From 9ea750e33610b69a5349367e0320ac2f68544f41 Mon Sep 17 00:00:00 2001 From: Space Time Date: Fri, 20 Dec 2024 17:43:50 +0800 Subject: [PATCH] =?UTF-8?q?1.1.3=20->=201.1.4=20=E7=AC=AC88=E6=AC=A1?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .filenesting.json | 2 +- Consts/MainMultilangConst.Designer.cs | 36 +++++++++---------- Consts/MainMultilangConst.resx | 22 ++++++------ Consts/MainMultilangConst.zh.resx | 22 ++++++------ ...v.cs => MainBrowserButtonIsEnabledConv.cs} | 2 +- Convs/MainConv.cs | 2 +- Wins/MainWin.xaml | 8 ++--- Wins/MainWin.xaml.cs | 12 +++---- 8 files changed, 53 insertions(+), 53 deletions(-) rename Convs/{MainStartButtonIsEnabledConv.cs => MainBrowserButtonIsEnabledConv.cs} (90%) diff --git a/.filenesting.json b/.filenesting.json index b27de62..43ed449 100644 --- a/.filenesting.json +++ b/.filenesting.json @@ -27,7 +27,7 @@ "MainSettingsBoxToolTipConv.cs": [ "MainConv.cs" ], "MainSettingsFunctionButtonContentConv.cs": [ "MainConv.cs" ], "MainSettingsModeButtonContentConv.cs": [ "MainConv.cs" ], - "MainStartButtonIsEnabledConv.cs": [ "MainConv.cs" ], + "MainBrowserButtonIsEnabledConv.cs": [ "MainConv.cs" ], "MainUpdateHostButtonContentConv.cs": [ "MainConv.cs" ], "MainUpdateHostButtonIsEnabledConv.cs": [ "MainConv.cs" ], "MainWinWidthConv.cs": [ "MainConv.cs" ], diff --git a/Consts/MainMultilangConst.Designer.cs b/Consts/MainMultilangConst.Designer.cs index 5dfabec..68b8470 100644 --- a/Consts/MainMultilangConst.Designer.cs +++ b/Consts/MainMultilangConst.Designer.cs @@ -258,6 +258,24 @@ namespace Sheas_Cealer.Consts { } } + /// + /// 查找类似 Start Cealing 的本地化字符串。 + /// + public static string BrowserButtonContent { + get { + return ResourceManager.GetString("BrowserButtonContent", resourceCulture); + } + } + + /// + /// 查找类似 Click to launch the injected browser 的本地化字符串。 + /// + public static string BrowserButtonToolTip { + get { + return ResourceManager.GetString("BrowserButtonToolTip", resourceCulture); + } + } + /// /// 查找类似 Edit Hosts Conf 的本地化字符串。 /// @@ -591,24 +609,6 @@ namespace Sheas_Cealer.Consts { } } - /// - /// 查找类似 Start Cealing 的本地化字符串。 - /// - public static string StartButtonContent { - get { - return ResourceManager.GetString("StartButtonContent", resourceCulture); - } - } - - /// - /// 查找类似 Click to launch the injected browser 的本地化字符串。 - /// - public static string StartButtonToolTip { - get { - return ResourceManager.GetString("StartButtonToolTip", resourceCulture); - } - } - /// /// 查找类似 Update Upstream Host 的本地化字符串。 /// diff --git a/Consts/MainMultilangConst.resx b/Consts/MainMultilangConst.resx index 7a6f7a2..56bf11d 100644 --- a/Consts/MainMultilangConst.resx +++ b/Consts/MainMultilangConst.resx @@ -123,9 +123,6 @@ Click to open the about window - - Browser Path - Edit Hosts Conf @@ -156,9 +153,6 @@ Click to edit upstream host - - Extra Args - GLB. Purging INIT. @@ -228,13 +222,22 @@ Reset URL + + Browser Path + + + Extra Args + Click to switch settings - + + Upstream URL + + Start Cealing - + Click to launch the injected browser @@ -243,9 +246,6 @@ Click to update upstream host - - Upstream URL - Browser diff --git a/Consts/MainMultilangConst.zh.resx b/Consts/MainMultilangConst.zh.resx index 1864679..28664a0 100644 --- a/Consts/MainMultilangConst.zh.resx +++ b/Consts/MainMultilangConst.zh.resx @@ -123,9 +123,6 @@ 点击打开关于窗口 - - 文件路径 - 编辑 Hosts 配置 @@ -156,9 +153,6 @@ 点击编辑上游规则 - - 额外参数 - 全局净化启动中 @@ -228,13 +222,22 @@ 重置链接 + + 文件路径 + + + 额外参数 + 点击切换设置模式 - + + 上游链接 + + 启动伪造 - + 点击启动参数注入完成的浏览器 @@ -243,9 +246,6 @@ 点击更新上游规则 - - 上游链接 - 浏览器 diff --git a/Convs/MainStartButtonIsEnabledConv.cs b/Convs/MainBrowserButtonIsEnabledConv.cs similarity index 90% rename from Convs/MainStartButtonIsEnabledConv.cs rename to Convs/MainBrowserButtonIsEnabledConv.cs index ca01fd6..a83e24f 100644 --- a/Convs/MainStartButtonIsEnabledConv.cs +++ b/Convs/MainBrowserButtonIsEnabledConv.cs @@ -6,7 +6,7 @@ using System.Windows.Data; namespace Sheas_Cealer.Convs; -internal class MainStartButtonIsEnabledConv : IMultiValueConverter +internal class MainBrowserButtonIsEnabledConv : IMultiValueConverter { public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { diff --git a/Convs/MainConv.cs b/Convs/MainConv.cs index 573dfbd..9c3a9aa 100644 --- a/Convs/MainConv.cs +++ b/Convs/MainConv.cs @@ -16,7 +16,7 @@ internal static class MainConv public static MainSettingsBoxToolTipConv MainSettingsBoxToolTipConv => new(); public static MainSettingsFunctionButtonContentConv MainSettingsFunctionButtonContentConv => new(); public static MainSettingsModeButtonContentConv MainSettingsModeButtonContentConv => new(); - public static MainStartButtonIsEnabledConv MainStartButtonIsEnabledConv => new(); + public static MainBrowserButtonIsEnabledConv MainBrowserButtonIsEnabledConv => new(); public static MainUpdateHostButtonContentConv MainUpdateHostButtonContentConv => new(); public static MainUpdateHostButtonIsEnabledConv MainUpdateHostButtonIsEnabledConv => new(); public static MainWinWidthConv MainWinWidthConv => new(); diff --git a/Wins/MainWin.xaml b/Wins/MainWin.xaml index 18fdf82..ac551d0 100644 --- a/Wins/MainWin.xaml +++ b/Wins/MainWin.xaml @@ -64,11 +64,11 @@