From ccd00afbb2a59629685b02b6d80f39128b3e5da7 Mon Sep 17 00:00:00 2001 From: liufei Date: Wed, 7 Jul 2021 17:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Control/Other/IconInfoDialog.xaml | 2 +- Control/UserControls/IconFont/IconPannel.xaml | 45 ++ .../UserControls/IconFont/IconPannel.xaml.cs | 29 + .../PannelCard/LeftCardControl.xaml | 9 +- .../PannelCard/LeftCardControl.xaml.cs | 6 +- .../PannelCard/RightCardControl.xaml | 2 +- Control/Windows/ConfigWindow.xaml | 2 +- Control/Windows/IconfontWindow.xaml | 41 ++ Control/Windows/IconfontWindow.xaml.cs | 91 +++ GeekDesk.csproj | 29 +- MainWindow.xaml | 18 +- MainWindow.xaml.cs | 16 +- Resource/Iconfont/iconfont.js | 1 + Resource/Iconfont/iconfont.js.bak | 294 +++++++++ Resource/Iconfont/iconfont.json | 604 ++++++++++++++++++ SvgToGeometry.cs | 73 --- Util/AeroGlassHelper.cs | 175 +++++ Util/ImageUtil.cs | 17 + Util/ScreenUtil.cs | 15 - Util/SvgToGeometry.cs | 83 +++ ViewModel/AppConfig.cs | 2 + ViewModel/IconfontInfo.cs | 40 ++ packages.config | 2 +- 23 files changed, 1489 insertions(+), 107 deletions(-) create mode 100644 Control/UserControls/IconFont/IconPannel.xaml create mode 100644 Control/UserControls/IconFont/IconPannel.xaml.cs create mode 100644 Control/Windows/IconfontWindow.xaml create mode 100644 Control/Windows/IconfontWindow.xaml.cs create mode 100644 Resource/Iconfont/iconfont.js create mode 100644 Resource/Iconfont/iconfont.js.bak create mode 100644 Resource/Iconfont/iconfont.json delete mode 100644 SvgToGeometry.cs create mode 100644 Util/AeroGlassHelper.cs delete mode 100644 Util/ScreenUtil.cs create mode 100644 Util/SvgToGeometry.cs create mode 100644 ViewModel/IconfontInfo.cs diff --git a/Control/Other/IconInfoDialog.xaml b/Control/Other/IconInfoDialog.xaml index 85f8838..59e7403 100644 --- a/Control/Other/IconInfoDialog.xaml +++ b/Control/Other/IconInfoDialog.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:hc="https://handyorg.github.io/handycontrol" - CornerRadius="10" + CornerRadius="4" Width="300" Height="300" Opacity="0.9"> diff --git a/Control/UserControls/IconFont/IconPannel.xaml b/Control/UserControls/IconFont/IconPannel.xaml new file mode 100644 index 0000000..9de1c89 --- /dev/null +++ b/Control/UserControls/IconFont/IconPannel.xaml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + --> - _swap; @@ -190,7 +193,8 @@ namespace GeekDesk.Control.UserControls.PannelCard /// private void EditMenuGeometry(object sender, RoutedEventArgs e) { - + MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo; + IconfontWindow.Show(SvgToGeometry.GetIconfonts(), menuInfo); } } } diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml b/Control/UserControls/PannelCard/RightCardControl.xaml index 101c830..a9cc785 100644 --- a/Control/UserControls/PannelCard/RightCardControl.xaml +++ b/Control/UserControls/PannelCard/RightCardControl.xaml @@ -52,7 +52,7 @@ Effect="{DynamicResource EffectShadow2}" Margin="5,0,5,5" Grid.ColumnSpan="2"> - + diff --git a/Control/Windows/ConfigWindow.xaml b/Control/Windows/ConfigWindow.xaml index 5a62658..a061841 100644 --- a/Control/Windows/ConfigWindow.xaml +++ b/Control/Windows/ConfigWindow.xaml @@ -62,7 +62,7 @@