diff --git a/Control/UserControls/Config/AboutControl.xaml b/Control/UserControls/Config/AboutControl.xaml
index 44c54d6..38c2ad1 100644
--- a/Control/UserControls/Config/AboutControl.xaml
+++ b/Control/UserControls/Config/AboutControl.xaml
@@ -12,9 +12,9 @@
-
+
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/Control/UserControls/Config/ThemeControl.xaml b/Control/UserControls/Config/ThemeControl.xaml
index ccc3623..71efd16 100644
--- a/Control/UserControls/Config/ThemeControl.xaml
+++ b/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">
@@ -25,7 +25,7 @@
-
+
@@ -35,65 +35,68 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Control/Windows/BacklogInfoWindow.xaml b/Control/Windows/BacklogInfoWindow.xaml
index cd06385..128d88f 100644
--- a/Control/Windows/BacklogInfoWindow.xaml
+++ b/Control/Windows/BacklogInfoWindow.xaml
@@ -9,6 +9,7 @@
WindowStartupLocation="CenterScreen"
Height="670"
Width="450"
+ Title="TaskInfo"
WindowStyle="None"
AllowsTransparency="True"
Background="Transparent" ShowInTaskbar="False"
diff --git a/Control/Windows/BacklogWindow.xaml b/Control/Windows/BacklogWindow.xaml
index 964fb0d..7afe0a5 100644
--- a/Control/Windows/BacklogWindow.xaml
+++ b/Control/Windows/BacklogWindow.xaml
@@ -9,6 +9,7 @@
WindowStartupLocation="CenterScreen"
Height="450"
Width="850"
+ Title="Task"
WindowStyle="None"
AllowsTransparency="True"
Background="Transparent" ShowInTaskbar="False"
diff --git a/Control/Windows/ConfigWindow.xaml b/Control/Windows/ConfigWindow.xaml
index dc8b34b..2d0aadf 100644
--- a/Control/Windows/ConfigWindow.xaml
+++ b/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 @@
-
+
diff --git a/Control/Windows/IconfontWindow.xaml b/Control/Windows/IconfontWindow.xaml
index 3378e4c..0331c31 100644
--- a/Control/Windows/IconfontWindow.xaml
+++ b/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"
diff --git a/Fonts/iconfont.ttf b/Fonts/iconfont.ttf
deleted file mode 100644
index 0a053ba..0000000
Binary files a/Fonts/iconfont.ttf and /dev/null differ
diff --git a/GeekDesk.csproj b/GeekDesk.csproj
index 83c5d56..7a3cd03 100644
--- a/GeekDesk.csproj
+++ b/GeekDesk.csproj
@@ -40,6 +40,12 @@
GeekDesk.App
+
+ false
+
+
+ Taskbar.ico
+
packages\SharpShellTools.2.2.0.0\lib\Apex.WinForms.dll
@@ -282,9 +288,6 @@
Resources.Designer.cs
-
- PreserveNewest
-
SettingsSingleFileGenerator
@@ -297,19 +300,27 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 54b3d0e..207aaff 100644
--- a/MainWindow.xaml
+++ b/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 @@
-
+
@@ -110,7 +110,7 @@
-
+
diff --git a/Resource/Image/About.png b/Resource/Image/About.png
index 5eb61bd..59c6815 100644
Binary files a/Resource/Image/About.png and b/Resource/Image/About.png differ
diff --git a/Resource/Image/BacklogImg.png b/Resource/Image/BacklogImg.png
index 410b86f..a7ec4e6 100644
Binary files a/Resource/Image/BacklogImg.png and b/Resource/Image/BacklogImg.png differ
diff --git a/Resource/Image/Taskbar.png b/Resource/Image/Taskbar.png
new file mode 100644
index 0000000..c90fcb1
Binary files /dev/null and b/Resource/Image/Taskbar.png differ
diff --git a/Resource/Image/TitleLogo.png b/Resource/Image/TitleLogo.png
new file mode 100644
index 0000000..f40cb79
Binary files /dev/null and b/Resource/Image/TitleLogo.png differ
diff --git a/Resource/Image/WindowLogo.png b/Resource/Image/WindowLogo.png
deleted file mode 100644
index 7c17f9b..0000000
Binary files a/Resource/Image/WindowLogo.png and /dev/null differ
diff --git a/Taskbar.ico b/Taskbar.ico
new file mode 100644
index 0000000..95903d6
Binary files /dev/null and b/Taskbar.ico differ