1.1.1 -> 1.1.2 第32次更新

This commit is contained in:
Space Time 2024-10-05 11:05:32 +08:00
parent 23241c8a5e
commit dafd160c70
7 changed files with 47 additions and 56 deletions

View File

@ -222,6 +222,24 @@ namespace Sheas_Cealer.Consts {
}
}
/// <summary>
/// 查找类似 Edit Hosts Conf 的本地化字符串。
/// </summary>
public static string EditHostsConfButtonContent {
get {
return ResourceManager.GetString("EditHostsConfButtonContent", resourceCulture);
}
}
/// <summary>
/// 查找类似 Click to edit hosts conf 的本地化字符串。
/// </summary>
public static string EditHostsConfButtonToolTip {
get {
return ResourceManager.GetString("EditHostsConfButtonToolTip", resourceCulture);
}
}
/// <summary>
/// 查找类似 Edit Local Host 的本地化字符串。
/// </summary>

View File

@ -126,6 +126,12 @@
<data name="BrowserPathSettingsModeName" xml:space="preserve">
<value>Browser Path</value>
</data>
<data name="EditHostsConfButtonContent" xml:space="preserve">
<value>Edit Hosts Conf</value>
</data>
<data name="EditHostsConfButtonToolTip" xml:space="preserve">
<value>Click to edit hosts conf</value>
</data>
<data name="EditLocalHostButtonContent" xml:space="preserve">
<value>Edit Local Host</value>
</data>

View File

@ -126,6 +126,12 @@
<data name="BrowserPathSettingsModeName" xml:space="preserve">
<value>文件路径</value>
</data>
<data name="EditHostsConfButtonContent" xml:space="preserve">
<value>编辑 Hosts 配置</value>
</data>
<data name="EditHostsConfButtonToolTip" xml:space="preserve">
<value>点击编辑 Hosts 配置</value>
</data>
<data name="EditLocalHostButtonContent" xml:space="preserve">
<value>编辑本地规则</value>
</data>
@ -265,7 +271,7 @@
<value>它死了,你是 Sheas Cealer 的英雄</value>
</data>
<data name="_GameStartMsg" xml:space="preserve">
<value>不,求你杀了我,我...控制不住自己了...</value>
<value>不,求你杀了我,我...控制不住了...</value>
</data>
<data name="_HostErrorMsg" xml:space="preserve">
<value>规则无法识别,请检查伪造规则中是否含有语法错误</value>

View File

@ -1,17 +0,0 @@
using System;
using System.Globalization;
using System.Windows.Data;
namespace Sheas_Cealer.Convs;
internal class MainMihomoButtonIsEnabledConv : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
bool isMihomoExist = (bool)value;
return isMihomoExist;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
}

View File

@ -1,17 +0,0 @@
using System;
using System.Globalization;
using System.Windows.Data;
namespace Sheas_Cealer.Convs;
internal class MainNginxButtonIsEnabledConv : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
bool isNginxExist = (bool)value;
return isNginxExist;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
}

View File

@ -114,15 +114,9 @@
</MultiBinding>
</Button.IsEnabled>
</Button>
<Button Grid.Column="1" Margin="5" d:Content="# # # #"
<Button IsEnabled="{Binding IsNginxExist}"
Grid.Column="1" Margin="5" d:Content="# # # #"
Click="NginxButton_Click" PreviewMouseDown="NginxButton_PreviewMouseDown">
<Button.IsEnabled>
<Binding Path="IsNginxExist">
<Binding.Converter>
<convs:MainNginxButtonIsEnabledConv />
</Binding.Converter>
</Binding>
</Button.IsEnabled>
<Button.Visibility>
<Binding Source="{x:Static consts:MainConst.IsAdmin}" Mode="OneTime">
<Binding.Converter>
@ -145,15 +139,9 @@
</Binding>
</Button.ToolTip>
</Button>
<Button Grid.Column="2" Margin="5" d:Content="# # # #"
<Button IsEnabled="{Binding IsMihomoExist}"
Grid.Column="2" Margin="5" d:Content="# # # #"
Click="MihomoButton_Click" PreviewMouseDown="MihomoButton_PreviewMouseDown">
<Button.IsEnabled>
<Binding Path="IsMihomoExist">
<Binding.Converter>
<convs:MainMihomoButtonIsEnabledConv />
</Binding.Converter>
</Binding>
</Button.IsEnabled>
<Button.Visibility>
<Binding Source="{x:Static consts:MainConst.IsAdmin}" Mode="OneTime">
<Binding.Converter>
@ -217,9 +205,10 @@
</Grid>
<Grid Grid.Row="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.6*" />
<ColumnDefinition Width="1.7*" />
<ColumnDefinition Width="1.6*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="1.5*" />
</Grid.ColumnDefinitions>
<Grid.Visibility>
<Binding Source="{x:Static consts:MainConst.IsAdmin}" Mode="OneTime">
@ -230,12 +219,17 @@
</Grid.Visibility>
<Button x:Name="EditNginxConfButton"
IsEnabled="{Binding IsNginxExist}"
Grid.Column="0" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditNginxConfButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditNginxConfButtonToolTip}}"
Click="EditConfButton_Click" />
<Button Grid.Column="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditMihomoConfButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditMihomoConfButtonToolTip}}"
<Button IsEnabled="{Binding IsMihomoExist}"
Grid.Column="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditMihomoConfButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditMihomoConfButtonToolTip}}"
Click="EditConfButton_Click" />
<Button x:Name="EditHostsConfButton"
Grid.Column="2" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditHostsConfButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditHostsConfButtonToolTip}}"
Click="EditConfButton_Click" />
<Button Focusable="False"
Grid.Column="2" Margin="5" d:Content="# # # #"
Grid.Column="3" Margin="5" d:Content="# # # #"
Click="NoClickButton_Click" Cursor="Hand">
<Button.Content>
<Binding Path="IsFlashing">

View File

@ -421,7 +421,8 @@ public partial class MainWin : Window
{
Button? senderButton = sender as Button;
string confPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, senderButton == EditNginxConfButton ? "nginx.conf" : "config.yaml");
string confPath = senderButton == EditHostsConfButton ? Path.Combine(Registry.LocalMachine.OpenSubKey(@"\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\DataBasePath")?.GetValue("DataBasePath", null)?.ToString() ?? @"C:\Windows\System32\drivers\etc", "hosts") :
Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, senderButton == EditNginxConfButton ? "nginx.conf" : "config.yaml");
if (!File.Exists(confPath))
File.Create(confPath).Dispose();