diff --git a/Consts/AboutConst.cs b/Consts/AboutConst.cs
index 58b0826..6c833fb 100644
--- a/Consts/AboutConst.cs
+++ b/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_使用协议";
}
\ No newline at end of file
diff --git a/Consts/AboutMultilangConst.Designer.cs b/Consts/AboutMultilangConst.Designer.cs
index 5ecb36a..4f06333 100644
--- a/Consts/AboutMultilangConst.Designer.cs
+++ b/Consts/AboutMultilangConst.Designer.cs
@@ -60,15 +60,6 @@ namespace Sheas_Cealer.Consts {
}
}
- ///
- /// 查找类似 ToS. 的本地化字符串。
- ///
- public static string AgreementButtonContent {
- get {
- return ResourceManager.GetString("AgreementButtonContent", resourceCulture);
- }
- }
-
///
/// 查找类似 Dev. Space Time 的本地化字符串。
///
@@ -78,6 +69,15 @@ namespace Sheas_Cealer.Consts {
}
}
+ ///
+ /// 查找类似 Docs 的本地化字符串。
+ ///
+ public static string DocumentationButtonContent {
+ get {
+ return ResourceManager.GetString("DocumentationButtonContent", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Email 的本地化字符串。
///
@@ -88,38 +88,38 @@ namespace Sheas_Cealer.Consts {
}
///
- /// 查找类似 Docs 的本地化字符串。
+ /// 查找类似 PP 的本地化字符串。
///
- public static string InstructionButtonContent {
+ public static string PolicyButtonContent {
get {
- return ResourceManager.GetString("InstructionButtonContent", resourceCulture);
+ return ResourceManager.GetString("PolicyButtonContent", resourceCulture);
}
}
///
/// 查找类似 Repo 的本地化字符串。
///
- public static string OpenSourceButtonContent {
+ public static string RepositoryButtonContent {
get {
- return ResourceManager.GetString("OpenSourceButtonContent", resourceCulture);
+ return ResourceManager.GetString("RepositoryButtonContent", resourceCulture);
}
}
///
- /// 查找类似 PP. 的本地化字符串。
+ /// 查找类似 ToS 的本地化字符串。
///
- public static string PrivacyButtonContent {
+ public static string TermsButtonContent {
get {
- return ResourceManager.GetString("PrivacyButtonContent", resourceCulture);
+ return ResourceManager.GetString("TermsButtonContent", resourceCulture);
}
}
///
- /// 查找类似 Ver. 的本地化字符串。
+ /// 查找类似 Ver. 的本地化字符串。
///
- public static string VersionButtonContent {
+ public static string VersionButtonLabelContent {
get {
- return ResourceManager.GetString("VersionButtonContent", resourceCulture);
+ return ResourceManager.GetString("VersionButtonLabelContent", resourceCulture);
}
}
}
diff --git a/Consts/AboutMultilangConst.resx b/Consts/AboutMultilangConst.resx
index fac6fad..f42d4dd 100644
--- a/Consts/AboutMultilangConst.resx
+++ b/Consts/AboutMultilangConst.resx
@@ -117,8 +117,8 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ToS.
+
+ ToS
Dev. Space Time
@@ -126,16 +126,16 @@
Email
-
+
Docs
-
+
Repo
-
- PP.
+
+ PP
-
- Ver.
+
+ Ver.
\ No newline at end of file
diff --git a/Consts/AboutMultilangConst.zh.resx b/Consts/AboutMultilangConst.zh.resx
index 41d71d9..f5e6f23 100644
--- a/Consts/AboutMultilangConst.zh.resx
+++ b/Consts/AboutMultilangConst.zh.resx
@@ -97,7 +97,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
使用协议
@@ -106,16 +106,16 @@
联系邮箱
-
+
使用文档
-
+
开源地址
-
+
隐私政策
-
- 版本号:
+
+ 版本号:
\ No newline at end of file
diff --git a/Convs/AboutVersionButtonContentConv.cs b/Convs/AboutVersionButtonContentConv.cs
index fbaa41a..48accc2 100644
--- a/Convs/AboutVersionButtonContentConv.cs
+++ b/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();
diff --git a/Preses/MainPres.cs b/Preses/MainPres.cs
index 746bbc8..2b19242 100644
--- a/Preses/MainPres.cs
+++ b/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))
{
diff --git a/README.md b/README.md
index 9db5fd0..c2e214f 100644
--- a/README.md
+++ b/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)
diff --git a/Wins/AboutWin.xaml b/Wins/AboutWin.xaml
index ca3ece1..599bc52 100644
--- a/Wins/AboutWin.xaml
+++ b/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">
-
-
-
-
@@ -24,11 +20,10 @@
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/Wins/AboutWin.xaml.cs b/Wins/AboutWin.xaml.cs
index 3e8f844..cb1f3f5 100644
--- a/Wins/AboutWin.xaml.cs
+++ b/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);
}
\ No newline at end of file
diff --git a/Wins/MainWin.xaml b/Wins/MainWin.xaml
index c87196b..6218efe 100644
--- a/Wins/MainWin.xaml
+++ b/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">
-
-
-
-
@@ -29,7 +25,7 @@
-
@@ -107,10 +103,10 @@
@@ -121,7 +117,7 @@
@@ -132,7 +128,7 @@