mirror of
https://github.com/SpaceTimee/Sheas-Cealer.git
synced 2025-07-14 05:12:09 +08:00
1.1.1 -> 1.1.2 第23次更新
This commit is contained in:
parent
c42d7351c4
commit
c1231e3fe1
@ -115,7 +115,7 @@
|
|||||||
</Button.IsEnabled>
|
</Button.IsEnabled>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Grid.Column="1" Margin="5" d:Content="# # # #"
|
<Button Grid.Column="1" Margin="5" d:Content="# # # #"
|
||||||
Click="NginxButton_Click">
|
Click="NginxButton_Click" PreviewMouseDown="NginxButton_PreviewMouseDown">
|
||||||
<Button.IsEnabled>
|
<Button.IsEnabled>
|
||||||
<Binding Path="IsNginxExist">
|
<Binding Path="IsNginxExist">
|
||||||
<Binding.Converter>
|
<Binding.Converter>
|
||||||
@ -146,7 +146,7 @@
|
|||||||
</Button.ToolTip>
|
</Button.ToolTip>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Grid.Column="2" Margin="5" d:Content="# # # #"
|
<Button Grid.Column="2" Margin="5" d:Content="# # # #"
|
||||||
Click="MihomoButton_Click">
|
Click="MihomoButton_Click" PreviewMouseDown="MihomoButton_PreviewMouseDown">
|
||||||
<Button.IsEnabled>
|
<Button.IsEnabled>
|
||||||
<Binding Path="IsMihomoExist">
|
<Binding Path="IsMihomoExist">
|
||||||
<Binding.Converter>
|
<Binding.Converter>
|
||||||
|
@ -143,6 +143,19 @@ public partial class MainWin : Window
|
|||||||
}
|
}
|
||||||
private void NginxButton_Click(object sender, RoutedEventArgs e)
|
private void NginxButton_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (HoldButtonTimer == null || HoldButtonTimer.IsEnabled)
|
||||||
|
NginxButtonHoldTimer_Tick(null, null!);
|
||||||
|
}
|
||||||
|
private void NginxButton_PreviewMouseDown(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
HoldButtonTimer = new() { Interval = TimeSpan.FromSeconds(1) };
|
||||||
|
HoldButtonTimer.Tick += NginxButtonHoldTimer_Tick;
|
||||||
|
HoldButtonTimer.Start();
|
||||||
|
}
|
||||||
|
private void NginxButtonHoldTimer_Tick(object? sender, EventArgs e)
|
||||||
|
{
|
||||||
|
HoldButtonTimer?.Stop();
|
||||||
|
|
||||||
string configPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "nginx.conf");
|
string configPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "nginx.conf");
|
||||||
string logsPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "logs");
|
string logsPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "logs");
|
||||||
string tempPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "temp");
|
string tempPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "temp");
|
||||||
@ -160,6 +173,9 @@ public partial class MainWin : Window
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
new NginxProc().ShellRun(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, @"-c nginx.conf");
|
new NginxProc().ShellRun(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, @"-c nginx.conf");
|
||||||
|
|
||||||
|
if (sender == null)
|
||||||
|
Application.Current.Dispatcher.InvokeShutdown();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -172,6 +188,19 @@ public partial class MainWin : Window
|
|||||||
}
|
}
|
||||||
private void MihomoButton_Click(object sender, RoutedEventArgs e)
|
private void MihomoButton_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (HoldButtonTimer == null || HoldButtonTimer.IsEnabled)
|
||||||
|
MihomoButtonHoldTimer_Tick(null, null!);
|
||||||
|
}
|
||||||
|
private void MihomoButton_PreviewMouseDown(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
HoldButtonTimer = new() { Interval = TimeSpan.FromSeconds(1) };
|
||||||
|
HoldButtonTimer.Tick += MihomoButtonHoldTimer_Tick;
|
||||||
|
HoldButtonTimer.Start();
|
||||||
|
}
|
||||||
|
private void MihomoButtonHoldTimer_Tick(object? sender, EventArgs e)
|
||||||
|
{
|
||||||
|
HoldButtonTimer?.Stop();
|
||||||
|
|
||||||
RegistryKey proxyKey = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true)!;
|
RegistryKey proxyKey = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true)!;
|
||||||
string configPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "config.yaml");
|
string configPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "config.yaml");
|
||||||
|
|
||||||
@ -199,6 +228,9 @@ public partial class MainWin : Window
|
|||||||
proxyKey.SetValue("ProxyServer", "127.0.0.1:" + mihomoPortNode);
|
proxyKey.SetValue("ProxyServer", "127.0.0.1:" + mihomoPortNode);
|
||||||
|
|
||||||
new MihomoProc().ShellRun(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "-d .");
|
new MihomoProc().ShellRun(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "-d .");
|
||||||
|
|
||||||
|
if (sender == null)
|
||||||
|
Application.Current.Dispatcher.InvokeShutdown();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user