1.1.4 更新

SpaceTimee · Dec 21, 2024 · 5af134c · 5af134c
1 parent bd73327
commit 5af134c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/App.xaml b/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             DispatcherUnhandledException="App_DispatcherUnhandledException">
+             Startup="App_OnStartup" DispatcherUnhandledException="App_DispatcherUnhandledException">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

diff --git a/App.xaml.cs b/App.xaml.cs
@@ -13,7 +13,7 @@ namespace Sheas_Cealer;
 
 public partial class App : Application
 {
-    protected override void OnStartup(StartupEventArgs e)
+    private void App_OnStartup(object sender, StartupEventArgs e)
     {
         #region Upgrade Settings
         if (Settings.Default.IsUpgradeRequired)

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 ## 自我介绍
 **Sheas Cealer**: 一只基于 **WPF(.Net8)** 的 SNI 伪造工具
 
-* 适用平台: Windows x64
+* 适用平台: Windows
 
 ## 词汇解释
 **[Sheas Cealer Dictionary](https://github.com/SpaceTimee/Sheas-Cealer/wiki/Sheas-Cealer-Dictionary)**
@@ -34,6 +34,8 @@
 1. Setup 安装器 (首选): 下载 Sheas Cealer Setup.exe 并运行 -> 按照提示设置即可安装
 2. Zip 压缩包 (免安装): 下载 Sheas Cealer Zip.zip 并解压 -> 完成后即可直接使用
 
+> Scd 版本: Scd 版本内置 .Net 运行时，可在缺乏 .Net 运行时的环境下运行，但代价是更大的文件体积以及更差跨平台能力，如果没有特殊原因，不建议使用 Scd 版本
+
 ## 食用文档
 **[Sheas Cealer Documentation](https://github.com/SpaceTimee/Sheas-Cealer/wiki/Sheas-Cealer-Documentation)**
 

diff --git a/README_EN.md b/README_EN.md
@@ -8,7 +8,7 @@
 ## About
 **Sheas Cealer**: A SNI concealing tool based on **WPF(.Net8)**
 
-* Applicable platform: Windows x64
+* Applicable platform: Windows
 
 ## Vocabulary
 **[Sheas Cealer Dictionary](https://github.com/SpaceTimee/Sheas-Cealer/wiki/Sheas-Cealer-Dictionary)**
@@ -30,6 +30,8 @@
 1. Github (preferred): [https://github.com/SpaceTimee/Sheas-Cealer/releases](https://github.com/SpaceTimee/Sheas-Cealer/releases)
 2. Lanzou (password 3wnj) (recommended in mainland China): [https://spacetime.lanzouu.com/b017hp0lc](https://spacetime.lanzouu.com/b017hp0lc)
 
+> Scd version: The Scd version has a built-in .Net runtime and can run in an environment without a .Net runtime, but the cost is a larger file size and worse cross-platform capabilities. If there is no special reason, it is not recommended to use the Scd version
+
 ## Installation
 1. Setup Installer (preferred): Download Sheas Cealer Setup.exe and run -> Then follow the prompts to install
 2. Zip Package (installation-free): Download Sheas Cealer Zip.zip and unzip -> Then you can use it directly

diff --git a/Wins/AboutWin.xaml b/Wins/AboutWin.xaml
@@ -23,13 +23,15 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <Button Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" d:Foreground="{x:Static consts:AboutConst.AccentBlueColor}"
+        <Button Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5"
+                d:Foreground="{Binding Source={x:Static consts:AboutConst.AccentBlueColor}, Converter={x:Static convs:AboutConv.AboutAccentButtonForegroundConv}}"
                 Foreground="{Binding AccentForegroundColor, Converter={x:Static convs:AboutConv.AboutAccentButtonForegroundConv}}"
                 Content="{x:Static consts:AboutConst.DeveloperButtonContent}"
                 ToolTip="{x:Static consts:AboutConst.DeveloperButtonUrl}"
                 Click="AboutButton_Click" />
         <Button x:Name="VersionButton"
-                Grid.Row="1" Grid.Column="0" Margin="5" d:Foreground="{x:Static consts:AboutConst.AccentBlueColor}" d:Content="# # #: #.#.#"
+                Grid.Row="1" Grid.Column="0" Margin="5" d:Content="# # #: #.#.#"
+                d:Foreground="{Binding Source={x:Static consts:AboutConst.AccentBlueColor}, Converter={x:Static convs:AboutConv.AboutAccentButtonForegroundConv}}"
                 Foreground="{Binding AccentForegroundColor, Converter={x:Static convs:AboutConv.AboutAccentButtonForegroundConv}}"
                 ToolTip="{x:Static consts:AboutConst.VersionButtonUrl}"
                 Click="AboutButton_Click">

diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs
@@ -89,9 +89,9 @@ await Task.Run(async () =>
                 await NginxCleaner.Clean();
 
             if (Array.Exists(Environment.GetCommandLineArgs(), arg => arg.Equals("-s", StringComparison.OrdinalIgnoreCase)))
-                LaunchButton_Click(null!, null!);
+                LaunchButton_Click(null, null!);
 
-            UpdateUpstreamHostButton_Click(null!, null!);
+            UpdateUpstreamHostButton_Click(null, null!);
         });
     }
     private async void MainWin_Closing(object sender, CancelEventArgs e)