update language gadget

diff --git a/SettingMainGadget/SettingMainGadget/LanguageInputGadget.cs b/SettingMainGadget/SettingMainGadget/LanguageInputGadget.cs
index f2df3f80b82d325cdc73dc34a521498c89866771..ed15461cf0830b36fad5ab5a91b08f07a15f2d28 100644 (file)
--- a/SettingMainGadget/SettingMainGadget/LanguageInputGadget.cs
+++ b/SettingMainGadget/SettingMainGadget/LanguageInputGadget.cs
@@ -84,9 +84,9 @@ namespace Setting.Menu
             {
                 keyboardItem.Clicked += (o, e) =>
                 {
-                    NavigateTo(MainMenuProvider.Language_InputMethod);
+                    NavigateTo("Language.InputMethod");
                 };
-                sections.Add(MainMenuProvider.Language_InputMethod, keyboardItem);
+                sections.Add("Language.InputMethod", keyboardItem);
             }
 
             TextHeaderListItem inputAssistanceHeaderItem = new TextHeaderListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_INPUT_ASSISTANCE)));
@@ -100,9 +100,9 @@ namespace Setting.Menu
             {
                 autofillServiceItem.Clicked += (o, e) =>
                 {
-                    NavigateTo(MainMenuProvider.Language_AutoFill);
+                    NavigateTo("Language.AutoFill");
                 };
-                sections.Add(MainMenuProvider.Language_AutoFill, autofillServiceItem);
+                sections.Add("Language.AutoFill", autofillServiceItem);
             }
 
             TextHeaderListItem bodySpeechHeaderItem = new TextHeaderListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_SPEECH)));
@@ -116,9 +116,9 @@ namespace Setting.Menu
             {
                 voiceControl.Clicked += (o, e) =>
                 {
-                    NavigateTo(MainMenuProvider.Language_VoiceControl);
+                    NavigateTo("Language.VoiceControl");
                 };
-                sections.Add(MainMenuProvider.Language_VoiceControl, voiceControl);
+                sections.Add("Language.VoiceControl", voiceControl);
             }
 
             TextListItem languageTTS = TextListItem.CreatePrimaryTextItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_VOICE_HEADER_TEXT_TO_SPEECH_HTTS)));
@@ -126,9 +126,9 @@ namespace Setting.Menu
             {
                 languageTTS.Clicked += (o, e) =>
                 {
-                    NavigateTo(MainMenuProvider.Language_TTS);
+                    NavigateTo("Language.TTS");
                 };
-                sections.Add(MainMenuProvider.Language_TTS, languageTTS);
+                sections.Add("Language.TTS", languageTTS);
             }
 
             TextListItem languageSTT = TextListItem.CreatePrimaryTextItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_VOICE_HEADER_SPEECH_TO_TEXT_HSTT)));
@@ -136,9 +136,9 @@ namespace Setting.Menu
             {
                 languageSTT.Clicked += (o, e) =>
                 {
-                    NavigateTo(MainMenuProvider.Language_STT);
+                    NavigateTo("Language.STT");
                 };
-                sections.Add(MainMenuProvider.Language_STT, languageSTT);
+                sections.Add("Language.STT", languageSTT);
             }
 
             var customization = GetCustomization().OrderBy(c => c.Order);

diff --git a/SettingMainGadget/SettingMainGadget/MainMenuProvider.cs b/SettingMainGadget/SettingMainGadget/MainMenuProvider.cs
index a85cf6d0dc723a02e610684cb86c7e79d81d74c1..6588022a5b27a6d2bc75cb403bcb8b571c980c7b 100644 (file)
--- a/SettingMainGadget/SettingMainGadget/MainMenuProvider.cs
+++ b/SettingMainGadget/SettingMainGadget/MainMenuProvider.cs
@@ -68,13 +68,6 @@ namespace SettingMainGadget
         public static string Storage_DefaultSettings = "Storage.DefaultSettings";
         public static string Storage_Apps = "Storage.Apps";
 
-        //external
-        public static string Language_InputMethod = "Language.InputMethod";
-        public static string Language_AutoFill = "Language.AutoFill";
-        public static string Language_VoiceControl = "Language.VoiceControl";
-        public static string Language_TTS = "Language.TTS";
-        public static string Language_STT = "Language.STT";
-
         public override SettingMenu[] Provide()
         {
             return new SettingMenu[]
@@ -102,13 +95,7 @@ namespace SettingMainGadget
                 new SettingMenu(path: Language, defaultOrder: 60, type: typeof(Setting.Menu.LanguageInputGadget)),
                 new SettingMenu(path: Language_Display, defaultOrder: 61, type: typeof(Setting.Menu.LanguageInput.LanguageInputDisplayLanguageGadget)),
                 new SettingMenu(path: Language_KeyboardHeader, defaultOrder: 62),
-                new SettingMenu(path: Language_InputMethod, defaultOrder: 63),
                 new SettingMenu(path: Language_InputAssistanceHeader, defaultOrder: 64),
-                new SettingMenu(path: Language_AutoFill, defaultOrder: 65),
-                new SettingMenu(path: Language_BodySpeech, defaultOrder: 66),
-                new SettingMenu(path: Language_VoiceControl, defaultOrder: 67),
-                new SettingMenu(path: Language_TTS, defaultOrder: 68),
-                new SettingMenu(path: Language_STT, defaultOrder: 69),
                 new SettingMenu(path: About, defaultOrder: 70, type: typeof(Setting.Menu.AboutGadget)),
                 new SettingMenu(path: About_ManageCertificates, defaultOrder: 10, type: typeof(Setting.Menu.About.AboutManageCertificatesGadget)),
                 new SettingMenu(path: About_RootCertificates, defaultOrder: 15, type: typeof(Setting.Menu.About.AboutRootCertificatesGadget)),