🐛 修复无法点击切换菜单的bug

App.config

@@ -2,6 +2,8 @@
 <configuration>
 	<configSections>
 		<section name="SystemIcons" type="System.Configuration.DictionarySectionHandler" />
+		<section name="SystemBGs" type="System.Collections.ObjectModel.ObservableCollection" />
+		<section name="GradientBGParam" type="GeekDesk.ViewModel.GradientBGParam" />
 	</configSections>
 	<SystemIcons>
 		<add key="Calculator" value="计算器" />
@@ -16,6 +18,9 @@
 		<add key="CMD" value="命令行" />
 		<add key="Services" value="服务" />
 	</SystemIcons>
+	<SystemBGs>
+		<GradientBGParam Color1="#FCCF31" Color2="#F55555" Name="诸神黄昏"/>
+	</SystemBGs>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
@@ -44,12 +49,13 @@
     </assemblyBinding>
   </runtime>
   <appSettings>
-    <add key="Version" value="2.4.14" />
-    <add key="GitHubUrl" value="https://github.com/Demo-Liu/GeekDesk" />
-    <add key="GiteeUrl" value="https://gitee.com/demo_liu/GeekDesk/tree/master" />
-    <add key="GitHubUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />
-    <add key="GiteeUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+      <add key="Version" value="2.4.16" />
+      <add key="GitHubUrl" value="https://github.com/BookerLiu/GeekDesk" />
+      <add key="GiteeUrl" value="https://gitee.com/BookerLiu/GeekDesk/tree/master" />
+      <add key="GitHubUpdateUrl" value="https://raw.githubusercontent.com/BookerLiu/GeekDesk/master/Update.json" />
+      <add key="GiteeUpdateUrl" value="https://gitee.com/BookerLiu/GeekDesk/raw/master/Update.json" />
+	  <!--<add key="GiteeUpdateUrl" value="file:///C:/Users/Fei/Desktop/GeekDesk/Update.json" />-->
+	  <add key="ClientSettingsProvider.ServiceUri" value="" />
 	<add key="CustomIconTeachUrl" value="https://mp.weixin.qq.com/s/LxoHAekho9HBVl4FRw_Law" />
   </appSettings>
   <system.web>

App.xaml.cs

@@ -1,11 +1,8 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
-using Microsoft.Win32;
 using System;
-using System.IO;
-using System.Text;
 using System.Windows;
-using System.Windows.Media.Animation;
+using System.Windows.Input;
 using System.Windows.Threading;
 
 namespace GeekDesk
@@ -43,6 +40,7 @@ namespace GeekDesk
         void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
             e.Handled = true;//使用这一行代码告诉运行时，该异常被处理了，不再作为UnhandledException抛出了。
+            Mouse.OverrideCursor = null;
             LogUtil.WriteErrorLog(e, "未捕获异常!");
             if (Constants.DEV)
             {
@@ -55,6 +53,18 @@ namespace GeekDesk
             LogUtil.WriteErrorLog(e, "严重异常!");
             MessageBox.Show("GeekDesk遇到未知问题崩溃!");
         }
+        public static void DoEvents()
+        {
+            var frame = new DispatcherFrame();
+            Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Background,
+                new DispatcherOperationCallback(
+                    delegate (object f)
+                    {
+                        ((DispatcherFrame)f).Continue = false;
+                        return null;
+                    }), frame);
+            Dispatcher.PushFrame(frame);
+        }
 
 
     }

Constant/BGStyle.cs

@@ -0,0 +1,11 @@
+/// <summary>
+/// 背景风格
+/// </summary>
+namespace GeekDesk.Constant
+{
+    public enum BGStyle
+    {
+        ImgBac = 1,  //图片
+        GradientBac = 2  //渐变色
+    }
+}

Constant/Constants.cs

@@ -1,10 +1,6 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Configuration;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GeekDesk.Constant
 {

Constant/HotKeyType.cs

@@ -0,0 +1,10 @@
+namespace GeekDesk.Constant
+{
+    public enum HotKeyType
+    {
+
+        Main = 0, //主窗口
+        ToDo = 1, //待办任务
+        ColorPicker = 2 //拾色器
+    }
+}

Constant/IconStartType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-/// <summary>
+/// <summary>
 /// 图标应用启动方式
 /// </summary>
 namespace GeekDesk.Constant

Constant/IconType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.Constant
+namespace GeekDesk.Constant
 {
     public enum IconType
     {

Constant/RunTimeStatus.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.Constant
+namespace GeekDesk.Constant
 {
     internal class RunTimeStatus
     {
@@ -20,6 +14,12 @@ namespace GeekDesk.Constant
         public static bool MARGIN_HIDE_AND_OTHER_SHOW = false;
 
 
+        /// <summary>
+        /// 是否锁定主面板 锁定后 不执行隐藏动作
+        /// </summary>
+        public static bool LOCK_APP_PANEL = false;
+
+
 
 
     }

Constant/SearchType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GeekDesk.Constant
+{
+    public enum SearchType
+    {
+        HOT_KEY = 0, //快捷键
+        KEY_DOWN = 1, //按下即搜
+    }
+}

Constant/TodoTaskExecType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.Constant
+namespace GeekDesk.Constant
 {
     public enum TodoTaskExecType
     {

Constant/UpdateType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-/// <summary>
+/// <summary>
 /// 更新源
 /// </summary>
 namespace GeekDesk.Constant

Control/Other/BacklogNotificatin.xaml.cs

@@ -5,18 +5,8 @@ using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using Quartz;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace GeekDesk.Control.Other
 {

Control/Other/CustomIconUrlDialog.xaml.cs

@@ -1,13 +1,9 @@
 using GeekDesk.Control.Windows;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using Microsoft.Win32;
-using System;
 using System.Configuration;
 using System.Diagnostics;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media.Imaging;
 
 
 namespace GeekDesk.Control.Other

Control/Other/GradientBGDialog.xaml

@@ -0,0 +1,74 @@
+<Border x:Class="GeekDesk.Control.Other.GradientBGDialog"
+        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="4"
+        >
+    <Grid>
+        <StackPanel>
+            <Grid Width="750"
+                  Height="550"
+                  Panel.ZIndex="0"
+                  MouseDown="DragMove"
+                  >
+                <Grid.Background>
+                    <SolidColorBrush Color="Black" Opacity="0.01"/>
+                </Grid.Background>
+            </Grid>
+            <hc:TransitioningContentControl TransitionMode="Fade"
+                                            Panel.ZIndex="99"
+                                            Width="600"
+                                            Height="400"
+                                            Margin="0,-620,0,0">
+                <Border Style="{StaticResource BorderBG}">
+                    <Grid>
+                        <ListBox x:Name="GradientBGs"
+                     ItemsSource="{Binding}"
+                     Background="Transparent"
+                     Margin="20,20,20,50"
+                     BorderThickness="0"
+                     >
+                            <ListBox.ItemContainerStyle>
+                                <Style TargetType="ListBoxItem">
+                                    <Setter Property="Margin" Value="10"/>
+                                    <Setter Property="Effect" Value="{StaticResource EffectShadow2}"/>
+                                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                                </Style>
+                            </ListBox.ItemContainerStyle>
+                            <ListBox.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <WrapPanel Background="Transparent"/>
+                                </ItemsPanelTemplate>
+                            </ListBox.ItemsPanel>
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <Border CornerRadius="4" Width="100" Height="100"
+                                MouseLeftButtonDown="BGBorder_MouseLeftButtonDown"
+                                Tag="{Binding}">
+                                        <Border.Background>
+                                            <LinearGradientBrush>
+                                                <GradientStop Offset="0" Color="{Binding Color1}"/>
+                                                <GradientStop Offset="1" Color="{Binding Color2}"/>
+                                            </LinearGradientBrush>
+                                        </Border.Background>
+                                        <Border Width="100" Height="30" VerticalAlignment="Bottom">
+                                            <Border.Background>
+                                                <SolidColorBrush Color="Gray" Opacity="0.4"/>
+                                            </Border.Background>
+                                            <TextBlock Text="{Binding Name}"  TextAlignment="Center" VerticalAlignment="Center" FontSize="17" FontWeight="Bold" Foreground="White"/>
+                                        </Border>
+                                    </Border>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+
+                        <hc:UniformSpacingPanel Spacing="10"  Grid.ColumnSpan="4">
+                            <Button Content="关闭" Style="{StaticResource Btn1}" Click="Close_Click" HorizontalAlignment="Stretch" Margin="524,360,-524,10" VerticalAlignment="Stretch"/>
+                        </hc:UniformSpacingPanel>
+                    </Grid>
+                </Border>
+
+            </hc:TransitioningContentControl>
+        </StackPanel>
+    </Grid>
+</Border>

Control/Other/GradientBGDialog.xaml.cs

@@ -0,0 +1,52 @@
+using GeekDesk.Util;
+using GeekDesk.ViewModel;
+using GeekDesk.ViewModel.Temp;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace GeekDesk.Control.Other
+{
+    /// <summary>
+    /// TextDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class GradientBGDialog
+    {
+        public HandyControl.Controls.Dialog dialog;
+
+        public GradientBGDialog()
+        {
+            this.DataContext = GradientBGParamList.GradientBGParams;
+            InitializeComponent();
+        }
+
+        private void Close_Click(object sender, RoutedEventArgs e)
+        {
+            dialog.Close();
+        }
+
+        private void BGBorder_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            GradientBGParam bgParam = (sender as Border).Tag as GradientBGParam;
+            MainWindow.appData.AppConfig.GradientBGParam = bgParam;
+            BGSettingUtil.BGSetting();
+        }
+
+        /// <summary>
+        /// 移动窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                Window.GetWindow(this).DragMove();
+            }
+        }
+
+
+
+
+    }
+}

Control/Other/IconInfoDialog.xaml.cs

@@ -3,7 +3,6 @@ using GeekDesk.ViewModel;
 using Microsoft.Win32;
 using System;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media.Imaging;
 
 

Control/Other/IconInfoUrlDialog.xaml.cs

@@ -4,7 +4,6 @@ using GeekDesk.ViewModel;
 using Microsoft.Win32;
 using System;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media.Imaging;
 
 
@@ -89,12 +88,13 @@ namespace GeekDesk.Control.Other
                     info.BitmapImage = ImageUtil.GetBitmapIconByPath(ofd.FileName);
                     CommonCode.SaveAppData(MainWindow.appData);
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 HandyControl.Controls.Growl.WarningGlobal("修改图标失败,已重置为默认图标!");
                 LogUtil.WriteErrorLog(ex, "修改图标失败!");
             }
-            
+
         }
     }
 }

Control/Other/MyColorPickerDialog.xaml

@@ -0,0 +1,30 @@
+<Border x:Class="GeekDesk.Control.Other.MyColorPickerDialog"
+        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="4"
+        >
+
+    <Grid>
+        <StackPanel>
+            <Grid Width="750"
+                  Height="550"
+                  Panel.ZIndex="0"
+                  MouseDown="DragMove"
+                    >
+                <Grid.Background>
+                    <SolidColorBrush Color="Black" Opacity="0.01"/>
+                </Grid.Background>
+            </Grid>
+            <hc:ColorPicker x:Name="MyColorPicker" 
+                            Panel.ZIndex="99"
+                            Margin="0,-500,0,0"
+                    Confirmed="MyColorPicker_Confirmed"
+                    Canceled="MyColorPicker_Canceled"
+                    ToggleButton.Checked="MyColorPicker_Checked"
+                    SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>
+        </StackPanel>
+    </Grid>
+
+
+</Border>

Control/Other/MyColorPickerDialog.xaml.cs

@@ -0,0 +1,106 @@
+using GeekDesk.Control.Windows;
+using GeekDesk.ViewModel;
+using System;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+
+
+namespace GeekDesk.Control.Other
+{
+
+    public enum ColorType
+    {
+        COLOR_1 = 1,
+        COLOR_2 = 2,
+        TEXT_COLOR = 3
+    }
+
+    /// <summary>
+    /// TextDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class MyColorPickerDialog
+    {
+        public static ColorType COLOR_TYPE = new ColorType();
+        private static AppConfig appConfig = MainWindow.appData.AppConfig;
+
+        public static HandyControl.Controls.Dialog dialog;
+        private System.Windows.Controls.Primitives.ToggleButton toggleButton = null;
+
+        private static ColorType colorType;
+
+
+        public MyColorPickerDialog(string strType, string token)
+        {
+            InitializeComponent();
+            switch (strType)
+            {
+                case "Color1":
+                    colorType = ColorType.COLOR_1; break;
+                case "Color2":
+                    colorType = ColorType.COLOR_2; break;
+                default:
+                    colorType = ColorType.TEXT_COLOR; break;
+            }
+            dialog = HandyControl.Controls.Dialog.Show(this, token);
+        }
+
+
+        /// <summary>
+        /// 取消按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MyColorPicker_Canceled(object sender, EventArgs e)
+        {
+            MyColorPickerClose(sender);
+        }
+        private void MyColorPicker_Confirmed(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
+        {
+            MyColorPickerClose(sender);
+        }
+
+        private void MyColorPicker_SelectedColorChanged(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
+        {
+            SolidColorBrush scb = MyColorPicker.SelectedBrush;
+            switch (colorType)
+            {
+                case ColorType.COLOR_1:
+                    appConfig.GradientBGParam.Color1 = scb.ToString(); break;
+                case ColorType.COLOR_2:
+                    appConfig.GradientBGParam.Color2 = scb.ToString(); break;
+                default:
+                    appConfig.TextColor = scb.ToString(); break;
+            }
+        }
+
+        /// <summary>
+        /// 移动窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                Window.GetWindow(this).DragMove();
+            }
+        }
+
+
+        private void MyColorPicker_Checked(object sender, RoutedEventArgs e)
+        {
+            toggleButton = e.OriginalSource as System.Windows.Controls.Primitives.ToggleButton;
+
+            PixelColorPickerWindow colorPickerWindow = new PixelColorPickerWindow(MyColorPicker);
+            colorPickerWindow.Show();
+        }
+
+        private void MyColorPickerClose(object sender)
+        {
+            dialog.Close();
+        }
+
+    }
+}

Control/UserControls/Config/AboutControl.xaml

@@ -22,14 +22,18 @@
                     <hc:Shield Subject=".net" Status=">=4.72" Margin="0,0,10,0" Color="#1182c3"/>
                     <hc:Shield Subject="IDE" Status="VS2019" Margin="0,0,10,0" Color="#1182c3"/>
 
-                    <hc:Shield Subject="GitHub" Visibility="Visible" Status="Demo-liu"
-                           Command="hc:ControlCommands.OpenLink" 
-                           CommandParameter="https://github.com/Demo-Liu/GeekDesk"
-                           Margin="0,0,10,0" Color="#24292F"/>
-                    <hc:Shield Subject="Gitee" Visibility="Visible" Status="Demo-liu" 
-                           Command="hc:ControlCommands.OpenLink" 
-                           CommandParameter="https://gitee.com/demo_liu/GeekDesk" 
-                           Margin="0,0,10,0" Color="#C71D23"/>
+                    <hc:Shield Subject="GitHub" Visibility="Visible" Status="Star"
+                               MouseEnter="SC_MouseEnter"
+                               MouseLeave="SC_MouseLeave"
+                               Command="hc:ControlCommands.OpenLink" 
+                               CommandParameter="https://github.com/BookerLiu/GeekDesk"
+                               Margin="0,0,10,0" Color="#24292F"/>
+                    <hc:Shield Subject="Gitee" Visibility="Visible" Status="Star"
+                               MouseEnter="SC_MouseEnter"
+                               MouseLeave="SC_MouseLeave"
+                               Command="hc:ControlCommands.OpenLink" 
+                               CommandParameter="https://gitee.com/BookerLiu/GeekDesk" 
+                               Margin="0,0,10,0" Color="#C71D23"/>
 
 
                 </hc:UniformSpacingPanel>

Control/UserControls/Config/AboutControl.xaml.cs

@@ -1,20 +1,9 @@
-using System;
+using GeekDesk.Constant;
+using GeekDesk.Util;
 using System.Configuration;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using GeekDesk.Util;
-using GeekDesk.Constant;
 
 namespace GeekDesk.Control.UserControls.Config
 {
@@ -45,5 +34,14 @@ namespace GeekDesk.Control.UserControls.Config
                 Window.GetWindow(this).DragMove();
             }
         }
+
+        private void SC_MouseEnter(object sender, MouseEventArgs e)
+        {
+            this.Cursor = Cursors.Hand;
+        }
+        private void SC_MouseLeave(object sender, MouseEventArgs e)
+        {
+            this.Cursor = Cursors.Arrow;
+        }
     }
 }

Control/UserControls/Config/MotionControl.xaml

@@ -4,13 +4,17 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
-             xmlns:hc="https://handyorg.github.io/handycontrol"
              mc:Ignorable="d" 
+             xmlns:hc="https://handyorg.github.io/handycontrol" 
+             xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" 
+             d:DataContext="{d:DesignInstance Type=viewmodel:AppConfig}"
+             xmlns:cst="clr-namespace:GeekDesk.Constant"
              Background="Transparent"
-             d:DesignHeight="300" d:DesignWidth="450">
+             d:DesignHeight="450" d:DesignWidth="450">
 
     <UserControl.Resources>
         <cvt:HideTypeConvert x:Key="HideTypeConvert"/>
+        <cvt:SearchTypeConvert x:Key="SearchTypeConvert"/>
     </UserControl.Resources>
     <Grid Background="Transparent" MouseDown="DragMove" 
           >
@@ -105,34 +109,93 @@
                          IsChecked="{Binding AppHideType, Mode=TwoWay, Converter={StaticResource HideTypeConvert}, ConverterParameter=3}"/>
             </hc:UniformSpacingPanel>
 
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                <TextBlock Text="搜索方式" VerticalAlignment="Center"/>
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
+                         Style="{StaticResource RadioButtonIcon}" Content="快捷键"
+                         IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=0}"/>
+                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
+                         Style="{StaticResource RadioButtonIcon}" Content="按键即搜" 
+                         IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=1}"/>
+            </hc:UniformSpacingPanel>
+
             <hc:UniformSpacingPanel Spacing="10"  Margin="0,10,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="热键设置" VerticalAlignment="Center"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10"  Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="主面板:" VerticalAlignment="Center" Width="55"/>
+                <TextBlock Text="主面板:" VerticalAlignment="Center" Margin="0,5,0,0" Width="55"/>
                 <hc:TextBox HorizontalAlignment="Left" 
-                        Tag="Main"
-                        VerticalAlignment="Top" 
-                        IsReadOnly="True" 
-                        IsReadOnlyCaretVisible="True" 
-                        Width="200"
-                        Text="{Binding HotkeyStr}" 
-                        KeyDown="HotKeyDown"
-                        KeyUp="HotKeyUp"
-                        />
+                            Tag="{x:Static cst:HotKeyType.Main}"
+                            VerticalAlignment="Top" 
+                            IsReadOnly="True" 
+                            IsReadOnlyCaretVisible="True" 
+                            Width="170"
+                            Text="{Binding HotkeyStr}" 
+                            KeyDown="HotKeyDown"
+                            KeyUp="HotKeyUp"
+                            InputMethod.IsInputMethodEnabled="False"
+                            />
+                <CheckBox Content="启用" 
+                          Click="EnableHotKey_Click" 
+                          Tag="{x:Static cst:HotKeyType.Main}" 
+                          IsChecked="{Binding EnableAppHotKey}">
+                    <CheckBox.Background>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </CheckBox.Background>
+                </CheckBox>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="新建待办:"  Width="55"/>
+                <TextBlock Text="待办任务:" Margin="0,5,0,0"  Width="55"/>
                 <hc:TextBox HorizontalAlignment="Left" 
-                        Tag="ToDo"
-                        VerticalAlignment="Top" 
-                        IsReadOnly="True" 
-                        IsReadOnlyCaretVisible="True" 
-                        Width="200"
-                        Text="{Binding ToDoHotkeyStr}" 
-                        KeyDown="HotKeyDown"
-                        KeyUp="HotKeyUp"
-                        />
+                            Tag="{x:Static cst:HotKeyType.ToDo}"
+                            VerticalAlignment="Top" 
+                            IsReadOnly="True" 
+                            IsReadOnlyCaretVisible="True" 
+                            Width="170"
+                            Text="{Binding ToDoHotkeyStr}" 
+                            KeyDown="HotKeyDown"
+                            KeyUp="HotKeyUp"
+                            InputMethod.IsInputMethodEnabled="False"
+                            />
+                <CheckBox Content="启用" 
+                          Click="EnableHotKey_Click" 
+                          Tag="{x:Static cst:HotKeyType.ToDo}" 
+                          IsChecked="{Binding EnableTodoHotKey}">
+                    <CheckBox.Background>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </CheckBox.Background>
+                </CheckBox>
+            </hc:UniformSpacingPanel>
+
+            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                <TextBlock Text="拾色器:" Margin="0,5,0,0"  Width="55"/>
+                <hc:TextBox HorizontalAlignment="Left" 
+                            Tag="{x:Static cst:HotKeyType.ColorPicker}"
+                            VerticalAlignment="Top" 
+                            IsReadOnly="True" 
+                            IsReadOnlyCaretVisible="True" 
+                            Width="170"
+                            Text="{Binding ColorPickerHotkeyStr}" 
+                            KeyDown="HotKeyDown"
+                            KeyUp="HotKeyUp"
+                            InputMethod.IsInputMethodEnabled="False"
+                            />
+                <CheckBox Content="启用" 
+                          Tag="{x:Static cst:HotKeyType.ColorPicker}"
+                          Click="EnableHotKey_Click"
+                          IsChecked="{Binding EnableColorPickerHotKey}">
+                    <CheckBox.Background>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </CheckBox.Background>
+                </CheckBox>
             </hc:UniformSpacingPanel>
         </StackPanel>
     </Grid>

Control/UserControls/Config/MotionControl.xaml.cs

@@ -1,26 +1,13 @@
 using GeekDesk.Constant;
-using GeekDesk.Control.Windows;
 using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using HandyControl.Data;
-using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using static GeekDesk.Util.GlobalHotKey;
 
 namespace GeekDesk.Control.UserControls.Config
@@ -48,95 +35,130 @@ namespace GeekDesk.Control.UserControls.Config
         /// <param name="e"></param>
         private void HotKeyDown(object sender, KeyEventArgs e)
         {
-            string tag = (sender as TextBox).Tag.ToString();
+            Console.WriteLine("downKey:" + e.Key.ToString());
 
-            Key downKey = e.Key;
-            if (downKey == Key.System)
+            lock (this)
             {
-                downKey = e.SystemKey;
-            }
+                HotKeyType hkType = (HotKeyType)(sender as TextBox).Tag;
 
-            bool main = false;
-            if ("Main".Equals(tag))
-            {
-                main = true;
-            }
-
-            if (prevKeyTemp == Key.None || prevKeyTemp != downKey)
-            {
-                if (hotkeyFinished)
+                Key downKey = e.Key;
+                if (downKey == Key.System)
                 {
-                    if (main)
+                    downKey = e.SystemKey;
+                }
+
+                if (!CheckIsEnable(hkType)) return;
+
+
+                Console.WriteLine("prevKeyTemp:" + prevKeyTemp.ToString());
+                
+                if (prevKeyTemp == Key.None || prevKeyTemp != downKey)
+                {
+                    if (hotkeyFinished)
                     {
-                        appConfig.Hotkey = 0;
-                        appConfig.HotkeyStr = "";
-                        appConfig.HotkeyModifiers = 0;
+                        switch (hkType)
+                        {
+                            case HotKeyType.Main:
+                                appConfig.Hotkey = Key.None;
+                                appConfig.HotkeyStr = "";
+                                appConfig.HotkeyModifiers = GlobalHotKey.HotkeyModifiers.None;
+                                break;
+                            case HotKeyType.ToDo:
+                                appConfig.ToDoHotkey = Key.None;
+                                appConfig.ToDoHotkeyStr = "";
+                                appConfig.ToDoHotkeyModifiers = GlobalHotKey.HotkeyModifiers.None;
+                                break;
+                            case HotKeyType.ColorPicker:
+                                appConfig.ColorPickerHotkey = Key.None;
+                                appConfig.ColorPickerHotkeyStr = "";
+                                appConfig.ColorPickerHotkeyModifiers = GlobalHotKey.HotkeyModifiers.None;
+                                break;
+                        }
+                        hotkeyFinished = false;
+                    }
+
+                    //首次按下按键
+                    if ((HotKeyType.Main == hkType && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0))
+                        || (HotKeyType.ToDo == hkType && (appConfig.ToDoHotkeyStr == null || appConfig.ToDoHotkeyStr.Length == 0))
+                        || (HotKeyType.ColorPicker == hkType && (appConfig.ColorPickerHotkeyStr == null || appConfig.ColorPickerHotkeyStr.Length == 0))
+                        )
+                    {
+                        if (CheckModifierKeys(downKey))
+                        {
+                            //辅助键
+                            switch (hkType)
+                            {
+                                case HotKeyType.Main:
+                                    appConfig.HotkeyStr = GetKeyName(downKey);
+                                    appConfig.HotkeyModifiers = GetModifierKeys(downKey);
+                                    break;
+                                case HotKeyType.ToDo:
+                                    appConfig.ToDoHotkeyStr = GetKeyName(downKey);
+                                    appConfig.ToDoHotkeyModifiers = GetModifierKeys(downKey);
+                                    break;
+                                case HotKeyType.ColorPicker:
+                                    appConfig.ColorPickerHotkeyStr = GetKeyName(downKey);
+                                    appConfig.ColorPickerHotkeyModifiers = GetModifierKeys(downKey);
+                                    break;
+                            }
+                            Console.WriteLine("进入设置" + downKey.ToString());
+                            prevKeyTemp = downKey;
+                            keysTemp.Add(e);
+                        }
                     }
                     else
                     {
-                        appConfig.ToDoHotkey = 0;
-                        appConfig.ToDoHotkeyStr = "";
-                        appConfig.ToDoHotkeyModifiers = 0;
-                    }
-                    hotkeyFinished = false;
-                }
-                //首次按下按键
-                if ((main && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0))
-                    || (!main && (appConfig.ToDoHotkeyStr == null || appConfig.ToDoHotkeyStr.Length == 0)))
-                {
-                    if (CheckModifierKeys(downKey))
-                    {
-                        //辅助键
-                        if (main)
+                        //非首次按下  需要判断前一个键值是否为辅助键
+                        if (CheckModifierKeys(prevKeyTemp)
+                            && ((downKey >= Key.A && downKey <= Key.Z)
+                            || (downKey >= Key.F1 && downKey <= Key.F12)
+                            || (downKey >= Key.D0 && downKey <= Key.D9)
+                            || downKey == Key.Oem3
+                            ))
                         {
-                            appConfig.HotkeyStr = GetKeyName(downKey);
-                            appConfig.HotkeyModifiers = GetModifierKeys(downKey);
+                            KeyUtil.KeyProp keyProp = new KeyUtil.KeyProp();
+                            KeyUtil.KeyToChar(downKey, ref keyProp, true);
+                            string downKeyStr = keyProp.character.ToString();
+                            //string downKeyStr = "";
+                            switch (hkType)
+                            {
+                                case HotKeyType.Main:
+                                    appConfig.Hotkey = downKey;
+                                    appConfig.HotkeyStr += downKeyStr;
+                                    break;
+                                case HotKeyType.ToDo:
+                                    appConfig.ToDoHotkey = downKey;
+                                    appConfig.ToDoHotkeyStr += downKeyStr;
+                                    break;
+                                case HotKeyType.ColorPicker:
+                                    appConfig.ColorPickerHotkey = downKey;
+                                    appConfig.ColorPickerHotkeyStr += downKeyStr;
+                                    break;
+                            }
+                            prevKeyTemp = downKey;
+                            keysTemp.Add(e);
                         }
-                        else
+                        else if (CheckModifierKeys(downKey))
                         {
-                            appConfig.ToDoHotkeyStr = GetKeyName(downKey);
-                            appConfig.ToDoHotkeyModifiers = GetModifierKeys(downKey);
-                        }
-                        prevKeyTemp = downKey;
-                        keysTemp.Add(e);
-                    }
-                }
-                else
-                {
-                    //非首次按下  需要判断前一个键值是否为辅助键
-                    if (CheckModifierKeys(prevKeyTemp)
-                        && ((downKey >= Key.A && downKey <= Key.Z)
-                        || (downKey >= Key.F1 && downKey <= Key.F12)
-                        || (downKey >= Key.D0 && downKey <= Key.D9)))
-                    {
-                        if (main)
-                        {
-                            appConfig.Hotkey = downKey;
-                            appConfig.HotkeyStr += downKey.ToString();
-                        }
-                        else
-                        {
-                            appConfig.ToDoHotkey = downKey;
-                            appConfig.ToDoHotkeyStr += downKey.ToString();
-                        }
-                        prevKeyTemp = downKey;
-                        keysTemp.Add(e);
-                    }
-                    else if (CheckModifierKeys(downKey))
-                    {
-                        if (main)
-                        {
-                            appConfig.HotkeyStr += GetKeyName(downKey);
-                            appConfig.HotkeyModifiers |= GetModifierKeys(downKey);
-                        }
-                        else
-                        {
-                            appConfig.ToDoHotkeyStr += GetKeyName(downKey);
-                            appConfig.ToDoHotkeyModifiers |= GetModifierKeys(downKey);
-                        }
+                            switch (hkType)
+                            {
+                                case HotKeyType.Main:
+                                    appConfig.HotkeyStr += GetKeyName(downKey);
+                                    appConfig.HotkeyModifiers |= GetModifierKeys(downKey);
+                                    break;
+                                case HotKeyType.ToDo:
+                                    appConfig.ToDoHotkeyStr += GetKeyName(downKey);
+                                    appConfig.ToDoHotkeyModifiers |= GetModifierKeys(downKey);
+                                    break;
+                                case HotKeyType.ColorPicker:
+                                    appConfig.ColorPickerHotkeyStr += GetKeyName(downKey);
+                                    appConfig.ColorPickerHotkeyModifiers |= GetModifierKeys(downKey);
+                                    break;
+                            }
 
-                        prevKeyTemp = downKey;
-                        keysTemp.Add(e);
+                            prevKeyTemp = downKey;
+                            keysTemp.Add(e);
+                        }
                     }
                 }
             }
@@ -191,15 +213,9 @@ namespace GeekDesk.Control.UserControls.Config
         }
 
 
-        [MethodImpl(MethodImplOptions.Synchronized)]
+        //[MethodImpl(MethodImplOptions.Synchronized)]
         private void HotKeyUp(object sender, KeyEventArgs e)
         {
-            string tag = (sender as TextBox).Tag.ToString();
-            bool main = false;
-            if ("Main".Equals(tag))
-            {
-                main = true;
-            }
             lock (this)
             {
                 bool allKeyUp = true;
@@ -218,30 +234,55 @@ namespace GeekDesk.Control.UserControls.Config
                     prevKeyTemp = Key.None;
                     hotkeyFinished = true;
 
-                    if (main)
-                    {
-                        if (MainWindow.hotKeyId != -1)
-                        {
-                            //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.mainWindow).Handle, Hotkey.keymap[MainWindow.hotKeyId]);
-                            GlobalHotKey.Dispose(MainWindow.hotKeyId);
-                        }
-                        MainWindow.RegisterHotKey(false);
-                    }
-                    else
-                    {
-                        if (MainWindow.toDoHotKeyId != -1)
-                        {
-                            //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.toDoInfoWindow).Handle, Hotkey.keymap[MainWindow.toDoHotKeyId]);
-                            GlobalHotKey.Dispose(MainWindow.toDoHotKeyId);
-                        }
-                        MainWindow.RegisterCreateToDoHotKey(false);
-                    }
+                    HotKeyType hkType = (HotKeyType)(sender as TextBox).Tag;
+                    if (!CheckIsEnable(hkType)) return;
 
+                    switch (hkType)
+                    {
+                        case HotKeyType.Main:
+                            if (MainWindow.hotKeyId != -1)
+                            {
+                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.mainWindow).Handle, Hotkey.keymap[MainWindow.hotKeyId]);
+                                GlobalHotKey.Dispose(MainWindow.hotKeyId);
+                            }
+                            MainWindow.RegisterHotKey(false);
+                            break;
+                        case HotKeyType.ToDo:
+                            if (MainWindow.toDoHotKeyId != -1)
+                            {
+                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.toDoInfoWindow).Handle, Hotkey.keymap[MainWindow.toDoHotKeyId]);
+                                GlobalHotKey.Dispose(MainWindow.toDoHotKeyId);
+                            }
+                            MainWindow.RegisterCreateToDoHotKey(false);
+                            break;
+                        case HotKeyType.ColorPicker:
+                            if (MainWindow.colorPickerHotKeyId != -1)
+                            {
+                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.toDoInfoWindow).Handle, Hotkey.keymap[MainWindow.toDoHotKeyId]);
+                                GlobalHotKey.Dispose(MainWindow.colorPickerHotKeyId);
+                            }
+                            MainWindow.RegisterColorPickerHotKey(false);
+                            break;
+                    }
 
                 }
             }
         }
 
+        private bool CheckIsEnable(HotKeyType hkType)
+        {
+            switch (hkType)
+            {
+                case HotKeyType.Main:
+                    return true == appConfig.EnableAppHotKey;
+                case HotKeyType.ToDo:
+                    return true == appConfig.EnableTodoHotKey;
+                case HotKeyType.ColorPicker:
+                    return true == appConfig.EnableColorPickerHotKey;
+            }
+            return false;
+        }
+
         /// <summary>
         /// 移动窗口
         /// </summary>
@@ -295,5 +336,55 @@ namespace GeekDesk.Control.UserControls.Config
             }
         }
 
+        /// <summary>
+        /// 启用热键
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void EnableHotKey_Click(object sender, RoutedEventArgs e)
+        {
+            HotKeyType hkType = (HotKeyType)(sender as CheckBox).Tag;
+            switch (hkType)
+            {
+                case HotKeyType.Main:
+                    if (true == appConfig.EnableAppHotKey)
+                    {
+                        MainWindow.RegisterHotKey(false);
+                    } else
+                    {
+                        if (MainWindow.hotKeyId != -1)
+                        {
+                            GlobalHotKey.Dispose(MainWindow.hotKeyId);
+                        }
+                    }
+                    break;
+                case HotKeyType.ToDo:
+                    if (true == appConfig.EnableTodoHotKey)
+                    {
+                        MainWindow.RegisterCreateToDoHotKey(false);
+                    }
+                    else
+                    {
+                        if (MainWindow.hotKeyId != -1)
+                        {
+                            GlobalHotKey.Dispose(MainWindow.toDoHotKeyId);
+                        }
+                    }
+                    break;
+                case HotKeyType.ColorPicker:
+                    if (true == appConfig.EnableColorPickerHotKey)
+                    {
+                        MainWindow.RegisterColorPickerHotKey(false);
+                    }
+                    else
+                    {
+                        if (MainWindow.hotKeyId != -1)
+                        {
+                            GlobalHotKey.Dispose(MainWindow.colorPickerHotKeyId);
+                        }
+                    }
+                    break;
+            }
+        }
     }
 }

Control/UserControls/Config/OtherControl.xaml.cs

@@ -1,20 +1,9 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace GeekDesk.Control.UserControls.Config
 {

Control/UserControls/Config/ThemeControl.xaml

@@ -2,44 +2,115 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel"
+             d:DataContext="{d:DesignInstance Type=viewmodel:AppConfig}"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:cvt="clr-namespace:GeekDesk.Converts" 
              mc:Ignorable="d" 
              Background="Transparent"
              d:DesignHeight="500" d:DesignWidth="450">
 
 
+    <UserControl.Resources>
+        <cvt:BGStyleConvert x:Key="BGStyleConvert"/>
+        <cvt:StringAppendConvert x:Key="StringAppendConvert"/>
+        <cvt:Visibility2BooleanConverter x:Key="Visibility2BooleanConverter"/>
+    </UserControl.Resources>
     <Grid>
-        <Grid  MouseDown="DragMove" Background="Transparent">
+        <Grid Background="Transparent">
             <StackPanel Margin="20" >
-                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
-                    <TextBlock Text="背景图片" VerticalAlignment="Center"/>
+                <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                    <TextBlock Text="背景风格" VerticalAlignment="Center"/>
                 </hc:UniformSpacingPanel>
-                <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0" Grid.ColumnSpan="4">
-                    <TextBlock Text="图片路径:" VerticalAlignment="Center" Margin="0,5,0,0"/>
-                    <TextBlock Text="{Binding BacImgName}" Width="200" 
-                               Margin="0,5,0,0"
-                           VerticalAlignment="Center"
-                           hc:Poptip.HitMode="None" 
-                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                           hc:Poptip.Content="{Binding BacImgName}" 
-                           hc:Poptip.Placement="TopLeft"
-                           />
-                    <Button Content="修改" Click="BGButton_Click"/>
-                    <Button Content="默认" Click="DefaultButton_Click"/>
+                <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
+                         Style="{StaticResource RadioButtonIcon}" Click="BGStyle_Changed" Content="图 片"
+                         IsChecked="{Binding BGStyle, Mode=TwoWay, Converter={StaticResource BGStyleConvert}, ConverterParameter=1}"/>
+                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
+                         Style="{StaticResource RadioButtonIcon}" Click="BGStyle_Changed" Content="纯 色" 
+                         IsChecked="{Binding BGStyle, Mode=TwoWay, Converter={StaticResource BGStyleConvert}, ConverterParameter=2}"/>
                 </hc:UniformSpacingPanel>
 
-                <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0"  Grid.ColumnSpan="4">
-                    <CheckBox x:Name="IconIsAdmin" Content="毛玻璃效果" IsChecked="{Binding BlurEffect}">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
-                </hc:UniformSpacingPanel>
+                <UniformGrid x:Name="ImgBGConf">
+                    <hc:TransitioningContentControl TransitionMode="Fade" 
+                                                    Height="130">
+                        <StackPanel>
+                            <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                                <TextBlock Text="图片背景" VerticalAlignment="Center"/>
+                            </hc:UniformSpacingPanel>
+                            <hc:UniformSpacingPanel Spacing="10" Margin="20,15,0,0" Grid.ColumnSpan="4">
+                                <TextBlock Text="图片路径:" VerticalAlignment="Center" Margin="0,5,0,0"/>
+                                <TextBlock Text="{Binding BacImgName}" Width="200" 
+                                           Margin="0,5,0,0"
+                                           VerticalAlignment="Center"
+                                           hc:Poptip.HitMode="None" 
+                                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                                           hc:Poptip.Content="{Binding BacImgName}" 
+                                           hc:Poptip.Placement="TopLeft"
+                                           />
+                                <Button Content="修改" Click="BGButton_Click"/>
+                                <Button Content="默认" Click="DefaultButton_Click"/>
+                            </hc:UniformSpacingPanel>
 
-                <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0"  Grid.ColumnSpan="4">
+                            <hc:UniformSpacingPanel Spacing="10" Margin="20,10,0,0"  Grid.ColumnSpan="4">
+                                <CheckBox x:Name="IconIsAdmin" Content="毛玻璃效果" Click="BGStyle_Changed" IsChecked="{Binding BlurEffect}">
+                                    <CheckBox.Background>
+                                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                            <GradientStop Color="#FF9EA3A6"/>
+                                        </LinearGradientBrush>
+                                    </CheckBox.Background>
+                                </CheckBox>
+                            </hc:UniformSpacingPanel>
+                        </StackPanel>
+                    </hc:TransitioningContentControl>
+
+                </UniformGrid>
+
+                <UniformGrid x:Name="GradientBGConf">
+                    <hc:TransitioningContentControl TransitionMode="Fade" 
+                                                    Height="130">
+                        <StackPanel>
+                            <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                                <TextBlock Text="纯色背景" VerticalAlignment="Center"/>
+                            </hc:UniformSpacingPanel>
+                            <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0" Grid.ColumnSpan="4">
+                                <TextBlock Text="色彩1:" VerticalAlignment="Center" Margin="0,5,0,0"/>
+                                <TextBlock Text="{Binding GradientBGParam.Color1, NotifyOnTargetUpdated=True}"
+                                           TargetUpdated="Color_TargetUpdated"
+                                           Width="65" 
+                                           Margin="0,5,0,0"
+                                           VerticalAlignment="Center"
+                                           />
+                                <Button Content="设置" Tag="Color1" Click="ColorButton_Click"/>
+                            </hc:UniformSpacingPanel>
+                            <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0" Grid.ColumnSpan="4">
+                                <TextBlock Text="色彩2:" VerticalAlignment="Center" Margin="0,5,0,0"/>
+                                <TextBlock Text="{Binding GradientBGParam.Color2, NotifyOnTargetUpdated=True}" 
+                                           TargetUpdated="Color_TargetUpdated"
+                                           Width="65" 
+                                           Margin="0,5,0,0"
+                                           VerticalAlignment="Center"
+                                           />
+                                <Button Content="设置" Tag="Color2" Click="ColorButton_Click"/>
+                            </hc:UniformSpacingPanel>
+
+                            <Button Content="系统预设"
+                                    Margin="0,5,0,0"
+                                    hc:Poptip.HitMode="None" 
+                                    hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                                    hc:Poptip.Content="{Binding GradientBGParam.Name, Converter={StaticResource StringAppendConvert}, ConverterParameter=当前设置: \{\}}" 
+                                    hc:Poptip.Placement="Top"
+                                    Click="SysBG_Click"
+                                    />
+                        </StackPanel>
+                    </hc:TransitioningContentControl>
+                </UniformGrid>
+
+
+                <hc:Divider LineStrokeDashArray="3,3" Margin="0,0,0,0" Height="20" LineStroke="Black" Grid.ColumnSpan="1"/>
+
+                <hc:UniformSpacingPanel Spacing="10" Margin="5,-10,0,0"  Grid.ColumnSpan="4">
                     <CheckBox x:Name="BarIcon" Content="显示托盘图标" IsChecked="{Binding ShowBarIcon}">
                         <CheckBox.Background>
                             <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
@@ -49,11 +120,20 @@
                     </CheckBox>
                 </hc:UniformSpacingPanel>
 
-                <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
+                <hc:UniformSpacingPanel Spacing="10" Margin="5,5,0,0"  Grid.ColumnSpan="4">
+                    <CheckBox  Content="显示主面板Logo" IsChecked="{Binding TitleLogoVisible, Mode=TwoWay, Converter={StaticResource Visibility2BooleanConverter}}">
+                        <CheckBox.Background>
+                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                <GradientStop Color="#FF9EA3A6"/>
+                            </LinearGradientBrush>
+                        </CheckBox.Background>
+                    </CheckBox>
+                </hc:UniformSpacingPanel>
 
-                <StackPanel>
+
+                <StackPanel Margin="0,15,0,0">
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
-                        <TextBlock Text="托盘不透明度" VerticalAlignment="Center"/>
+                        <TextBlock Text="卡片不透明度" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
                     <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                         <hc:PreviewSlider Value="{Binding CardOpacity}"
@@ -66,15 +146,17 @@
                         </hc:PreviewSlider>
                     </hc:UniformSpacingPanel>
 
+                   
 
                     <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                         <TextBlock Text="背景图片不透明度" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
                     <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                         <hc:PreviewSlider Value="{Binding BgOpacity}"
-                                  Maximum="100"
-                                  Width="350"
-                                  >
+                                          ValueChanged="BGOpacity_ValueChanged"
+                                          Maximum="100"
+                                          Width="350"
+                                          > 
                             <hc:PreviewSlider.PreviewContent>
                                 <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
                             </hc:PreviewSlider.PreviewContent>
@@ -131,28 +213,27 @@
                 <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
                 <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
                     <TextBlock VerticalAlignment="Center" Text="图标字体颜色:" />
-                    <TextBlock VerticalAlignment="Center" Text="{Binding TextColor}" Width="100"/>
-                    <Button Content="选择" Margin="0,-10,0,0"  Click="ColorButton_Click"/>
+                    <TextBlock VerticalAlignment="Center" Text="{Binding TextColor}" Foreground="{Binding TextColor}" Width="100"/>
+                    <Button Content="选择" Margin="0,-10,0,0" Tag="Text"  Click="ColorButton_Click"/>
                 </hc:UniformSpacingPanel>
             </StackPanel>
         </Grid>
 
-        <StackPanel x:Name="ColorPanel" Panel.ZIndex="1" 
+        <!--<StackPanel x:Name="ColorPanel" Panel.ZIndex="1" 
                     Visibility="Collapsed"
                     Height="500"
                     Width="450"
                     VerticalAlignment="Center">
             <StackPanel.Background>
-                <SolidColorBrush Color="AliceBlue" Opacity="0"/>
-            </StackPanel.Background>
+                <SolidColorBrush Color="AliceBlue" Opacity="0.01"/>
+            </StackPanel.Background>-->
 
-            <hc:ColorPicker Name="MyColorPicker" 
-                            ToggleButton.Checked="MyColorPicker_Checked"
+            <!--<hc:ColorPicker Name="MyColorPicker" 
                             Canceled="MyColorPicker_Canceled"
                             Confirmed="MyColorPicker_Confirmed"
-                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>
+                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>-->
 
-        </StackPanel>
+        <!--</StackPanel>-->
     </Grid>
 
 </UserControl>

Control/UserControls/Config/ThemeControl.xaml.cs

@@ -1,41 +1,39 @@
 using GeekDesk.Constant;
+using GeekDesk.Control.Other;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace GeekDesk.Control.UserControls.Config
 {
+
     /// <summary>
     /// MotionControl.xaml 的交互逻辑
     /// </summary>
     public partial class ThemeControl : System.Windows.Controls.UserControl
     {
-
         private static AppConfig appConfig = MainWindow.appData.AppConfig;
 
-        private System.Windows.Controls.Primitives.ToggleButton toggleButton = null;
         public ThemeControl()
         {
+
             InitializeComponent();
+            if (appConfig.BGStyle != BGStyle.GradientBac)
+            {
+                GradientBGConf.Visibility = Visibility.Collapsed;
+                ImgBGConf.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                ImgBGConf.Visibility = Visibility.Collapsed;
+                GradientBGConf.Visibility = Visibility.Visible;
+            }
         }
 
         /// <summary>
@@ -64,7 +62,7 @@ namespace GeekDesk.Control.UserControls.Config
                 LogUtil.WriteErrorLog(ex, "修改背景失败,已重置为默认背景!");
                 HandyControl.Controls.Growl.WarningGlobal("修改背景失败,已重置为默认背景!");
             }
-
+            BGSettingUtil.BGSetting();
         }
 
 
@@ -81,47 +79,16 @@ namespace GeekDesk.Control.UserControls.Config
                 LogUtil.WriteErrorLog(ex, "修改背景失败2,已重置为默认背景!");
                 HandyControl.Controls.Growl.WarningGlobal("修改背景失败,已重置为默认背景!");
             }
-
+            BGSettingUtil.BGSetting();
         }
 
 
         private void ColorButton_Click(object sender, RoutedEventArgs e)
         {
-            ColorPanel.Visibility = Visibility.Visible;
+            string tag = (sender as Button).Tag.ToString();
+            new MyColorPickerDialog(tag, "ConfigWindowDialog");
         }
 
-        /// <summary>
-        /// 取消按钮事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MyColorPicker_Canceled(object sender, EventArgs e)
-        {
-            MyColorPickerClose(sender);
-        }
-        private void MyColorPicker_Confirmed(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
-        {
-            MyColorPickerClose(sender);
-        }
-
-        private void MyColorPicker_SelectedColorChanged(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
-        {
-            SolidColorBrush scb = MyColorPicker.SelectedBrush;
-            appConfig.TextColor = scb.ToString();
-        }
-
-        /// <summary>
-        /// 移动窗口
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                Window.GetWindow(this).DragMove();
-            }
-        }
 
         private void PreviewSlider_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
@@ -131,6 +98,7 @@ namespace GeekDesk.Control.UserControls.Config
             };
             System.Threading.ThreadStart ts = new System.Threading.ThreadStart(cbu.CheckButtonUp);
             System.Threading.Thread t = new System.Threading.Thread(ts);
+            t.IsBackground = true;
             t.Start();
         }
 
@@ -158,26 +126,36 @@ namespace GeekDesk.Control.UserControls.Config
             }
         }
 
-        private void MyColorPicker_Checked(object sender, RoutedEventArgs e)
-        {
-            toggleButton = e.OriginalSource as System.Windows.Controls.Primitives.ToggleButton;
-        }
 
-
-        private void MyColorPickerClose(object sender)
+        public void BGStyle_Changed(object sender, RoutedEventArgs e)
         {
-            if (toggleButton != null && toggleButton.IsChecked == true)
+            BGSettingUtil.BGSetting();
+            if (appConfig.BGStyle != BGStyle.GradientBac)
             {
-                HandyControl.Controls.ColorPicker cp = sender as HandyControl.Controls.ColorPicker;
-                const BindingFlags InstanceBindFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-                Type type = cp.GetType();
-                toggleButton.IsChecked = false;
-                MethodInfo mi = type.GetMethod("ToggleButtonDropper_Click", InstanceBindFlags);
-                mi.Invoke(cp, new object[] { null, null });
+                GradientBGConf.Visibility = Visibility.Collapsed;
+                ImgBGConf.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                ImgBGConf.Visibility = Visibility.Collapsed;
+                GradientBGConf.Visibility = Visibility.Visible;
             }
-            ColorPanel.Visibility = Visibility.Collapsed;
         }
 
+        private void BGOpacity_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            BGSettingUtil.BGSetting();
+        }
 
+        private void Color_TargetUpdated(object sender, DataTransferEventArgs e)
+        {
+            BGSettingUtil.BGSetting();
+        }
+
+        private void SysBG_Click(object sender, RoutedEventArgs e)
+        {
+            GradientBGDialog gbg = new GradientBGDialog();
+            gbg.dialog = HandyControl.Controls.Dialog.Show(gbg, "ConfigWindowDialog");
+        }
     }
 }

Control/UserControls/IconFont/IconPannel.xaml.cs

@@ -1,18 +1,4 @@
-using GeekDesk.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace GeekDesk.Control.UserControls.IconFont
 {

Control/UserControls/PannelCard/LeftCardControl.xaml

@@ -8,7 +8,8 @@
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
              xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="450" d:DesignWidth="800"
+             >
     <UserControl.Resources>
 
         <!--左侧栏样式动画-->
@@ -17,11 +18,12 @@
             <Setter Property="Margin" Value="0,0,0,1"/>
             <Setter Property="Background">
                 <Setter.Value>
-                    <SolidColorBrush Opacity="0"/>
+                    <SolidColorBrush Color="Black" Opacity="0.01"/>
                 </Setter.Value>
             </Setter>
             <Setter Property="FocusVisualStyle" Value="{x:Null}" />
             <EventSetter Event="MouseEnter" Handler="Menu_MouseEnter"/>
+            <EventSetter Event="PreviewMouseLeftButtonDown" Handler="ListBoxItem_MouseDown"/>
             <!--<EventSetter Event="Unselected" Handler="Lbi_Unselected"/>-->
             <Style.Triggers>
                 <MultiTrigger>
@@ -44,7 +46,11 @@
                         </BeginStoryboard>
                     </MultiTrigger.ExitActions>
                     <MultiTrigger.Setters>
-                        <Setter Property="Background" Value="Transparent"/>
+                        <Setter Property="Background">
+                            <Setter.Value>
+                                <SolidColorBrush Color="Black" Opacity="0.01"/>
+                            </Setter.Value>
+                        </Setter>
                         <Setter Property="Foreground" Value="Black"/>
                     </MultiTrigger.Setters>
                 </MultiTrigger>
@@ -104,6 +110,7 @@
                      SelectedIndex="{Binding AppConfig.SelectedMenuIndex}"
                      VirtualizingPanel.VirtualizationMode="Recycling"
                      SelectionChanged="Menu_SelectionChanged"
+                     PreviewMouseWheel="Menu_MouseWheel"
                      >
                 <ListBox.Resources>
                     <ContextMenu x:Key="MenuDialog" Width="200">
@@ -131,7 +138,7 @@
 
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <StackPanel Tag="{Binding}" MouseDown="ListBoxItem_MouseDown">
+                        <StackPanel Tag="{Binding}">
                             <TextBox Text="{Binding Path=MenuName, Mode=TwoWay}"
                                     HorizontalAlignment="Left"
                                     Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=35}"

Control/UserControls/PannelCard/LeftCardControl.xaml.cs

@@ -1,7 +1,6 @@
 using DraggAnimatedPanelExample;
 using GeekDesk.Constant;
 using GeekDesk.Control.Windows;
-using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using System;
@@ -10,10 +9,8 @@ using System.Collections.ObjectModel;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Threading;
 
 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -28,12 +25,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
 
         //是否正在修改菜单
-        private static bool IS_EDIT = false;
+        public bool IS_EDIT = false;
 
         public LeftCardControl()
         {
             InitializeComponent();
-           
+
 
             this.Loaded += (s, e) =>
             {
@@ -44,7 +41,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
 
         private void SetMenuListBoxItemEvent()
-        {            
+        {
             int size = MenuListBox.Items.Count;
             for (int i = 0; i < size; i++)
             {
@@ -87,7 +84,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
         }
 
-    DelegateCommand<int[]> _swap;
+        DelegateCommand<int[]> _swap;
 
         public DelegateCommand<int[]> SwapCommand
         {
@@ -208,9 +205,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void RenameMenu(object sender, RoutedEventArgs e)
         {
+            IS_EDIT = true;
             MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
             menuInfo.MenuEdit = (int)Visibility.Visible;
-            IS_EDIT = true;
         }
 
         /// <summary>
@@ -279,6 +276,8 @@ namespace GeekDesk.Control.UserControls.PannelCard
                     menuInfo.MenuEdit = Visibility.Collapsed;
                 }
                 IS_EDIT = false;
+                //为了解决无法修改菜单的问题
+                MainWindow.mainWindow.SearchBox.Focus();
                 MenuListBox.SelectedIndex = menuSelectIndexTemp;
             }
         }
@@ -312,6 +311,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
         private void Menu_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
+            if (IS_EDIT) return;
             //设置对应菜单的图标列表
             if (MenuListBox.SelectedIndex == -1)
             {
@@ -333,7 +333,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
         {
             if (appData.AppConfig.HoverMenu && !IS_EDIT)
             {
-                new Thread(() =>
+                Thread t = new Thread(() =>
                 {
                     Thread.Sleep(200);
                     this.Dispatcher.Invoke(() =>
@@ -345,7 +345,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
                             MenuListBox.SelectedIndex = index;
                         }
                     });
-                }).Start();
+                });
+                t.IsBackground = true;
+                t.Start();
             }
         }
 
@@ -356,11 +358,35 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void ListBoxItem_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            if (RunTimeStatus.SEARCH_BOX_SHOW) {
+            if (RunTimeStatus.SEARCH_BOX_SHOW)
+            {
                 MainWindow.mainWindow.HidedSearchBox();
             }
+
+            ListBoxItem lbi = sender as ListBoxItem;
+            MenuInfo mi = lbi.DataContext as MenuInfo;
+            int index = MenuListBox.Items.IndexOf(mi);
+            MenuListBox.SelectedIndex = index;
         }
 
+
+        ///// <summary>
+        ///// 点击菜单后  隐藏搜索框
+        ///// </summary>
+        ///// <param name="sender"></param>
+        ///// <param name="e"></param>
+        //private void ListBoxItemPanel_MouseDown(object sender, MouseButtonEventArgs e)
+        //{
+        //    if (RunTimeStatus.SEARCH_BOX_SHOW)
+        //    {
+        //        MainWindow.mainWindow.HidedSearchBox();
+        //    }
+        //    MenuInfo mi = (sender as StackPanel).Tag as MenuInfo;
+        //    int index = MenuListBox.Items.IndexOf(mi);
+        //    MenuListBox.SelectedIndex = index;
+        //}
+
+
         /// <summary>
         /// 隐藏搜索框
         /// </summary>
@@ -373,5 +399,33 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 MainWindow.mainWindow.HidedSearchBox();
             }
         }
+
+        private void Menu_MouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            if (e.Delta < 0)
+            {
+                int index = MenuListBox.SelectedIndex;
+                if (index < MenuListBox.Items.Count - 1)
+                {
+                    index ++;
+                } else
+                {
+                    index = 0;
+                }
+                MenuListBox.SelectedIndex = index;
+            } else if (e.Delta > 0)
+            {
+                int index = MenuListBox.SelectedIndex;
+                if (index > 0)
+                {
+                    index --;
+                }
+                else
+                {
+                    index = MenuListBox.Items.Count - 1;
+                }
+                MenuListBox.SelectedIndex = index;
+            }
+        }
     }
 }

Control/UserControls/PannelCard/RightCardControl.xaml

@@ -58,7 +58,8 @@
                  Drop="Wrap_Drop" 
                  BorderThickness="1" 
                  Effect="{DynamicResource EffectShadow2}" 
-                 Margin="5,0,5,5" Grid.ColumnSpan="2">
+                 Margin="5,0,5,5" Grid.ColumnSpan="2"
+                 PreviewMouseRightButtonDown="WrapCard_PreviewMouseRightButtonDown">
             <hc:Card.Background>
                 <SolidColorBrush Color="AliceBlue"  hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"/>
             </hc:Card.Background>
@@ -69,6 +70,7 @@
                 <ContextMenu Width="200">
                     <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
                     <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
+                    <MenuItem x:Name="CardLockCM" Header="锁定主面板" Click="LockAppPanel"/>
                 </ContextMenu>
             </hc:Card.ContextMenu>
             <Grid>
@@ -175,43 +177,44 @@
                    VirtualizingPanel.IsVirtualizing="True"  
                    VirtualizingPanel.IsContainerVirtualizable="True"
                    >
-                    <hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom1Transition}">
-                        <ListBox ItemsSource="{Binding Source={StaticResource SearchIconList},Path=IconList}" 
+                    <UniformGrid x:Name="VerticalUFG">
+                        <hc:TransitioningContentControl TransitionMode="Left2RightWithFade">
+                            <ListBox ItemsSource="{Binding Source={StaticResource SearchIconList},Path=IconList}" 
                              BorderThickness="0"
                              Padding="0,10,0,0"
                              >
-                            <ListBox.Background>
-                                <SolidColorBrush Opacity="0"/>
-                            </ListBox.Background>
+                                <ListBox.Background>
+                                    <SolidColorBrush Opacity="0"/>
+                                </ListBox.Background>
 
-                            <ListBox.Resources>
-                                <ContextMenu x:Key="IconDialog" Width="200">
-                                    <MenuItem Header="管理员方式运行" Click="IconAdminStart" Tag="{Binding}"/>
-                                    <MenuItem Header="打开文件所在位置" Click="ShowInExplore" Tag="{Binding}"/>
-                                    <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
-                                    <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
-                                    <MenuItem Header="资源管理器菜单" Click="SystemContextMenu" Tag="{Binding}"/>
-                                    <MenuItem Header="属性" Click="PropertyConfig" Tag="{Binding}"/>
-                                </ContextMenu>
-                            </ListBox.Resources>
+                                <ListBox.Resources>
+                                    <ContextMenu x:Key="IconDialog" Width="200">
+                                        <MenuItem Header="管理员方式运行" Click="IconAdminStart" Tag="{Binding}"/>
+                                        <MenuItem Header="打开文件所在位置" Click="ShowInExplore" Tag="{Binding}"/>
+                                        <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
+                                        <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
+                                        <MenuItem Header="资源管理器菜单" Click="SystemContextMenu" Tag="{Binding}"/>
+                                        <MenuItem Header="属性" Click="PropertyConfig" Tag="{Binding}"/>
+                                    </ContextMenu>
+                                </ListBox.Resources>
 
-                            <ListBox.ItemContainerStyle>
-                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource MyListBoxItemStyle}">
-                                    <Setter Property="ContextMenu" Value="{StaticResource IconDialog}"/>
-                                </Style>
-                            </ListBox.ItemContainerStyle>
+                                <ListBox.ItemContainerStyle>
+                                    <Style TargetType="ListBoxItem" BasedOn="{StaticResource MyListBoxItemStyle}">
+                                        <Setter Property="ContextMenu" Value="{StaticResource IconDialog}"/>
+                                    </Style>
+                                </ListBox.ItemContainerStyle>
 
-                            <ListBox.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <StackPanel Background="#00FFFFFF"
+                                <ListBox.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Background="#00FFFFFF"
                                             Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.MenuCardWidth, Mode=OneWay, Converter={StaticResource SearchResWidth}, ConverterParameter=1}"
                                             />
-                                </ItemsPanelTemplate>
-                            </ListBox.ItemsPanel>
+                                    </ItemsPanelTemplate>
+                                </ListBox.ItemsPanel>
 
-                            <ListBox.ItemTemplate>
-                                <DataTemplate>
-                                    <WrapPanel Tag="{Binding}"
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <WrapPanel Tag="{Binding}"
                                            Height="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageHeight, Mode=OneWay}" 
                                            Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.MenuCardWidth, Mode=OneWay, Converter={StaticResource SearchResWidth}, ConverterParameter=2}" 
                                            HorizontalAlignment="Left"
@@ -224,8 +227,8 @@
                                            MouseLeftButtonUp="Icon_MouseLeftButtonUp"
                                            Margin="25,20,0,0"
                                            >
-                                        <Image Style="{StaticResource ImageStyle}"  RenderOptions.BitmapScalingMode="HighQuality"/>
-                                        <TextBlock
+                                            <Image Style="{StaticResource ImageStyle}"  RenderOptions.BitmapScalingMode="HighQuality"/>
+                                            <TextBlock
                                            Margin="10,5,0,0"
                                            MaxHeight="40"
                                            FontSize="13"
@@ -235,13 +238,13 @@
                                            VerticalAlignment="Center" 
                                            Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
                                            Text="{Binding Name}"/>
-                                    </WrapPanel>
-                                </DataTemplate>
-                            </ListBox.ItemTemplate>
-                        </ListBox>
-                    </hc:TransitioningContentControl>
-                    
+                                        </WrapPanel>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
 
+                        </hc:TransitioningContentControl>
+                    </UniformGrid>
                 </WrapPanel>
 
             </Grid>

Control/UserControls/PannelCard/RightCardControl.xaml.cs

@@ -9,13 +9,12 @@ using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;
+using System.Windows.Threading;
 
 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -199,12 +198,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
                                     //p.StartInfo.CreateNoWindow = false; //设置显示窗口
                                     p.StartInfo.UseShellExecute = true;//不使用操作系统外壳程序启动进程
                                     //p.StartInfo.ErrorDialog = false;
-                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
+                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
                                     {
                                         //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
                                         if (appData.AppConfig.MarginHide)
                                         {
-                                            if (!MarginHide.IS_HIDE)
+                                            if (!MarginHide.IsMargin())
                                             {
                                                 MainWindow.HideApp();
                                             }
@@ -217,12 +216,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
                                     }
                                     break;// c#好像不能case穿透
                                 case IconStartType.DEFAULT_STARTUP:
-                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
+                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
                                     {
                                         //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
                                         if (appData.AppConfig.MarginHide)
                                         {
-                                            if (!MarginHide.IS_HIDE)
+                                            if (!MarginHide.IsMargin())
                                             {
                                                 MainWindow.HideApp();
                                             }
@@ -241,7 +240,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
                         }
                         else
                         {
-                            if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
+                            if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
                             {
                                 //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
                                 if (appData.AppConfig.MarginHide)
@@ -422,12 +421,31 @@ namespace GeekDesk.Control.UserControls.PannelCard
             double height = appData.AppConfig.ImageHeight;
             width += width * 0.15;
             height += height * 0.15;
-            ImgStoryBoard(sender, (int)width, (int)height, 1, true);
+            Thread t = new Thread(() =>
+            {
+                this.Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    ImgStoryBoard(sender, (int)width, (int)height, 1, true);
+                }));
+            });
+            t.IsBackground = true;
+            t.Start();
+
         }
 
         private void StackPanel_MouseLeave(object sender, MouseEventArgs e)
         {
-            ImgStoryBoard(sender, appData.AppConfig.ImageWidth, appData.AppConfig.ImageHeight, 220);
+
+            Thread t = new Thread(() =>
+            {
+            this.Dispatcher.BeginInvoke(new Action(() =>
+            {
+                ImgStoryBoard(sender, appData.AppConfig.ImageWidth, appData.AppConfig.ImageHeight, 260);
+            }));
+            });
+            t.IsBackground = true;
+            t.Start();
+
         }
 
 
@@ -436,6 +454,59 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
             if (appData.AppConfig.PMModel) return;
 
+            //int count = 0;
+            //Panel sp = sender as Panel;
+            //Image img = sp.Children[0] as Image;
+
+
+            //int nowH = (int)img.Height;
+
+            //bool isSmall = nowH > height;
+
+            //if (!isSmall)
+            //{
+            //    img.Height = height;
+            //    img.Width = width;
+            //    return;
+            //}
+            //double subLen = (double)Math.Abs(nowH - height) / (double)milliseconds;
+
+            //new Thread(() =>
+            //{
+            //    this.Dispatcher.Invoke(() =>
+            //    {
+            //        while (count < milliseconds)
+            //        {
+            //            if (!isSmall)
+            //            {
+            //                img.Height += subLen;
+            //                img.Width += subLen;
+            //            } else
+            //            {
+            //                //if (img.Height > 1)
+            //                //{
+            //                //    img.Height -= 1;
+            //                //    img.Width -= 1;
+            //                //}
+            //                Application.Current.Dispatcher.Invoke(DispatcherPriority.Background,
+            //                             new Action(delegate {
+            //                                 img.Height -= subLen;
+            //                                 img.Width -= subLen;
+            //                             }));
+            //                //img.Height -= subLen;
+            //                //img.Width -= subLen;
+            //            }
+            //            count++;
+            //            Thread.Sleep(1);
+            //        }
+            //        img.Height = height;
+            //        img.Width = width;
+            //    });
+            //}).Start();
+
+
+
+
             Panel sp = sender as Panel;
 
             DependencyObject dos = sp.Parent;
@@ -491,6 +562,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 {
                     ThreadStart ts = new ThreadStart(crs.Remove);
                     System.Threading.Thread t = new System.Threading.Thread(ts);
+                    t.IsBackground = true;
                     t.Start();
                 }
                 else
@@ -501,10 +573,10 @@ namespace GeekDesk.Control.UserControls.PannelCard
             };
             img.BeginAnimation(WidthProperty, widthAnimation);
             img.BeginAnimation(HeightProperty, heightAnimation);
-
+            //###################################################################
             //myStoryboard.Completed += (s, e) =>
             //{
-            //    if (checkRmStoryboard || true)
+            //    if (checkRmStoryboard)
             //    {
             //        ThreadStart ts = new ThreadStart(crs.Remove);
             //        System.Threading.Thread t = new System.Threading.Thread(ts);
@@ -623,5 +695,26 @@ namespace GeekDesk.Control.UserControls.PannelCard
         {
             this.Cursor = Cursors.Arrow;
         }
+
+        /// <summary>
+        /// 锁定/解锁主面板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LockAppPanel(object sender, RoutedEventArgs e)
+        {
+            RunTimeStatus.LOCK_APP_PANEL = !RunTimeStatus.LOCK_APP_PANEL;
+        }
+
+        private void WrapCard_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (RunTimeStatus.LOCK_APP_PANEL)
+            {
+                CardLockCM.Header = "解锁主面板";
+            } else
+            {
+                CardLockCM.Header = "锁定主面板";
+            }
+        }
     }
 }

Control/UserControls/SystemItem/SystemItem.xaml.cs

@@ -1,20 +1,8 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace GeekDesk.Control.UserControls.SystemItem
 {
@@ -47,7 +35,8 @@ namespace GeekDesk.Control.UserControls.SystemItem
                 };
                 iconInfo.Content_NoWrite = iconInfo.Name_NoWrite
                     + "\n使用次数:" + iconInfo.Count;
-            } else
+            }
+            else
             {
                 //startupMenu or Store
                 iconInfo = CommonCode.GetIconInfoByPath(thisInfo.LnkPath_NoWrite);

Control/UserControls/ToDo/TodoControl.xaml

@@ -6,25 +6,58 @@
              xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ToDoInfo}"
              mc:Ignorable="d" 
+             xmlns:cst="clr-namespace:GeekDesk.Converts"
              Background="Transparent"
              >
 
+    <UserControl.Resources>
+        <!--<cst:Count2VisibleConvert x:Key="Count2VisibleConvert"/>
+        <cst:CountGreZero2BoolConvert x:Key="CountGreZero2BoolConvert"/>
+        <Style x:Key="NoDataStyle" TargetType="TextBlock">
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="False">
+                    <Setter Property="Visibility" Value="Visible"/>
+                </DataTrigger>
+                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="True">
+                    <Setter Property="Visibility" Value="Collapsed"/>
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+        <Style x:Key="ToDoStyle" TargetType="DataGrid">
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="True">
+                    <Setter Property="Visibility" Value="Visible"/>
+                </DataTrigger>
+                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="False">
+                    <Setter Property="Visibility" Value="Collapsed"/>
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>-->
+    </UserControl.Resources>
     <hc:SimplePanel Margin="20" Background="Transparent">
         <Grid Background="Transparent">
+            <TextBlock x:Name="IsNewToDo" Visibility="Collapsed" />
+            <TextBlock x:Name="NoData" 
+                       VerticalAlignment="Center" 
+                       HorizontalAlignment="Center"
+                       TextAlignment="Center"
+                       Text="暂无数据!"
+                       />
+
             <DataGrid x:Name="BacklogList" 
-                  HeadersVisibility="All"  
-                  AutoGenerateColumns="False" 
-                  ItemsSource="{Binding}"
-                  IsReadOnly="True"
-                  Initialized="DataGridMenu_Initialized"
-                  >
+                      HeadersVisibility="All"  
+                      AutoGenerateColumns="False" 
+                      ItemsSource="{Binding}"
+                      IsReadOnly="True"
+                      Initialized="DataGridMenu_Initialized"
+                      >
                 <DataGrid.ContextMenu>
                     <ContextMenu x:Name="Menu" Width="120">
                         <MenuItem Header="详情" Click="DetailMenu_Click"/>
                         <MenuItem Header="删除" Click="DeleteMenu_Click"/>
                     </ContextMenu>
                 </DataGrid.ContextMenu>
-                <DataGrid.RowStyle>
+                <!--<DataGrid.RowStyle>
                     <Style TargetType="DataGridRow" BasedOn="{StaticResource DataGridRowStyle}">
                         <EventSetter Event="MouseRightButtonDown" Handler="DataGridRow_MouseRightButtonDown" />
                         <Setter Property="Background" Value="White"/>
@@ -37,8 +70,59 @@
                             </Trigger>
                         </Style.Triggers>
                     </Style>
+                </DataGrid.RowStyle>-->
+
+
+
+                <DataGrid.RowStyle>
+                    <Style TargetType="{x:Type DataGridRow}">
+                        <Style.Setters>
+                            <Setter Property="SnapsToDevicePixels" Value="true"/>
+                            <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
+                            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="{x:Type DataGridRow}">
+                                        <Border CornerRadius="8" MouseRightButtonDown="DataGridRow_MouseRightButtonDown" Margin="0,0,0,5" BorderBrush="Black" BorderThickness="0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                                            <Border.Style>
+                                                <Style TargetType="Border">
+                                                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                                                </Style>
+                                            </Border.Style>
+                                            <SelectiveScrollingGrid>
+                                                <SelectiveScrollingGrid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                    <ColumnDefinition Width="*"/>
+                                                </SelectiveScrollingGrid.ColumnDefinitions>
+                                                <SelectiveScrollingGrid.RowDefinitions>
+                                                    <RowDefinition Height="*"/>
+                                                    <RowDefinition Height="Auto"/>
+                                                </SelectiveScrollingGrid.RowDefinitions>
+                                                <DataGridCellsPresenter Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                                <Path Name="Cross" Grid.ColumnSpan="2" Visibility="Collapsed" Margin="10,0,10,0" Data="M0,0.5 L1,0.5" Stretch="Fill" Stroke="Gray" StrokeThickness="1" Opacity="0.5" />
+                                            </SelectiveScrollingGrid>
+                                        </Border>
+                                        <ControlTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding ElementName=IsNewToDo, Path=Text}" Value="N">
+                                                <Setter TargetName="Cross" Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding ElementName=IsNewToDo, Path=Text}" Value="Y">
+                                                <Setter TargetName="Cross" Property="Visibility" Value="Collapsed"/>
+                                            </DataTrigger>
+                                        </ControlTemplate.Triggers>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style.Setters>
+                        <Style.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="#E5E5E2" />
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
                 </DataGrid.RowStyle>
 
+
                 <DataGrid.CellStyle>
                     <Style TargetType="DataGridCell" BasedOn="{StaticResource DataGridCellStyle}">
                         <Setter Property="HorizontalContentAlignment" Value="Center"/>

Control/UserControls/ToDo/TodoControl.xaml.cs

@@ -3,19 +3,10 @@ using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace GeekDesk.Control.UserControls.Backlog
 {
@@ -80,7 +71,17 @@ namespace GeekDesk.Control.UserControls.Backlog
         /// <param name="e"></param>
         private void DataGridRow_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
-            BacklogList.SelectedIndex = ((DataGridRow)sender).GetIndex();
+            int index;
+            ToDoInfo info = ((Border)sender).DataContext as ToDoInfo;
+            if (type == ToDoType.NEW)
+            {
+                index = MainWindow.appData.ToDoList.IndexOf(info);
+            }
+            else
+            {
+                index = MainWindow.appData.HiToDoList.IndexOf(info);
+            }
+            BacklogList.SelectedIndex = index;
             Menu.IsOpen = true;
         }
 

Control/Windows/ConfigWindow.xaml

@@ -24,30 +24,32 @@
             <DropShadowEffect BlurRadius="20" Direction="-90" Color="Gray"
                               RenderingBias="Quality" ShadowDepth="2"/>
         </Grid.Effect>
-        <Border Style="{StaticResource BorderBG}">
-            <Grid Background="Transparent">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
+        <Grid  hc:Dialog.Token="ConfigWindowDialog">
+            <hc:DialogContainer  Margin="10">
+                <Border Style="{StaticResource BorderBG}">
+                    <Grid Background="Transparent">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="140"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
 
-                <hc:Card Grid.Row="0" Grid.Column="0" Background="Transparent" BorderThickness="0">
+                        <hc:Card Grid.Row="0" Grid.Column="0" Background="Transparent" BorderThickness="0">
 
-                    <hc:SideMenu AutoSelect="True" Background="Transparent" Margin="1,7,0,3">
-                        <hc:SideMenu.ItemContainerStyle>
-                            <Style TargetType="hc:SideMenuItem" BasedOn="{StaticResource MyMenuStyle}"/>
-                        </hc:SideMenu.ItemContainerStyle>
+                            <hc:SideMenu AutoSelect="True" Background="Transparent" Margin="1,7,0,3">
+                                <hc:SideMenu.ItemContainerStyle>
+                                    <Style TargetType="hc:SideMenuItem" BasedOn="{StaticResource MyMenuStyle}"/>
+                                </hc:SideMenu.ItemContainerStyle>
 
-                        <hc:SideMenuItem Header="关于"
+                                <hc:SideMenuItem Header="关于"
                                      IsSelected="True"
                                      Selected="MemuClick"
                                      Tag="About"
                                      >
-                            <hc:SideMenuItem.Icon>
-                                <Button Background="Transparent" 
+                                    <hc:SideMenuItem.Icon>
+                                        <Button Background="Transparent" 
                                     IsEnabled="False"
                                     Opacity="0.9"
                                     BorderThickness="0"
@@ -56,13 +58,13 @@
                                     hc:IconElement.Width="18"
                                     HorizontalAlignment="Right"
                                     />
-                            </hc:SideMenuItem.Icon>
-                        </hc:SideMenuItem>
-                        <hc:SideMenuItem Header="显示设置"
+                                    </hc:SideMenuItem.Icon>
+                                </hc:SideMenuItem>
+                                <hc:SideMenuItem Header="显示设置"
                                      Tag="Theme"
                                      Selected="MemuClick">
-                            <hc:SideMenuItem.Icon>
-                                <Button Background="Transparent" 
+                                    <hc:SideMenuItem.Icon>
+                                        <Button Background="Transparent" 
                                     IsEnabled="False"
                                     Opacity="1"
                             BorderThickness="0"
@@ -71,14 +73,14 @@
                             hc:IconElement.Width="18"
                             HorizontalAlignment="Right"
                             />
-                            </hc:SideMenuItem.Icon>
-                        </hc:SideMenuItem>
+                                    </hc:SideMenuItem.Icon>
+                                </hc:SideMenuItem>
 
-                        <hc:SideMenuItem Header="动作"
+                                <hc:SideMenuItem Header="动作"
                                      Tag="Motion"
                                      Selected="MemuClick">
-                            <hc:SideMenuItem.Icon>
-                                <Button Background="Transparent" 
+                                    <hc:SideMenuItem.Icon>
+                                        <Button Background="Transparent" 
                                     IsEnabled="False"
                                     Opacity="1"
                             BorderThickness="0"
@@ -87,13 +89,13 @@
                             hc:IconElement.Width="18"
                             HorizontalAlignment="Right"
                             />
-                            </hc:SideMenuItem.Icon>
-                        </hc:SideMenuItem>
-                        <hc:SideMenuItem Header="其它"
+                                    </hc:SideMenuItem.Icon>
+                                </hc:SideMenuItem>
+                                <hc:SideMenuItem Header="其它"
                                      Tag="Other"
                                      Selected="MemuClick">
-                            <hc:SideMenuItem.Icon>
-                                <Button Background="Transparent" 
+                                    <hc:SideMenuItem.Icon>
+                                        <Button Background="Transparent" 
                                     IsEnabled="False"
                                     Opacity="1"
                             BorderThickness="0"
@@ -102,21 +104,28 @@
                             hc:IconElement.Width="18"
                             HorizontalAlignment="Right"
                             />
-                            </hc:SideMenuItem.Icon>
-                        </hc:SideMenuItem>
-                    </hc:SideMenu>
-                </hc:Card>
-                <hc:ScrollViewer  Grid.Row="0" Grid.Column="1" BorderThickness="0" Margin="0,5,1,5">
-                    <hc:Card x:Name="RightCard" Height="480" BorderThickness="0"  MouseDown="DragMove">
-                        <hc:Card.Background>
-                            <SolidColorBrush  Opacity="0"/>
-                        </hc:Card.Background>
-                    </hc:Card>
-                </hc:ScrollViewer>
+                                    </hc:SideMenuItem.Icon>
+                                </hc:SideMenuItem>
+                            </hc:SideMenu>
+                        </hc:Card>
+                        <hc:ScrollViewer  Grid.Row="0" Grid.Column="1" BorderThickness="0" Margin="0,5,1,5">
+                            <UniformGrid x:Name="UFG">
+                                <hc:TransitioningContentControl TransitionMode="Left2RightWithFade">
+                                    <hc:Card x:Name="RightCard" BorderThickness="0"  MouseDown="DragMove">
+                                        <hc:Card.Background>
+                                            <SolidColorBrush  Opacity="0"/>
+                                        </hc:Card.Background>
+                                    </hc:Card>
+                                </hc:TransitioningContentControl>
+                            </UniformGrid>
+                        </hc:ScrollViewer>
 
-                <Button Width="22" Height="22" Click="Close_Button_Click" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0" Grid.Column="1"/>
-            </Grid>
-        </Border>
+                        <Button Width="22" Height="22" Click="Close_Button_Click" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0" Grid.Column="1"/>
+                    </Grid>
+                </Border>
+
+            </hc:DialogContainer>
+        </Grid>
     </Grid>
 
 </hc:Window>

Control/Windows/ConfigWindow.xaml.cs

@@ -1,14 +1,10 @@
-
-using GeekDesk.Constant;
-using GeekDesk.Control.UserControls;
-using GeekDesk.Control.UserControls.Config;
+using GeekDesk.Control.UserControls.Config;
 using GeekDesk.Interface;
-using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
-using HandyControl.Data;
-using System;
+using System.Collections.Generic;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace GeekDesk.Control.Windows
@@ -22,6 +18,14 @@ namespace GeekDesk.Control.Windows
         private static readonly ThemeControl theme = new ThemeControl();
         private static readonly MotionControl motion = new MotionControl();
         private static readonly OtherControl other = new OtherControl();
+        private static List<UserControl> ucList = new List<UserControl>();
+        static ConfigWindow()
+        {
+            ucList.Add(about);
+            ucList.Add(theme);
+            ucList.Add(motion);
+            ucList.Add(other);
+        }
         public MainWindow mainWindow;
 
         private ConfigWindow(AppConfig appConfig, MainWindow mainWindow)
@@ -34,8 +38,8 @@ namespace GeekDesk.Control.Windows
             this.mainWindow = mainWindow;
         }
 
-         
-        
+
+
 
         /// <summary>
         /// 点击关闭按钮
@@ -53,16 +57,24 @@ namespace GeekDesk.Control.Windows
             switch (smi.Tag.ToString())
             {
                 case "Motion":
+                    UFG.Visibility = Visibility.Collapsed;
                     RightCard.Content = motion;
+                    UFG.Visibility = Visibility.Visible;
                     break;
                 case "Theme":
+                    UFG.Visibility = Visibility.Collapsed;
                     RightCard.Content = theme;
+                    UFG.Visibility = Visibility.Visible;
                     break;
                 case "Other":
+                    UFG.Visibility = Visibility.Collapsed;
                     RightCard.Content = other;
+                    UFG.Visibility = Visibility.Visible;
                     break;
                 default:
+                    UFG.Visibility = Visibility.Collapsed;
                     RightCard.Content = about;
+                    UFG.Visibility = Visibility.Visible;
                     break;
             }
         }

Control/Windows/GlobalColorPickerWindow.xaml

@@ -0,0 +1,49 @@
+<Window x:Class="GeekDesk.Control.Windows.GlobalColorPickerWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:GeekDesk.Control.Windows"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
+        WindowStyle="None"
+        AllowsTransparency="True"
+        Background="Transparent"
+        KeyDown="OnKeyDown"
+        >
+    <Border CornerRadius="8" 
+            Background="White"
+            Height="385"
+            Width="228">
+        <StackPanel>
+
+            <Border MouseDown="DragMove" 
+                    VerticalAlignment="Top" 
+                    CornerRadius="8,8,0,0"
+                    Height="20" 
+                    Background="White"
+                    >
+                <Button Width="18"  Height="18" 
+                        hc:IconElement.Geometry="{StaticResource ErrorGeometry}" 
+                        Padding="0" 
+                        Background="Transparent"
+                        Opacity="0.6"
+                        Margin="0,0,5,0"
+                        Click="Button_Click"
+                        HorizontalAlignment="Right" 
+                        MouseEnter="Button_MouseEnter"
+                        MouseLeave="Button_MouseLeave"
+                        VerticalAlignment="Center">
+                    
+                </Button>
+            </Border>
+
+            <hc:ColorPicker HorizontalAlignment="Center" 
+                            VerticalAlignment="Bottom" 
+                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"
+                            x:Name="MyColorPicker" 
+                            Confirmed="MyColorPicker_Confirmed"
+                            Canceled="MyColorPicker_Canceled"
+                            ToggleButton.Checked="MyColorPicker_Checked"/>
+        </StackPanel>
+    </Border>
+</Window>

Control/Windows/GlobalColorPickerWindow.xaml.cs

@@ -0,0 +1,152 @@
+using GeekDesk.Interface;
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace GeekDesk.Control.Windows
+{
+    /// <summary>
+    /// GlobalColorPickerWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class GlobalColorPickerWindow : IWindowCommon
+    {
+        PixelColorPickerWindow colorPickerWindow = null;
+        public GlobalColorPickerWindow()
+        {
+            this.Topmost = true;
+            InitializeComponent();
+        }
+
+        public void OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                this.DataContext = null;
+                this.Close();
+            }
+        }
+
+
+        /// <summary>
+        /// 取消按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MyColorPicker_Canceled(object sender, EventArgs e)
+        {
+            MyColorPickerClose();
+        }
+        private void MyColorPicker_Confirmed(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
+        {
+            Color c = MyColorPicker.SelectedBrush.Color;
+            Clipboard.SetData(DataFormats.Text, string.Format("#{0:X2}{1:X2}{2:X2}{3:X2}", c.A, c.R, c.G, c.B));
+        }
+
+        /// <summary>
+        /// 移动窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                this.DragMove();
+            }
+        }
+
+
+        private void MyColorPicker_Checked(object sender, RoutedEventArgs e)
+        {           
+            this.Hide();
+            if (colorPickerWindow == null || !colorPickerWindow.Activate())
+            {
+                colorPickerWindow = new PixelColorPickerWindow(MyColorPicker);
+            }
+            colorPickerWindow.Show();
+        }
+
+        private void MyColorPickerClose()
+        {
+            this.Close();
+        }
+
+        private static System.Windows.Window window = null;
+
+        public static void CreateNoShow()
+        {
+            if (window == null || !window.Activate())
+            {
+                window = new GlobalColorPickerWindow();
+                window.Opacity = 0;
+                App.DoEvents();
+                window.Show();
+            }
+            window.Hide();
+            new Thread(() =>
+            {
+                Thread.Sleep(200);
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    GlobalColorPickerWindow thisWindow = (GlobalColorPickerWindow)window;
+                    if (thisWindow.colorPickerWindow == null || !thisWindow.colorPickerWindow.Activate())
+                    {
+                        thisWindow.colorPickerWindow = new PixelColorPickerWindow(thisWindow.MyColorPicker);
+                    }
+                    thisWindow.colorPickerWindow.Show();
+                });
+            }).Start();
+            
+        }
+
+        public static void Show()
+        {
+            if (window == null || !window.Activate())
+            {
+                window = new GlobalColorPickerWindow();
+            }
+            window.Opacity = 1;
+            window.Show();
+            Keyboard.Focus(window);
+        }
+
+        public static void ShowOrHide()
+        {
+            if (window == null || !window.Activate())
+            {
+                window = new GlobalColorPickerWindow();
+                window.Show();
+                Keyboard.Focus(window);
+            }
+            else
+            {
+                window.Close();
+            }
+        }
+
+        private void MyColorPicker_SelectedColorChanged(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
+        {
+            Show();
+        }
+
+        private void Button_MouseEnter(object sender, MouseEventArgs e)
+        {
+            Button btn = sender as Button;
+            btn.Opacity = 1;
+        }
+
+        private void Button_MouseLeave(object sender, MouseEventArgs e)
+        {
+            Button btn = sender as Button;
+            btn.Opacity = 0.6;
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+    }
+}

Control/Windows/PixelColorPickerWindow.xaml

@@ -0,0 +1,89 @@
+<Window 
+    x:Class="GeekDesk.Control.Windows.PixelColorPickerWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xml:lang="zh-CN"
+    WindowStyle="None" 
+    AllowsTransparency="True"
+    Background="Black"
+    PreviewMouseMove="Window_PreviewMouseMove"
+    MouseLeftButtonDown="Window_MouseLeftButtonDown"
+    MouseWheel="Window_MouseWheel"
+    >
+    <Window.Resources>
+        <Style x:Key="TextKey" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="12"/>
+        </Style>
+        <Style x:Key="TextValue" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="Margin" Value="10,0,0,0"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Image x:Name="DesktopBG" RenderOptions.BitmapScalingMode="HighQuality"/>
+        
+        <Canvas HorizontalAlignment="Left" VerticalAlignment="Top" Background="Transparent">
+            <Canvas x:Name="ColorCanvas" 
+                        Width="185"
+                        Height="160">
+                <Border Background="White" 
+                        CornerRadius="5"
+                        >
+                    <Grid>
+                        <WrapPanel HorizontalAlignment="Center" Height="70" Margin="0,5,0,80">
+                            <Border Width="70" Height="70" 
+                                    BorderBrush="Black"
+                                    BorderThickness="1">
+                                <Rectangle x:Name="PixelColor" StrokeThickness="0">
+                                    <Rectangle.Fill>
+                                        <SolidColorBrush />
+                                    </Rectangle.Fill>
+                                </Rectangle>
+                            </Border>
+                            <Border x:Name="Pixel" 
+                                    HorizontalAlignment="Center" 
+                                    VerticalAlignment="Center"
+                                    Width="70" 
+                                    Height="70" 
+                                    Background="Black"
+                                    BorderBrush="Black"
+                                    BorderThickness="1" 
+                                    Margin="20,0,0,0"
+                                    >
+                                <Grid>
+                                    <Rectangle x:Name="PixelBG" StrokeThickness="0">
+                                        <Rectangle.Fill>
+                                            <VisualBrush ViewboxUnits="Absolute" Viewbox="0,0,20,20"
+                                            ViewportUnits="RelativeToBoundingBox" Viewport="0,0,1,1">
+                                            </VisualBrush>
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <Border HorizontalAlignment="Center" 
+                                            VerticalAlignment="Center" 
+                                            Width="6" Height="6" 
+                                            BorderBrush="White" BorderThickness="0.6">
+
+                                        <Border Width="4.5" Height="4.5" BorderBrush="Black" BorderThickness="0.6"/>
+                                    </Border>
+                                </Grid>
+                            </Border>
+                        </WrapPanel>
+                        <WrapPanel HorizontalAlignment="Center" Height="80" Margin="0,85,0,5">
+                            <StackPanel Width="100" Height="80">
+                                <TextBlock Text="RGB:" Style="{StaticResource TextKey}"/>
+                                <TextBlock x:Name="PixelColor_RGB"  Style="{StaticResource TextValue}"/>
+
+                                <TextBlock Text="HTML:" Margin="0,5,0,0" Style="{StaticResource TextKey}"/>
+                                <TextBlock x:Name="PixelColor_HTML" Style="{StaticResource TextValue}"/>
+                            </StackPanel>
+                            <StackPanel Width="65" Height="80" Margin="10,0,0,0">
+                                <TextBlock x:Name="Pixel_XY" TextAlignment="Right"/>
+                            </StackPanel>
+                        </WrapPanel>
+                    </Grid>
+                </Border>
+            </Canvas>
+        </Canvas>
+
+    </Grid>
+</Window>

Control/Windows/PixelColorPickerWindow.xaml.cs

@@ -0,0 +1,195 @@
+using GeekDesk.Interface;
+using GeekDesk.Util;
+using HandyControl.Controls;
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace GeekDesk.Control.Windows
+{
+    /// <summary>
+    /// ColorPickerWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class PixelColorPickerWindow : IWindowCommon
+    {
+        private static int PIXEL_REC_LENGTH = 20;
+
+        private static readonly int MIN_LENGTH = 10;
+        private static readonly int MAX_LENGTH = 50;
+
+        private static System.Drawing.Bitmap bgBitmap;
+
+        private readonly ColorPicker colorPicker;
+
+        public PixelColorPickerWindow(ColorPicker colorPicker)
+        {
+            InitializeComponent();
+            this.colorPicker = colorPicker;
+            ColorPickerWindow_Init();
+        }
+
+        private void ColorPickerWindow_Init()
+        {
+
+            this.WindowState = WindowState.Normal;//还原窗口（非最小化和最大化）
+
+            this.Width = SystemParameters.VirtualScreenWidth;
+            this.Height = SystemParameters.VirtualScreenHeight;
+
+            this.Left = SystemParameters.VirtualScreenLeft;
+            this.Top = SystemParameters.VirtualScreenTop;
+
+            DesktopBG.Width = this.Width;
+            DesktopBG.Height = this.Height;
+            this.Topmost = true;
+
+            bgBitmap = new System.Drawing.Bitmap(
+                    (int)SystemParameters.VirtualScreenWidth,
+                    (int)SystemParameters.VirtualScreenHeight,
+                    System.Drawing.Imaging.PixelFormat.Format32bppArgb
+                );
+
+            using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bgBitmap))
+            {
+                g.CopyFromScreen(
+                    0,
+                    0,
+                    0,
+                    0,
+                    bgBitmap.Size
+                    );
+            }
+            BitmapSource bs = Imaging.CreateBitmapSourceFromHBitmap(
+                                         bgBitmap.GetHbitmap(),
+                                        IntPtr.Zero,
+                                        Int32Rect.Empty,
+                                        BitmapSizeOptions.FromEmptyOptions()
+                                    );
+            DesktopBG.Source = bs;
+            VisualBrush b = (VisualBrush)PixelBG.Fill;
+            b.Visual = DesktopBG;
+            Mouse.OverrideCursor = Cursors.Cross;
+            SetPixelAbout(null);
+        }
+
+
+        public void OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                this.DataContext = null;
+                this.Close();
+            }
+        }
+
+        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            Mouse.OverrideCursor = null;
+            Point pos = e.MouseDevice.GetPosition(DesktopBG);
+            System.Drawing.Color colorD = bgBitmap.GetPixel((int)pos.X, (int)pos.Y);
+            colorPicker.SelectedBrush = new SolidColorBrush(Color.FromArgb(colorD.A, colorD.R, colorD.G, colorD.B));
+            DeleteObject(bgBitmap.GetHbitmap());
+            this.Close();
+            ClickColorPickerToggleButton(colorPicker);
+        }
+
+        public void ClickColorPickerToggleButton(ColorPicker colorPicker)
+        {
+            const BindingFlags InstanceBindFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+            Type type = colorPicker.GetType();
+            FieldInfo fi = type.GetField("_toggleButtonDropper", InstanceBindFlags);
+
+            ToggleButton tb = (ToggleButton)fi.GetValue(colorPicker);
+            if (tb != null && tb.IsChecked == true)
+            {
+                tb.IsChecked = false;
+                MethodInfo mi = type.GetMethod("ToggleButtonDropper_Click", InstanceBindFlags);
+                mi.Invoke(colorPicker, new object[] { null, null });
+            }
+        }
+   
+        private void Window_PreviewMouseMove(object sender, MouseEventArgs e)
+        {
+            SetPixelAbout(e);
+        }
+
+        [System.Runtime.InteropServices.DllImport("gdi32.dll")]
+        public static extern bool DeleteObject(IntPtr onj);
+
+        private void SetPixelAbout(MouseEventArgs e)
+        {
+            VisualBrush b = (VisualBrush)PixelBG.Fill;
+
+            Point pos;
+            if (e == null)
+            {
+                pos = MouseUtil.GetMousePosition();
+            }
+            else
+            {
+                pos = e.MouseDevice.GetPosition(DesktopBG);
+            }
+            Rect viewBox = b.Viewbox;
+
+            viewBox.Width = PIXEL_REC_LENGTH;
+            viewBox.Height = PIXEL_REC_LENGTH;
+
+            viewBox.X = pos.X - PIXEL_REC_LENGTH / 2;
+            viewBox.Y = pos.Y - PIXEL_REC_LENGTH / 2;
+            b.Viewbox = viewBox;
+
+            double x = pos.X + 10;
+            double y = pos.Y + 10;
+            if (x + ColorCanvas.Width > SystemParameters.VirtualScreenWidth)
+            {
+                x = pos.X - ColorCanvas.Width - 10;
+            }
+            if (y + ColorCanvas.Height > SystemParameters.VirtualScreenHeight)
+            {
+                y = pos.Y - ColorCanvas.Height - 10;
+            }
+
+            Canvas.SetLeft(ColorCanvas, x);
+            Canvas.SetTop(ColorCanvas, y);
+
+
+            System.Drawing.Color dColor = bgBitmap.GetPixel((int)pos.X, (int)pos.Y);
+
+            PixelColor_HTML.Text = "#" + dColor.Name.ToUpper();
+            PixelColor_RGB.Text = dColor.R + "," + dColor.G + "," + dColor.B;
+            Pixel_XY.Text = pos.X + "*" + pos.Y;
+
+            SolidColorBrush scb = (SolidColorBrush)PixelColor.Fill;
+            scb.Color = Color.FromArgb(dColor.A, dColor.R, dColor.G, dColor.B);
+        }
+
+        /// <summary>
+        /// 滚轮控制缩放区域
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_MouseWheel(object sender, MouseWheelEventArgs e)
+        {
+
+            if (e.Delta < 0 && PIXEL_REC_LENGTH < MAX_LENGTH)
+            {
+                //缩小
+                PIXEL_REC_LENGTH += 5;
+            }
+            else if (e.Delta > 0 && PIXEL_REC_LENGTH > MIN_LENGTH)
+            {
+                //放大
+                PIXEL_REC_LENGTH -= 5;
+            }
+            SetPixelAbout(e);
+        }
+
+    }
+}

Control/Windows/SystemItemWindow.xaml.cs

@@ -1,5 +1,4 @@
 using GeekDesk.Constant;
-using GeekDesk.Control.Other;
 using GeekDesk.Interface;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
@@ -8,13 +7,10 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.IO;
-using System.Resources;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using static GeekDesk.Util.ShowWindowFollowMouse;
@@ -85,7 +81,8 @@ namespace GeekDesk.Control.Windows
                             IsBackground = true
                         };
                         t.Start();
-                    } else
+                    }
+                    else
                     {
                         StartMenuLoading.Visibility = Visibility.Collapsed;
                         vm.IconInfos = startMenuIcons;
@@ -109,7 +106,8 @@ namespace GeekDesk.Control.Windows
                         vm.IconInfos = null;
                         systemIcons = GetSysteIconInfos();
                         vm.IconInfos = systemIcons;
-                    } else
+                    }
+                    else
                     {
                         vm.IconInfos = systemIcons;
                     }
@@ -142,7 +140,7 @@ namespace GeekDesk.Control.Windows
                 }
                 StartMenuLoading.Visibility = Visibility.Collapsed;
             }));
-            
+
         }
 
         /// <summary>
@@ -161,7 +159,8 @@ namespace GeekDesk.Control.Windows
             if (filePaths == null || filePaths.Length == 0)
             {
                 dirPaths.CopyTo(paths, 0);
-            } else
+            }
+            else
             {
                 dirPaths.CopyTo(paths, filePaths.Length - 1);
             }
@@ -195,7 +194,7 @@ namespace GeekDesk.Control.Windows
             //foreach(FileSystemInfo fi in fileInfoArr)
             //{
             //    string path = fi.FullName;
-                
+
             //}
         }
 

Control/Windows/ToDoInfoWindow.xaml.cs

@@ -5,18 +5,9 @@ using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using Quartz;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace GeekDesk.Control.Windows
 {
@@ -42,7 +33,8 @@ namespace GeekDesk.Control.Windows
             DateTime time = DateTime.Now.AddMinutes(10);
             ExeTime.SelectedDateTime = time;
             SetTimePanel.Visibility = Visibility.Visible;
-            this.DataContext = new ToDoInfo {
+            this.DataContext = new ToDoInfo
+            {
                 ExeTime = time.ToString("yyyy-MM-dd HH:mm:ss")
             };
         }
@@ -97,7 +89,8 @@ namespace GeekDesk.Control.Windows
             {
                 Growl.Warning("任务标题不能为空!");
                 return;
-            } else
+            }
+            else
             {
                 if (SetTimePanel.Visibility == Visibility.Visible)
                 {
@@ -117,7 +110,9 @@ namespace GeekDesk.Control.Windows
                         return;
                     }
                     execTime = ExeTime.Text;
-                } else {
+                }
+                else
+                {
                     execType = TodoTaskExecType.CRON;
                     if (Cron.Text.Trim() == "")
                     {
@@ -128,7 +123,8 @@ namespace GeekDesk.Control.Windows
                     {
                         bool isValid = CronExpression.IsValidExpression(Cron.Text);
                         if (!isValid) throw new Exception();
-                    } catch (Exception)
+                    }
+                    catch (Exception)
                     {
                         Growl.Warning("请输入正确的Cron表达式!");
                         return;
@@ -155,7 +151,8 @@ namespace GeekDesk.Control.Windows
                 if (appData.HiToDoList.Contains(tdi))
                 {
                     appData.HiToDoList.Remove(tdi);
-                } else if (appData.ToDoList.Contains(tdi))
+                }
+                else if (appData.ToDoList.Contains(tdi))
                 {
                     appData.ToDoList.Remove(tdi);
                 }
@@ -175,7 +172,8 @@ namespace GeekDesk.Control.Windows
                 int h = minutes / 60;
                 Growl.SuccessGlobal("设置待办任务成功, 系统将在 " + h + " 小时零 " + m + " 分钟后提醒您!");
 
-            } else
+            }
+            else
             {
                 Growl.SuccessGlobal("设置待办任务成功, 系统将在 " + minutes + " 分钟后提醒您!");
             }
@@ -202,7 +200,8 @@ namespace GeekDesk.Control.Windows
             {
                 window = new ToDoInfoWindow();
                 window.Show();
-            } else
+            }
+            else
             {
                 window.Close();
             }

Control/Windows/ToDoWindow.xaml

@@ -78,8 +78,12 @@
                         </hc:SideMenuItem>
                     </hc:SideMenu>
                 </hc:Card>
-                <hc:Card Grid.Row="0" MouseDown="DragMove" Background="Transparent" BorderThickness="0" Grid.Column="1" x:Name="RightCard" Height="450">
-                </hc:Card>
+                <UniformGrid x:Name="UFG" Grid.Column="1" Grid.Row="0">
+                    <hc:TransitioningContentControl TransitionMode="Left2RightWithFade">
+                        <hc:Card x:Name="RightCard" VerticalAlignment="Top" MouseDown="DragMove" Background="Transparent" BorderThickness="0"   Height="410"/>
+                    </hc:TransitioningContentControl>
+                </UniformGrid>
+                
 
 
                 <Button Width="22" Height="22" Click="Close_Button_Click" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0" Grid.Column="1"/>
@@ -87,8 +91,8 @@
                     Panel.ZIndex="1"
                     Style="{StaticResource Btn1}"
                     Grid.Column="1"
-                    Margin="590.01,29,10,384"
-                    Click="CreateBacklog_BtnClick"/>
+                    Margin="669,400,0,0"
+                    Click="CreateBacklog_BtnClick" HorizontalAlignment="Left" VerticalAlignment="Top"/>
             </Grid>
         </Border>
     </Grid>

Control/Windows/ToDoWindow.xaml.cs

@@ -2,20 +2,8 @@
 using GeekDesk.Interface;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace GeekDesk.Control.Windows
 {
@@ -32,6 +20,16 @@ namespace GeekDesk.Control.Windows
             RightCard.Content = backlog;
             backlog.BacklogList.ItemsSource = appData.ToDoList;
             this.Topmost = true;
+            if (backlog.BacklogList.Items.Count > 0)
+            {
+                backlog.NoData.Visibility = Visibility.Collapsed;
+                backlog.BacklogList.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                backlog.NoData.Visibility = Visibility.Visible;
+                backlog.BacklogList.Visibility = Visibility.Collapsed;
+            }
         }
 
 
@@ -64,12 +62,37 @@ namespace GeekDesk.Control.Windows
             switch (smi.Tag.ToString())
             {
                 case "History":
+                    UFG.Visibility = Visibility.Collapsed;
                     backlog.BacklogList.ItemsSource = appData.HiToDoList;
+                    if (backlog.BacklogList.Items.Count > 0)
+                    {
+                        backlog.NoData.Visibility = Visibility.Collapsed;
+                        backlog.BacklogList.Visibility = Visibility.Visible;
+                    } else
+                    {
+                        backlog.NoData.Visibility = Visibility.Visible;
+                        backlog.BacklogList.Visibility = Visibility.Collapsed;
+                    }
                     backlog.type = ToDoType.HISTORY;
+                    backlog.IsNewToDo.Text = "N";
+                    UFG.Visibility = Visibility.Visible;
                     break;
                 default:
+                    UFG.Visibility = Visibility.Collapsed;
                     backlog.BacklogList.ItemsSource = appData.ToDoList;
+                    if (backlog.BacklogList.Items.Count > 0)
+                    {
+                        backlog.NoData.Visibility = Visibility.Collapsed;
+                        backlog.BacklogList.Visibility = Visibility.Visible;
+                    }
+                    else
+                    {
+                        backlog.NoData.Visibility = Visibility.Visible;
+                        backlog.BacklogList.Visibility = Visibility.Collapsed;
+                    }
                     backlog.type = ToDoType.NEW;
+                    backlog.IsNewToDo.Text = "Y";
+                    UFG.Visibility = Visibility.Visible;
                     break;
             }
         }
@@ -98,6 +121,21 @@ namespace GeekDesk.Control.Windows
             Keyboard.Focus(window);
         }
 
+        public static void ShowOrHide()
+        {
+            if (window == null || !window.Activate())
+            {
+                window = new ToDoWindow();
+                window.Show();
+                Keyboard.Focus(window);
+            }
+            else
+            {
+                window.Close();
+            }
+        }
+
+
         public void OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Escape)

Control/Windows/UpdateWindow.xaml

@@ -22,16 +22,24 @@
             <StackPanel HorizontalAlignment="Center">
                 <hc:Card BorderThickness="0" Effect="{DynamicResource EffectShadow2}" Margin="20,20,20,0">
                     <!--Card 的内容部分-->
-                    <Border CornerRadius="4,4,0,0" Height="260">
-                        <StackPanel>
-                            <TextBlock Margin="10" x:Name="MsgTitle" TextWrapping="Wrap" FontSize="16" HorizontalAlignment="Left" Style="{DynamicResource TextBlockLargeBold}" Text="测试"/>
-                            <StackPanel x:Name="MsgPanel">
-                                <hc:ScrollViewer x:Name="MsgBar"  HorizontalScrollBarVisibility="Visible"  IsInertiaEnabled="True" Margin="10" Width="430">
-                                    <TextBlock  Width="430" FontSize="15" LineHeight="22" x:Name="Msg" TextWrapping="Wrap" VerticalAlignment="Center" Text="测试"/>
+                        <Border CornerRadius="4,4,0,0">
+                            <StackPanel>
+                            <hc:SimplePanel VerticalAlignment="Center">
+                                <TextBlock Margin="10" x:Name="MsgTitle" TextWrapping="Wrap" FontSize="16" HorizontalAlignment="Left" Style="{DynamicResource TextBlockLargeBold}" Text="测试"/>
+                                <Button HorizontalAlignment="Right" Margin="0,0,10,0" 
+                                        Content="去点个Star" Click="StarBtnClick" 
+                                        Style="{StaticResource Btn1}"
+                                        hc:IconElement.Geometry="M718.565517 863.126069c-7.344552 0-15.077517-2.189241-22.987034-6.285241L512 760.337655l-183.613793 96.503173c-18.785103 9.851586-37.499586 7.521103-48.16331-5.12-5.12-6.10869-10.557793-17.125517-7.485794-35.345656l35.063173-204.411586L159.249655 467.155862c-12.747034-12.393931-17.584552-27.153655-13.241379-40.430345 4.343172-13.312 16.913655-22.386759 34.568827-24.929103l205.223725-29.837242 91.806896-185.979586c7.874207-15.995586 20.409379-25.140966 34.392276-25.140965 13.947586 0 26.482759 9.145379 34.392276 25.140965l91.771586 185.979586 205.259035 29.837242c17.619862 2.577655 30.190345 11.652414 34.498206 24.964414 4.378483 13.27669-0.529655 28.001103-13.241379 40.430344l-148.51531 144.807725 35.063172 204.411586c3.10731 18.149517-2.365793 29.272276-7.485793 35.345655a32.273655 32.273655 0 0 1-25.176276 11.369931z"
+                                        />
+                            </hc:SimplePanel>
+                                <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Margin="20,0,20,0"/>
+                                <hc:ScrollViewer BorderThickness="0" Margin="0,5,1,5" Height="225">
+                                    <StackPanel x:Name="MsgPanel">
+                                            <TextBlock  Width="430" FontSize="15" LineHeight="25" x:Name="Msg" TextWrapping="Wrap" VerticalAlignment="Center" Text="测试"/>
+                                    </StackPanel>
                                 </hc:ScrollViewer>
                             </StackPanel>
-                        </StackPanel>
-                    </Border>
+                        </Border>
                     <!--Card 的尾部部分-->
                     <hc:Card.Footer>
                         <StackPanel Margin="10" Width="520">
@@ -47,7 +55,7 @@
                     </hc:Card.Footer>
                 </hc:Card>
                 <hc:UniformSpacingPanel Spacing="100" HorizontalAlignment="Center" Margin="0,10,0,0">
-                    <Button Content="暂不更新" Click="Close_Click" />
+                    <Button Content="暂不更新" Click="Close_Click" Style="{StaticResource Btn1}"/>
                     <Button Content="前往更新" Click="Confirm_Click" Style="{StaticResource Btn1}"/>
                 </hc:UniformSpacingPanel>
             </StackPanel>

Control/Windows/UpdateWindow.xaml.cs

@@ -4,20 +4,11 @@ using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Net;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace GeekDesk.Control.Windows
 {
@@ -42,7 +33,7 @@ namespace GeekDesk.Control.Windows
             {
 
             }
-           
+
         }
 
         /// <summary>
@@ -68,7 +59,7 @@ namespace GeekDesk.Control.Windows
             githubUrl = StringUtil.IsEmpty(jo["githubUrl"]) ? ConfigurationManager.AppSettings["GitHubUrl"] : jo["githubUrl"].ToString();
             giteeUrl = StringUtil.IsEmpty(jo["giteeUrl"]) ? ConfigurationManager.AppSettings["GiteeUrl"] : jo["giteeUrl"].ToString();
             string msg = "";
-            for (int i=0; i<ja.Count; i++)
+            for (int i = 0; i < ja.Count; i++)
             {
                 msg += "• " + ja[i].ToString() + "\n";
             }
@@ -92,7 +83,11 @@ namespace GeekDesk.Control.Windows
                     packageUrl = giteeUrl;
                     break;
             }
-            Process.Start(packageUrl);
+            Process.Start(new ProcessStartInfo("cmd", $"/c start {packageUrl}")
+            {
+                UseShellExecute = false,
+                CreateNoWindow = true
+            });
             this.Close();
         }
 
@@ -104,6 +99,7 @@ namespace GeekDesk.Control.Windows
                 window = new UpdateWindow(jo);
             }
             window.Show();
+            window.Activate();
             Keyboard.Focus(window);
         }
 
@@ -115,5 +111,59 @@ namespace GeekDesk.Control.Windows
                 this.Close();
             }
         }
+
+        private void StarBtnClick(object sender, RoutedEventArgs e)
+        {
+
+            string githubUrl = ConfigurationManager.AppSettings["GitHubUrl"];
+            string giteeUrl = ConfigurationManager.AppSettings["GiteeUrl"];
+
+            if(!ReqGitUrl(githubUrl))
+            {
+                if (!ReqGitUrl(giteeUrl))
+                {
+                    OpenLinkUrl(githubUrl);
+                } else
+                {
+                    OpenLinkUrl(giteeUrl);
+                }
+            } else
+            {
+                OpenLinkUrl(githubUrl);
+            }
+        }
+
+
+        private bool ReqGitUrl(String url)
+        {
+            HttpWebResponse myResponse = null;
+            try
+            {
+                ServicePointManager.Expect100Continue = true;
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+                //创建Web访问对  象
+                WebRequest myRequest = WebRequest.Create(url);
+
+                myRequest.ContentType = "text/plain; charset=utf-8";
+                //通过Web访问对象获取响应内容
+                myResponse = (HttpWebResponse)myRequest.GetResponse();
+            }
+            catch 
+            {
+                return false;
+            }
+
+            return myResponse != null && myResponse.StatusCode == HttpStatusCode.OK;
+        }
+
+        private void OpenLinkUrl(String url)
+        {
+            Process.Start(new ProcessStartInfo("cmd", $"/c start {url}")
+            {
+                UseShellExecute = false,
+                CreateNoWindow = true
+            });
+        }
+
     }
 }

Converts/BGStyleConvert.cs

@@ -0,0 +1,25 @@
+using GeekDesk.Constant;
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace GeekDesk.Converts
+{
+    class BGStyleConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (BGStyle)value == (BGStyle)int.Parse(parameter.ToString());
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool isChecked = (bool)value;
+            if (!isChecked)
+            {
+                return null;
+            }
+            return (BGStyle)int.Parse(parameter.ToString());
+        }
+    }
+}

Converts/Count2VisibleConvert.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace GeekDesk.Converts
+{
+    public class Count2VisibleConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null) return Visibility.Collapsed;
+            int count = (int)value;
+
+            if (parameter == null || "Y".Equals(parameter.ToString()))
+            {
+                if (count > 0)
+                {
+                    return Visibility.Visible;
+                }
+                else
+                {
+                    return Visibility.Collapsed;
+                }
+            } else
+            {
+                if (count <= 0)
+                {
+                    return Visibility.Visible;
+                }
+                else
+                {
+                    return Visibility.Collapsed;
+                }
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Converts/CountGreZero2BoolConvert.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace GeekDesk.Converts
+{
+    public class CountGreZero2BoolConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null) return false;
+            int count = (int)value;
+            if (count > 0)
+            {
+                return true;
+            } else
+            {
+                return false;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Converts/DoubleToGridLength.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 

Converts/HideTypeConvert.cs

@@ -1,15 +1,11 @@
 using GeekDesk.Constant;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace GeekDesk.Converts
 {
-   public class HideTypeConvert : IValueConverter
+    public class HideTypeConvert : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {

Converts/IntToCornerRadius.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 

Converts/MenuInfoConvert.cs

@@ -1,15 +1,10 @@
-using GeekDesk.Constant;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace GeekDesk.Converts
 {
-   public class MenuInfoConvert : IValueConverter
+    public class MenuInfoConvert : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
@@ -17,7 +12,8 @@ namespace GeekDesk.Converts
             if (menuIndex == -1)
             {
                 return "";
-            } else
+            }
+            else
             {
                 string type = parameter.ToString();
                 if ("1".Equals(type))

Converts/OpcityConvert.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace GeekDesk.Converts

Converts/SearchResWidth.cs

@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Data;
 
 namespace GeekDesk.Converts
@@ -18,7 +13,8 @@ namespace GeekDesk.Converts
             {
                 double menuLeftWidth = double.Parse(value.ToString());
                 return MainWindow.mainWindow.Width - menuLeftWidth;
-            } else
+            }
+            else
             {
                 double menuLeftWidth = double.Parse(value.ToString());
                 return (MainWindow.mainWindow.Width - menuLeftWidth) / 2;

Converts/SearchTypeConvert.cs

@@ -0,0 +1,25 @@
+using GeekDesk.Constant;
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace GeekDesk.Converts
+{
+    public class SearchTypeConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (SearchType)value == (SearchType)int.Parse(parameter.ToString());
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool isChecked = (bool)value;
+            if (!isChecked)
+            {
+                return null;
+            }
+            return (SearchType)int.Parse(parameter.ToString());
+        }
+    }
+}

Converts/SortTypeConvert.cs

@@ -1,10 +1,6 @@
 using GeekDesk.Constant;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace GeekDesk.Converts

Converts/StringAppendConvert.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace GeekDesk.Converts
+{
+    class StringAppendConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null) return null;
+            if (parameter == null)
+            {
+                return value.ToString();
+            }
+            else
+            {
+                string val = value.ToString();
+                string param = parameter.ToString();
+                return param.Replace("{}", val);
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Converts/TodoTaskExecConvert.cs

@@ -1,15 +1,11 @@
 using GeekDesk.Constant;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace GeekDesk.Converts
 {
-   public class TodoTaskExecConvert : IValueConverter
+    public class TodoTaskExecConvert : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {

Converts/UpdateTypeConvert.cs

@@ -1,10 +1,6 @@
 using GeekDesk.Constant;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace GeekDesk.Converts

Converts/Visibility2BooleanConverter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace GeekDesk.Converts
+{
+    internal class Visibility2BooleanConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((Visibility)value == Visibility.Visible)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((bool)value)
+            {
+                return Visibility.Visible;
+            }
+            else
+            {
+                return Visibility.Collapsed;
+            }
+        }
+    }
+}

GeekDesk.csproj

@@ -15,6 +15,21 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -127,12 +142,15 @@
     <Compile Include="Command\DelegateCommandBase.cs" />
     <Compile Include="Constant\AppHideType.cs" />
     <Compile Include="Constant\Constants.cs" />
+    <Compile Include="Constant\HotKeyType.cs" />
     <Compile Include="Constant\IconType.cs" />
     <Compile Include="Constant\CommonEnum.cs" />
     <Compile Include="Constant\IconStartType.cs" />
     <Compile Include="Constant\RunTimeStatus.cs" />
+    <Compile Include="Constant\SearchType.cs" />
     <Compile Include="Constant\SortType.cs" />
     <Compile Include="Constant\TodoTaskExecType.cs" />
+    <Compile Include="Constant\BGStyle.cs" />
     <Compile Include="Constant\UpdateType.cs" />
     <Compile Include="Control\Other\BacklogNotificatin.xaml.cs">
       <DependentUpon>BacklogNotificatin.xaml</DependentUpon>
@@ -140,6 +158,12 @@
     <Compile Include="Control\Other\CustomIconUrlDialog.xaml.cs">
       <DependentUpon>CustomIconUrlDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Control\Other\GradientBGDialog.xaml.cs">
+      <DependentUpon>GradientBGDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Control\Other\MyColorPickerDialog.xaml.cs">
+      <DependentUpon>MyColorPickerDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Control\Other\IconInfoUrlDialog.xaml.cs">
       <DependentUpon>IconInfoUrlDialog.xaml</DependentUpon>
     </Compile>
@@ -155,6 +179,12 @@
     <Compile Include="Control\UserControls\IconFont\IconPannel.xaml.cs">
       <DependentUpon>IconPannel.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Control\Windows\GlobalColorPickerWindow.xaml.cs">
+      <DependentUpon>GlobalColorPickerWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Control\Windows\PixelColorPickerWindow.xaml.cs">
+      <DependentUpon>PixelColorPickerWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Control\Windows\SystemItemWindow.xaml.cs">
       <DependentUpon>SystemItemWindow.xaml</DependentUpon>
     </Compile>
@@ -191,6 +221,10 @@
     <Compile Include="Control\Windows\UpdateWindow.xaml.cs">
       <DependentUpon>UpdateWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Converts\CountGreZero2BoolConvert.cs" />
+    <Compile Include="Converts\Count2VisibleConvert.cs" />
+    <Compile Include="Converts\SearchTypeConvert.cs" />
+    <Compile Include="Converts\StringAppendConvert.cs" />
     <Compile Include="Converts\DoubleToGridLength.cs" />
     <Compile Include="Converts\MenuInfoConvert.cs" />
     <Compile Include="Converts\SearchResWidth.cs" />
@@ -198,7 +232,9 @@
     <Compile Include="Converts\TodoTaskExecConvert.cs" />
     <Compile Include="Converts\IntToCornerRadius.cs" />
     <Compile Include="Converts\OpcityConvert.cs" />
+    <Compile Include="Converts\BGStyleConvert.cs" />
     <Compile Include="Converts\UpdateTypeConvert.cs" />
+    <Compile Include="Converts\Visibility2BooleanConverter.cs" />
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.cs" />
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.Drag.cs" />
     <Compile Include="Converts\HideTypeConvert.cs" />
@@ -208,10 +244,13 @@
     <Compile Include="MyThread\DispatcherBuild.cs" />
     <Compile Include="MyThread\UpdateThread.cs" />
     <Compile Include="Util\AeroGlassHelper.cs" />
+    <Compile Include="Util\BGSettingUtil.cs" />
+    <Compile Include="Util\ColorUtil.cs" />
     <Compile Include="Util\GlobalHotKey.cs" />
     <Compile Include="Util\CommonCode.cs" />
     <Compile Include="Util\FileIcon.cs" />
     <Compile Include="Util\FileUtil.cs" />
+    <Compile Include="Util\KeyUtil.cs" />
     <Compile Include="Util\LogUtil.cs" />
     <Compile Include="Util\MarginHide.cs" />
     <Compile Include="Util\HttpUtil.cs" />
@@ -225,6 +264,9 @@
     <Compile Include="Util\SvgToGeometry.cs" />
     <Compile Include="ViewModel\AppConfig.cs" />
     <Compile Include="ViewModel\AppData.cs" />
+    <Compile Include="ViewModel\GradientBGParam.cs" />
+    <Compile Include="ViewModel\CPDataContext.cs" />
+    <Compile Include="ViewModel\Temp\GradientBGParamList.cs" />
     <Compile Include="ViewModel\Temp\SearchIconList.cs" />
     <Compile Include="ViewModel\ToDoInfo.cs" />
     <Compile Include="ViewModel\IconfontInfo.cs" />
@@ -238,6 +280,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Control\Other\GradientBGDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Control\Other\MyColorPickerDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Control\Other\IconInfoUrlDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -258,6 +308,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Control\Windows\GlobalColorPickerWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Control\Windows\PixelColorPickerWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Control\Windows\SystemItemWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -402,5 +460,22 @@
     <Resource Include="Resource\Image\SystemIcon\RecycleBin.png" />
     <Resource Include="Resource\Image\SystemIcon\Registry.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties update_1json__JsonSchema="https://typedoc.org/schema.json" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>

GeekDesk.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Blend for Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32319.34
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeekDesk", "GeekDesk.csproj", "{B4983CEC-2281-413C-8ECF-92EE0E40A713}"
 EndProject

Interface/IWindowCommon.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Input;
+using System.Windows.Input;
 
 namespace GeekDesk.Interface
 {

MainWindow.xaml

@@ -4,10 +4,12 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:uc="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
+        xmlns:cn="clr-namespace:GeekDesk.Constant"
         mc:Ignorable="d"
         xmlns:cvt="clr-namespace:GeekDesk.Converts"
-        x:Name="window"
-        xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:AppData}"
+        x:Name="AppWindow"
+        xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" 
+        d:DataContext="{d:DesignInstance Type=viewmodel:AppData}"
         Title="GeekDesk" 
         MinWidth="600"
         MinHeight="400"
@@ -16,29 +18,36 @@
         Background="Transparent"
         ShowInTaskbar="False"
         Opacity="0"
-        Deactivated="App_LostFocus"
+        Deactivated="AppWindow_Deactivated"
         SizeChanged="Window_SizeChanged"
         KeyDown="OnKeyDown"
         Focusable="True"
         MouseDown="MainWindow_MouseDown"
         MouseEnter="MainWindow_MouseEnter"
+        GotFocus="Window_GotFocus"
         >
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="0" ResizeBorderThickness="15"/>
     </WindowChrome.WindowChrome>
     <Window.Resources>
-        <RoutedUICommand x:Key="SearchItem" Text="SearchItem"/>
+        <RoutedUICommand x:Key="SearchHotKeyDown" Text="SearchHotKeyDown"/>
 
         <cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
         <cvt:IntToCornerRadius x:Key="IntToCornerRadius"/>
         <cvt:DoubleToGridLength x:Key="DoubleToGridLength"/>
+        <Style x:Key="BorderBacStyle" TargetType="Border">
+            
+        </Style>
+
     </Window.Resources>
     <Window.InputBindings>
-        <KeyBinding Gesture="Ctrl+F" Key="F"  Command="{StaticResource SearchItem}"/>
+        <KeyBinding Gesture="Ctrl+F" Key="F"  Command="{StaticResource SearchHotKeyDown}"/>
     </Window.InputBindings>
     <Window.CommandBindings>
-        <CommandBinding Command="{StaticResource SearchItem}" CanExecute="SearchItem"/>
+        <CommandBinding Command="{StaticResource SearchHotKeyDown}" CanExecute="SearchHotKeyDown"/>
+        <!--<CommandBinding Command="ChangeImgBG" Executed="ChangeImgBG_Executed" CanExecute="ChangeImgBG_CanExecute" />-->
+
     </Window.CommandBindings>
 
     <Window.Effect>
@@ -48,29 +57,16 @@
     <Border Margin="20" CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0"
             Background="AliceBlue"
             Opacity="{Binding AppConfig.PannelOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"
-            VirtualizingPanel.VirtualizationMode="Recycling"  VirtualizingPanel.IsVirtualizing="True"  VirtualizingPanel.IsContainerVirtualizable="True"
             hc:Dialog.Token="IconInfoDialog"
             Focusable="True"
             >
         <hc:DialogContainer Focusable="True">
-
-            <Border CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0">
-                <!--背景图片-->
-                <Border.Background>
-                    <VisualBrush>
-                        <VisualBrush.Visual>
-                            <Grid ClipToBounds="True">
-                                <Image Source="{Binding AppConfig.BitmapImage}" Margin="-30" Opacity="{Binding AppConfig.BgOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
-                                    <Image.Effect>
-                                        <BlurEffect Radius="{Binding AppConfig.BlurValue}"/>
-                                    </Image.Effect>
-                                </Image>
-                            </Grid>
-                        </VisualBrush.Visual>
-                    </VisualBrush>
-                </Border.Background>
-
-
+            <!-- -1是为了解决圆角白线的问题-->
+            <Border x:Name="BGBorder" 
+                    CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  
+                    BorderThickness="0"
+                    Margin="-1"
+                    >
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="40" MouseMove="DragMove"></RowDefinition>
@@ -89,7 +85,7 @@
                         <DockPanel.Background>
                             <SolidColorBrush Opacity="0.01"/>
                         </DockPanel.Background>
-                        <Image Source="/Resource/Image/TitleLogo.png" Margin="10,0,0,0" Width="94" Height="30" HorizontalAlignment="Left"/>
+                        <Image Visibility="{Binding AppConfig.TitleLogoVisible}" 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">
@@ -129,7 +125,7 @@
                     </DockPanel>
 
 
-                    <uc:LeftCardControl Grid.Row="1" Grid.Column="0"/>
+                    <uc:LeftCardControl x:Name="LeftCard" Grid.Row="1" Grid.Column="0"/>
 
                     <!--分割线-->
                     <GridSplitter Opacity="0" Grid.Row="1" Grid.Column="0" Width="1"  VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
@@ -137,23 +133,21 @@
                     <!--搜索输入框-->
                     <TextBox Panel.ZIndex="2" Grid.Row="0" Grid.Column="1" 
                              x:Name="SearchBox"
-                             Visibility="Collapsed"
+                             Width="0"
                              Margin="-100,5,0,0"
                              Height="32"
                              FontSize="16"
-                             Width="400"
                              BorderThickness="0"
                              TextChanged="SearchBox_TextChanged"
                              />
 
 
-                    <uc:RightCardControl x:Name="RightCard" Grid.Row="1" Grid.Column="1"/>
-
-                    <hc:NotifyIcon Icon="/Taskbar.ico"  Click="NotifyIcon_Click" x:Name="BarIcon"
-                                   Visibility="{Binding AppConfig.ShowBarIcon, Mode=TwoWay, Converter={StaticResource Boolean2VisibilityConverter}}">
+                    <hc:NotifyIcon Icon="/Taskbar.ico" Click="NotifyIcon_Click" x:Name="BarIcon"
+                            Visibility="{Binding AppConfig.ShowBarIcon, Mode=TwoWay, Converter={StaticResource Boolean2VisibilityConverter}}">
                         <hc:NotifyIcon.ContextMenu>
-                            <ContextMenu Width="130">
+                            <ContextMenu Width="130" x:Name="TaskbarContextMenu">
                                 <MenuItem Header="打开面板" Click="ShowApp"/>
+                                <MenuItem Header="拾色器" Click="ColorPicker"/>
                                 <MenuItem Header="隐藏图标" Click="CloseBarIcon"/>
                                 <MenuItem Header="待办"  Click="BacklogMenuClick"/>
                                 <MenuItem Header="程序目录"  Click="OpenThisDir"/>
@@ -162,8 +156,10 @@
                                 <MenuItem Header="退出" Click="ExitApp"/>
                             </ContextMenu>
                         </hc:NotifyIcon.ContextMenu>
-
                     </hc:NotifyIcon>
+
+                    <uc:RightCardControl x:Name="RightCard" Grid.Row="1" Grid.Column="1"/>
+
                     <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,0"/>
                 </Grid>
             </Border>

MainWindow.xaml.cs

@@ -1,23 +1,24 @@
 using GeekDesk.Constant;
 using GeekDesk.Control.UserControls.Config;
+using GeekDesk.Control.UserControls.PannelCard;
 using GeekDesk.Control.Windows;
 using GeekDesk.Interface;
-using GeekDesk.Task;
 using GeekDesk.MyThread;
+using GeekDesk.Task;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-
+using GeekDesk.ViewModel.Temp;
+using NPinyin;
 using System;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
+using System.Windows.Threading;
 using static GeekDesk.Util.ShowWindowFollowMouse;
-using System.Collections.ObjectModel;
-using NPinyin;
-using GeekDesk.ViewModel.Temp;
-using System.Threading;
 
 namespace GeekDesk
 {
@@ -32,6 +33,7 @@ namespace GeekDesk
         public static ToDoInfoWindow toDoInfoWindow;
         public static int hotKeyId = -1;
         public static int toDoHotKeyId = -1;
+        public static int colorPickerHotKeyId = -1;
         public static MainWindow mainWindow;
         public MainWindow()
         {
@@ -52,16 +54,25 @@ namespace GeekDesk
             }
         }
 
+
         /// <summary>
         /// 显示搜索框
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void SearchItem(object sender, CanExecuteRoutedEventArgs e)
+        private void SearchHotKeyDown(object sender, CanExecuteRoutedEventArgs e)
+        {
+            if (appData.AppConfig.SearchType == SearchType.HOT_KEY)
+            {
+                ShowSearchBox();
+            }
+        }
+
+        private void ShowSearchBox()
         {
             RunTimeStatus.SEARCH_BOX_SHOW = true;
             RightCard.VisibilitySearchCard(Visibility.Visible);
-            SearchBox.Visibility = Visibility.Visible;
+            SearchBox.Width = 400;
             SearchBox.Focus();
         }
         /// <summary>
@@ -71,7 +82,20 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
         {
+             if (!RunTimeStatus.SEARCH_BOX_SHOW 
+                && appData.AppConfig.SearchType != SearchType.KEY_DOWN
+                )
+            {
+                SearchBox.TextChanged -= SearchBox_TextChanged;
+                SearchBox.Clear();
+                SearchBox.TextChanged += SearchBox_TextChanged;
+                return;
+            }
+
+            if (!RunTimeStatus.SEARCH_BOX_SHOW) ShowSearchBox();
+
             string inputText = SearchBox.Text.ToLower();
+            RightCard.VerticalUFG.Visibility = Visibility.Collapsed;
             if (!string.IsNullOrEmpty(inputText))
             {
                 SearchIconList.IconList.Clear();
@@ -93,15 +117,20 @@ namespace GeekDesk
             {
                 SearchIconList.IconList.Clear();
             }
+            RightCard.VerticalUFG.Visibility = Visibility.Visible;
         }
 
         public void HidedSearchBox()
         {
             RunTimeStatus.SEARCH_BOX_SHOW = false;
-            SearchBox.Visibility = Visibility.Collapsed;
+            SearchBox.TextChanged -= SearchBox_TextChanged;
+            SearchBox.Clear();
+            SearchBox.TextChanged += SearchBox_TextChanged;
+            SearchBox.Width = 0;
             SearchIconList.IconList.Clear();
             RightCard.VisibilitySearchCard(Visibility.Collapsed);
-            SearchBox.Text = "";
+            Keyboard.Focus(SearchBox);
+            App.DoEvents();
         }
 
 
@@ -110,7 +139,6 @@ namespace GeekDesk
         /// </summary>
         private void LoadData()
         {
-            GC.KeepAlive(appData); // 持活
             this.DataContext = appData;
             if (appData.MenuList.Count == 0)
             {
@@ -129,6 +157,7 @@ namespace GeekDesk
         /// <param name="e"></param>
         void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            BGSettingUtil.BGSetting();
             if (!appData.AppConfig.StartedShowPanel)
             {
                 if (appData.AppConfig.AppAnimation)
@@ -149,8 +178,19 @@ namespace GeekDesk
             BarIcon.Text = Constants.MY_NAME;
 
             //注册热键
-            RegisterHotKey(true);
-            RegisterCreateToDoHotKey(true);
+            if (true == appData.AppConfig.EnableAppHotKey)
+            {
+                RegisterHotKey(true);
+            }
+            if (true == appData.AppConfig.EnableTodoHotKey)
+            {
+                RegisterCreateToDoHotKey(true);
+            }
+
+            if (true == appData.AppConfig.EnableColorPickerHotKey)
+            {
+                RegisterColorPickerHotKey(true);
+            }
 
             //注册自启动
             if (!appData.AppConfig.SelfStartUped && !Constants.DEV)
@@ -175,9 +215,8 @@ namespace GeekDesk
         {
             try
             {
-                if (appData.AppConfig.HotkeyModifiers != 0)
+                if (appData.AppConfig.HotkeyModifiers != GlobalHotKey.HotkeyModifiers.None)
                 {
-
                     hotKeyId = GlobalHotKey.RegisterHotKey(appData.AppConfig.HotkeyModifiers, appData.AppConfig.Hotkey, () =>
                     {
                         if (MotionControl.hotkeyFinished)
@@ -192,10 +231,12 @@ namespace GeekDesk
                             }
                         }
                     });
-                }
-                if (!first)
+                    if (!first)
+                    {
+                        HandyControl.Controls.Growl.Success("GeekDesk快捷键注册成功(" + appData.AppConfig.HotkeyStr + ")!", "HotKeyGrowl");
+                    }
+                } else
                 {
-                    HandyControl.Controls.Growl.Success("GeekDesk快捷键注册成功(" + appData.AppConfig.HotkeyStr + ")!", "HotKeyGrowl");
                 }
             }
             catch (Exception)
@@ -222,21 +263,22 @@ namespace GeekDesk
             try
             {
 
-                if (appData.AppConfig.ToDoHotkeyModifiers != 0)
+                if (appData.AppConfig.HotkeyModifiers != GlobalHotKey.HotkeyModifiers.None)
                 {
                     //加载完毕注册热键
                     toDoHotKeyId = GlobalHotKey.RegisterHotKey(appData.AppConfig.ToDoHotkeyModifiers, appData.AppConfig.ToDoHotkey, () =>
                     {
                         if (MotionControl.hotkeyFinished)
                         {
-                            ToDoInfoWindow.ShowOrHide();
+                            ToDoWindow.ShowOrHide();
                         }
                     });
+                    if (!first)
+                    {
+                        HandyControl.Controls.Growl.Success("新建待办任务快捷键注册成功(" + appData.AppConfig.ToDoHotkeyStr + ")!", "HotKeyGrowl");
+                    }
                 }
-                if (!first)
-                {
-                    HandyControl.Controls.Growl.Success("新建待办任务快捷键注册成功(" + appData.AppConfig.ToDoHotkeyStr + ")!", "HotKeyGrowl");
-                }
+                
             }
             catch (Exception)
             {
@@ -251,6 +293,42 @@ namespace GeekDesk
             }
         }
 
+        /// <summary>
+        /// 注册新建待办的热键
+        /// </summary>
+        public static void RegisterColorPickerHotKey(bool first)
+        {
+            try
+            {
+                if (appData.AppConfig.HotkeyModifiers != GlobalHotKey.HotkeyModifiers.None)
+                {
+                    //加载完毕注册热键
+                    colorPickerHotKeyId = GlobalHotKey.RegisterHotKey(appData.AppConfig.ColorPickerHotkeyModifiers, appData.AppConfig.ColorPickerHotkey, () =>
+                    {
+                        if (MotionControl.hotkeyFinished)
+                        {
+                            GlobalColorPickerWindow.CreateNoShow();
+                        }
+                    });
+                    if (!first)
+                    {
+                        HandyControl.Controls.Growl.Success("拾色器快捷键注册成功(" + appData.AppConfig.ColorPickerHotkeyStr + ")!", "HotKeyGrowl");
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                if (first)
+                {
+                    HandyControl.Controls.Growl.WarningGlobal("拾色器快捷键已被其它程序占用(" + appData.AppConfig.ColorPickerHotkeyStr + ")!");
+                }
+                else
+                {
+                    HandyControl.Controls.Growl.Warning("拾色器快捷键已被其它程序占用(" + appData.AppConfig.ColorPickerHotkeyStr + ")!", "HotKeyGrowl");
+                }
+            }
+        }
+
 
         /// <summary>
         /// 重置窗体大小 写入缓存
@@ -311,14 +389,7 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void CloseButtonClick(object sender, RoutedEventArgs e)
         {
-            if (appData.AppConfig.AppAnimation)
-            {
-                FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
-            }
-            else
-            {
-                this.Visibility = Visibility.Collapsed;
-            }
+            HideApp();
         }
 
 
@@ -352,9 +423,11 @@ namespace GeekDesk
             //    return;
             //}
 
-            //修改贴边隐藏状态为未隐藏
+            MainWindow.mainWindow.Activate();
+
             if (MarginHide.ON_HIDE)
             {
+                //修改贴边隐藏状态为未隐藏
                 MarginHide.IS_HIDE = false;
                 if (!CommonCode.MouseInWindow(mainWindow))
                 {
@@ -369,35 +442,31 @@ namespace GeekDesk
             }
 
             FadeStoryBoard(1, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Visible);
-
-            Keyboard.Focus(mainWindow.EmptyTextBox);
+            Keyboard.Focus(mainWindow);
+            Keyboard.Focus(mainWindow.SearchBox);
         }
 
         public static void HideApp()
         {
             if (!MarginHide.IS_HIDE)
             {
+                //关闭锁定
+                RunTimeStatus.LOCK_APP_PANEL = false;
                 if (RunTimeStatus.SEARCH_BOX_SHOW)
                 {
                     mainWindow.HidedSearchBox();
-                    new Thread(() =>
-                    {
-                        Thread.Sleep(100);
-                        App.Current.Dispatcher.BeginInvoke(new Action(() =>
-                        {
-                            FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
-                        }));
-                    }).Start();
+                    FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
                 }
                 else
                 {
                     FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
                 }
-            } else
+            }
+            else
             {
                 ShowApp();
             }
-            
+
         }
 
         /// <summary>
@@ -529,10 +598,11 @@ namespace GeekDesk
             SettingButton.ContextMenu = null;
         }
 
-        private void App_LostFocus(object sender, EventArgs e)
+
+        private void AppWindowLostFocus()
         {
             if (appData.AppConfig.AppHideType == AppHideType.LOST_FOCUS
-                && this.Opacity == 1)
+                && this.Opacity == 1 && !RunTimeStatus.LOCK_APP_PANEL)
             {
                 //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
                 if (!appData.AppConfig.MarginHide || (appData.AppConfig.MarginHide && !MarginHide.IS_HIDE))
@@ -542,6 +612,7 @@ namespace GeekDesk
             }
         }
 
+
         private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this.DataContext != null)
@@ -600,12 +671,26 @@ namespace GeekDesk
 
         public void OnKeyDown(object sender, KeyEventArgs e)
         {
+            //char c = (char)e.Key;
+
             if (e.Key == Key.Escape)
             {
                 HideApp();
             }
+            //else if (
+            //    appData.AppConfig.SearchType == SearchType.KEY_DOWN &&
+            //    (
+            //        (e.Key >= Key.D0 && e.Key <= Key.Z) 
+            //        || (e.Key >= Key.NumPad0 && e.Key < Key.NumPad9)
+            //        )
+            //    )
+            //{
+            //    ShowSearchBox();
+            //}
         }
 
+
+
         /// <summary>
         /// 为了让修改菜单的textBox失去焦点
         /// </summary>
@@ -613,7 +698,7 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void MainWindow_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            EmptyTextBox.Focus();
+            SearchBox.Focus();
         }
 
         /// <summary>
@@ -626,5 +711,32 @@ namespace GeekDesk
             //防止延迟贴边隐藏
             RunTimeStatus.MARGIN_HIDE_AND_OTHER_SHOW = false;
         }
+
+        /// <summary>
+        /// 打开屏幕拾色器
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ColorPicker(object sender, RoutedEventArgs e)
+        {
+            TaskbarContextMenu.IsOpen = false;
+            GlobalColorPickerWindow.CreateNoShow();
+        }
+
+
+        private void Window_GotFocus(object sender, RoutedEventArgs e)
+        {
+            if (!LeftCard.IS_EDIT)
+            {
+                //if判断是为了能够使修改菜单时  菜单能够获得焦点
+                Keyboard.Focus(SearchBox);
+            }
+        }
+
+        private void AppWindow_Deactivated(object sender, EventArgs e)
+        {
+            AppWindowLostFocus();
+        }
+
     }
 }

MyThread/DispatcherBuild.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Threading;
 using System.Windows.Threading;
 
 namespace GeekDesk.MyThread
@@ -25,6 +20,7 @@ namespace GeekDesk.MyThread
                 manualResetEvent.Set();
                 Dispatcher.Run();
             });
+            thread.IsBackground = true;
             thread.Start();
             manualResetEvent.WaitOne();
             manualResetEvent.Dispose();

MyThread/MouseHookThread.cs

@@ -2,11 +2,6 @@
 using GeekDesk.ViewModel;
 using Gma.System.MouseKeyHook;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
 
@@ -24,7 +19,8 @@ namespace GeekDesk.MyThread
         {
             //使用dispatcher来单独监听UI线程  防止程序卡顿
             dispatcher = DispatcherBuild.Build();
-            dispatcher.Invoke((Action)(() =>
+            m_GlobalHook = Hook.GlobalEvents();
+            dispatcher.BeginInvoke((Action)(() =>
             {
                 m_GlobalHook.MouseUpExt += M_GlobalHook_MouseUpExt;
             }));
@@ -49,7 +45,7 @@ namespace GeekDesk.MyThread
                 if (MotionControl.hotkeyFinished)
                 {
                     App.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Render, new Action(() =>
-                    { 
+                    {
                         if (MainWindow.mainWindow.Visibility == Visibility.Collapsed || MainWindow.mainWindow.Opacity == 0)
                         {
                             MainWindow.ShowApp();

MyThread/UpdateThread.cs

@@ -4,13 +4,8 @@ using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
 using System.Configuration;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
 
 namespace GeekDesk.MyThread
 {
@@ -32,7 +27,13 @@ namespace GeekDesk.MyThread
             {
 
                 //等待1分钟后再检查更新  有的网络连接过慢
-                System.Threading.Thread.Sleep(60 * 1000);
+                int sleepTime = 60 * 1000;
+                if (Constants.DEV)
+                {
+                    sleepTime = 1;
+                }
+
+                System.Threading.Thread.Sleep(sleepTime);
 
                 string updateUrl;
                 string nowVersion = ConfigurationManager.AppSettings["Version"];
@@ -59,7 +60,8 @@ namespace GeekDesk.MyThread
                         }));
                     }
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 LogUtil.WriteErrorLog(ex, "获取更新失败!");
             }

Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@ using System.Windows;
 [assembly: AssemblyTitle("GeekDesk")]
 [assembly: AssemblyDescription("小巧、美观的桌面快速启动工具")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Demo-Liu")]
+[assembly: AssemblyCompany("BookerLiu")]
 [assembly: AssemblyProduct("GeekDesk")]
 [assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.1.4")]
-[assembly: AssemblyFileVersion("2.4.1.4")]
+[assembly: AssemblyVersion("2.4.1.6")]
+[assembly: AssemblyFileVersion("2.4.1.6")]

Task/ToDoTask.cs

@@ -1,16 +1,11 @@
-using GeekDesk.Control;
-using GeekDesk.Control.Other;
+using GeekDesk.Control.Other;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using HandyControl.Data;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Timers;
 
 namespace GeekDesk.Task

Update.json

@@ -1,9 +1,9 @@
 {
 	"title": "GeekDesk版本更新",
-	"subTitle": "V2.4.14",
+	"subTitle": "V2.4.16",
 	"msgTitle": "本次更新内容如下",
-	"msg": "['这次更新间隔比较久, 一个是工作比较忙, 另一个是因为老毛病颈椎病犯了, 但新版本总归是来了','增加图标排序功能','增加鼠标悬停切换菜单','增加搜索功能,显示界面后按下Ctrl+F','其它已知问题修复','老规矩兄弟萌, 我用爱发电, 你们点免费Star']",
-	"githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases",
-	"giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases",
-	"version": "2.4.14"
+	"msg": "['兄弟萌求Star, 求Star, 由于功能越来越多, 之后的更新我会测试一周再发布, 尽量做到没有BUG, 见谅', '这个版本没有功能性改变, 主要是为了修复上个版本的bug', '修复无法修改菜单名称的问题', '修复通过任务栏图标打开拾色器, 图标菜单消失问题']",
+	"githubUrl": "https://github.com/BookerLiu/GeekDesk/releases",
+	"giteeUrl": "https://gitee.com/BookerLiu/GeekDesk/releases",
+	"version": "2.4.16"
 }

Util/BGSettingUtil.cs

@@ -0,0 +1,69 @@
+using GeekDesk.Constant;
+using GeekDesk.ViewModel;
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Effects;
+
+namespace GeekDesk.Util
+{
+    public class BGSettingUtil
+    {
+        private static readonly AppConfig appConfig = MainWindow.appData.AppConfig;
+        public static void BGSetting()
+        {
+            if (appConfig.BGStyle == BGStyle.ImgBac || appConfig.BGStyle == 0)
+            {
+                Image image = new Image
+                {
+                    Effect = new BlurEffect()
+                    {
+                        Radius = appConfig.BlurValue
+                    },
+                    Margin = new Thickness(-30),
+                    Source = appConfig.BitmapImage,
+                    Opacity = (double)(Math.Round((decimal)(appConfig.BgOpacity / 100.00), 2))
+                };
+
+
+                //binding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
+                //image.SetBinding(Image.OpacityProperty, binding);
+
+                Grid grid = new Grid
+                {
+                    ClipToBounds = true
+                };
+                grid.Children.Add(image);
+
+                VisualBrush vb = new VisualBrush
+                {
+                    Visual = grid
+                };
+                MainWindow.mainWindow.BGBorder.Background = vb;
+            }
+            else
+            {
+                LinearGradientBrush lgb = new LinearGradientBrush();
+
+                GradientStop gs = new GradientStop
+                {
+                    Color = (Color)ColorConverter.ConvertFromString(appConfig.GradientBGParam.Color1),
+                    Offset = 0
+                };
+
+                lgb.GradientStops.Add(gs);
+
+                GradientStop gs2 = new GradientStop
+                {
+                    Color = (Color)ColorConverter.ConvertFromString(appConfig.GradientBGParam.Color2),
+                    Offset = 1
+                };
+                lgb.GradientStops.Add(gs2);
+                MainWindow.mainWindow.BGBorder.Background = lgb;
+            }
+
+        }
+
+    }
+}

Util/ColorUtil.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GeekDesk.Util
+{
+    public class ColorUtil
+    {
+
+
+      
+    }
+}

Util/FileIcon.cs

@@ -1,5 +1,4 @@
-using IWshRuntimeLibrary;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -21,17 +20,17 @@ namespace GeekDesk.Util
             return list;
         }
 
-          [DllImport("User32.dll")]
-         public static extern int PrivateExtractIcons(
-             string lpszFile, //文件名可以是exe,dll,ico,cur,ani,bmp
-             int nIconIndex,  //从第几个图标开始获取
-             int cxIcon,      //获取图标的尺寸x
-             int cyIcon,      //获取图标的尺寸y
-             IntPtr[] phicon, //获取到的图标指针数组
-             int[] piconid,   //图标对应的资源编号
-             int nIcons,      //指定获取的图标数量，仅当文件类型为.exe 和 .dll时候可用
-             int flags        //标志，默认0就可以，具体可以看LoadImage函数
-         );
+        [DllImport("User32.dll")]
+        public static extern int PrivateExtractIcons(
+           string lpszFile, //文件名可以是exe,dll,ico,cur,ani,bmp
+           int nIconIndex,  //从第几个图标开始获取
+           int cxIcon,      //获取图标的尺寸x
+           int cyIcon,      //获取图标的尺寸y
+           IntPtr[] phicon, //获取到的图标指针数组
+           int[] piconid,   //图标对应的资源编号
+           int nIcons,      //指定获取的图标数量，仅当文件类型为.exe 和 .dll时候可用
+           int flags        //标志，默认0就可以，具体可以看LoadImage函数
+       );
 
 
         public static BitmapImage GetBitmapImage(string filePath)

Util/FileUtil.cs

@@ -1,11 +1,8 @@
 using IWshRuntimeLibrary;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace GeekDesk.Util
 {

Util/GlobalHotKey.cs

@@ -10,6 +10,7 @@ namespace GeekDesk.Util
     {
         public enum HotkeyModifiers
         {
+            None = 0,
             MOD_ALT = 0x1,
             MOD_CONTROL = 0x2,
             MOD_SHIFT = 0x4,
@@ -53,7 +54,8 @@ namespace GeekDesk.Util
                 UnregisterHotKey(handleTemp[id].Handle, id);
                 GlobalHotKey.handleTemp[id].Dispose();
                 GlobalHotKey.handleTemp.Remove(id);
-            } catch
+            }
+            catch
             {
                 //nothing
             }
@@ -75,7 +77,7 @@ namespace GeekDesk.Util
             {
                 CreateHandle(new CreateParams());
                 this.callback += callback;
-            } 
+            }
 
             private static readonly int WM_HOTKEY = 0x0312;
             protected override void WndProc(ref Message m)
@@ -94,4 +96,4 @@ namespace GeekDesk.Util
 
 
     }
-    }
+}

Util/HttpUtil.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Net;
 using System.Text;
-using System.Web;
 
 namespace GeekDesk.Util
 {
@@ -16,10 +12,10 @@ namespace GeekDesk.Util
             ServicePointManager.Expect100Continue = true;
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
             //创建Web访问对  象
-            HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create(url);
+            WebRequest myRequest = WebRequest.Create(url);
             myRequest.ContentType = "text/plain; charset=utf-8";
             //通过Web访问对象获取响应内容
-            HttpWebResponse myResponse = (HttpWebResponse)myRequest.GetResponse();
+            WebResponse myResponse = myRequest.GetResponse();
 
             //通过响应内容流创建StreamReader对象，因为StreamReader更高级更快
             StreamReader reader = new StreamReader(myResponse.GetResponseStream(), Encoding.GetEncoding("utf-8"));

Util/ImageUtil.cs

@@ -1,12 +1,9 @@
 using GeekDesk.Constant;
 using System;
 using System.Drawing;
-using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Text.RegularExpressions;
-using System.Windows;
-using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 

Util/KeyUtil.cs

@@ -0,0 +1,137 @@
+using System;
+
+using System.Windows.Input;
+
+namespace GeekDesk.Util
+{
+    public class KeyUtil
+    {
+        public class KeyProp
+        {
+            public Key key;
+            public bool printable;
+            public char character;
+            public bool shift;
+            public bool ctrl;
+            public bool alt;
+            public int type; //sideband
+            public string s;    //sideband
+        };
+
+        public static void KeyToChar(Key key,
+            ref KeyProp keyProp,
+            bool downCap = false,
+            bool downShift = false
+            )
+        {
+            bool iscap;
+            bool caplock = false;
+            bool shift;
+
+            keyProp.key = key;
+
+            keyProp.alt = Keyboard.IsKeyDown(Key.LeftAlt) ||
+                              Keyboard.IsKeyDown(Key.RightAlt);
+
+            keyProp.ctrl = Keyboard.IsKeyDown(Key.LeftCtrl) ||
+                              Keyboard.IsKeyDown(Key.RightCtrl);
+
+            keyProp.shift = Keyboard.IsKeyDown(Key.LeftShift) ||
+                              Keyboard.IsKeyDown(Key.RightShift);
+
+            if (keyProp.alt || keyProp.ctrl)
+            {
+                keyProp.printable = false;
+                keyProp.type = 1;
+            }
+            else
+            {
+                keyProp.printable = true;
+                keyProp.type = 0;
+            }
+
+            shift = downShift || keyProp.shift;
+            //caplock = Console.CapsLock; //Keyboard.IsKeyToggled(Key.CapsLock);
+            iscap = downCap || ((caplock && !shift) || (!caplock && shift));
+
+            switch (key)
+            {
+                case Key.Enter: keyProp.character = '\n'; return;
+                case Key.A: keyProp.character = (iscap ? 'A' : 'a'); return;
+                case Key.B: keyProp.character = (iscap ? 'B' : 'b'); return;
+                case Key.C: keyProp.character = (iscap ? 'C' : 'c'); return;
+                case Key.D: keyProp.character = (iscap ? 'D' : 'd'); return;
+                case Key.E: keyProp.character = (iscap ? 'E' : 'e'); return;
+                case Key.F: keyProp.character = (iscap ? 'F' : 'f'); return;
+                case Key.G: keyProp.character = (iscap ? 'G' : 'g'); return;
+                case Key.H: keyProp.character = (iscap ? 'H' : 'h'); return;
+                case Key.I: keyProp.character = (iscap ? 'I' : 'i'); return;
+                case Key.J: keyProp.character = (iscap ? 'J' : 'j'); return;
+                case Key.K: keyProp.character = (iscap ? 'K' : 'k'); return;
+                case Key.L: keyProp.character = (iscap ? 'L' : 'l'); return;
+                case Key.M: keyProp.character = (iscap ? 'M' : 'm'); return;
+                case Key.N: keyProp.character = (iscap ? 'N' : 'n'); return;
+                case Key.O: keyProp.character = (iscap ? 'O' : 'o'); return;
+                case Key.P: keyProp.character = (iscap ? 'P' : 'p'); return;
+                case Key.Q: keyProp.character = (iscap ? 'Q' : 'q'); return;
+                case Key.R: keyProp.character = (iscap ? 'R' : 'r'); return;
+                case Key.S: keyProp.character = (iscap ? 'S' : 's'); return;
+                case Key.T: keyProp.character = (iscap ? 'T' : 't'); return;
+                case Key.U: keyProp.character = (iscap ? 'U' : 'u'); return;
+                case Key.V: keyProp.character = (iscap ? 'V' : 'v'); return;
+                case Key.W: keyProp.character = (iscap ? 'W' : 'w'); return;
+                case Key.X: keyProp.character = (iscap ? 'X' : 'x'); return;
+                case Key.Y: keyProp.character = (iscap ? 'Y' : 'y'); return;
+                case Key.Z: keyProp.character = (iscap ? 'Z' : 'z'); return;
+                case Key.D0: keyProp.character = (shift ? ')' : '0'); return;
+                case Key.D1: keyProp.character = (shift ? '!' : '1'); return;
+                case Key.D2: keyProp.character = (shift ? '@' : '2'); return;
+                case Key.D3: keyProp.character = (shift ? '#' : '3'); return;
+                case Key.D4: keyProp.character = (shift ? '$' : '4'); return;
+                case Key.D5: keyProp.character = (shift ? '%' : '5'); return;
+                case Key.D6: keyProp.character = (shift ? '^' : '6'); return;
+                case Key.D7: keyProp.character = (shift ? '&' : '7'); return;
+                case Key.D8: keyProp.character = (shift ? '*' : '8'); return;
+                case Key.D9: keyProp.character = (shift ? '(' : '9'); return;
+                case Key.OemPlus: keyProp.character = (shift ? '+' : '='); return;
+                case Key.OemMinus: keyProp.character = (shift ? '_' : '-'); return;
+                case Key.OemQuestion: keyProp.character = (shift ? '?' : '/'); return;
+                case Key.OemComma: keyProp.character = (shift ? '<' : ','); return;
+                case Key.OemPeriod: keyProp.character = (shift ? '>' : '.'); return;
+                case Key.OemOpenBrackets: keyProp.character = (shift ? '{' : '['); return;
+                case Key.OemQuotes: keyProp.character = (shift ? '"' : '\''); return;
+                case Key.Oem1: keyProp.character = (shift ? ':' : ';'); return;
+                case Key.Oem3: keyProp.character = (shift ? '~' : '`'); return;
+                case Key.Oem5: keyProp.character = (shift ? '|' : '\\'); return;
+                case Key.Oem6: keyProp.character = (shift ? '}' : ']'); return;
+                case Key.Tab: keyProp.character = '\t'; return;
+                case Key.Space: keyProp.character = ' '; return;
+
+                // Number Pad
+                case Key.NumPad0: keyProp.character = '0'; return;
+                case Key.NumPad1: keyProp.character = '1'; return;
+                case Key.NumPad2: keyProp.character = '2'; return;
+                case Key.NumPad3: keyProp.character = '3'; return;
+                case Key.NumPad4: keyProp.character = '4'; return;
+                case Key.NumPad5: keyProp.character = '5'; return;
+                case Key.NumPad6: keyProp.character = '6'; return;
+                case Key.NumPad7: keyProp.character = '7'; return;
+                case Key.NumPad8: keyProp.character = '8'; return;
+                case Key.NumPad9: keyProp.character = '9'; return;
+                case Key.Subtract: keyProp.character = '-'; return;
+                case Key.Add: keyProp.character = '+'; return;
+                case Key.Decimal: keyProp.character = '.'; return;
+                case Key.Divide: keyProp.character = '/'; return;
+                case Key.Multiply: keyProp.character = '*'; return;
+
+                default:
+                    keyProp.type = 1;
+                    keyProp.printable = false;
+                    keyProp.character = '\x00';
+                    return;
+            } //switch  
+        }
+
+
+    }
+}

Util/LogUtil.cs

@@ -1,10 +1,7 @@
 using GeekDesk.Constant;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace GeekDesk.Util
 {
@@ -48,27 +45,30 @@ namespace GeekDesk.Util
                         fs.Write(buffer, 0, buffer.Length);
                     }
                 }
-            } catch
+            }
+            catch
             {
 
             }
-           
+
         }
 
 
         public static void WriteLog(string msg)
         {
-            try {
-                using (FileStream fs = File.Open(Constants.LOG_FILE_PATH, FileMode.OpenOrCreate, FileAccess.ReadWrite))
+            try
             {
-                fs.Seek(0, SeekOrigin.End);
-                byte[] buffer = Encoding.Default.GetBytes("-------------------------------------------------------\r\n");
-                fs.Write(buffer, 0, buffer.Length);
+                using (FileStream fs = File.Open(Constants.LOG_FILE_PATH, FileMode.OpenOrCreate, FileAccess.ReadWrite))
+                {
+                    fs.Seek(0, SeekOrigin.End);
+                    byte[] buffer = Encoding.Default.GetBytes("-------------------------------------------------------\r\n");
+                    fs.Write(buffer, 0, buffer.Length);
 
-                buffer = Encoding.Default.GetBytes(DateTime.Now.ToString() + msg + "\r\n" );
-                fs.Write(buffer, 0, buffer.Length);
+                    buffer = Encoding.Default.GetBytes(DateTime.Now.ToString() + msg + "\r\n");
+                    fs.Write(buffer, 0, buffer.Length);
+                }
             }
-            } catch { }
+            catch { }
         }
 
 

Util/MarginHide.cs

@@ -1,9 +1,11 @@
-using System;
-
-using System.Windows.Forms;
+using GeekDesk.Constant;
+using GeekDesk.MyThread;
+using System;
+using System.Threading;
 using System.Windows;
+using System.Windows.Input;
 using System.Windows.Media.Animation;
-using GeekDesk.Constant;
+using System.Windows.Threading;
 
 namespace GeekDesk.Util
 {
@@ -23,10 +25,14 @@ namespace GeekDesk.Util
     {
         private static Window window;//定义使用该方法的窗体
 
-        private static readonly int hideTime = 200;
-        private static readonly int fadeHideTime = 180;
-        private static readonly int fadeShowTime = 200;
-        private static readonly int taskTime = 250;
+        private static readonly int hideTime = 50;
+        private static readonly int showTime = 30;
+
+        private static int animalTime;
+
+        private static readonly int fadeHideTime = 50;
+        private static readonly int fadeShowTime = 50;
+        private static readonly int taskTime = 200;
 
         public static readonly int shadowWidth = 20;
 
@@ -37,7 +43,7 @@ namespace GeekDesk.Util
 
         public static bool IS_HIDE = false;
 
-        private static Timer timer = null;
+        private static System.Windows.Forms.Timer timer = null;
 
         public static void ReadyHide(Window window)
         {
@@ -72,7 +78,8 @@ namespace GeekDesk.Util
         private static void HideWindow(object o, EventArgs e)
         {
             if (window.Visibility != Visibility.Visible 
-                || RunTimeStatus.MARGIN_HIDE_AND_OTHER_SHOW) return;
+                || RunTimeStatus.MARGIN_HIDE_AND_OTHER_SHOW 
+                || RunTimeStatus.LOCK_APP_PANEL) return;
 
             double screenLeft = SystemParameters.VirtualScreenLeft;
             double screenTop = SystemParameters.VirtualScreenTop;
@@ -97,7 +104,7 @@ namespace GeekDesk.Util
                 if (windowTop <= screenTop)
                 {
                     IS_HIDE = true;
-                    FadeAnimation(1, 0);
+                    //FadeAnimation(1, 0);
                     HideAnimation(windowTop, screenTop - windowHeight + showMarginWidth, Window.TopProperty, HideType.TOP_HIDE);
                     return;
                 }
@@ -105,7 +112,7 @@ namespace GeekDesk.Util
                 if (windowLeft <= screenLeft)
                 {
                     IS_HIDE = true;
-                    FadeAnimation(1, 0);
+                    //FadeAnimation(1, 0);
                     HideAnimation(windowLeft, screenLeft - windowWidth + showMarginWidth, Window.LeftProperty, HideType.LEFT_HIDE);
                     return;
                 }
@@ -113,7 +120,7 @@ namespace GeekDesk.Util
                 if (windowLeft + windowWidth + Math.Abs(screenLeft) >= screenWidth)
                 {
                     IS_HIDE = true;
-                    FadeAnimation(1, 0);
+                    //FadeAnimation(1, 0);
                     HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - showMarginWidth, Window.LeftProperty, HideType.RIGHT_HIDE);
                     return;
                 }
@@ -126,7 +133,7 @@ namespace GeekDesk.Util
                 {
                     IS_HIDE = false;
                     HideAnimation(windowTop, screenTop, Window.TopProperty, HideType.TOP_SHOW);
-                    FadeAnimation(0, 1);
+                    //FadeAnimation(0, 1);
                     return;
                 }
                 //左侧显示
@@ -134,7 +141,7 @@ namespace GeekDesk.Util
                 {
                     IS_HIDE = false;
                     HideAnimation(windowLeft, screenLeft, Window.LeftProperty, HideType.LEFT_SHOW);
-                    FadeAnimation(0, 1);
+                    //FadeAnimation(0, 1);
                     return;
                 }
                 //右侧显示
@@ -142,7 +149,7 @@ namespace GeekDesk.Util
                 {
                     IS_HIDE = false;
                     HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - windowWidth, Window.LeftProperty, HideType.RIGHT_SHOW);
-                    FadeAnimation(0, 1);
+                    //FadeAnimation(0, 1);
                     return;
                 }
             }
@@ -155,7 +162,7 @@ namespace GeekDesk.Util
         {
             ON_HIDE = true;
             if (timer != null) return;
-            timer = new Timer
+            timer = new System.Windows.Forms.Timer
             {
                 Interval = taskTime
             };//添加timer计时器，隐藏功能
@@ -186,7 +193,7 @@ namespace GeekDesk.Util
                 if (windowLeft <= screenLeft - showMarginWidth)
                 {
                     IS_HIDE = false;
-                    FadeAnimation(0, 1);
+                    //FadeAnimation(0, 1);
                     HideAnimation(windowLeft, screenLeft, Window.LeftProperty, HideType.LEFT_SHOW);
                     return;
                 }
@@ -195,7 +202,7 @@ namespace GeekDesk.Util
                 if (windowTop <= screenTop - showMarginWidth)
                 {
                     IS_HIDE = false;
-                    FadeAnimation(0, 1);
+                    //FadeAnimation(0, 1);
                     HideAnimation(windowTop, screenTop, Window.TopProperty, HideType.TOP_SHOW);
                     return;
                 }
@@ -204,7 +211,7 @@ namespace GeekDesk.Util
                 if (windowLeft + Math.Abs(screenLeft) == screenWidth - showMarginWidth)
                 {
                     IS_HIDE = false;
-                    FadeAnimation(0, 1);
+                    //FadeAnimation(0, 1);
                     HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - windowWidth, Window.LeftProperty, HideType.RIGHT_SHOW);
                     return;
                 }
@@ -215,99 +222,175 @@ namespace GeekDesk.Util
         private static void HideAnimation(double from, double to, DependencyProperty property, HideType hideType)
         {
 
-            double toTemp = to;
-            double leftT = window.Width / 4 * 3;
-            double topT = window.Height / 4 * 3;
-            switch (hideType)
+            new Thread(() =>
             {
-                case HideType.LEFT_HIDE:
-                    to += leftT;
-                    break;
-                case HideType.LEFT_SHOW:
-                    to -= leftT;
-                    break;
-                case HideType.RIGHT_HIDE:
-                    to -= leftT;
-                    break;
-                case HideType.RIGHT_SHOW:
-                    to += leftT;
-                    break;
-                case HideType.TOP_HIDE:
-                    to += topT;
-                    break;
-                case HideType.TOP_SHOW:
-                    to -= topT;
-                    break;
-            }
-            DoubleAnimation da = new DoubleAnimation
-            {
-                From = from,
-                To = to,
-                Duration = new Duration(TimeSpan.FromMilliseconds(hideTime))
-            };
-            // 如果是显示 则贴屏幕侧不显示阴影
-            bool isShow = false;
-            int shadowWidthTemp = Constants.SHADOW_WIDTH;
-            if (hideType <= HideType.RIGHT_SHOW)
-            {
-                isShow = true;
-                if (hideType == HideType.RIGHT_SHOW)
+                App.Current.Dispatcher.Invoke(() =>
                 {
-                    shadowWidthTemp = -shadowWidthTemp;
-                }
-            }
-            da.Completed += (s, e) =>
-            {
-                if ("Top".Equals(property.Name))
-                {
-                    window.Top = isShow ? toTemp - shadowWidthTemp : toTemp;
-                }
-                else
-                {
-                    window.Left = isShow ? toTemp - shadowWidthTemp : toTemp;
-                }
-                window.BeginAnimation(property, null);
-            };
+                    double abs = Math.Abs(Math.Abs(to) - Math.Abs(from));
+                    double subLen = abs / hideTime;
 
-            Timeline.SetDesiredFrameRate(da, 60);
-            window.BeginAnimation(property, da);
+                    if ((int)hideType <= 3)
+                    {
+                        animalTime = showTime;                        
+                    } else
+                    {
+                        animalTime = hideTime;
+                    }
+
+                    int count = 0;
+                    while (count < animalTime)
+                    {
+                        switch (hideType)
+                        {
+                            case HideType.LEFT_HIDE:
+                                window.Left -= subLen;
+                                break;
+                            case HideType.LEFT_SHOW:
+                                window.Left += subLen;
+                                break;
+                            case HideType.RIGHT_HIDE:
+                                window.Left += subLen;
+                                break;
+                            case HideType.RIGHT_SHOW:
+                                window.Left -= subLen;
+                                break;
+                            case HideType.TOP_HIDE:
+                                window.Top -= subLen;
+                                break;
+                            case HideType.TOP_SHOW:
+                                window.Top += subLen;
+                                break;
+                        }
+                        count++;
+                        Thread.Sleep(1);
+                    }
+
+                    switch (hideType)
+                    {
+                        case HideType.LEFT_HIDE:
+                            window.Left = to;
+                            break;
+                        case HideType.LEFT_SHOW:
+                            window.Left = to - 20;
+                            break;
+                        case HideType.RIGHT_HIDE:
+                            window.Left = to;
+                            break;
+                        case HideType.RIGHT_SHOW:
+                            window.Left = to + 20;
+                            break;
+                        case HideType.TOP_HIDE:
+                            window.Top = to;
+                            break;
+                        case HideType.TOP_SHOW:
+                            window.Top = to - 20;
+                            break;
+                    }
+                    //double toTemp = to;
+                    //double leftT = 0;
+                    //double topT = 0;
+                    //switch (hideType)
+                    //{
+                    //    case HideType.LEFT_HIDE:
+                    //        to += leftT;
+                    //        break;
+                    //    case HideType.LEFT_SHOW:
+                    //        to -= leftT;
+                    //        break;
+                    //    case HideType.RIGHT_HIDE:
+                    //        to -= leftT;
+                    //        break;
+                    //    case HideType.RIGHT_SHOW:
+                    //        to += leftT;
+                    //        break;
+                    //    case HideType.TOP_HIDE:
+                    //        to += topT;
+                    //        break;
+                    //    case HideType.TOP_SHOW:
+                    //        to -= topT;
+                    //        break;
+                    //}
+                    //DoubleAnimation da = new DoubleAnimation
+                    //{
+                    //    From = from,
+                    //    To = to,
+                    //    Duration = new Duration(TimeSpan.FromMilliseconds(hideTime))
+                    //};
+                    //// 如果是显示 则贴屏幕侧不显示阴影
+                    //bool isShow = false;
+                    //int shadowWidthTemp = Constants.SHADOW_WIDTH;
+                    //if (hideType <= HideType.RIGHT_SHOW)
+                    //{
+                    //    isShow = true;
+                    //    if (hideType == HideType.RIGHT_SHOW)
+                    //    {
+                    //        shadowWidthTemp = -shadowWidthTemp;
+                    //    }
+                    //}
+                    //da.Completed += (s, e) =>
+                    //{
+                    //    if ("Top".Equals(property.Name))
+                    //    {
+                    //        window.Top = isShow ? toTemp - shadowWidthTemp : toTemp;
+                    //    }
+                    //    else
+                    //    {
+                    //        window.Left = isShow ? toTemp - shadowWidthTemp : toTemp;
+                    //    }
+                    //    window.BeginAnimation(property, null);
+                    //};
+
+                    //Timeline.SetDesiredFrameRate(da, 60);
+                    //window.BeginAnimation(property, da);
+                });
+            }).Start();
+            
+            
         }
 
         private static void FadeAnimation(double from, double to)
         {
-            double time;
-            if (to == 0D)
+            new Thread(() =>
             {
-                time = fadeHideTime;
-            }
-            else
-            {
-                time = fadeShowTime;
-            }
-            DoubleAnimation opacityAnimation = new DoubleAnimation
-            {
-                From = from,
-                To = to,
-                Duration = new Duration(TimeSpan.FromMilliseconds(time))
-            };
-            opacityAnimation.Completed += (s, e) =>
-            {
-                //window.Opacity = to;
-                window.BeginAnimation(Window.OpacityProperty, null);
-            };
-            Timeline.SetDesiredFrameRate(opacityAnimation, 60);
-            window.BeginAnimation(Window.OpacityProperty, opacityAnimation);
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    double time;
+                    if (to == 0D)
+                    {
+                        time = fadeHideTime;
+                    }
+                    else
+                    {
+                        time = fadeShowTime;
+                    }
+                    DoubleAnimation opacityAnimation = new DoubleAnimation
+                    {
+                        From = from,
+                        To = to,
+                        Duration = new Duration(TimeSpan.FromMilliseconds(time))
+                    };
+                    opacityAnimation.Completed += (s, e) =>
+                    {
+                        //window.Opacity = to;
+                        window.BeginAnimation(Window.OpacityProperty, null);
+                    };
+                    Timeline.SetDesiredFrameRate(opacityAnimation, 60);
+                    window.BeginAnimation(Window.OpacityProperty, opacityAnimation);
+                });
+            }).Start();
         }
 
 
         public static void WaitHide(int waitTime)
         {
-            new System.Threading.Thread(()=>
+            System.Threading.Thread t = new System.Threading.Thread(() =>
             {
                 System.Threading.Thread.Sleep(waitTime);
                 //修改状态为false 继续执行贴边隐藏
                 RunTimeStatus.MARGIN_HIDE_AND_OTHER_SHOW = false;
-            }).Start();
+            });
+            t.IsBackground = true;
+            t.Start();
         }
 
 

Util/MouseUtil.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace GeekDesk.Util

Util/RegisterUtil.cs

@@ -1,9 +1,5 @@
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GeekDesk.Util
 {

Util/ShellContextMenu.cs

@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
 using System.Drawing;
-using System.Windows.Forms;
 using System.IO;
-using System.Security.Permissions;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
 
 namespace GeekDesk.Util
 {
@@ -1166,7 +1164,7 @@ namespace GeekDesk.Util
             Int32 ParseDisplayName(
                 IntPtr hwnd,
                 IntPtr pbc,
-                [MarshalAs(UnmanagedType.LPWStr)] 
+                [MarshalAs(UnmanagedType.LPWStr)]
             string pszDisplayName,
                 ref uint pchEaten,
                 out IntPtr ppidl,
@@ -1261,7 +1259,7 @@ namespace GeekDesk.Util
             Int32 SetNameOf(
                 IntPtr hwnd,
                 IntPtr pidl,
-                [MarshalAs(UnmanagedType.LPWStr)] 
+                [MarshalAs(UnmanagedType.LPWStr)]
             string pszName,
                 SHGNO uFlags,
                 out IntPtr ppidlOut);

Util/StringUtil.cs

@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.Util
+namespace GeekDesk.Util
 {
-   public class StringUtil
+    public class StringUtil
     {
 
 

Util/SvgToGeometry.cs

@@ -4,10 +4,8 @@ using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Xml;
 

ViewModel/AppConfig.cs

@@ -1,6 +1,7 @@
 
 using GeekDesk.Constant;
 using GeekDesk.Util;
+using GeekDesk.ViewModel.Temp;
 using Newtonsoft.Json;
 using System;
 using System.Collections.ObjectModel;
@@ -27,6 +28,7 @@ namespace GeekDesk.ViewModel
         private int selectedMenuIndex = 0;  //上次选中菜单索引
         private bool followMouse = true;  //面板跟随鼠标 默认是
         private Visibility configIconVisible = Visibility.Visible; // 设置按钮是否显示
+        private Visibility titleLogoVisible = Visibility.Visible; // 标题logo是否显示
         private AppHideType appHideType = AppHideType.START_EXE;  //面板关闭方式 (默认启动程序后)
         private bool startedShowPanel = true;  //启动时是否显示主面板  默认显示
         [field: NonSerialized]
@@ -46,7 +48,12 @@ namespace GeekDesk.ViewModel
 
         private string toDoHotkeyStr = "Ctrl + Shift + Q";  //待办任务快捷键
         private HotkeyModifiers toDoHotkeyModifiers; //待办任务快捷键
-        private Key toDoHotkey = Key.E; //待办任务快捷键
+        private Key toDoHotkey = Key.Q; //待办任务快捷键
+
+
+        private string colorPickerHotkeyStr = ""; //拾色器快捷键
+        private HotkeyModifiers colorPickerHotkeyModifiers; //拾色器快捷键
+        private Key colorPickerHotkey; //拾色器快捷键
 
         private string customIconUrl; //自定义图标url
         private string customIconJsonUrl;  //自定义图标json信息url
@@ -75,8 +82,121 @@ namespace GeekDesk.ViewModel
 
         private bool hoverMenu = false; //悬停切换菜单  默认关闭
 
+        private BGStyle bgStyle = BGStyle.ImgBac; //背景风格
+
+        private GradientBGParam gradientBGParam = null; //渐变背景参数
+
+        private bool? enableAppHotKey = true;  //可能为null 开启热键
+        private bool? enableTodoHotKey = true; //可能为null 开启待办热键
+
+        private bool enableColorPickerHotKey;  //新增 默认为false 不需要考虑null值
+
+        private SearchType searchType;
+
+
         #region GetSet
 
+        public SearchType SearchType
+        {
+            get
+            {
+                return searchType;
+            }
+            set
+            {
+                searchType = value;
+                OnPropertyChanged("SearchType");
+            }
+        }
+
+        public bool EnableColorPickerHotKey
+        {
+            get
+            {
+                return enableColorPickerHotKey;
+            }
+            set
+            {
+                enableColorPickerHotKey = value;
+                OnPropertyChanged("EnableColorPickerHotKey");
+            }
+        }
+
+        public bool? EnableAppHotKey
+        {
+            get
+            {
+                if (enableAppHotKey == null) enableAppHotKey = true;
+                return enableAppHotKey;
+            }
+            set
+            {
+                enableAppHotKey = value;
+                OnPropertyChanged("EnableAppHotKey");
+            }
+        }
+
+        public bool? EnableTodoHotKey
+        {
+            get
+            {
+                if (enableTodoHotKey == null) enableTodoHotKey = true;
+                return enableTodoHotKey;
+            }
+            set
+            {
+                enableTodoHotKey = value;
+                OnPropertyChanged("EnableTodoHotKey");
+            }
+        }
+
+        public Visibility TitleLogoVisible
+        {
+            get
+            {
+                return titleLogoVisible;
+            }
+            set
+            {
+                titleLogoVisible = value;
+                OnPropertyChanged("TitleLogoVisible");
+            }
+        }
+
+        public GradientBGParam GradientBGParam
+        {
+            get
+            {
+                if (gradientBGParam == null)
+                {
+                    gradientBGParam = GradientBGParamList.GradientBGParams[0];
+                }
+                return gradientBGParam;
+            }
+            set
+            {
+                gradientBGParam = value;
+                OnPropertyChanged("GradientBGParam");
+            }
+        }
+
+        public BGStyle BGStyle
+        {
+            get
+            {
+                if (bgStyle == 0)
+                {
+                    bgStyle = (BGStyle)1;
+                }
+                return bgStyle;
+            }
+            set
+            {
+                bgStyle = value;
+                OnPropertyChanged("BGStyle");
+            }
+        }
+
         public bool HoverMenu
         {
             get
@@ -321,6 +441,47 @@ namespace GeekDesk.ViewModel
             }
         }
 
+        public Key ColorPickerHotkey
+        {
+            get
+            {
+                return colorPickerHotkey;
+            }
+            set
+            {
+                colorPickerHotkey = value;
+                OnPropertyChanged("ColorPickerHotkey");
+            }
+        }
+
+
+        public HotkeyModifiers ColorPickerHotkeyModifiers
+        {
+            get
+            {
+                return colorPickerHotkeyModifiers;
+            }
+            set
+            {
+                colorPickerHotkeyModifiers = value;
+                OnPropertyChanged("ColorPickerHotkeyModifiers");
+            }
+        }
+
+        public string ColorPickerHotkeyStr
+        {
+            get
+            {
+                return colorPickerHotkeyStr;
+            }
+            set
+            {
+                colorPickerHotkeyStr = value;
+                OnPropertyChanged("ColorPickerHotkeyStr");
+            }
+        }
+
+
         public Key ToDoHotkey
         {
             get
@@ -328,7 +489,7 @@ namespace GeekDesk.ViewModel
                 //兼容老版本
                 if (toDoHotkey == Key.None)
                 {
-                    toDoHotkey = Key.Q;
+                    toDoHotkey = Key.E;
                 }
                 return toDoHotkey;
             }

ViewModel/AppData.cs

@@ -1,6 +1,5 @@
 using GeekDesk.Util;
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 

ViewModel/CPDataContext.cs

@@ -0,0 +1,93 @@
+using System.ComponentModel;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace GeekDesk.ViewModel
+{
+
+    public class CPDataContext : INotifyPropertyChanged
+    {
+        private BitmapSource pixelIMG;
+
+        private System.Drawing.Color pixelColor_D;
+
+        public Color pixelColor;
+
+        private string colorHtml;
+
+        private string colorRGB;
+
+        private string pixelXY;
+
+        public BitmapSource PixelIMG
+        {
+            set
+            {
+                pixelIMG = value;
+                OnPropertyChanged("PixelIMG");
+            }
+            get { return pixelIMG; }
+        }
+
+        public System.Drawing.Color PixelColor_D
+        {
+            set
+            {
+                pixelColor_D = value;
+                ColorHtml = pixelColor_D.Name.ToUpper().Substring(2);
+                ColorRGB = pixelColor_D.R + "," + pixelColor_D.G + "," + pixelColor_D.B;
+                PixelColor = Color.FromArgb(pixelColor_D.A, pixelColor_D.R, pixelColor_D.G, pixelColor_D.B);
+            }
+            get { return pixelColor_D; }
+        }
+
+        public Color PixelColor
+        {
+            set
+            {
+                pixelColor = value;
+                OnPropertyChanged("PixelColor");
+            }
+            get { return pixelColor; }
+        }
+
+        public string ColorRGB
+        {
+            set
+            {
+                colorRGB = value;
+                OnPropertyChanged("ColorRGB");
+            }
+            get { return colorRGB; }
+        }
+
+        public string ColorHtml
+        {
+            set
+            {
+                colorHtml = value;
+                OnPropertyChanged("ColorHtml");
+            }
+            get { return colorHtml; }
+        }
+
+
+        public string PixelXY
+        {
+            set
+            {
+                pixelXY = value;
+                OnPropertyChanged("PixelXY");
+            }
+            get { return pixelXY; }
+        }
+
+
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        private void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}

ViewModel/GradientBGParam.cs

@@ -0,0 +1,76 @@
+using GeekDesk.Util;
+using System;
+using System.ComponentModel;
+
+namespace GeekDesk.ViewModel
+{
+    [Serializable]
+    public class GradientBGParam : INotifyPropertyChanged
+    {
+        private string color1;
+
+        private string color2;
+
+        private string name;
+
+        public GradientBGParam() { }
+
+        public GradientBGParam(string name, string color1, string color2)
+        {
+            this.name = name;
+            this.color1 = color1;
+            this.color2 = color2;
+        }
+
+
+
+        public string Color1
+        {
+            get
+            {
+                return color1;
+            }
+            set
+            {
+                color1 = value;
+                OnPropertyChanged("Color1");
+            }
+        }
+
+        public string Color2
+        {
+            get
+            {
+                return color2;
+            }
+            set
+            {
+                color2 = value;
+                OnPropertyChanged("Color2");
+            }
+        }
+
+        public string Name
+        {
+            get
+            {
+                return name;
+            }
+            set
+            {
+                name = value;
+                OnPropertyChanged("Name");
+            }
+        }
+
+
+        [field: NonSerializedAttribute()]
+        public event PropertyChangedEventHandler PropertyChanged;
+        private void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            CommonCode.SaveAppData(MainWindow.appData);
+        }
+
+    }
+}

ViewModel/IconInfo.cs

@@ -1,11 +1,7 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
-using Newtonsoft.Json;
 using System;
 using System.ComponentModel;
-using System.IO;
-using System.Reflection;
-using System.Text;
 using System.Windows.Media.Imaging;
 
 /// <summary>

ViewModel/IconfontInfo.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.ViewModel
+namespace GeekDesk.ViewModel
 {
     public class IconfontInfo
     {

ViewModel/MenuInfo.cs

@@ -11,7 +11,7 @@ namespace GeekDesk.ViewModel
     [Serializable]
     public class MenuInfo : INotifyPropertyChanged
     {
-       
+
 
         private string menuName;
         private string menuId;
@@ -65,7 +65,7 @@ namespace GeekDesk.ViewModel
             set
             {
                 menuName = value;
-                OnPropertyChanged("MenuName");               
+                OnPropertyChanged("MenuName");
             }
         }
 
@@ -94,7 +94,8 @@ namespace GeekDesk.ViewModel
                 if (menuEdit == Visibility.Visible)
                 {
                     NotMenuEdit = Visibility.Collapsed;
-                } else
+                }
+                else
                 {
                     NotMenuEdit = Visibility.Visible;
                 }

ViewModel/Temp/GradientBGParamList.cs

@@ -0,0 +1,35 @@
+using System.Collections.ObjectModel;
+
+namespace GeekDesk.ViewModel.Temp
+{
+    public class GradientBGParamList
+    {
+
+
+        private static ObservableCollection<GradientBGParam> gradientBGParams;
+
+        static GradientBGParamList()
+        {
+            //gradientBGParams = (ObservableCollection<GradientBGParam>)ConfigurationManager.GetSection("SystemBGs")
+            gradientBGParams = new ObservableCollection<GradientBGParam>
+            {
+                new GradientBGParam("魅惑妖术", "#FFDDE1", "#EE9CA7"),
+                new GradientBGParam ("森林之友", "#EBF7E3", "#A8E4C0"),
+                new GradientBGParam("完美谢幕", "#D76D77", "#FFAF7B")
+            };
+        }
+
+        public static ObservableCollection<GradientBGParam> GradientBGParams
+        {
+            get
+            {
+                return gradientBGParams;
+            }
+            set
+            {
+                gradientBGParams = value;
+            }
+        }
+
+    }
+}

ViewModel/ToDoInfo.cs

@@ -1,11 +1,7 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GeekDesk.ViewModel
 {