From 3ab294f3b79734a74e9a5981592c76cb042a9834 Mon Sep 17 00:00:00 2001 From: Tongg Date: Thu, 19 Dec 2024 17:30:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=EF=BC=8CUI=E9=87=8D?= =?UTF-8?q?=E7=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.xaml | 19 +- Language/zh_CN.xaml | 20 +- MainWindow.xaml | 2 +- SparkClient.csproj | 5 + ViewModel/Configuration/ConfigMenuPageVM.cs | 3 +- ViewModel/Configuration/SettingBaseVM.cs | 15 ++ .../SettingsPages/ModelColorSetPageVM.cs | 7 + .../{ => SettingsPages}/SettingsVM.cs | 2 +- Views/BaseWindow/BaseControl.xaml | 60 ++--- Views/Configuration/SettingPageBase.xaml | 209 ++++++++++++++++++ Views/Configuration/SettingPageBase.xaml.cs | 11 + .../SettingPages/CustomSettingPage.xaml | 195 ++++++++++++++++ .../CustomSettingPage.xaml.cs} | 6 +- .../SettingPages/ModelColorSetPage.xaml | 12 + .../SettingPages/ModelColorSetPage.xaml.cs | 11 + Views/Configuration/SettingsPage.xaml | 78 ------- 16 files changed, 539 insertions(+), 116 deletions(-) create mode 100644 ViewModel/Configuration/SettingBaseVM.cs create mode 100644 ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs rename ViewModel/Configuration/{ => SettingsPages}/SettingsVM.cs (99%) create mode 100644 Views/Configuration/SettingPageBase.xaml create mode 100644 Views/Configuration/SettingPageBase.xaml.cs create mode 100644 Views/Configuration/SettingPages/CustomSettingPage.xaml rename Views/Configuration/{SettingsPage.xaml.cs => SettingPages/CustomSettingPage.xaml.cs} (80%) create mode 100644 Views/Configuration/SettingPages/ModelColorSetPage.xaml create mode 100644 Views/Configuration/SettingPages/ModelColorSetPage.xaml.cs delete mode 100644 Views/Configuration/SettingsPage.xaml diff --git a/App.xaml b/App.xaml index 0efa2be..f3ca95c 100644 --- a/App.xaml +++ b/App.xaml @@ -11,6 +11,9 @@ xmlns:viewModel="clr-namespace:SparkClient.ViewModel" xmlns:dialogVM="clr-namespace:SparkClient.ViewModel.Dialog" xmlns:dialogView="clr-namespace:SparkClient.Views.Dialog" + xmlns:settingsPages="clr-namespace:SparkClient.ViewModel.Configuration.SettingsPages" + xmlns:settingPages="clr-namespace:SparkClient.Views.Configuration.SettingPages" + xmlns:configuration="clr-namespace:System.Configuration;assembly=System.Configuration.ConfigurationManager" StartupUri="MainWindow.xaml"> @@ -48,6 +51,18 @@ + + + + + + + + + + + + @@ -58,9 +73,7 @@ - - - + diff --git a/Language/zh_CN.xaml b/Language/zh_CN.xaml index e647f4f..e66592a 100644 --- a/Language/zh_CN.xaml +++ b/Language/zh_CN.xaml @@ -89,7 +89,7 @@ 保存 系统配置 - 语言设置 + 语言设置 上传文件 TXT文件 STL文件 @@ -102,6 +102,24 @@ 保存路径不存在 RULE_NAME + + 系统配置 + 通用设置 + 模型设置 + 保存/Save + 语言设置 + 上传文件 + TXT 文件 + STL 文件 + XLSX 文件(Excel 2007+) + DAT 文件 + 保存路径 + 选择 + 请选择 + 定级标准 + + + 正面视角 截图当前视角到PNG diff --git a/MainWindow.xaml b/MainWindow.xaml index f11e841..137b8ad 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -153,7 +153,7 @@ - + diff --git a/SparkClient.csproj b/SparkClient.csproj index 4ceff56..939e7ac 100644 --- a/SparkClient.csproj +++ b/SparkClient.csproj @@ -135,6 +135,11 @@ Designer + + MSBuild:Compile + Wpf + Designer + diff --git a/ViewModel/Configuration/ConfigMenuPageVM.cs b/ViewModel/Configuration/ConfigMenuPageVM.cs index da6042b..50072ef 100644 --- a/ViewModel/Configuration/ConfigMenuPageVM.cs +++ b/ViewModel/Configuration/ConfigMenuPageVM.cs @@ -1,6 +1,7 @@ using System.Windows.Input; using SparkClient.Model.Helper; using SparkClient.ViewModel.BaseWindow; +using SparkClient.ViewModel.Configuration.SettingsPages; namespace SparkClient.ViewModel.Configuration; @@ -64,7 +65,7 @@ public class ConfigMenuPageVM : BaseViewModel public void SettingConfig(object parameter) { - BaseControlVM vm = new BaseControlVM(new SettingsVM(), MultilingualHelper.getString("System Settings")); + BaseControlVM vm = new BaseControlVM(new SettingBaseVM(), MultilingualHelper.getString("SystemSetting")); WindowManager.mainViewModel.Content = vm; WindowManager.openContent.Add(vm); } diff --git a/ViewModel/Configuration/SettingBaseVM.cs b/ViewModel/Configuration/SettingBaseVM.cs new file mode 100644 index 0000000..0d8b3bd --- /dev/null +++ b/ViewModel/Configuration/SettingBaseVM.cs @@ -0,0 +1,15 @@ +using SparkClient.ViewModel.Configuration.SettingsPages; + +namespace SparkClient.ViewModel.Configuration; + +public class SettingBaseVM : BaseViewModel +{ + public object CustomSetContent { get; } + public object ModelColorSetContent { get; } + + public SettingBaseVM() + { + CustomSetContent = new SettingsVM(); + ModelColorSetContent = new ModelColorSetPageVM(); + } +} \ No newline at end of file diff --git a/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs b/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs new file mode 100644 index 0000000..dd516de --- /dev/null +++ b/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs @@ -0,0 +1,7 @@ +namespace SparkClient.ViewModel.Configuration.SettingsPages; + +public class ModelColorSetPageVM +{ + + +} \ No newline at end of file diff --git a/ViewModel/Configuration/SettingsVM.cs b/ViewModel/Configuration/SettingsPages/SettingsVM.cs similarity index 99% rename from ViewModel/Configuration/SettingsVM.cs rename to ViewModel/Configuration/SettingsPages/SettingsVM.cs index de8e69a..5bc626b 100644 --- a/ViewModel/Configuration/SettingsVM.cs +++ b/ViewModel/Configuration/SettingsPages/SettingsVM.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using System.Windows.Input; -namespace SparkClient.ViewModel.Configuration +namespace SparkClient.ViewModel.Configuration.SettingsPages { class SettingsVM : BaseViewModel { diff --git a/Views/BaseWindow/BaseControl.xaml b/Views/BaseWindow/BaseControl.xaml index 97fbe21..4a6327b 100644 --- a/Views/BaseWindow/BaseControl.xaml +++ b/Views/BaseWindow/BaseControl.xaml @@ -7,13 +7,13 @@ mc:Ignorable="d" Margin="10" CornerRadius="15" > - + - + @@ -21,32 +21,33 @@ + VerticalAlignment="Center" Foreground="#000" + FontWeight="Bold" + HorizontalAlignment="Left" FontSize="20" Margin="10 0 0 0"/> - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + diff --git a/Views/Configuration/SettingPageBase.xaml b/Views/Configuration/SettingPageBase.xaml new file mode 100644 index 0000000..a311505 --- /dev/null +++ b/Views/Configuration/SettingPageBase.xaml @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Views/Configuration/SettingPageBase.xaml.cs b/Views/Configuration/SettingPageBase.xaml.cs new file mode 100644 index 0000000..f4ee3e3 --- /dev/null +++ b/Views/Configuration/SettingPageBase.xaml.cs @@ -0,0 +1,11 @@ +using System.Windows.Controls; + +namespace SparkClient.Views.Configuration; + +public partial class SettingPageBase +{ + public SettingPageBase() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/Views/Configuration/SettingPages/CustomSettingPage.xaml b/Views/Configuration/SettingPages/CustomSettingPage.xaml new file mode 100644 index 0000000..e8b1c5f --- /dev/null +++ b/Views/Configuration/SettingPages/CustomSettingPage.xaml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +