diff --git a/Language/zh_CN.xaml b/Language/zh_CN.xaml
index 13e4f5a..42ce5e4 100644
--- a/Language/zh_CN.xaml
+++ b/Language/zh_CN.xaml
@@ -140,7 +140,9 @@
亭部主刻面颜色
下腰面颜色
底面颜色
-
+
+ 确定
+ 取消
diff --git a/Resource/Images/UIResource/01-4-1.png b/Resource/Images/UIResource/01-4-1.png
new file mode 100644
index 0000000..eb87a1f
Binary files /dev/null and b/Resource/Images/UIResource/01-4-1.png differ
diff --git a/Resource/Images/UserControl/03-10.png b/Resource/Images/UserControl/03-10.png
new file mode 100644
index 0000000..5c74eb6
Binary files /dev/null and b/Resource/Images/UserControl/03-10.png differ
diff --git a/Resource/Images/UserControl/03-14-1.png b/Resource/Images/UserControl/03-14-1.png
new file mode 100644
index 0000000..719cb21
Binary files /dev/null and b/Resource/Images/UserControl/03-14-1.png differ
diff --git a/Resource/Images/UserControl/03-8-1.png b/Resource/Images/UserControl/03-8-1.png
new file mode 100644
index 0000000..dcbee79
Binary files /dev/null and b/Resource/Images/UserControl/03-8-1.png differ
diff --git a/Resource/Images/UserControl/03-8-2.png b/Resource/Images/UserControl/03-8-2.png
new file mode 100644
index 0000000..a355126
Binary files /dev/null and b/Resource/Images/UserControl/03-8-2.png differ
diff --git a/Resource/Images/UserControl/03-8.png b/Resource/Images/UserControl/03-8.png
new file mode 100644
index 0000000..650a6d4
Binary files /dev/null and b/Resource/Images/UserControl/03-8.png differ
diff --git a/Resource/Images/UserControl/03-9.png b/Resource/Images/UserControl/03-9.png
new file mode 100644
index 0000000..fd44b0e
Binary files /dev/null and b/Resource/Images/UserControl/03-9.png differ
diff --git a/Resource/Images/ic_1000.png b/Resource/Images/ic_1000.png
new file mode 100644
index 0000000..f0c0e3e
Binary files /dev/null and b/Resource/Images/ic_1000.png differ
diff --git a/Resource/Images/ic_500.png b/Resource/Images/ic_500.png
new file mode 100644
index 0000000..47e16a0
Binary files /dev/null and b/Resource/Images/ic_500.png differ
diff --git a/Resource/Images/icon_200.png b/Resource/Images/icon_200.png
new file mode 100644
index 0000000..d5b2d80
Binary files /dev/null and b/Resource/Images/icon_200.png differ
diff --git a/SparkClient.csproj b/SparkClient.csproj
index f916658..b465070 100644
--- a/SparkClient.csproj
+++ b/SparkClient.csproj
@@ -134,6 +134,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SparkClient.sln.DotSettings.user b/SparkClient.sln.DotSettings.user
index a906f9c..7fff9ad 100644
--- a/SparkClient.sln.DotSettings.user
+++ b/SparkClient.sln.DotSettings.user
@@ -15,6 +15,7 @@
ForceIncluded
ForceIncluded
ForceIncluded
+ ForceIncluded
ForceIncluded
ForceIncluded
ForceIncluded
@@ -27,6 +28,8 @@
ForceIncluded
ForceIncluded
ForceIncluded
+ ForceIncluded
+ ForceIncluded
ForceIncluded
ForceIncluded
ForceIncluded
@@ -36,5 +39,6 @@
ForceIncluded
ForceIncluded
ForceIncluded
+ ForceIncluded
ForceIncluded
ForceIncluded
\ No newline at end of file
diff --git a/Views/BaseWindow/BaseControl.xaml b/Views/BaseWindow/BaseControl.xaml
index 5de3846..718c304 100644
--- a/Views/BaseWindow/BaseControl.xaml
+++ b/Views/BaseWindow/BaseControl.xaml
@@ -7,6 +7,30 @@
mc:Ignorable="d"
Loaded="BaseControl_OnLoaded"
>
+
+
+
+
@@ -30,14 +54,14 @@
-
+ HorizontalAlignment="Left" FontSize="24" >
@@ -60,10 +84,9 @@
Width="40" Height="40"
HorizontalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"
- MouseEnter="Border_Minimize_MouseEnter"
- MouseLeave="Border_MouseLeave"
+
MouseLeftButtonDown="Minimize_Click">
-
+
@@ -72,11 +95,9 @@
Width="40" Height="40"
HorizontalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"
- Margin="10 0 "
- MouseEnter="Border_Close_MouseEnter"
- MouseLeave="Border_MouseLeave"
+ Margin="20 0 "
MouseLeftButtonDown="Close_Click">
-
+
diff --git a/Views/BaseWindow/HomeWindow.xaml b/Views/BaseWindow/HomeWindow.xaml
index a85c93e..3e2a36f 100644
--- a/Views/BaseWindow/HomeWindow.xaml
+++ b/Views/BaseWindow/HomeWindow.xaml
@@ -57,6 +57,29 @@
+
+
+
@@ -64,11 +87,11 @@
-
+
-
+
@@ -76,22 +99,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -107,10 +151,9 @@
Width="40" Height="40"
HorizontalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"
- MouseEnter="Border_Minimize_MouseEnter"
- MouseLeave="Border_MouseLeave"
+
MouseLeftButtonDown="Minimize_Click">
-
+
@@ -119,11 +162,9 @@
Width="40" Height="40"
HorizontalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"
- Margin="10 0 "
- MouseEnter="Border_Close_MouseEnter"
- MouseLeave="Border_MouseLeave"
+ Margin="30 0 "
MouseLeftButtonDown="Close_Click">
-
+
@@ -264,7 +305,7 @@
-
+
diff --git a/Views/BaseWindow/HomeWindow.xaml.cs b/Views/BaseWindow/HomeWindow.xaml.cs
index 0ffdc28..1734717 100644
--- a/Views/BaseWindow/HomeWindow.xaml.cs
+++ b/Views/BaseWindow/HomeWindow.xaml.cs
@@ -3,6 +3,7 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using SparkClient.ViewModel.BaseWindow;
+using MessageBox = SparkClient.Views.Dialog.MessageBox;
namespace SparkClient.Views.BaseWindow;
@@ -117,4 +118,10 @@ public partial class HomeWindow
{
parentWindow = Window.GetWindow(this);
}
+
+ private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+ {
+ string sss;
+ var res = new MessageBox().ShowInput("heihei?", out sss);
+ }
}
\ No newline at end of file
diff --git a/Views/Configuration/ConfigMenuPage.xaml b/Views/Configuration/ConfigMenuPage.xaml
index fa01f5c..e91935c 100644
--- a/Views/Configuration/ConfigMenuPage.xaml
+++ b/Views/Configuration/ConfigMenuPage.xaml
@@ -34,17 +34,41 @@
+
+
+
+
-
+
-
+
@@ -52,22 +76,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -83,10 +129,8 @@
Width="40" Height="40"
HorizontalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"
- MouseEnter="Border_Minimize_MouseEnter"
- MouseLeave="Border_MouseLeave"
MouseLeftButtonDown="Minimize_Click">
-
+
@@ -95,15 +139,16 @@
Width="40" Height="40"
HorizontalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"
- Margin="10 0 "
- MouseEnter="Border_Close_MouseEnter"
- MouseLeave="Border_MouseLeave"
+ Margin="30 0 "
+
MouseLeftButtonDown="Close_Click">
-
+
-
+
+
+
@@ -160,7 +205,7 @@
+ Text="{StaticResource AlgorithmConfig}"/>
diff --git a/Views/Dialog/MessageBox.xaml b/Views/Dialog/MessageBox.xaml
new file mode 100644
index 0000000..37df742
--- /dev/null
+++ b/Views/Dialog/MessageBox.xaml
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Views/Dialog/MessageBox.xaml.cs b/Views/Dialog/MessageBox.xaml.cs
new file mode 100644
index 0000000..1d86ff9
--- /dev/null
+++ b/Views/Dialog/MessageBox.xaml.cs
@@ -0,0 +1,124 @@
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using SparkClient.Model.Helper;
+
+namespace SparkClient.Views.Dialog;
+
+public partial class MessageBox : Window
+{
+ public MessageBox()
+ {
+ InitializeComponent();
+ WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+ }
+ private void Grid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ if (e.ButtonState == MouseButtonState.Pressed)
+ {
+ this.DragMove();
+ }
+ }
+
+ private int _showType = -1;
+ private bool _result = false;
+ public void Show(String message, String btnStr = "")
+ {
+ BorderInput.Visibility = Visibility.Hidden;
+ Grid.SetRow(GridButtons, 2);
+ CancelButton.Visibility = Visibility.Hidden;
+ Grid.SetColumn(ConfirmButton, 2);
+ TextBlockCenterBox.Text = message;
+ _showType = 0;
+ this.Height = 200;
+ if (!string.IsNullOrWhiteSpace(btnStr))
+ {
+ ConfirmButtonText.Text = btnStr;
+ }
+ else
+ {
+ ConfirmButtonText.Text = MultilingualHelper.getString("DialogConfirmDefaultTitle");
+ }
+ this.ShowDialog();
+
+ }
+ public MessageBoxResult ShowAsk(String message, String confirmButtonTitle = "", String cancelButtonTitle ="")
+ {
+ BorderInput.Visibility = Visibility.Hidden;
+ Grid.SetRow(GridButtons, 2);
+ _showType = 1;
+ this.Height = 250;
+ TextBlockCenterBox.Text = message;
+ if (!string.IsNullOrWhiteSpace(confirmButtonTitle) && !string.IsNullOrWhiteSpace(cancelButtonTitle))
+ {
+ ConfirmButtonText.Text = confirmButtonTitle;
+ CancelButtonText.Text = cancelButtonTitle;
+ }
+ else
+ {
+ ConfirmButtonText.Text = MultilingualHelper.getString("DialogConfirmDefaultTitle");
+ CancelButtonText.Text = MultilingualHelper.getString("DialogCancelDefaultTitle");
+ }
+ this.ShowDialog();
+
+ return _result==true ? MessageBoxResult.OK : MessageBoxResult.Cancel;
+ }
+ //
+ public MessageBoxResult ShowInput(String message, out String inputStr , String confirmButtonTitle = "", String cancelButtonTitle ="")
+ {
+ _showType = 2;
+ this.Height = 350;
+ TextBlockCenterBox.Text = message;
+ if (!string.IsNullOrWhiteSpace(confirmButtonTitle) && !string.IsNullOrWhiteSpace(cancelButtonTitle))
+ {
+ ConfirmButtonText.Text = confirmButtonTitle;
+ CancelButtonText.Text = cancelButtonTitle;
+ }
+ else
+ {
+ ConfirmButtonText.Text = MultilingualHelper.getString("DialogConfirmDefaultTitle");
+ CancelButtonText.Text = MultilingualHelper.getString("DialogCancelDefaultTitle");
+ }
+ this.ShowDialog();
+
+ inputStr = TextBoxInput.Text;
+ return _result==true ? MessageBoxResult.OK : MessageBoxResult.Cancel;
+ }
+ private void CloseButton_OnClick(object sender, RoutedEventArgs e)
+ {
+ this.Close();
+
+ }
+
+ private void ConfirmButton_OnClick(object sender, RoutedEventArgs e)
+ {
+ if (_showType == 0)
+ {
+ this.Close();
+ }else if (_showType == 1)
+ {
+ _result = true;
+ this.Close();
+ }else if (_showType == 2)
+ {
+ if (string.IsNullOrWhiteSpace(TextBoxInput.Text))
+ {
+ BorderInput.BorderBrush = Brushes.Red;
+ return;
+ }
+ else
+ {
+ _result = true;
+ this.Close();
+ }
+ }
+ }
+
+ private void CancelButton_OnClick(object sender, RoutedEventArgs e)
+ {
+ this.Close();
+ }
+}
\ No newline at end of file
diff --git a/Views/UserControl/Viewport3D.xaml b/Views/UserControl/Viewport3D.xaml
index 1cbf31b..805f4dd 100644
--- a/Views/UserControl/Viewport3D.xaml
+++ b/Views/UserControl/Viewport3D.xaml
@@ -26,70 +26,24 @@
+
-
@@ -149,11 +103,11 @@