From 7a3b4a5f16aa4415bfc181ffa3fb91f479c7320f Mon Sep 17 00:00:00 2001
From: ZGGSONG <zggsong@foxmail.com>
Date: Thu, 15 Dec 2022 20:00:49 +0800
Subject: [PATCH] feat: add handyconftrol

---
 STranslate/App.xaml           |  6 +++++-
 STranslate/MainWindow.xaml    | 26 +++++++++++++++++++-------
 STranslate/MainWindow.xaml.cs |  9 +++++++--
 STranslate/STranslate.csproj  |  1 +
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/STranslate/App.xaml b/STranslate/App.xaml
index 7be6f55..ab123e0 100644
--- a/STranslate/App.xaml
+++ b/STranslate/App.xaml
@@ -4,6 +4,10 @@
              xmlns:local="clr-namespace:STranslate"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/STranslate/MainWindow.xaml b/STranslate/MainWindow.xaml
index 68b0eca..34aa94d 100644
--- a/STranslate/MainWindow.xaml
+++ b/STranslate/MainWindow.xaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:STranslate"
         xmlns:vm="clr-namespace:STranslate.ViewModel"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
         mc:Ignorable="d"
         Background="Transparent"
         WindowStartupLocation="CenterScreen"
@@ -30,6 +31,12 @@
                 <RowDefinition Height="5*"/>
             </Grid.RowDefinitions>
 
+            <hc:NotifyIcon Text="STranslate"
+                           Click="NotifyIcon_Click"
+                           IsBlink="False"
+                           Visibility="Visible"
+                           Icon="/Images/translate.ico"/>
+            
             <!--input-->
             <Grid Margin="10">
                 <!--输入框-->
@@ -45,6 +52,8 @@
                              FontSize="18"
                              MinHeight="35"
                              TextWrapping="Wrap"
+                             VerticalAlignment="Top"
+                             HorizontalAlignment="Left"
                              Text="{Binding InputTxt,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                         <TextBox.InputBindings>
                             <KeyBinding Command="{Binding TranslateCmd}" Key="Enter"/>
@@ -55,7 +64,9 @@
             <!--output-->
             <Grid Margin="10"
                   Grid.Row="1">
-                <Label Content="翻译结果: "/>
+                <Label Content="翻译结果: "
+                       VerticalAlignment="Top"
+                       HorizontalAlignment="Left"/>
 
                 <!--输出框-->
                 <Border BorderBrush="#000"
@@ -67,13 +78,14 @@
                              BorderBrush="{x:Null}"
                              BorderThickness="0"
                              IsReadOnly="True"
-                               Margin="5"
-                               FontSize="18"
-                               MinHeight="35"
-                               TextWrapping="Wrap"
-                               Text="{Binding OutputTxt}"/>
+                             Margin="5"
+                             FontSize="18"
+                             MinHeight="35"
+                             VerticalAlignment="Top"
+                             HorizontalAlignment="Left"
+                             TextWrapping="Wrap"
+                             Text="{Binding OutputTxt}"/>
                 </Border>
-
                 <!--<Button Content="复制"
                         Margin="0,0,10,0"
                         VerticalAlignment="Top"
diff --git a/STranslate/MainWindow.xaml.cs b/STranslate/MainWindow.xaml.cs
index 9451d36..0e132a6 100644
--- a/STranslate/MainWindow.xaml.cs
+++ b/STranslate/MainWindow.xaml.cs
@@ -48,10 +48,10 @@ namespace STranslate
                 Topmost = Topmost != true;
                 Opacity = Topmost ? 1 : 0.9;
             }
-            //最小化 Ctrl+M
+            //最小化 Esc
             if (e.Key == Key.Escape)
             {
-                WindowState = WindowState.Minimized;
+                this.Hide();
             }
             //退出 Ctrl+Q
             if (e.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Control) && e.Key == Key.Q)
@@ -85,5 +85,10 @@ namespace STranslate
                 Height = 450;
             }
         }
+
+        private void NotifyIcon_Click(object sender, RoutedEventArgs e)
+        {
+            this.Show();
+        }
     }
 }
diff --git a/STranslate/STranslate.csproj b/STranslate/STranslate.csproj
index 36351be..4c57578 100644
--- a/STranslate/STranslate.csproj
+++ b/STranslate/STranslate.csproj
@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="HandyControls" Version="3.4.4" />
     <PackageReference Include="YamlDotNet" Version="12.2.1" />
   </ItemGroup>