mirrors/Sheas-Cealer
1
0
Fork 0
mirror of https://github.com/SpaceTimee/Sheas-Cealer.git synced 2025-07-13 04:42:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.1.3 -> 1.1.4 第88次更新

Browse Source
This commit is contained in:
Space Time 2024-12-20 17:43:50 +08:00
parent e66f1eb5b2
commit 9ea750e336
8 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.filenesting.json
View File

@ -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" ],

36
Consts/MainMultilangConst.Designer.cs generated
View File

@ -258,6 +258,24 @@ namespace Sheas_Cealer.Consts {
}
}
/// <summary>
/// 查找类似 Start Cealing 的本地化字符串。
/// </summary>
public static string BrowserButtonContent {
get {
return ResourceManager.GetString("BrowserButtonContent", resourceCulture);
}
}
/// <summary>
/// 查找类似 Click to launch the injected browser 的本地化字符串。
/// </summary>
public static string BrowserButtonToolTip {
get {
return ResourceManager.GetString("BrowserButtonToolTip", resourceCulture);
}
}
/// <summary>
/// 查找类似 Edit Hosts Conf 的本地化字符串。
/// </summary>
@ -591,24 +609,6 @@ namespace Sheas_Cealer.Consts {
}
}
/// <summary>
/// 查找类似 Start Cealing 的本地化字符串。
/// </summary>
public static string StartButtonContent {
get {
return ResourceManager.GetString("StartButtonContent", resourceCulture);
}
}
/// <summary>
/// 查找类似 Click to launch the injected browser 的本地化字符串。
/// </summary>
public static string StartButtonToolTip {
get {
return ResourceManager.GetString("StartButtonToolTip", resourceCulture);
}
}
/// <summary>
/// 查找类似 Update Upstream Host 的本地化字符串。
/// </summary>

22
Consts/MainMultilangConst.resx
View File

@ -123,9 +123,6 @@
<data name="AboutButtonToolTip" xml:space="preserve">
<value>Click to open the about window</value>
</data>
<data name="SettingsModeButtonBrowserPathContent" xml:space="preserve">
<value>Browser Path</value>
</data>
<data name="EditHostsConfButtonContent" xml:space="preserve">
<value>Edit Hosts Conf</value>
</data>
@ -156,9 +153,6 @@
<data name="EditUpstreamHostButtonToolTip" xml:space="preserve">
<value>Click to edit upstream host</value>
</data>
<data name="SettingsModeButtonExtraArgsContent" xml:space="preserve">
<value>Extra Args</value>
</data>
<data name="MihomoButtonIsInitingContent" xml:space="preserve">
<value>GLB. Purging INIT.</value>
</data>
@ -228,13 +222,22 @@
<data name="SettingsFunctionButtonUpstreamUrlContent" xml:space="preserve">
<value>Reset URL</value>
</data>
<data name="SettingsModeButtonBrowserPathContent" xml:space="preserve">
<value>Browser Path</value>
</data>
<data name="SettingsModeButtonExtraArgsContent" xml:space="preserve">
<value>Extra Args</value>
</data>
<data name="SettingsModeButtonToolTip" xml:space="preserve">
<value>Click to switch settings</value>
</data>
<data name="StartButtonContent" xml:space="preserve">
<data name="SettingsModeButtonUpstreamUrlContent" xml:space="preserve">
<value>Upstream URL</value>
</data>
<data name="BrowserButtonContent" xml:space="preserve">
<value>Start Cealing</value>
</data>
<data name="StartButtonToolTip" xml:space="preserve">
<data name="BrowserButtonToolTip" xml:space="preserve">
<value>Click to launch the injected browser</value>
</data>
<data name="UpdateUpstreamHostButtonContent" xml:space="preserve">
@ -243,9 +246,6 @@
<data name="UpdateUpstreamHostButtonToolTip" xml:space="preserve">
<value>Click to update upstream host</value>
</data>
<data name="SettingsModeButtonUpstreamUrlContent" xml:space="preserve">
<value>Upstream URL</value>
</data>
<data name="_BrowserPathDialogFilterFileType" xml:space="preserve">
<value>Browser</value>
</data>

22
Consts/MainMultilangConst.zh.resx
View File

@ -123,9 +123,6 @@
<data name="AboutButtonToolTip" xml:space="preserve">
<value>点击打开关于窗口</value>
</data>
<data name="SettingsModeButtonBrowserPathContent" xml:space="preserve">
<value>文件路径</value>
</data>
<data name="EditHostsConfButtonContent" xml:space="preserve">
<value>编辑 Hosts 配置</value>
</data>
@ -156,9 +153,6 @@
<data name="EditUpstreamHostButtonToolTip" xml:space="preserve">
<value>点击编辑上游规则</value>
</data>
<data name="SettingsModeButtonExtraArgsContent" xml:space="preserve">
<value>额外参数</value>
</data>
<data name="MihomoButtonIsInitingContent" xml:space="preserve">
<value>全局净化启动中</value>
</data>
@ -228,13 +222,22 @@
<data name="SettingsFunctionButtonUpstreamUrlContent" xml:space="preserve">
<value>重置链接</value>
</data>
<data name="SettingsModeButtonBrowserPathContent" xml:space="preserve">
<value>文件路径</value>
</data>
<data name="SettingsModeButtonExtraArgsContent" xml:space="preserve">
<value>额外参数</value>
</data>
<data name="SettingsModeButtonToolTip" xml:space="preserve">
<value>点击切换设置模式</value>
</data>
<data name="StartButtonContent" xml:space="preserve">
<data name="SettingsModeButtonUpstreamUrlContent" xml:space="preserve">
<value>上游链接</value>
</data>
<data name="BrowserButtonContent" xml:space="preserve">
<value>启动伪造</value>
</data>
<data name="StartButtonToolTip" xml:space="preserve">
<data name="BrowserButtonToolTip" xml:space="preserve">
<value>点击启动参数注入完成的浏览器</value>
</data>
<data name="UpdateUpstreamHostButtonContent" xml:space="preserve">
@ -243,9 +246,6 @@
<data name="UpdateUpstreamHostButtonToolTip" xml:space="preserve">
<value>点击更新上游规则</value>
</data>
<data name="SettingsModeButtonUpstreamUrlContent" xml:space="preserve">
<value>上游链接</value>
</data>
<data name="_BrowserPathDialogFilterFileType" xml:space="preserve">
<value>浏览器</value>
</data>

2
Convs/MainStartButtonIsEnabledConv.cs → Convs/MainBrowserButtonIsEnabledConv.cs
View File

@ -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)
{

2
Convs/MainConv.cs
View File

@ -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();

8
Wins/MainWin.xaml
View File

@ -64,11 +64,11 @@
<Button IsDefault="True"
Grid.Column="0" Margin="5"
Content="{x:Static consts:MainConst.StartButtonContent}"
ToolTip="{x:Static consts:MainConst.StartButtonToolTip}"
Click="StartButton_Click" PreviewMouseDown="StartButton_PreviewMouseDown">
Content="{x:Static consts:MainConst.BrowserButtonContent}"
ToolTip="{x:Static consts:MainConst.BrowserButtonToolTip}"
Click="BrowserButton_Click" PreviewMouseDown="BrowserButton_PreviewMouseDown">
<Button.IsEnabled>
<MultiBinding Converter="{x:Static convs:MainConv.MainStartButtonIsEnabledConv}">
<MultiBinding Converter="{x:Static convs:MainConv.MainBrowserButtonIsEnabledConv}">
<Binding Path="BrowserPath" />
<Binding Path="ExtraArgs" />
</MultiBinding>

12
Wins/MainWin.xaml.cs
View File

@ -89,7 +89,7 @@ public partial class MainWin : Window
await NginxCleaner.Clean();
if (Array.Exists(Environment.GetCommandLineArgs(), arg => arg.Equals("-s", StringComparison.OrdinalIgnoreCase)))
StartButton_Click(null!, null!);
BrowserButton_Click(null!, null!);
UpdateUpstreamHostButton_Click(null!, null!);
});
@ -159,18 +159,18 @@ public partial class MainWin : Window
}
}
private void StartButton_Click(object? sender, RoutedEventArgs e)
private void BrowserButton_Click(object? sender, RoutedEventArgs e)
{
if (HoldButtonTimer == null || HoldButtonTimer.IsEnabled)
StartButtonHoldTimer_Tick(sender == null, null!);
BrowserButtonHoldTimer_Tick(sender == null, null!);
}
private void StartButton_PreviewMouseDown(object sender, MouseButtonEventArgs e)
private void BrowserButton_PreviewMouseDown(object sender, MouseButtonEventArgs e)
{
HoldButtonTimer = new() { Interval = TimeSpan.FromSeconds(1) };
HoldButtonTimer.Tick += StartButtonHoldTimer_Tick;
HoldButtonTimer.Tick += BrowserButtonHoldTimer_Tick;
HoldButtonTimer.Start();
}
private async void StartButtonHoldTimer_Tick(object? sender, EventArgs e)
private async void BrowserButtonHoldTimer_Tick(object? sender, EventArgs e)
{
HoldButtonTimer?.Stop();