perf: update icons

STranslate/MainWindow.xaml

@@ -18,7 +18,7 @@
         WindowStyle="None"
         Height="450"
         Width="400"
-        Icon="/Images/translate2.ico">
+        Icon="/Images/translate.ico">
     <Window.DataContext>
         <vm:MainVM />
     </Window.DataContext>
@@ -37,7 +37,7 @@
             <hc:NotifyIcon Text="STranslate"
                            IsBlink="False"
                            Visibility="Visible"
-                           Icon="/Images/translate2.ico">
+                           Icon="/Images/translate.ico">
                 <hc:NotifyIcon.ContextMenu>
                     <ContextMenu Style="{StaticResource InputElementBaseStyle}"
                                  Width="120">
@@ -62,7 +62,7 @@
 
             <!--header-->
             <Grid x:Name="Header">
-                <Button Margin="10,0"
+                <Button Margin="5,0"
                         Cursor="Hand"
                         BorderBrush="Transparent"
                         VerticalAlignment="Top"

STranslate/MainWindow.xaml.cs

@@ -222,7 +222,7 @@ namespace STranslate
             this.Activate();
             this.TextBoxInput.Focus();
         }
-        private BitmapImage LockImgPath = new BitmapImage(new Uri("pack://application:,,,/Images/lock2.png"));
+        private BitmapImage LockImgPath = new BitmapImage(new Uri("pack://application:,,,/Images/lock3.png"));
-        private BitmapImage UnLockImgPath = new BitmapImage(new Uri("pack://application:,,,/Images/unlock2.png"));
+        private BitmapImage UnLockImgPath = new BitmapImage(new Uri("pack://application:,,,/Images/unlock3.png"));
     }
 }

STranslate/Properties/Resources.Designer.cs

@@ -93,9 +93,9 @@ namespace STranslate.Properties {
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap lock2 {
+        internal static System.Drawing.Bitmap lock3 {
             get {
-                object obj = ResourceManager.GetObject("lock2", resourceCulture);
+                object obj = ResourceManager.GetObject("lock3", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -113,9 +113,9 @@ namespace STranslate.Properties {
         /// <summary>
         ///   查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Icon translate2 {
+        internal static System.Drawing.Icon translate {
             get {
-                object obj = ResourceManager.GetObject("translate2", resourceCulture);
+                object obj = ResourceManager.GetObject("translate", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
@@ -123,9 +123,9 @@ namespace STranslate.Properties {
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap unlock2 {
+        internal static System.Drawing.Bitmap unlock3 {
             get {
-                object obj = ResourceManager.GetObject("unlock2", resourceCulture);
+                object obj = ResourceManager.GetObject("unlock3", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }

STranslate/Properties/Resources.resx

@@ -127,17 +127,17 @@
   <data name="input" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\input.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="lock2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="lock3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\lock2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\lock3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="screenshot" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\screenshot.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="translate2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="translate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\translate2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\translate.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="unlock2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="unlock3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\unlock2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\unlock3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="window" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\window.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

STranslate/STranslate.csproj

@@ -50,7 +50,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Images\translate2.ico</ApplicationIcon>
+    <ApplicationIcon>Images\translate.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="HandyControl, Version=3.4.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
@@ -85,6 +85,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Utils\ConfigUtil.cs" />
     <Compile Include="Utils\GetWordsUtil.cs" />
     <Compile Include="Utils\HotKeysUtil.cs" />
@@ -114,11 +119,6 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
@@ -136,9 +136,6 @@
     <Resource Include="Images\copy.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="Images\translate2.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Images\crossword.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
@@ -151,10 +148,13 @@
     <Resource Include="Images\window.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="Images\lock2.png">
+    <Resource Include="Images\unlock3.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\lock3.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="Images\unlock2.png">
+    <Resource Include="Images\translate.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
     <Content Include="STranslate.yml">