From ef7cb465a113f1c594cba7b919facd7dc94b8c9a Mon Sep 17 00:00:00 2001 From: liufei Date: Wed, 12 May 2021 10:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8F=AF=E7=AE=80=E5=8D=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.xaml | 1 + GeekDesk.csproj | 31 ++- MainWindow.xaml | 197 +++++++++--------- MainWindow.xaml.cs | 134 ++++++------- Resource/DefaultIconfont/iconfont.json | 219 +++++++++++++++++++++ Resource/DefaultIconfont/iconfont.svg | 116 +++++++++++ Resource/DefaultIconfont/iconfont.ttf | Bin 0 -> 12332 bytes Resource/Dictionary/GemetryDictionary.xaml | 11 ++ Resource/Image/Ico.ico | Bin 0 -> 233534 bytes Resource/Image/Ico.png | Bin 0 -> 5062 bytes Resource/Image/WindowLogo.png | Bin 0 -> 8211 bytes Util/HotKey.cs | 89 +++++++++ ViewModel/AppConfig.cs | 14 ++ ViewModel/AppData.cs | 13 -- ViewModel/IconInfo.cs | 15 ++ ViewModel/MenuInfo.cs | 29 ++- packages.config | 5 +- 17 files changed, 672 insertions(+), 202 deletions(-) create mode 100644 Resource/DefaultIconfont/iconfont.json create mode 100644 Resource/DefaultIconfont/iconfont.svg create mode 100644 Resource/DefaultIconfont/iconfont.ttf create mode 100644 Resource/Dictionary/GemetryDictionary.xaml create mode 100644 Resource/Image/Ico.ico create mode 100644 Resource/Image/Ico.png create mode 100644 Resource/Image/WindowLogo.png create mode 100644 Util/HotKey.cs diff --git a/App.xaml b/App.xaml index 53e826a..e7f6a79 100644 --- a/App.xaml +++ b/App.xaml @@ -11,6 +11,7 @@ + diff --git a/GeekDesk.csproj b/GeekDesk.csproj index 608ad9d..9a5f64b 100644 --- a/GeekDesk.csproj +++ b/GeekDesk.csproj @@ -41,29 +41,14 @@ packages\CommonServiceLocator.2.0.6\lib\net45\CommonServiceLocator.dll - - packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll - - - packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll - - - packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll - packages\HandyControl.3.1.0\lib\net452\HandyControl.dll - - packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - packages\System.Drawing.Common.5.0.2\lib\net461\System.Drawing.Common.dll - - - packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll + packages\System.Drawing.Common.6.0.0-preview.3.21201.4\lib\net461\System.Drawing.Common.dll @@ -96,6 +81,7 @@ + @@ -117,6 +103,10 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + @@ -141,9 +131,18 @@ SettingsSingleFileGenerator Settings.Designer.cs + + + + + + + + + \ No newline at end of file diff --git a/MainWindow.xaml b/MainWindow.xaml index 6441e16..f43a993 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -9,33 +9,10 @@ xmlns:util="clr-namespace:GeekDesk.Util" xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel" x:Name="window" xmlns:hc="https://handyorg.github.io/handycontrol" - Title="MainWindow" Height="500" Width="600"> + Title="MainWindow" Height="500" Width="600" + > - - - - - - - - - @@ -124,25 +94,49 @@ - + + - + - - + + + + + +