1.1.3 -> 1.1.4 第53次更新

Consts/MainMultilangConst.Designer.cs

@@ -258,15 +258,6 @@ namespace Sheas_Cealer.Consts {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Browser Path 的本地化字符串。
-        /// </summary>
-        public static string BrowserPathSettingsModeName {
-            get {
-                return ResourceManager.GetString("BrowserPathSettingsModeName", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Edit Hosts Conf 的本地化字符串。
         /// </summary>
@@ -357,15 +348,6 @@ namespace Sheas_Cealer.Consts {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Extra Args 的本地化字符串。
-        /// </summary>
-        public static string ExtraArgsSettingsModeName {
-            get {
-                return ResourceManager.GetString("ExtraArgsSettingsModeName", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 GLB. Purging INIT. 的本地化字符串。
         /// </summary>
@@ -573,6 +555,24 @@ namespace Sheas_Cealer.Consts {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Browser Path 的本地化字符串。
+        /// </summary>
+        public static string SettingsModeButtonBrowserPathContent {
+            get {
+                return ResourceManager.GetString("SettingsModeButtonBrowserPathContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Extra Args 的本地化字符串。
+        /// </summary>
+        public static string SettingsModeButtonExtraArgsContent {
+            get {
+                return ResourceManager.GetString("SettingsModeButtonExtraArgsContent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Click to switch settings 的本地化字符串。
         /// </summary>
@@ -582,6 +582,15 @@ namespace Sheas_Cealer.Consts {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Upstream URL 的本地化字符串。
+        /// </summary>
+        public static string SettingsModeButtonUpstreamUrlContent {
+            get {
+                return ResourceManager.GetString("SettingsModeButtonUpstreamUrlContent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Start Cealing 的本地化字符串。
         /// </summary>
@@ -617,14 +626,5 @@ namespace Sheas_Cealer.Consts {
                 return ResourceManager.GetString("UpdateUpstreamHostButtonToolTip", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   查找类似 Upstream URL 的本地化字符串。
-        /// </summary>
-        public static string UpstreamUrlSettingsModeName {
-            get {
-                return ResourceManager.GetString("UpstreamUrlSettingsModeName", resourceCulture);
-            }
-        }
     }
 }

Consts/MainMultilangConst.resx

@@ -123,7 +123,7 @@
   <data name="AboutButtonToolTip" xml:space="preserve">
     <value>Click to open the about window</value>
   </data>
-  <data name="BrowserPathSettingsModeName" xml:space="preserve">
+  <data name="SettingsModeButtonBrowserPathContent" xml:space="preserve">
     <value>Browser Path</value>
   </data>
   <data name="EditHostsConfButtonContent" xml:space="preserve">
@@ -156,7 +156,7 @@
   <data name="EditUpstreamHostButtonToolTip" xml:space="preserve">
     <value>Click to edit upstream host</value>
   </data>
-  <data name="ExtraArgsSettingsModeName" xml:space="preserve">
+  <data name="SettingsModeButtonExtraArgsContent" xml:space="preserve">
     <value>Extra Args</value>
   </data>
   <data name="MihomoButtonIsInitingContent" xml:space="preserve">
@@ -243,7 +243,7 @@
   <data name="UpdateUpstreamHostButtonToolTip" xml:space="preserve">
     <value>Click to update upstream host</value>
   </data>
-  <data name="UpstreamUrlSettingsModeName" xml:space="preserve">
+  <data name="SettingsModeButtonUpstreamUrlContent" xml:space="preserve">
     <value>Upstream URL</value>
   </data>
   <data name="_BrowserPathDialogFilterFileType" xml:space="preserve">

Consts/MainMultilangConst.zh.resx

@@ -123,7 +123,7 @@
   <data name="AboutButtonToolTip" xml:space="preserve">
     <value>点击打开关于窗口</value>
   </data>
-  <data name="BrowserPathSettingsModeName" xml:space="preserve">
+  <data name="SettingsModeButtonBrowserPathContent" xml:space="preserve">
     <value>文件路径</value>
   </data>
   <data name="EditHostsConfButtonContent" xml:space="preserve">
@@ -156,7 +156,7 @@
   <data name="EditUpstreamHostButtonToolTip" xml:space="preserve">
     <value>点击编辑上游规则</value>
   </data>
-  <data name="ExtraArgsSettingsModeName" xml:space="preserve">
+  <data name="SettingsModeButtonExtraArgsContent" xml:space="preserve">
     <value>额外参数</value>
   </data>
   <data name="MihomoButtonIsInitingContent" xml:space="preserve">
@@ -243,7 +243,7 @@
   <data name="UpdateUpstreamHostButtonToolTip" xml:space="preserve">
     <value>点击更新上游规则</value>
   </data>
-  <data name="UpstreamUrlSettingsModeName" xml:space="preserve">
+  <data name="SettingsModeButtonUpstreamUrlContent" xml:space="preserve">
     <value>上游链接</value>
   </data>
   <data name="_BrowserPathDialogFilterFileType" xml:space="preserve">

Convs/MainSettingsBoxHintConv.cs

@@ -14,9 +14,9 @@ internal class MainSettingsBoxHintConv : IValueConverter
 
         return settingsMode switch
         {
-            MainConst.SettingsMode.BrowserPathMode => MainConst.BrowserPathSettingsModeName,
+            MainConst.SettingsMode.BrowserPathMode => MainConst.SettingsModeButtonBrowserPathContent,
-            MainConst.SettingsMode.UpstreamUrlMode => MainConst.UpstreamUrlSettingsModeName,
+            MainConst.SettingsMode.UpstreamUrlMode => MainConst.SettingsModeButtonUpstreamUrlContent,
-            MainConst.SettingsMode.ExtraArgsMode => MainConst.ExtraArgsSettingsModeName,
+            MainConst.SettingsMode.ExtraArgsMode => MainConst.SettingsModeButtonExtraArgsContent,
             _ => throw new UnreachableException()
         };
     }

Convs/MainSettingsModeButtonContentConv.cs

@@ -13,9 +13,9 @@ internal class MainSettingsModeButtonContentConv : IValueConverter
 
         return settingsMode switch
         {
-            MainConst.SettingsMode.BrowserPathMode => MainConst.UpstreamUrlSettingsModeName,
+            MainConst.SettingsMode.BrowserPathMode => MainConst.SettingsModeButtonUpstreamUrlContent,
-            MainConst.SettingsMode.UpstreamUrlMode => MainConst.ExtraArgsSettingsModeName,
+            MainConst.SettingsMode.UpstreamUrlMode => MainConst.SettingsModeButtonExtraArgsContent,
-            MainConst.SettingsMode.ExtraArgsMode => MainConst.BrowserPathSettingsModeName,
+            MainConst.SettingsMode.ExtraArgsMode => MainConst.SettingsModeButtonBrowserPathContent,
             _ => throw new NotImplementedException()
         };
     }