优化界面及logo

Control/UserControls/Config/AboutControl.xaml

@@ -12,9 +12,9 @@
     <UserControl.Resources>
         
     </UserControl.Resources>
-    <hc:SimplePanel Margin="20">
+    <hc:SimplePanel Margin="20,50,20,20">
         <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top">
-            <Image Source="/Resource/Image/About.png" Width="200" Height="200"/>
+            <Image Source="/Resource/Image/About.png" Width="400" Height="100"/>
             <TextBlock   TextAlignment="Center"  Text="Copyright ©  2021 GeekDesk 1.0 beta"/>
             <WrapPanel Margin="0,10,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
                 <hc:Shield Subject=".net" Status=">=4.72" Margin="0,0,10,0" Color="#1182c3"/>
@@ -29,7 +29,7 @@
                     </hc:Poptip.Instance>
                 </hc:Shield>
             </WrapPanel>
-            <TextBlock Margin="0,20,0,0" FontSize="15" Width="200" TextAlignment="Center" Text="这是个人开发的程序,所有人可任意修改和免费使用(商用请联系作者)" TextWrapping="Wrap"/>
+            <TextBlock Margin="0,20,0,0" FontSize="13" Width="200" TextAlignment="Center" Text="这是个人开发的程序,所有人可任意修改和免费使用(商用请联系作者)" TextWrapping="Wrap"/>
         </StackPanel>
     </hc:SimplePanel>
 </UserControl>

Control/UserControls/Config/ThemeControl.xaml

@@ -7,7 +7,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              mc:Ignorable="d" 
              Background="AliceBlue"
-             d:DesignHeight="350" d:DesignWidth="450">
+             d:DesignHeight="380" d:DesignWidth="450">
     <hc:SimplePanel Margin="20">
 
         <hc:UniformSpacingPanel Spacing="10" Margin="0,0,-40,-12" Grid.ColumnSpan="4">
@@ -25,7 +25,7 @@
             <Button Content="修改" Click="BGButton_Click"/>
         </hc:UniformSpacingPanel>
 
-        <hc:UniformSpacingPanel Spacing="10" Margin="19,50,11,-36.433" Grid.ColumnSpan="4">
+        <hc:UniformSpacingPanel Spacing="10" Margin="19,60,11,-36.433" Grid.ColumnSpan="4">
             <CheckBox x:Name="IconIsAdmin" Content="毛玻璃效果" IsChecked="{Binding BlurEffect}">
                 <CheckBox.Background>
                     <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
@@ -35,65 +35,68 @@
             </CheckBox>
         </hc:UniformSpacingPanel>
 
-        <!--<hc:Divider LineStrokeDashArray="3,3" Margin="0,60,0,66" LineStroke="Black" Grid.ColumnSpan="4"/>-->
+        <hc:Divider LineStrokeDashArray="3,3" Margin="0,91.5,0,34.5" LineStroke="Black" Grid.ColumnSpan="4"/>
 
-        <hc:UniformSpacingPanel Spacing="10" Margin="0,80,-40,-89.5" Grid.ColumnSpan="4">
-            <TextBlock Text="托盘不透明度" VerticalAlignment="Center"/>
-        </hc:UniformSpacingPanel>
-        <hc:UniformSpacingPanel Spacing="10" Margin="0,110,-40,-122" Grid.ColumnSpan="4">
-            <hc:PreviewSlider Value="{Binding CardOpacity}"
+        <StackPanel Margin="0,30,0,0">
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,80,-40,-89.5" Grid.ColumnSpan="4">
+                <TextBlock Text="托盘不透明度" VerticalAlignment="Center"/>
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,110,-40,-122" Grid.ColumnSpan="4">
+                <hc:PreviewSlider Value="{Binding CardOpacity}"
                               Maximum="100"
                               Margin="0,-12,-313.5,19.5"
                               >
-                <hc:PreviewSlider.PreviewContent>
-                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                </hc:PreviewSlider.PreviewContent>
-            </hc:PreviewSlider>
-        </hc:UniformSpacingPanel>
+                    <hc:PreviewSlider.PreviewContent>
+                        <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                    </hc:PreviewSlider.PreviewContent>
+                </hc:PreviewSlider>
+            </hc:UniformSpacingPanel>
 
 
-        <hc:UniformSpacingPanel Spacing="10" Margin="0,135,-40,-161.626" Grid.ColumnSpan="4">
-            <TextBlock Text="背景图片不透明度" VerticalAlignment="Center"/>
-        </hc:UniformSpacingPanel>
-        <hc:UniformSpacingPanel Spacing="10" Margin="0,155,-40,-183" Grid.ColumnSpan="4">
-            <hc:PreviewSlider Value="{Binding BgOpacity}"
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,135,-40,-161.626" Grid.ColumnSpan="4">
+                <TextBlock Text="背景图片不透明度" VerticalAlignment="Center"/>
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,155,-40,-183" Grid.ColumnSpan="4">
+                <hc:PreviewSlider Value="{Binding BgOpacity}"
                               Maximum="100"
                               Margin="0,0,-313.5,7.5"
                               >
-                <hc:PreviewSlider.PreviewContent>
-                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                </hc:PreviewSlider.PreviewContent>
-            </hc:PreviewSlider>
-        </hc:UniformSpacingPanel>
+                    <hc:PreviewSlider.PreviewContent>
+                        <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                    </hc:PreviewSlider.PreviewContent>
+                </hc:PreviewSlider>
+            </hc:UniformSpacingPanel>
 
 
-        <hc:UniformSpacingPanel Spacing="10" Margin="0,195,-40,-208.813" Grid.ColumnSpan="4">
-            <TextBlock Text="主面板不透明度" VerticalAlignment="Center"/>
-        </hc:UniformSpacingPanel>
-        <hc:UniformSpacingPanel Spacing="10" Margin="0,215,-40,-241" Grid.ColumnSpan="4">
-            <hc:PreviewSlider Value="{Binding PannelOpacity}"
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,195,-40,-208.813" Grid.ColumnSpan="4">
+                <TextBlock Text="主面板不透明度" VerticalAlignment="Center"/>
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,215,-40,-241" Grid.ColumnSpan="4">
+                <hc:PreviewSlider Value="{Binding PannelOpacity}"
                               Minimum="50"
                               Maximum="100"
                               Margin="0,0,-313.5,7.5"
                               >
-                <hc:PreviewSlider.PreviewContent>
-                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                </hc:PreviewSlider.PreviewContent>
-            </hc:PreviewSlider>
-        </hc:UniformSpacingPanel>
+                    <hc:PreviewSlider.PreviewContent>
+                        <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                    </hc:PreviewSlider.PreviewContent>
+                </hc:PreviewSlider>
+            </hc:UniformSpacingPanel>
 
-        <hc:UniformSpacingPanel Spacing="10" Margin="0,245,-40,-279.313" Grid.ColumnSpan="4">
-            <TextBlock Text="主面板圆角大小" VerticalAlignment="Center"/>
-        </hc:UniformSpacingPanel>
-        <hc:UniformSpacingPanel Spacing="10" Margin="0,265,-40,-321" Grid.ColumnSpan="4">
-            <hc:PreviewSlider Value="{Binding PannelCornerRadius}"
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,245,-40,-279.313" Grid.ColumnSpan="4">
+                <TextBlock Text="主面板圆角大小" VerticalAlignment="Center"/>
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,265,-40,-321" Grid.ColumnSpan="4">
+                <hc:PreviewSlider Value="{Binding PannelCornerRadius}"
                               Maximum="25"
                               Margin="0,0,-313.5,7.5"
                               >
-                <hc:PreviewSlider.PreviewContent>
-                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                </hc:PreviewSlider.PreviewContent>
-            </hc:PreviewSlider>
-        </hc:UniformSpacingPanel>
+                    <hc:PreviewSlider.PreviewContent>
+                        <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                    </hc:PreviewSlider.PreviewContent>
+                </hc:PreviewSlider>
+            </hc:UniformSpacingPanel>
+        </StackPanel>
+        
     </hc:SimplePanel>
 </UserControl>

Control/Windows/BacklogInfoWindow.xaml

@@ -9,6 +9,7 @@
            WindowStartupLocation="CenterScreen"
            Height="670" 
            Width="450" 
+           Title="TaskInfo"
            WindowStyle="None"
            AllowsTransparency="True"
            Background="Transparent" ShowInTaskbar="False"

Control/Windows/BacklogWindow.xaml

@@ -9,6 +9,7 @@
            WindowStartupLocation="CenterScreen"
            Height="450" 
            Width="850" 
+           Title="Task"
            WindowStyle="None"
            AllowsTransparency="True"
            Background="Transparent" ShowInTaskbar="False"

Control/Windows/ConfigWindow.xaml

@@ -5,6 +5,7 @@
            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
            xmlns:hc="https://handyorg.github.io/handycontrol"
            xmlns:local="clr-namespace:GeekDesk"
+           Title="Setting"
            mc:Ignorable="d"
            WindowStartupLocation="CenterScreen"
            Height="450" 
@@ -105,7 +106,7 @@
                 </hc:SideMenu>
             </hc:Card>
             <hc:ScrollViewer  Grid.Row="0" Grid.Column="1">
-                <hc:Card x:Name="RightCard" Height="450"  MouseDown="DragMove">
+                <hc:Card x:Name="RightCard" Height="448"  MouseDown="DragMove">
                 </hc:Card>
             </hc:ScrollViewer>
 

Control/Windows/IconfontWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:hc="https://handyorg.github.io/handycontrol"
         xmlns:uc="clr-namespace:GeekDesk.Control.UserControls.IconFont"
         mc:Ignorable="d"
-        Title="IconfontWindow"
+        Title="Svg"
         Height="450" Width="600"
         WindowStyle="None"
         AllowsTransparency="True"

GeekDesk.csproj

@@ -40,6 +40,12 @@
   <PropertyGroup>
     <StartupObject>GeekDesk.App</StartupObject>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>false</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Taskbar.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Apex.WinForms, Version=1.6.0.0, Culture=neutral, PublicKeyToken=98d06957926c086d, processorArchitecture=MSIL">
       <HintPath>packages\SharpShellTools.2.2.0.0\lib\Apex.WinForms.dll</HintPath>
@@ -282,9 +288,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <Resource Include="Resource\Iconfont\iconfont.json" />
-    <Resource Include="Fonts\iconfont.ttf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -297,19 +300,27 @@
   <ItemGroup>
     <Resource Include="Resource\Image\图片.png" />
     <Resource Include="Resource\Image\文件夹.png" />
-    <Resource Include="Resource\Image\WindowLogo.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resource\Iconfont\iconfont.js" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resource\Image\About.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resource\Image\公众号.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resource\Image\BacklogImg.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resource\Image\Taskbar.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resource\Image\TitleLogo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resource\Image\About.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Taskbar.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

MainWindow.xaml

@@ -11,7 +11,7 @@
         xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
         x:Name="window"
         xmlns:hc="https://handyorg.github.io/handycontrol"
-        Title="MainWindow" 
+        Title="GeekDesk" 
         d:DesignHeight="500" d:DesignWidth="700"
         WindowStyle="None"
         AllowsTransparency="True"
@@ -66,7 +66,7 @@
                     <DockPanel.Background>
                         <SolidColorBrush Opacity="0.01"/>
                     </DockPanel.Background>
-                    <Image Source="/Resource/Image/WindowLogo.png" Margin="10,0,0,0" Width="94" Height="30" HorizontalAlignment="Left"/>
+                    <Image Source="/Resource/Image/TitleLogo.png" Margin="10,0,0,0" Width="94" Height="30" HorizontalAlignment="Left"/>
                 </DockPanel>
 
                 <DockPanel Grid.Row="0" Grid.Column="2" MouseMove="DragMove">
@@ -110,7 +110,7 @@
 
                 <uc:RightCardControl Grid.Row="1" Grid.Column="1"/>
                 
-                <hc:NotifyIcon Icon="/Resource/Image/About.png" Text="GeekDesk" Click="NotifyIcon_Click">
+                <hc:NotifyIcon Icon="/Resource/Image/Taskbar.png" Text="GeekDesk" Click="NotifyIcon_Click">
                     <hc:NotifyIcon.ContextMenu>
                         <ContextMenu Width="130">
                             <MenuItem Header="打开面板" Click="ShowApp"/>