refactor(SignaturePage): Simplify the logic of the signature page and remove unnecessary functions

sunquakes · sunquakes · commit 18b5ba012f29 · 2026-03-12T19:00:26.000+08:00
Remove the signature preview window and related image processing code
Optimize page layout and default stroke size
Add a new "Clear" string resource
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -210,7 +210,6 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
 
         private void MinimizeToTray()
         {
-            _notifyIcon!.ShowBalloonTip(2000, Strings.Toolbox, Strings.MinimizedToTray, ToolTipIcon.None);
             Hide();
         }
 
diff --git a/Pages/HomePage.xaml b/Pages/HomePage.xaml
@@ -4,8 +4,8 @@
       xmlns:local="clr-namespace:DevTools.Pages"
       xmlns:resources="clr-namespace:DevTools.Resources"
       Title="HomePage">
-    <Grid Margin="20">
-        <UniformGrid Rows="2" Columns="3" HorizontalAlignment="Center" VerticalAlignment="Center">
+    <Grid>
+        <UniformGrid Rows="2" Columns="3" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,150">
             <Button x:Name="BtnMd5" Click="BtnMd5_Click" Style="{StaticResource CardButtonStyle}" Margin="8">
                 <StackPanel Width="140" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <TextBlock FontFamily="{StaticResource FontAwesomeSolid}" Text="&#xf023;" FontSize="32" FontWeight="Bold" HorizontalAlignment="Center" TextAlignment="Center" Foreground="#FFFFFF" />
diff --git a/Pages/SignaturePage.xaml b/Pages/SignaturePage.xaml
@@ -17,64 +17,45 @@
             
             <TextBlock Text="{x:Static resources:Strings.PageSignature}" FontSize="18" Margin="0,10" />
             
-            <StackPanel Orientation="Horizontal" Margin="0,10">
-                <TextBlock Text="{x:Static resources:Strings.PenSize}" FontWeight="Bold" VerticalAlignment="Center" Margin="0,0,10,0" />
-                <Slider x:Name="PenSizeSlider" 
-                          Width="200" 
-                          Minimum="1" 
-                          Maximum="10" 
-                          Value="2" 
-                          VerticalAlignment="Center" />
-                <TextBlock x:Name="PenSizeText" Text="2" FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,0,0" />
-            </StackPanel>
-            
             <Border BorderBrush="#666" BorderThickness="1" CornerRadius="4" Margin="0,10">
                 <InkCanvas x:Name="SignatureCanvas" 
                             Height="300" 
                             Background="#FFFFFF">
                     <InkCanvas.DefaultDrawingAttributes>
-                        <DrawingAttributes x:Name="DefaultPenAttributes" Color="#000000" Width="2" />
+                        <DrawingAttributes x:Name="DefaultPenAttributes" Color="#000000" Width="7" Height="7" FitToCurve="True" />
                     </InkCanvas.DefaultDrawingAttributes>
                 </InkCanvas>
             </Border>
             
-            <StackPanel Orientation="Horizontal" Margin="0,10" HorizontalAlignment="Center">
-                <Button Click="Clear_Click" Width="40" Height="32" Margin="5,0" ToolTip="{x:Static resources:Strings.ClearAll}">
-                    <TextBlock FontFamily="{StaticResource FontAwesomeSolid}" Text="&#xf2ed;" FontSize="16" FontWeight="Bold" Foreground="#FFFFFF" />
-                </Button>
-                <Button Click="Generate_Click" Width="40" Height="32" Margin="5,0" ToolTip="{x:Static resources:Strings.Generate}">
-                    <TextBlock FontFamily="{StaticResource FontAwesomeSolid}" Text="&#xf02a;" FontSize="16" FontWeight="Bold" Foreground="#FFFFFF" />
-                </Button>
-                <Button x:Name="SaveImageButton" 
-                        Click="SaveImage_Click" 
-                        Width="40" 
-                        Height="32" 
-                        Margin="5,0" 
-                        Visibility="Collapsed"
-                        ToolTip="{x:Static resources:Strings.SaveImage}">
-                    <TextBlock FontFamily="{StaticResource FontAwesomeSolid}" Text="&#xf0c7;" FontSize="16" FontWeight="Bold" Foreground="#FFFFFF" />
-                </Button>
-            </StackPanel>
-            
-            <!-- Image preview -->
-            <Border x:Name="ImageBorder" 
-                    CornerRadius="8" 
-                    BorderBrush="#4A4A4A" 
-                    BorderThickness="1" 
-                    Cursor="Hand" 
-                    MouseLeftButtonUp="ImageBorder_MouseLeftButtonUp" 
-                    ToolTip="{x:Static resources:Strings.ClickToPreview}"
-                    Visibility="Collapsed"
-                    Margin="0,10">
-                <Image x:Name="ResultImage" Height="200" Stretch="Uniform" />
-            </Border>
-            
-            <StackPanel Orientation="Horizontal" Margin="0,8">
-                <TextBlock Text="{x:Static resources:Strings.ImageSize}" FontWeight="Bold" />
-                <TextBlock x:Name="ImageDimensionsText" Text="-" />
-                <TextBlock Text="{x:Static resources:Strings.Size}" FontWeight="Bold" Margin="12,0,0,0" />
-                <TextBlock x:Name="ImageSizeText" Text="-" />
-            </StackPanel>
+            <Grid Margin="0,10">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                    <TextBlock Text="{x:Static resources:Strings.PenSize}" FontWeight="Bold" VerticalAlignment="Center" Margin="0,0,10,0" />
+                    <Slider x:Name="PenSizeSlider" 
+                              Width="100" 
+                              Minimum="1" 
+                              Maximum="10" 
+                              Value="7" 
+                              VerticalAlignment="Center" />
+                    <TextBlock x:Name="PenSizeText" Text="7" FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,0,0" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                    <Button Click="Convert_Click" Width="40" Height="32" Margin="5,0" ToolTip="{x:Static resources:Strings.Convert}">
+                        <TextBlock FontFamily="{StaticResource FontAwesomeSolid}" Text="&#xf362;" FontSize="16" FontWeight="Bold" Foreground="#FFFFFF" />
+                    </Button>
+                    <Button Click="Clear_Click" Width="40" Height="32" Margin="5,0" ToolTip="{x:Static resources:Strings.ClearAll}">
+                        <TextBlock FontFamily="{StaticResource FontAwesomeSolid}" Text="&#xf2ed;" FontSize="16" FontWeight="Bold" Foreground="#FFFFFF" />
+                    </Button>
+                    <Button x:Name="SaveImageButton" 
+                            Click="SaveImage_Click" 
+                            Width="40" 
+                            Height="32" 
+                            Margin="5,0" 
+                            Visibility="Collapsed"
+                            ToolTip="{x:Static resources:Strings.SaveImage}">
+                        <TextBlock FontFamily="{StaticResource FontAwesomeSolid}" Text="&#xf0c7;" FontSize="16" FontWeight="Bold" Foreground="#FFFFFF" />
+                    </Button>
+                </StackPanel>
+            </Grid>
             
             <StackPanel Orientation="Horizontal" Margin="0,6">
                 <TextBlock Text="{x:Static resources:Strings.Base64}" FontWeight="Bold" VerticalAlignment="Center" />
diff --git a/Pages/SignaturePage.xaml.cs b/Pages/SignaturePage.xaml.cs
@@ -3,31 +3,18 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Media.Effects;
 using Microsoft.Win32;
 using DevTools.Helpers;
 using DevTools.Resources;
-using Button = System.Windows.Controls.Button;
 using MessageBox = System.Windows.MessageBox;
 using SaveFileDialog = Microsoft.Win32.SaveFileDialog;
-using Cursors = System.Windows.Input.Cursors;
-using Orientation = System.Windows.Controls.Orientation;
-using HorizontalAlignment = System.Windows.HorizontalAlignment;
-using Image = System.Windows.Controls.Image;
-using Color = System.Windows.Media.Color;
-using Brushes = System.Windows.Media.Brushes;
-using Application = System.Windows.Application;
-using FontFamily = System.Windows.Media.FontFamily;
-using Point = System.Windows.Point;
 
 namespace DevTools.Pages
 {
     public partial class SignaturePage : Page
     {
-        private byte[]? _currentImageBytes;
         private BitmapSource? _currentImage;
 
         public SignaturePage()
@@ -45,27 +32,18 @@ private void PenSizeSlider_ValueChanged(object sender, RoutedPropertyChangedEven
         {
             PenSizeText.Text = e.NewValue.ToString("F0");
             DefaultPenAttributes.Width = e.NewValue;
+            DefaultPenAttributes.Height = e.NewValue;
         }
 
         private void Clear_Click(object sender, RoutedEventArgs e)
         {
             SignatureCanvas.Strokes.Clear();
-            ClearResult();
-        }
-
-        private void ClearResult()
-        {
             Base64Text.Text = string.Empty;
-            ImageDimensionsText.Text = "-";
-            ImageSizeText.Text = "-";
-            _currentImageBytes = null;
             _currentImage = null;
-            ResultImage.Source = null;
             SaveImageButton.Visibility = Visibility.Collapsed;
-            ImageBorder.Visibility = Visibility.Collapsed;
         }
 
-        private void Generate_Click(object sender, RoutedEventArgs e)
+        private void Convert_Click(object sender, RoutedEventArgs e)
         {
             if (SignatureCanvas.Strokes.Count == 0)
             {
@@ -99,17 +77,10 @@ private void Generate_Click(object sender, RoutedEventArgs e)
 
                 using var stream = new MemoryStream();
                 encoder.Save(stream);
-                _currentImageBytes = stream.ToArray();
+                var imageBytes = stream.ToArray();
 
-                var base64 = Convert.ToBase64String(_currentImageBytes);
-                Base64Text.Text = base64;
-
-                ImageDimensionsText.Text = $"{bitmap.PixelWidth} x {bitmap.PixelHeight}";
-                ImageSizeText.Text = FormatBytes(_currentImageBytes.Length);
-
-                ResultImage.Source = _currentImage;
+                Base64Text.Text = Convert.ToBase64String(imageBytes);
                 SaveImageButton.Visibility = Visibility.Visible;
-                ImageBorder.Visibility = Visibility.Visible;
             }
             catch (Exception ex)
             {
@@ -136,109 +107,6 @@ private void SaveImage_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
-            SaveImage(_currentImage);
-        }
-
-        private void ImageBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            if (_currentImage == null)
-            {
-                MessageBox.Show(Strings.NoImageToPreview, Strings.Info, MessageBoxButton.OK, MessageBoxImage.Information);
-                return;
-            }
-
-            var previewWindow = new Window
-            {
-                Title = $"{Strings.ImagePreview} - {_currentImage.PixelWidth} x {_currentImage.PixelHeight}",
-                Width = Math.Min(_currentImage.PixelWidth + 40, SystemParameters.WorkArea.Width * 0.9),
-                Height = Math.Min(_currentImage.PixelHeight + 100, SystemParameters.WorkArea.Height * 0.9),
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                Background = new SolidColorBrush(Color.FromRgb(18, 18, 18))
-            };
-
-            var grid = new Grid();
-            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-            grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
-
-            var toolbar = new StackPanel
-            {
-                Orientation = Orientation.Horizontal,
-                HorizontalAlignment = HorizontalAlignment.Right,
-                Margin = new Thickness(10)
-            };
-
-            var saveButton = CreateIconButton();
-            saveButton.Click += (s, args) => SaveImage(_currentImage);
-            toolbar.Children.Add(saveButton);
-
-            grid.Children.Add(toolbar);
-            Grid.SetRow(toolbar, 0);
-
-            var image = new Image
-            {
-                Source = _currentImage,
-                Stretch = Stretch.Uniform,
-                Margin = new Thickness(10)
-            };
-
-            grid.Children.Add(image);
-            Grid.SetRow(image, 1);
-
-            previewWindow.Content = grid;
-            previewWindow.ShowDialog();
-        }
-
-        private Button CreateIconButton()
-        {
-            var textBlock = new TextBlock
-            {
-                FontFamily = (FontFamily)Application.Current.FindResource("FontAwesomeSolid"),
-                Text = "\uf0c7",
-                FontSize = 18,
-                Foreground = Brushes.White,
-                RenderTransformOrigin = new Point(0.5, 0.5)
-            };
-
-            var button = new Button
-            {
-                Content = textBlock,
-                Width = 40,
-                Height = 40,
-                Cursor = System.Windows.Input.Cursors.Hand,
-                Background = new SolidColorBrush(Color.FromRgb(74, 74, 74)),
-                BorderThickness = new Thickness(0),
-                ToolTip = Strings.SaveImage
-            };
-
-            var template = new ControlTemplate(typeof(Button));
-            var borderFactory = new FrameworkElementFactory(typeof(Border));
-            borderFactory.Name = "border";
-            borderFactory.SetValue(Border.BackgroundProperty, new TemplateBindingExtension(Button.BackgroundProperty));
-            borderFactory.SetValue(Border.CornerRadiusProperty, new CornerRadius(20));
-            borderFactory.SetValue(Border.SnapsToDevicePixelsProperty, true);
-
-            var contentFactory = new FrameworkElementFactory(typeof(ContentPresenter));
-            contentFactory.SetValue(ContentPresenter.HorizontalAlignmentProperty, HorizontalAlignment.Center);
-            contentFactory.SetValue(ContentPresenter.VerticalAlignmentProperty, VerticalAlignment.Center);
-
-            borderFactory.AppendChild(contentFactory);
-            template.VisualTree = borderFactory;
-
-            var hoverTrigger = new Trigger { Property = Button.IsMouseOverProperty, Value = true };
-            hoverTrigger.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Color.FromRgb(90, 90, 90)), "border"));
-            hoverTrigger.Setters.Add(new Setter(Border.EffectProperty, new DropShadowEffect { Color = Color.FromArgb(102, 0, 0, 0), BlurRadius = 12, ShadowDepth = 2 }, "border"));
-            template.Triggers.Add(hoverTrigger);
-
-            var pressedTrigger = new Trigger { Property = Button.IsPressedProperty, Value = true };
-            pressedTrigger.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Color.FromRgb(106, 106, 106)), "border"));
-            template.Triggers.Add(pressedTrigger);
-
-            button.Template = template;
-            return button;
-        }
-
-        private void SaveImage(BitmapSource image)
-        {
             var dialog = new SaveFileDialog
             {
                 Filter = "PNG Image|*.png|JPEG Image|*.jpg|Bitmap Image|*.bmp|GIF Image|*.gif|All Files|*.*",
@@ -258,7 +126,7 @@ private void SaveImage(BitmapSource image)
                         _ => new PngBitmapEncoder()
                     };
 
-                    encoder.Frames.Add(BitmapFrame.Create(image));
+                    encoder.Frames.Add(BitmapFrame.Create(_currentImage));
 
                     using var stream = new FileStream(dialog.FileName, FileMode.Create);
                     encoder.Save(stream);
@@ -271,18 +139,5 @@ private void SaveImage(BitmapSource image)
                 }
             }
         }
-
-        private string FormatBytes(long bytes)
-        {
-            string[] sizes = { "B", "KB", "MB", "GB" };
-            double len = bytes;
-            int order = 0;
-            while (len >= 1024 && order < sizes.Length - 1)
-            {
-                order++;
-                len = len / 1024;
-            }
-            return $"{len:0.##} {sizes[order]}";
-        }
     }
 }
diff --git a/Resources/Strings.cs b/Resources/Strings.cs
@@ -25,6 +25,7 @@ public static string Get(string key)
         public static string Copy => Get("Copy");
         public static string Generate => Get("Generate");
         public static string ClearAll => Get("ClearAll");
+        public static string Clear => Get("Clear");
         public static string ShowOnly => Get("ShowOnly");
         public static string Save => Get("Save");
         public static string Delete => Get("Delete");
diff --git a/Resources/Strings.en-US.resx b/Resources/Strings.en-US.resx
@@ -73,6 +73,9 @@
   <data name="ClearAll" xml:space="preserve">
     <value>Clear All</value>
   </data>
+  <data name="Clear" xml:space="preserve">
+    <value>Clear</value>
+  </data>
   <data name="ShowOnly" xml:space="preserve">
     <value>Show Only</value>
   </data>
@@ -304,4 +307,13 @@
   <data name="SignatureGenerateFailed" xml:space="preserve">
     <value>Failed to generate signature</value>
   </data>
+  <data name="NoImageToPreview" xml:space="preserve">
+    <value>No image to preview</value>
+  </data>
+  <data name="ClickToPreview" xml:space="preserve">
+    <value>Click to preview</value>
+  </data>
+  <data name="ImageSaved" xml:space="preserve">
+    <value>Image saved</value>
+  </data>
 </root>
diff --git a/Resources/Strings.resx b/Resources/Strings.resx
@@ -73,6 +73,9 @@
   <data name="ClearAll" xml:space="preserve">
     <value>清除全部</value>
   </data>
+  <data name="Clear" xml:space="preserve">
+    <value>清除</value>
+  </data>
   <data name="ShowOnly" xml:space="preserve">
     <value>仅显示</value>
   </data>
@@ -262,4 +265,13 @@
   <data name="SignatureGenerateFailed" xml:space="preserve">
     <value>生成签名失败</value>
   </data>
+  <data name="NoImageToPreview" xml:space="preserve">
+    <value>没有可预览的图片</value>
+  </data>
+  <data name="ClickToPreview" xml:space="preserve">
+    <value>点击预览</value>
+  </data>
+  <data name="ImageSaved" xml:space="preserve">
+    <value>图片已保存</value>
+  </data>
 </root>
diff --git a/Resources/Strings.zh-CN.resx b/Resources/Strings.zh-CN.resx

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,6 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs`
`210`	`210`
`211`	`211`	`private void MinimizeToTray()`
`212`	`212`	`{`
`213`		`- _notifyIcon!.ShowBalloonTip(2000, Strings.Toolbox, Strings.MinimizedToTray, ToolTipIcon.None);`
`214`	`213`	`Hide();`
`215`	`214`	`}`
`216`	`215`