1.1.1 -> 1.1.2 第44次更新

This commit is contained in:
Space Time 2024-10-06 22:47:10 +08:00
parent c3bcd15084
commit 8e7f0a97cf
2 changed files with 35 additions and 17 deletions

View File

@ -228,9 +228,18 @@
<Button Grid.Column="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditUpstreamHostButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditUpstreamHostButtonToolTip}}"
Click="EditHostButton_Click" />
<Button x:Name="EditNginxConfButton"
IsEnabled="{Binding IsNginxExist}"
Grid.Column="2" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditNginxConfButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditNginxConfButtonToolTip}}"
Click="EditConfButton_Click">
<Button.IsEnabled>
<MultiBinding>
<MultiBinding.Converter>
<convs:MainProxyButtonIsEnabledConv />
</MultiBinding.Converter>
<Binding Path="IsNginxExist" />
<Binding Path="IsNginxIniting" />
</MultiBinding>
</Button.IsEnabled>
<Button.Visibility>
<Binding Source="{x:Static consts:MainConst.IsAdmin}" Mode="OneTime">
<Binding.Converter>
@ -239,9 +248,18 @@
</Binding>
</Button.Visibility>
</Button>
<Button IsEnabled="{Binding IsMihomoExist}"
Grid.Column="3" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditMihomoConfButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditMihomoConfButtonToolTip}}"
<Button Grid.Column="3" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditMihomoConfButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditMihomoConfButtonToolTip}}"
Click="EditConfButton_Click">
<Button.IsEnabled>
<MultiBinding>
<MultiBinding.Converter>
<convs:MainProxyButtonIsEnabledConv />
</MultiBinding.Converter>
<Binding Path="IsMihomoExist" />
<Binding Path="IsMihomoIniting" />
</MultiBinding>
</Button.IsEnabled>
<Button.Visibility>
<Binding Source="{x:Static consts:MainConst.IsAdmin}" Mode="OneTime">
<Binding.Converter>

View File

@ -362,6 +362,18 @@ public partial class MainWin : Window
ProcessStartInfo processStartInfo = new(hostPath) { UseShellExecute = true };
Process.Start(processStartInfo);
}
private void EditConfButton_Click(object sender, RoutedEventArgs e)
{
Button? senderButton = sender as Button;
string confPath = senderButton == EditHostsConfButton ? MainConst.HostsConfPath :
senderButton == EditNginxConfButton ? MainConst.NginxConfPath : MainConst.MihomoConfPath;
if (!File.Exists(confPath))
File.Create(confPath).Dispose();
ProcessStartInfo processStartInfo = new(confPath) { UseShellExecute = true };
Process.Start(processStartInfo);
}
private async void UpdateUpstreamHostButton_Click(object sender, RoutedEventArgs e)
{
string newUpstreamHostUrl = (MainPres!.UpstreamUrl.StartsWith("http://") || MainPres!.UpstreamUrl.StartsWith("https://") ? string.Empty : "https://") + MainPres!.UpstreamUrl;
@ -388,21 +400,8 @@ public partial class MainWin : Window
Process.Start(new ProcessStartInfo(newUpstreamHostUrl) { UseShellExecute = true });
}
}
private void ThemesButton_Click(object sender, RoutedEventArgs e) => MainPres!.IsLightTheme = MainPres.IsLightTheme.HasValue ? MainPres.IsLightTheme.Value ? null : true : false;
private void AboutButton_Click(object sender, RoutedEventArgs e) => new AboutWin().ShowDialog();
private void EditConfButton_Click(object sender, RoutedEventArgs e)
{
Button? senderButton = sender as Button;
string confPath = senderButton == EditHostsConfButton ? MainConst.HostsConfPath :
senderButton == EditNginxConfButton ? MainConst.NginxConfPath : MainConst.MihomoConfPath;
if (!File.Exists(confPath))
File.Create(confPath).Dispose();
ProcessStartInfo processStartInfo = new(confPath) { UseShellExecute = true };
Process.Start(processStartInfo);
}
private async void NoClickButton_Click(object sender, RoutedEventArgs e)
{
if (GameFlashInterval <= 10)
@ -473,6 +472,7 @@ public partial class MainWin : Window
MessageBox.Show($"{MainConst._GameGradeMsg} {GameFlashInterval}");
}
}
private void AboutButton_Click(object sender, RoutedEventArgs e) => new AboutWin().ShowDialog();
private void ProxyTimer_Tick(object? sender, EventArgs e)
{