From bc40050c9f81a1eebfd82b2ab1c5786a2b953af5 Mon Sep 17 00:00:00 2001
From: ZGGSONG <zggsong@foxmail.com>
Date: Fri, 16 Dec 2022 14:42:04 +0800
Subject: [PATCH] fix: fix handycontrol and add copy value manual

---
 STranslate/App.xaml                         |   1 +
 STranslate/Images/copy.png                  | Bin 0 -> 2293 bytes
 STranslate/MainWindow.xaml                  |  63 +++++++++++++-------
 STranslate/MainWindow.xaml.cs               |   2 +-
 STranslate/Properties/Resources.Designer.cs |  10 ++++
 STranslate/Properties/Resources.resx        |   3 +
 STranslate/STranslate.csproj                |   6 +-
 STranslate/ViewModel/MainVM.cs              |  11 ++++
 8 files changed, 71 insertions(+), 25 deletions(-)
 create mode 100644 STranslate/Images/copy.png

diff --git a/STranslate/App.xaml b/STranslate/App.xaml
index ab123e0..00c1b25 100644
--- a/STranslate/App.xaml
+++ b/STranslate/App.xaml
@@ -6,6 +6,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/STranslate/Images/copy.png b/STranslate/Images/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e3a2b35940376da25b05d3e2f3f0d152be28d95
GIT binary patch
literal 2293
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

literal 0
HcmV?d00001

diff --git a/STranslate/MainWindow.xaml b/STranslate/MainWindow.xaml
index 2967ea6..108ed7d 100644
--- a/STranslate/MainWindow.xaml
+++ b/STranslate/MainWindow.xaml
@@ -24,7 +24,7 @@
         <vm:MainVM/>
     </Window.DataContext>
     <Border BorderThickness="0"
-            Background="BlanchedAlmond"
+            Background="#fff"
             CornerRadius="10">
         <Grid>
             <Grid.RowDefinitions>
@@ -43,7 +43,9 @@
             <Grid x:Name="Input"
                   Margin="10,10,10,0">
                 <!--输入框-->
-                <Border x:Name="BorderInput" BorderBrush="#000"
+                <Border x:Name="BorderInput"
+                        Background="#f6f6f6"
+                        BorderBrush="#000"
                         BorderThickness="1"
                         CornerRadius="4"
                         Margin="5"
@@ -68,22 +70,35 @@
             </Grid>
             <!--mid-->
             <StackPanel Grid.Row="1"
-                        Margin="10,0,10,0"
+                        HorizontalAlignment="Center"
                         Orientation="Horizontal">
-                <Label Content="翻译结果: "
-                       VerticalAlignment="Center"
-                       HorizontalAlignment="Left"/>
                 <Label Content="当前语言:"
-                       Margin="10,0,0,0"/>
+                       Background="Transparent"
+                       BorderThickness="0"/>
                 <ComboBox x:Name="InCombo"
-                          Style="{StaticResource ComboBoxBaseStyle}"
+                          Background="#f6f6f6"
+                          Style="{StaticResource ComboBox.Small}"
                           ItemsSource="{Binding InputCombo}"
                           SelectedItem="{Binding InputComboSelected}"/>
-                <Label Content="目标语言:"/>
+                <Label Content="目标语言:"
+                       Margin="10,0"
+                       Background="Transparent"
+                       BorderThickness="0"/>
                 <ComboBox x:Name="OutCombo"
-                          Style="{StaticResource ComboBoxBaseStyle}"
+                          Background="#f6f6f6"
+                          Style="{StaticResource ComboBox.Small}"
                           ItemsSource="{Binding OutputCombo}"
                           SelectedItem="{Binding OutputComboSelected}"/>
+                <Button Margin="10,0,0,0"
+                        Cursor="Hand"
+                        Command="{Binding CopyTranslateResultCmd}">
+                    <Image Source="/Images/copy.png"/>
+                    <hc:FloatingBlock.ContentTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="复制成功"/>
+                        </DataTemplate>
+                    </hc:FloatingBlock.ContentTemplate>
+                </Button>
             </StackPanel>
             <!--output-->
             <Grid Margin="10,0,10,10"
@@ -91,24 +106,26 @@
                   Grid.Row="2">
                 <!--输出框-->
                 <Border x:Name="BorderOutput"
+                        Background="#f6f6f6"
                         BorderBrush="#000"
                         BorderThickness="1"
                         CornerRadius="4"
                         Margin="5"
                         Height="{Binding ElementName=Output, Path=Height}">
-                    <TextBox x:Name="TextBoxOutput"
-                             Background="Transparent"
-                             BorderBrush="{x:Null}"
-                             BorderThickness="0"
-                             IsReadOnly="True"
-                             Margin="5"
-                             FontSize="18"
-                             Width="{Binding ElementName=BorderOutput, Path=ActualWidth}"
-                             Height="{Binding ElementName=BorderOutput, Path=Height}"
-                             VerticalAlignment="Top"
-                             HorizontalAlignment="Left"
-                             TextWrapping="Wrap"
-                             Text="{Binding OutputTxt}"/>
+                    <hc:TextBox x:Name="TextBoxOutput"
+                                hc:InfoElement.Placeholder="翻译"
+                                Background="Transparent"
+                                BorderBrush="{x:Null}"
+                                BorderThickness="0"
+                                IsReadOnly="True"
+                                Margin="5"
+                                FontSize="18"
+                                Width="{Binding ElementName=BorderOutput, Path=ActualWidth}"
+                                Height="{Binding ElementName=BorderOutput, Path=Height}"
+                                VerticalAlignment="Top"
+                                HorizontalAlignment="Left"
+                                TextWrapping="Wrap"
+                                Text="{Binding OutputTxt}"/>
                 </Border>
                 <!--<Button Content="复制"
                         Margin="0,0,10,0"
diff --git a/STranslate/MainWindow.xaml.cs b/STranslate/MainWindow.xaml.cs
index 9d18456..3d5ef08 100644
--- a/STranslate/MainWindow.xaml.cs
+++ b/STranslate/MainWindow.xaml.cs
@@ -28,13 +28,13 @@ namespace STranslate
         protected override void OnSourceInitialized(EventArgs e)
         {
             HotkeysUtil.InitialHook(this);
-#if true
             HotkeysUtil.Regist(HotkeyModifiers.MOD_ALT, Key.A, () =>
             {
                 this.Show();
                 this.Activate();
                 this.TextBoxInput.Focus();
             });
+#if false
             HotkeysUtil.Regist(HotkeyModifiers.MOD_ALT, Key.D, () =>
             {
                 //复制内容
diff --git a/STranslate/Properties/Resources.Designer.cs b/STranslate/Properties/Resources.Designer.cs
index 2c315c9..13ab9cc 100644
--- a/STranslate/Properties/Resources.Designer.cs
+++ b/STranslate/Properties/Resources.Designer.cs
@@ -60,6 +60,16 @@ namespace STranslate.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] copy {
+            get {
+                object obj = ResourceManager.GetObject("copy", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
diff --git a/STranslate/Properties/Resources.resx b/STranslate/Properties/Resources.resx
index 7147c61..2a42a7b 100644
--- a/STranslate/Properties/Resources.resx
+++ b/STranslate/Properties/Resources.resx
@@ -118,6 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\copy.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="translate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\translate.svg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
diff --git a/STranslate/STranslate.csproj b/STranslate/STranslate.csproj
index 4c57578..32cfa36 100644
--- a/STranslate/STranslate.csproj
+++ b/STranslate/STranslate.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <None Remove=".gitignore" />
+    <None Remove="Images\copy.png" />
     <None Remove="Images\translate.ico" />
     <None Remove="Images\translate.svg" />
     <None Remove="Images\translate_x128.png" />
@@ -17,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HandyControls" Version="3.4.4" />
+    <PackageReference Include="HandyControl" Version="3.4.0" />
     <PackageReference Include="YamlDotNet" Version="12.2.1" />
   </ItemGroup>
 
@@ -28,6 +29,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="Images\copy.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\translate.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
diff --git a/STranslate/ViewModel/MainVM.cs b/STranslate/ViewModel/MainVM.cs
index 947a992..7afaef2 100644
--- a/STranslate/ViewModel/MainVM.cs
+++ b/STranslate/ViewModel/MainVM.cs
@@ -29,6 +29,16 @@ namespace STranslate.ViewModel
 
                 config = ConfigUtil.ReadConfig(ConfigPath);
 
+                //手动复制翻译结果
+                CopyTranslateResultCmd = new RelayCommand((_) =>
+                {
+                    return string.IsNullOrEmpty(OutputTxt) ? false : true;
+                }, (_) =>
+                {
+                    System.Diagnostics.Debug.Print("手动复制翻译结果: " + OutputTxt);
+                    Clipboard.SetText(OutputTxt);
+                });
+
 
                 TranslateCmd = new RelayCommand((_) =>
                 {
@@ -64,6 +74,7 @@ namespace STranslate.ViewModel
         }
 
         public ICommand TranslateCmd { get; private set; }
+        public ICommand CopyTranslateResultCmd { get; private set; }
 
         private string _InputTxt;
         public string InputTxt { get => _InputTxt; set => UpdateProperty(ref _InputTxt, value); }