1.1.0 -> 1.1.1 第10次更新

Consts/AboutConst.cs

@@ -4,12 +4,14 @@ namespace Sheas_Cealer.Consts;
 
 internal class AboutConst : AboutMultilangConst
 {
-    public static string Version => Assembly.GetExecutingAssembly().GetName().Version!.ToString()[0..^2];
     public static string DeveloperButtonUrl => "https://www.spacetimee.xyz";
+    public static string VersionButtonVersionContent => Assembly.GetExecutingAssembly().GetName().Version!.ToString()[0..^2];
     public static string VersionButtonUrl => "https://spacetime.lanzouu.com/b017hp0lc";
     public static string EmailButtonUrl => "Zeus6_6@163.com";
-    public static string InstructionButtonUrl => "https://github.com/SpaceTimee/Sheas-Cealer/wiki/Sheas-Cealer-Instruction";
-    public static string OpenSourceButtonUrl => "https://github.com/SpaceTimee/Sheas-Cealer";
-    public static string PrivacyButtonUrl => "https://thoughts.teambition.com/share/6264eda98adeb10041b92fda#title=Sheas_Cealer_隐私政策";
-    public static string AgreementButtonUrl => "https://thoughts.teambition.com/share/6264edd78adeb10041b92fdb#title=Sheas_Cealer_使用协议";
+
+    public static string DocumentationButtonUrl => "https://github.com/SpaceTimee/Sheas-Cealer/wiki/Sheas-Cealer-Documentation";
+    public static string RepositoryButtonUrl => "https://github.com/SpaceTimee/Sheas-Cealer";
+
+    public static string PolicyButtonUrl => "https://thoughts.teambition.com/share/6264eda98adeb10041b92fda#title=Sheas_Cealer_隐私政策";
+    public static string TermsButtonUrl => "https://thoughts.teambition.com/share/6264edd78adeb10041b92fdb#title=Sheas_Cealer_使用协议";
 }

Consts/AboutMultilangConst.Designer.cs

@@ -60,15 +60,6 @@ namespace Sheas_Cealer.Consts {
             }
         }
         
-        /// <summary>
-        ///   查找类似 ToS. 的本地化字符串。
-        /// </summary>
-        public static string AgreementButtonContent {
-            get {
-                return ResourceManager.GetString("AgreementButtonContent", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Dev. Space Time 的本地化字符串。
         /// </summary>
@@ -78,6 +69,15 @@ namespace Sheas_Cealer.Consts {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Docs 的本地化字符串。
+        /// </summary>
+        public static string DocumentationButtonContent {
+            get {
+                return ResourceManager.GetString("DocumentationButtonContent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Email 的本地化字符串。
         /// </summary>
@@ -88,38 +88,38 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Docs 的本地化字符串。
+        ///   查找类似 PP 的本地化字符串。
         /// </summary>
-        public static string InstructionButtonContent {
+        public static string PolicyButtonContent {
             get {
-                return ResourceManager.GetString("InstructionButtonContent", resourceCulture);
+                return ResourceManager.GetString("PolicyButtonContent", resourceCulture);
             }
         }
         
         /// <summary>
         ///   查找类似 Repo 的本地化字符串。
         /// </summary>
-        public static string OpenSourceButtonContent {
+        public static string RepositoryButtonContent {
             get {
-                return ResourceManager.GetString("OpenSourceButtonContent", resourceCulture);
+                return ResourceManager.GetString("RepositoryButtonContent", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   查找类似 PP. 的本地化字符串。
+        ///   查找类似 ToS 的本地化字符串。
         /// </summary>
-        public static string PrivacyButtonContent {
+        public static string TermsButtonContent {
             get {
-                return ResourceManager.GetString("PrivacyButtonContent", resourceCulture);
+                return ResourceManager.GetString("TermsButtonContent", resourceCulture);
             }
         }
         
         /// <summary>
         ///   查找类似 Ver. 的本地化字符串。
         /// </summary>
-        public static string VersionButtonContent {
+        public static string VersionButtonLabelContent {
             get {
-                return ResourceManager.GetString("VersionButtonContent", resourceCulture);
+                return ResourceManager.GetString("VersionButtonLabelContent", resourceCulture);
             }
         }
     }

Consts/AboutMultilangConst.resx

@@ -117,8 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="AgreementButtonContent" xml:space="preserve">
-    <value>ToS.</value>
+  <data name="TermsButtonContent" xml:space="preserve">
+    <value>ToS</value>
   </data>
   <data name="DeveloperButtonContent" xml:space="preserve">
     <value>Dev. Space Time</value>
@@ -126,16 +126,16 @@
   <data name="EmailButtonContent" xml:space="preserve">
     <value>Email</value>
   </data>
-  <data name="InstructionButtonContent" xml:space="preserve">
+  <data name="DocumentationButtonContent" xml:space="preserve">
     <value>Docs</value>
   </data>
-  <data name="OpenSourceButtonContent" xml:space="preserve">
+  <data name="RepositoryButtonContent" xml:space="preserve">
     <value>Repo</value>
   </data>
-  <data name="PrivacyButtonContent" xml:space="preserve">
-    <value>PP.</value>
+  <data name="PolicyButtonContent" xml:space="preserve">
+    <value>PP</value>
   </data>
-  <data name="VersionButtonContent" xml:space="preserve">
-    <value>Ver. </value>
+  <data name="VersionButtonLabelContent" xml:space="preserve">
+    <value>Ver.</value>
   </data>
 </root>

Consts/AboutMultilangConst.zh.resx

@@ -97,7 +97,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="AgreementButtonContent" xml:space="preserve">
+  <data name="TermsButtonContent" xml:space="preserve">
     <value>使用协议</value>
   </data>
   <data name="DeveloperButtonContent" xml:space="preserve">
@@ -106,16 +106,16 @@
   <data name="EmailButtonContent" xml:space="preserve">
     <value>联系邮箱</value>
   </data>
-  <data name="InstructionButtonContent" xml:space="preserve">
+  <data name="DocumentationButtonContent" xml:space="preserve">
     <value>使用文档</value>
   </data>
-  <data name="OpenSourceButtonContent" xml:space="preserve">
+  <data name="RepositoryButtonContent" xml:space="preserve">
     <value>开源地址</value>
   </data>
-  <data name="PrivacyButtonContent" xml:space="preserve">
+  <data name="PolicyButtonContent" xml:space="preserve">
     <value>隐私政策</value>
   </data>
-  <data name="VersionButtonContent" xml:space="preserve">
-    <value>版本号: </value>
+  <data name="VersionButtonLabelContent" xml:space="preserve">
+    <value>版本号:</value>
   </data>
 </root>

Convs/AboutVersionButtonContentConv.cs

@@ -8,10 +8,10 @@ internal class AboutVersionButtonContentConv : IMultiValueConverter
 {
     public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        string? VersionButtonContent = values[0] as string;
-        string? version = values[1] as string;
+        string? versionButtonLabelContent = values[0] as string;
+        string? versionButtonVersionContent = values[1] as string;
 
-        return VersionButtonContent + version;
+        return $"{versionButtonLabelContent} {versionButtonVersionContent}";
     }
 
     public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException();

Preses/MainPres.cs

@@ -70,7 +70,7 @@ internal partial class MainPres : ObservableObject
 
     [ObservableProperty]
     private string extraArgs;
-    private partial void OnExtraArgsChanged(string value)
+    partial void OnExtraArgsChanged(string value)
     {
         if (MainConst.ExtraArgsRegex().IsMatch(value))
         {

README.md

@@ -31,7 +31,7 @@
 2. Zip 压缩包 (免安装): 下载 Sheas Cealer Zip.zip 并解压 -> 完成后即可直接使用
 
 ## 食用文档
-**[Sheas Cealer Instruction](https://github.com/SpaceTimee/Sheas-Cealer/wiki/Sheas-Cealer-Instruction)**
+**[Sheas Cealer Documentation](https://github.com/SpaceTimee/Sheas-Cealer/wiki/Sheas-Cealer-Documentation)**
 
 ## 项目构建
 [Sheas Cealer Build](https://github.com/SpaceTimee/Sheas-Cealer/wiki/Sheas-Cealer-Build)

Wins/AboutWin.xaml

@@ -3,15 +3,11 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:convs="clr-namespace:Sheas_Cealer.Convs"
         xmlns:consts="clr-namespace:Sheas_Cealer.Consts"
+        xmlns:convs="clr-namespace:Sheas_Cealer.Convs"
         mc:Ignorable="d"
         Style="{DynamicResource CommonWindow}" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" SizeToContent="Height" Width="600"
         KeyDown="AboutWin_KeyDown">
-    <Window.Resources>
-        <consts:AboutConst x:Key="AboutConst" />
-    </Window.Resources>
-
     <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
@@ -24,11 +20,10 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <Button x:Name="DeveloperButton"
-                Content="{Binding DeveloperButtonContent, Source={StaticResource AboutConst}}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" Foreground="#FF2196F3" ToolTip="{Binding DeveloperButtonUrl, Source={StaticResource AboutConst}}"
+        <Button Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" Foreground="#FF2196F3" Content="{Binding Source={x:Static consts:AboutConst.DeveloperButtonContent}, Mode=OneTime}" ToolTip="{Binding Source={x:Static consts:AboutConst.DeveloperButtonUrl}, Mode=OneTime}"
                 Click="AboutButton_Click" />
         <Button x:Name="VersionButton"
-                Grid.Row="1" Grid.Column="0" Margin="5" Foreground="#FF2196F3" ToolTip="{Binding VersionButtonUrl, Source={StaticResource AboutConst}}"
+                Grid.Row="1" Grid.Column="0" Margin="5" Foreground="#FF2196F3" ToolTip="{Binding Source={x:Static consts:AboutConst.VersionButtonUrl}, Mode=OneTime}"
                 Click="AboutButton_Click">
             <Button.Content>
                 <MultiBinding Mode="OneTime">
@@ -36,26 +31,23 @@
                         <convs:AboutVersionButtonContentConv />
                     </MultiBinding.Converter>
 
-                    <Binding Path="VersionButtonContent" Source="{StaticResource AboutConst}" />
-                    <Binding Path="Version" Source="{StaticResource AboutConst}" />
+                    <Binding Source="{x:Static consts:AboutConst.VersionButtonLabelContent}" />
+                    <Binding Source="{x:Static consts:AboutConst.VersionButtonVersionContent}" />
                 </MultiBinding>
             </Button.Content>
         </Button>
         <Button x:Name="EmailButton"
-                Content="{Binding EmailButtonContent, Source={StaticResource AboutConst}}" Grid.Row="1" Grid.Column="1" Margin="5" ToolTip="{Binding EmailButtonUrl, Source={StaticResource AboutConst}}" />
-
-        <Button x:Name="InstructionButton"
-                Content="{Binding InstructionButtonContent, Source={StaticResource AboutConst}}" Grid.Row="0" Grid.Column="2" Margin="5" ToolTip="{Binding InstructionButtonUrl, Source={StaticResource AboutConst}}"
-                Click="AboutButton_Click" />
-        <Button x:Name="OpenSourceButton"
-                Content="{Binding OpenSourceButtonContent, Source={StaticResource AboutConst}}" Grid.Row="1" Grid.Column="2" Margin="5" ToolTip="{Binding OpenSourceButtonUrl, Source={StaticResource AboutConst}}"
+                Grid.Row="1" Grid.Column="1" Margin="5" Content="{Binding Source={x:Static consts:AboutConst.EmailButtonContent}, Mode=OneTime}" ToolTip="{Binding Source={x:Static consts:AboutConst.EmailButtonUrl}, Mode=OneTime}"
                 Click="AboutButton_Click" />
 
-        <Button x:Name="PrivacyButton"
-                Content="{Binding PrivacyButtonContent, Source={StaticResource AboutConst}}" Grid.Row="0" Grid.Column="3" Margin="5" ToolTip="{Binding PrivacyButtonUrl, Source={StaticResource AboutConst}}"
+        <Button Grid.Row="0" Grid.Column="2" Margin="5" Content="{Binding Source={x:Static consts:AboutConst.DocumentationButtonContent}, Mode=OneTime}" ToolTip="{Binding Source={x:Static consts:AboutConst.DocumentationButtonUrl}, Mode=OneTime}"
                 Click="AboutButton_Click" />
-        <Button x:Name="AgreementButton"
-                Content="{Binding AgreementButtonContent, Source={StaticResource AboutConst}}" Grid.Row="1" Grid.Column="3" Margin="5" ToolTip="{Binding AgreementButtonUrl, Source={StaticResource AboutConst}}"
+        <Button Grid.Row="1" Grid.Column="2" Margin="5" Content="{Binding Source={x:Static consts:AboutConst.RepositoryButtonContent}, Mode=OneTime}" ToolTip="{Binding Source={x:Static consts:AboutConst.RepositoryButtonUrl}, Mode=OneTime}"
+                Click="AboutButton_Click" />
+
+        <Button Grid.Row="0" Grid.Column="3" Margin="5" Content="{Binding Source={x:Static consts:AboutConst.PolicyButtonContent}, Mode=OneTime}" ToolTip="{Binding Source={x:Static consts:AboutConst.PolicyButtonUrl}, Mode=OneTime}"
+                Click="AboutButton_Click" />
+        <Button Grid.Row="1" Grid.Column="3" Margin="5" Content="{Binding Source={x:Static consts:AboutConst.TermsButtonContent}, Mode=OneTime}" ToolTip="{Binding Source={x:Static consts:AboutConst.TermsButtonUrl}, Mode=OneTime}"
                 Click="AboutButton_Click" />
     </Grid>
 </Window>

Wins/AboutWin.xaml.cs

@@ -10,6 +10,7 @@ namespace Sheas_Cealer.Wins;
 public partial class AboutWin : Window
 {
     internal AboutWin() => InitializeComponent();
+    protected override void OnSourceInitialized(EventArgs e) => IconRemover.RemoveIcon(this);
 
     private void AboutButton_Click(object sender, RoutedEventArgs e)
     {
@@ -25,6 +26,4 @@ public partial class AboutWin : Window
         if (e.Key == Key.Escape)
             Close();
     }
-
-    protected override void OnSourceInitialized(EventArgs e) => IconRemover.RemoveIcon(this);
 }

Wins/MainWin.xaml

@@ -11,10 +11,6 @@
         d:DataContext="{d:DesignInstance preses:MainPres}" AllowDrop="True"
         Style="{DynamicResource CommonWindow}" WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize" SizeToContent="Height" Width="600"
         Loaded="MainWin_Loaded" Closing="MainWin_Closing" DragEnter="MainWin_DragEnter" Drop="MainWin_Drop" KeyDown="MainWin_KeyDown">
-    <Window.Resources>
-        <consts:MainConst x:Key="MainConst" />
-    </Window.Resources>
-
     <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -29,7 +25,7 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <Button Grid.Column="0" Margin="5" ToolTip="{Binding SettingsModeButtonToolTip, Source={StaticResource MainConst}}"
+            <Button Grid.Column="0" Margin="5" ToolTip="{Binding Source={x:Static consts:MainConst.SettingsModeButtonToolTip}}"
                     Click="SettingsModeButton_Click">
                 <Button.Content>
                     <Binding Path="Mode">
@@ -70,7 +66,7 @@
                     </Binding>
                 </md:HintAssist.Hint>
             </TextBox>
-            <Button Grid.Column="2" Margin="5" ToolTip="{Binding SettingsFunctionButtonToolTip, Source={StaticResource MainConst}}"
+            <Button Grid.Column="2" Margin="5" ToolTip="{Binding Source={x:Static consts:MainConst.SettingsFunctionButtonToolTip}}"
                     Click="SettingsFunctionButton_Click">
                 <Button.Content>
                     <Binding Path="Mode">
@@ -83,7 +79,7 @@
         </Grid>
 
         <Button IsDefault="True"
-                Grid.Row="1" Margin="5" Content="{Binding StartCealButtonContent, Source={StaticResource MainConst}}" ToolTip="{Binding StartCealButtonToolTip, Source={StaticResource MainConst}}"
+                Grid.Row="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.StartCealButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.StartCealButtonToolTip}}"
                 Click="StartCealButton_Click" PreviewMouseDown="StartCealButton_PreviewMouseDown">
 
             <Button.IsEnabled>
@@ -107,10 +103,10 @@
             </Grid.ColumnDefinitions>
 
             <Button x:Name="EditHostButton"
-                    Grid.Column="0" Margin="5" Content="{Binding EditHostButtonContent, Source={StaticResource MainConst}}" ToolTip="{Binding EditHostButtonToolTip, Source={StaticResource MainConst}}"
+                    Grid.Column="0" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditHostButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditHostButtonToolTip}}"
                     Click="EditHostButton_Click" />
             <Button x:Name="UpdateHostButton"
-                    Grid.Column="1" Margin="5" Content="{Binding UpdateHostButtonContent, Source={StaticResource MainConst}}" ToolTip="{Binding UpdateHostButtonToolTip, Source={StaticResource MainConst}}"
+                    Grid.Column="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.UpdateHostButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.UpdateHostButtonToolTip}}"
                     Click="UpdateHostButton_Click">
                 <Button.IsEnabled>
                     <Binding Path="UpstreamUrl">
@@ -121,7 +117,7 @@
                 </Button.IsEnabled>
             </Button>
             <Button x:Name="ThemesButton"
-                    Grid.Column="2" Margin="5" ToolTip="{Binding ThemesButtonToolTip, Source={StaticResource MainConst}}"
+                    Grid.Column="2" Margin="5" ToolTip="{Binding Source={x:Static consts:MainConst.ThemesButtonToolTip}}"
                     Click="ThemesButton_Click">
                 <Button.Content>
                     <Binding Path="IsLightTheme">
@@ -132,7 +128,7 @@
                 </Button.Content>
             </Button>
             <Button x:Name="AboutButton"
-                    Grid.Column="3" Margin="5" Content="{Binding AboutButtonContent, Source={StaticResource MainConst}}" ToolTip="{Binding AboutButtonToolTip, Source={StaticResource MainConst}}"
+                    Grid.Column="3" Margin="5" Content="{Binding Source={x:Static consts:MainConst.AboutButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.AboutButtonToolTip}}"
                     Click="AboutButton_Click" />
         </Grid>
     </Grid>