update res path

diff --git a/SettingMainGadget/SettingMainGadget/Storage/DefaultStorageGadget.cs b/SettingMainGadget/SettingMainGadget/Storage/DefaultStorageGadget.cs
index bc5b0e37c98124a0414e4834aab8213f59c5a6a0..948c81d2e7fff3b39e92c09193fc47c1cb066c43 100644 (file)
--- a/SettingMainGadget/SettingMainGadget/Storage/DefaultStorageGadget.cs
+++ b/SettingMainGadget/SettingMainGadget/Storage/DefaultStorageGadget.cs
@@ -11,7 +11,7 @@ namespace Setting.Menu.Storage
 {
     public class DefaultStorageGadget : SettingCore.MenuGadget
     {
-        public override string ProvideTitle() => Resources.IDS_SM_HEADER_DEFAULT_STORAGE_SETTINGS_ABB;
+        public override string ProvideTitle() => NUIGadgetResourceManager.GetString(nameof(Resources.IDS_SM_HEADER_DEFAULT_STORAGE_SETTINGS_ABB));
 
         private const string VconfSharedContent = "db/setting/default_memory/wifi_direct";
         private const string VconfAppInstall = "db/setting/default_memory/install_applications";
@@ -56,18 +56,18 @@ namespace Setting.Menu.Storage
             GetStorageStatus(out int shared, out int app, out int status);
 
             // Shared contents
-            var headerItem = new TextHeaderListItem(Resources.IDS_ST_HEADER_SHARED_CONTENT);
+            var headerItem = new TextHeaderListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_HEADER_SHARED_CONTENT)));
             content.Add(headerItem);
 
-            headerItem = new TextHeaderListItem(Resources.IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT, true);
+            headerItem = new TextHeaderListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT)), true);
             content.Add(headerItem);
 
             RadioButtonGroup radioButtonStorageGroup = new RadioButtonGroup();
 
-            RadioButtonListItem device = new RadioButtonListItem(Resources.IDS_ST_BODY_DEVICE_STORAGE);
+            RadioButtonListItem device = new RadioButtonListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_DEVICE_STORAGE)));
             device.RadioButton.IsSelected = shared == 0;
 
-            RadioButtonListItem card = new RadioButtonListItem(Resources.IDS_ST_BODY_SD_CARD);
+            RadioButtonListItem card = new RadioButtonListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_SD_CARD)));
             // disable storage selection if the card is not mounted 
             if (status != 1)
             {
@@ -91,15 +91,15 @@ namespace Setting.Menu.Storage
             headerItem = new TextHeaderListItem("App installation"); // TODO : add translation to Resources
             content.Add(headerItem);
 
-            headerItem = new TextHeaderListItem(Resources.IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION, true);
+            headerItem = new TextHeaderListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION)), true);
             content.Add(headerItem);
 
             RadioButtonGroup radioButtonAppGroup = new RadioButtonGroup();
 
-            RadioButtonListItem deviceStorage = new RadioButtonListItem(Resources.IDS_ST_BODY_DEVICE_STORAGE);
+            RadioButtonListItem deviceStorage = new RadioButtonListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_DEVICE_STORAGE)));
             deviceStorage.RadioButton.IsSelected = app == 0;
 
-            RadioButtonListItem cardStorage = new RadioButtonListItem(Resources.IDS_ST_BODY_SD_CARD);
+            RadioButtonListItem cardStorage = new RadioButtonListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_SD_CARD)));
             // disable storage selection if the card is not mounted
             if (status != 1)
             {

diff --git a/SettingMainGadget/SettingMainGadget/StorageGadget.cs b/SettingMainGadget/SettingMainGadget/StorageGadget.cs
index 304ad718b3f6b3b87fd79ca5945d513fd56d2621..808ca1b67c780364507b51b57d3d56761a7ffd22 100644 (file)
--- a/SettingMainGadget/SettingMainGadget/StorageGadget.cs
+++ b/SettingMainGadget/SettingMainGadget/StorageGadget.cs
@@ -21,7 +21,7 @@ namespace Setting.Menu
 
         public override string ProvideIconPath() => GetResourcePath("storage.svg");
 
-        public override string ProvideTitle() => Resources.IDS_ST_BODY_DEVICE_STORAGE;
+        public override string ProvideTitle() => NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_DEVICE_STORAGE));
 
         private const string VconfCardStatus = "memory/sysman/mmc";
 
@@ -103,7 +103,7 @@ namespace Setting.Menu
                 storageIndicator.AddItem("system", new Color("#17234D"), 0);
                 sections.Add(MainMenuProvider.Storage_UsageIndicator, storageIndicator);
 
-                var totalItem = TextListItem.CreatePrimaryTextItemWithSecondaryText($"{Resources.IDS_ST_HEADER_TOTAL_SPACE}:", GetMediaSizeString(InternalTotal));
+                var totalItem = TextListItem.CreatePrimaryTextItemWithSecondaryText($"{NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_HEADER_TOTAL_SPACE))}:", GetMediaSizeString(InternalTotal));
                 sections.Add(MainMenuProvider.Storage_TotalInternal, totalItem);
 
                 var freeItem = TextListItem.CreatePrimaryTextItemWithSecondaryText("Free space:", GetMediaSizeString(InternalAvailable)); // TODO : add translation to Resources
@@ -120,27 +120,27 @@ namespace Setting.Menu
                 },
             };
 
-            appsItem = new TextWithIconListItem(Resources.IDS_SM_TMBODY_APPS_ABB, new Color("#FFC700"), subText: Resources.IDS_SM_SBODY_CALCULATING_ING);
+            appsItem = new TextWithIconListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_SM_TMBODY_APPS_ABB)), new Color("#FFC700"), subText: NUIGadgetResourceManager.GetString(nameof(Resources.IDS_SM_SBODY_CALCULATING_ING)));
             appsItem.Clicked += (s, e) =>
             {
             };
             usageSummary.Add(appsItem);
 
-            var imageItem = new TextWithIconListItem(Resources.IDS_ST_BODY_IMAGES, new Color("#FF8A00"), subText: GetMediaSizeString(sizeImage));
+            var imageItem = new TextWithIconListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_IMAGES)), new Color("#FF8A00"), subText: GetMediaSizeString(sizeImage));
             imageItem.Clicked += (s, e) =>
             {
                 // TODO : add media files info gadget 
             };
             usageSummary.Add(imageItem);
 
-            var videoItem = new TextWithIconListItem(Resources.IDS_ST_BODY_VIDEOS, new Color("#FF6200"), subText: GetMediaSizeString(sizeVideo));
+            var videoItem = new TextWithIconListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_VIDEOS)), new Color("#FF6200"), subText: GetMediaSizeString(sizeVideo));
             videoItem.Clicked += (s, e) =>
             {
                 // TODO : add media files info gadget 
             };
             usageSummary.Add(videoItem);
 
-            var audioItem = new TextWithIconListItem(Resources.IDS_ST_BODY_AUDIO, new Color("#A40404"), subText: GetMediaSizeString(sizeAudio));
+            var audioItem = new TextWithIconListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_AUDIO)), new Color("#A40404"), subText: GetMediaSizeString(sizeAudio));
             audioItem.Clicked += (s, e) =>
             {
                 // TODO : add media files info gadget 
@@ -149,21 +149,21 @@ namespace Setting.Menu
 
             // TODO : add documents item
 
-            var miscItem = new TextWithIconListItem(Resources.IDS_ST_BODY_MISCELLANEOUS_FILES, new Color("#28262B"), subText: GetMediaSizeString(sizeMisc));
+            var miscItem = new TextWithIconListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_MISCELLANEOUS_FILES)), new Color("#28262B"), subText: GetMediaSizeString(sizeMisc));
             miscItem.Clicked += (s, e) =>
             {
                 // TODO : add miscellaneous info gadget 
             };
             usageSummary.Add(miscItem);
 
-            cacheItem = new TextWithIconListItem(Resources.IDS_ST_BODY_CACHED_DATA_ABB, new Color("#3641FA"), subText: Resources.IDS_SM_SBODY_CALCULATING_ING);
+            cacheItem = new TextWithIconListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_CACHED_DATA_ABB)), new Color("#3641FA"), subText: NUIGadgetResourceManager.GetString(nameof(Resources.IDS_SM_SBODY_CALCULATING_ING)));
             cacheItem.Clicked += (s, e) =>
             {
                 ShowCachePopup();
             };
             usageSummary.Add(cacheItem);            
             
-            systemItem = new TextWithIconListItem(Resources.IDS_ST_BODY_SYSTEM_STORAGE, new Color("#17234D"), subText: Resources.IDS_SM_SBODY_CALCULATING_ING);
+            systemItem = new TextWithIconListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_SYSTEM_STORAGE)), new Color("#17234D"), subText: NUIGadgetResourceManager.GetString(nameof(Resources.IDS_SM_SBODY_CALCULATING_ING)));
             usageSummary.Add(systemItem);
 
             sections.Add(MainMenuProvider.Storage_UsageSummary, usageSummary);
@@ -193,20 +193,20 @@ namespace Setting.Menu
                     Logger.Warn($"could not get value for {VconfCardStatus}");
                 }
 
-                var totalItem = TextListItem.CreatePrimaryTextItemWithSecondaryText($"{Resources.IDS_ST_HEADER_TOTAL_SPACE}:", GetMediaSizeString(ExternalTotal));
+                var totalItem = TextListItem.CreatePrimaryTextItemWithSecondaryText($"{NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_HEADER_TOTAL_SPACE))}:", GetMediaSizeString(ExternalTotal));
                 externalStorage.Add(totalItem);
 
                 var freeItem = TextListItem.CreatePrimaryTextItemWithSecondaryText("Free space:", GetMediaSizeString(ExternalAvailable)); // TODO : add translation to Resources
                 externalStorage.Add(freeItem);
 
-                var unmount = TextListItem.CreatePrimaryTextItem(Resources.IDS_ST_BODY_UNMOUNT_SD_CARD);
+                var unmount = TextListItem.CreatePrimaryTextItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_UNMOUNT_SD_CARD)));
                 unmount.Clicked += (s, e) =>
                 {
                     // TODO : add popup with unmount functionality (storage_request_unmount_mmc)
                 };
                 externalStorage.Add(unmount);
 
-                var format = TextListItem.CreatePrimaryTextItem(Resources.IDS_ST_BODY_FORMAT_SD_CARD);
+                var format = TextListItem.CreatePrimaryTextItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_FORMAT_SD_CARD)));
                 format.Clicked += (s, e) =>
                 {
                     // TODO : add popup with format card functionality (storage_request_format_mmc)
@@ -215,7 +215,7 @@ namespace Setting.Menu
             }
             else
             {
-                var item = TextListItem.CreatePrimaryTextItemWithSubText("No SD card", Resources.IDS_ST_BODY_INSERT_SD_CARD); // TODO : add translation to Resources
+                var item = TextListItem.CreatePrimaryTextItemWithSubText("No SD card", NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_INSERT_SD_CARD))); // TODO : add translation to Resources
                 item.IsEnabled = false;
                 externalStorage.Add(item);
             }
@@ -507,7 +507,7 @@ namespace Setting.Menu
             {
                 WidthResizePolicy = ResizePolicyType.FitToChildren,
                 HeightResizePolicy = ResizePolicyType.FitToChildren,
-                Text = Resources.IDS_ST_BUTTON_CANCEL,
+                Text = NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BUTTON_CANCEL)),
                 Size = new Size(252, 48).SpToPx(),
                 Margin = new Extents(32, 61, 0, 32).SpToPx(),
             };