: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,11 +18,15 @@
 		<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>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+		<probing privatePath="lib" />
       <dependentAssembly>
         <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.0.6.0" newVersion="2.0.6.0" />
@@ -41,16 +47,21 @@
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
+      </dependentAssembly>
     </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="CustomIconTeachUrl" value="https://mp.weixin.qq.com/s/LxoHAekho9HBVl4FRw_Law" />
+      <add key="Version" value="2.5.10" />
+      <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:///D:/WorkSpace/workspace-VS/GeekDesk/Update.json" />-->
+	  <add key="ClientSettingsProvider.ServiceUri" value="" />
+	  <add key="CustomIconTeachUrl" value="https://mp.weixin.qq.com/s/LxoHAekho9HBVl4FRw_Law" />
   </appSettings>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">

App.xaml

@@ -13,6 +13,8 @@
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
                 <ResourceDictionary Source="/GeekDesk;component/Resource/Dictionary/CommonStyle.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/XamlFlair.WPF;component/DefaultAnimations.xaml"/>
+                <ResourceDictionary Source="/GeekDesk;component/Resource/Dictionary/XamlFlairSettings.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
   </Application.Resources>

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
 {
@@ -17,14 +13,22 @@ namespace GeekDesk.Constant
 
         public static string MY_NAME = DEV ? "GeekDesk-D" : "GeekDesk";
 
+
         /// <summary>
         /// app数据文件路径
         /// </summary>
         public static string DATA_FILE_PATH = APP_DIR + "Data";  //app数据文件路径
 
-        public static string LOG_FILE_PATH = APP_DIR + "Log.log";
+        /// <summary>
+        /// 备份文件路径
+        /// </summary>
+        public static string DATA_FILE_BAK_PATH = APP_DIR + "bak\\Data.bak";  //app备份数据文件路径
 
-        public static string ERROR_FILE_PATH = APP_DIR + "Error.log";
+        public static string PW_FILE_BAK_PATH = APP_DIR + "bak\\pw.txt";  //密码文件路径
+
+        public static string LOG_FILE_PATH = APP_DIR + "logs\\log.log"; //日志文件
+
+        public static string ERROR_FILE_PATH = APP_DIR + "logs\\error.log"; // 错误日志
 
         public static int SHADOW_WIDTH = 20;
 

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/PasswordType.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GeekDesk.Constant
+{
+    public enum PasswordType
+    {
+        INPUT = 0, //键入密码
+        CREATE = 1, //新建密码
+        ALTER = 2, //修改密码
+        CANCEL = 3, //取消密码
+    }
+}

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,7 +14,31 @@ namespace GeekDesk.Constant
         public static bool MARGIN_HIDE_AND_OTHER_SHOW = false;
 
 
+        /// <summary>
+        /// 是否锁定主面板 锁定后 不执行隐藏动作
+        /// </summary>
+        public static bool LOCK_APP_PANEL = false;
 
 
+        /// <summary>
+        /// 是否弹出了菜单密码框
+        /// </summary>
+        public static bool SHOW_MENU_PASSWORDBOX = false;
+
+        /// <summary>
+        /// 是否弹出了右键菜单
+        /// </summary>
+        public static bool SHOW_RIGHT_BTN_MENU = false;
+
+        /// <summary>
+        /// 是否点击了面板功能按钮
+        /// </summary>
+        public static bool APP_BTN_IS_DOWN = false;
+
+        /// <summary>
+        /// 是否正在编辑菜单
+        /// </summary>
+        public static bool IS_MENU_EDIT = 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
 {
@@ -72,7 +62,7 @@ namespace GeekDesk.Control.Other
             }
             ToDoTask.activityBacklog[info].Close(); //关闭桌面通知
             ToDoTask.activityBacklog.Remove(info);//激活任务删除
-            CommonCode.SaveAppData(appData);
+            CommonCode.SaveAppData(appData, Constants.DATA_FILE_PATH);
         }
 
 

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/GlobalMsgNotification.xaml

@@ -0,0 +1,54 @@
+<Border x:Class="GeekDesk.Control.Other.GlobalMsgNotification"
+        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"
+        BorderThickness="0"
+        Style="{StaticResource BorderBG}"
+        Margin="15"
+        BorderBrush="{DynamicResource BorderBrush}"
+        Width="320"
+        Height="400">
+    <Border.Background>
+        <SolidColorBrush Color="AliceBlue" Opacity="0.96"/>
+    </Border.Background>
+    <Grid>
+
+        <StackPanel>
+            <Image Source="/Resource/Image/BacklogImg.png" Width="260" Margin="0,20,0,0"/>
+            <hc:Card Width="260" Height="220" BorderThickness="0" Effect="{DynamicResource EffectShadow2}" Margin="0,20,0,0">
+            
+            <Border CornerRadius="4,4,0,0" Height="160" Padding="10,0,10,0">
+                    <ScrollViewer>
+                        <TextBlock TextOptions.TextFormattingMode="Display"
+                                   TextOptions.TextHintingMode="Animated"
+                                   UseLayoutRounding="True"
+                                   TextWrapping="Wrap"
+                                   FontStyle="Normal"
+                                   FontSize="15"
+                                   LineHeight="22"
+                                   VerticalAlignment="Center"
+                                   HorizontalAlignment="Center"
+                                   Text="{Binding Msg}"/>
+                    </ScrollViewer>
+            </Border>
+            
+            
+            <!--<hc:Card.Footer>
+                <StackPanel Margin="10" Width="160">
+            
+                    <TextBlock TextWrapping="NoWrap" FontSize="20"  Style="{DynamicResource TextBlockLargeBold}" TextTrimming="CharacterEllipsis" 
+                                       Text="{Binding Title}" 
+                                       HorizontalAlignment="Left"/>
+                    
+            
+                    <TextBlock TextWrapping="NoWrap" Style="{DynamicResource TextBlockDefault}" TextTrimming="CharacterEllipsis" 
+                                        Margin="0,6,0,0"
+                                       HorizontalAlignment="Left"/>
+                </StackPanel>
+            </hc:Card.Footer>-->
+        </hc:Card>
+        </StackPanel>
+
+        <Button Click="Close_Click" Content="朕已阅" Margin="10,0,10,20" Width="298" VerticalAlignment="Bottom"/>
+    </Grid>
+</Border>

Control/Other/GlobalMsgNotification.xaml.cs

@@ -0,0 +1,61 @@
+using GeekDesk.Constant;
+using GeekDesk.Task;
+using GeekDesk.Util;
+using GeekDesk.ViewModel;
+using HandyControl.Controls;
+using Quartz;
+using System;
+using System.Windows;
+using System.Windows.Input;
+
+namespace GeekDesk.Control.Other
+{
+    /// <summary>
+    /// BacklogNotificatin.xaml 的交互逻辑
+    /// </summary>
+    public partial class GlobalMsgNotification
+    {
+
+        public Notification ntf;
+        public GlobalMsgNotification(DialogMsg msg)
+        {
+            InitializeComponent();
+            this.DataContext = msg;
+        }
+
+
+        public class DialogMsg
+        {
+            public string msg;
+            public string title;
+
+            public string Msg
+            {
+                get
+                {
+                    return msg;
+                }
+                set
+                {
+                    msg = value;
+                }
+            }
+            public string Title
+            {
+                get
+                {
+                    return title;
+                }
+                set
+                {
+                    title = value;
+                }
+            }
+        }
+
+        private void Close_Click(object sender, RoutedEventArgs e)
+        {
+            ntf.Close();
+        }
+    }
+}

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

@@ -2,6 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:hc="https://handyorg.github.io/handycontrol"
+        xmlns:cvt="clr-namespace:GeekDesk.Converts"
         CornerRadius="4"
         Width="350"
         Height="450"
@@ -10,29 +11,39 @@
     <Border.Resources>
         <Style x:Key="LeftTB" TargetType="TextBlock" BasedOn="{StaticResource TextBlockBaseStyle}">
             <Setter Property="Width" Value="75"/>
-            <Setter Property="TextAlignment" Value="Center"/>
+            <Setter Property="TextAlignment" Value="Left"/>
             <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="Margin" Value="0,8,0,0"/>
+            <Setter Property="Margin" Value="5,8,0,0"/>
             <Setter Property="FontSize" Value="14"/>
         </Style>
+        <cvt:StringAppendConvert x:Key="StringAppendConvert"/>
     </Border.Resources>
     <hc:SimplePanel Margin="10" VerticalAlignment="Center">
         <StackPanel>
             <Button Width="22"  Height="22" Command="hc:ControlCommands.Close" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top"/>
-            <hc:UniformSpacingPanel Spacing="10">
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,15,0,0">
                 <TextBlock Text="名称:"  Style="{StaticResource LeftTB}"/>
                 <TextBox x:Name="IconName" Text="{Binding Name, Mode=OneWay}" Width="230" FontSize="14"/>
             </hc:UniformSpacingPanel>
-            <hc:Divider LineStrokeDashArray="3,3"  LineStroke="Black"/>
-            <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,15,0,0">
+                <TextBlock Text="相对路径:"  Style="{StaticResource LeftTB}"/>
+                <TextBlock Text="{Binding RelativePath, Mode=OneWay}" 
+                           VerticalAlignment="Center"
+                           Margin="0,8,0,0"
+                           Width="230"
+                           FontSize="14"
+                           TextTrimming="WordEllipsis"
+                           hc:Poptip.Placement="Bottom"
+                           hc:Poptip.Content="{Binding RelativePath, Mode=OneWay, Converter={StaticResource StringAppendConvert}, ConverterParameter='\{\}\\\n(同盘符下才会建立相对路径)'}"/>
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,15,0,0">
                 <TextBlock  Text="图标:"  Style="{StaticResource LeftTB}"/>
                 <Image x:Name="IconImg" Source="{Binding BitmapImage, Mode=OneWay}" RenderOptions.BitmapScalingMode="HighQuality" Width="60" Height="60"/>
                 <Button Content="修改" Click="EditImage"/>
                 <Button Content="重置" Click="ReStoreImage"/>
             </hc:UniformSpacingPanel>
-            <hc:Divider LineStrokeDashArray="3,3"  LineStroke="Black" Grid.ColumnSpan="4"/>
-            <hc:UniformSpacingPanel Spacing="10">
+            <hc:UniformSpacingPanel Spacing="10" Margin="4,15,0,0">
                 <CheckBox x:Name="IconIsAdmin" Content="始终以管理员方式启动" IsChecked="{Binding AdminStartUp, Mode=OneWay}">
                     <CheckBox.Background>
                         <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
@@ -41,12 +52,11 @@
                     </CheckBox.Background>
                 </CheckBox>
             </hc:UniformSpacingPanel>
-            <hc:Divider LineStrokeDashArray="3,3"  LineStroke="Black" Grid.ColumnSpan="4"/>
-            <hc:UniformSpacingPanel Spacing="10">
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,15,0,0">
                 <TextBlock Text="启动参数:"  Style="{StaticResource LeftTB}"/>
                 <TextBox x:Name="StartArg" Text="{Binding StartArg, Mode=OneWay}" Width="230" Height="100" TextWrapping="Wrap" FontSize="14"/>
             </hc:UniformSpacingPanel>
-            <hc:UniformSpacingPanel Spacing="10"  Grid.ColumnSpan="4">
+            <hc:UniformSpacingPanel Margin="0,25,0,0" Spacing="10"  Grid.ColumnSpan="4">
                 <Button Content="保存" Style="{StaticResource Btn1}" Click="SaveProperty" Margin="265,10,0,0"/>
             </hc:UniformSpacingPanel>
         </StackPanel>

Control/Other/IconInfoDialog.xaml.cs

@@ -1,9 +1,9 @@
-using GeekDesk.Util;
+using GeekDesk.Constant;
+using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using Microsoft.Win32;
 using System;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media.Imaging;
 
 
@@ -39,7 +39,7 @@ namespace GeekDesk.Control.Other
             info.Name = IconName.Text;
             info.AdminStartUp = IconIsAdmin.IsChecked.Value;
             info.StartArg = StartArg.Text;
-            CommonCode.SaveAppData(MainWindow.appData);
+            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
             dialog.Close();
         }
 
@@ -52,7 +52,7 @@ namespace GeekDesk.Control.Other
         {
             IconInfo info = this.DataContext as IconInfo;
             info.BitmapImage = ImageUtil.ByteArrToImage(info.DefaultImage);
-            CommonCode.SaveAppData(MainWindow.appData);
+            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
         }
 
         /// <summary>
@@ -73,7 +73,7 @@ namespace GeekDesk.Control.Other
                 {
                     IconInfo info = this.DataContext as IconInfo;
                     info.BitmapImage = ImageUtil.GetBitmapIconByPath(ofd.FileName);
-                    CommonCode.SaveAppData(MainWindow.appData);
+                    CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
                 }
             }
             catch (Exception e1)

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;
 
 
@@ -53,7 +52,7 @@ namespace GeekDesk.Control.Other
             {
                 MainWindow.appData.MenuList[MainWindow.appData.AppConfig.SelectedMenuIndex].IconList.Add(info);
             }
-            CommonCode.SaveAppData(MainWindow.appData);
+            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
             dialog.Close();
         }
 
@@ -66,7 +65,7 @@ namespace GeekDesk.Control.Other
         {
             IconInfo info = this.DataContext as IconInfo;
             info.BitmapImage = ImageUtil.ByteArrToImage(info.DefaultImage);
-            CommonCode.SaveAppData(MainWindow.appData);
+            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
         }
 
         /// <summary>
@@ -87,14 +86,15 @@ namespace GeekDesk.Control.Other
                 {
                     IconInfo info = this.DataContext as IconInfo;
                     info.BitmapImage = ImageUtil.GetBitmapIconByPath(ofd.FileName);
-                    CommonCode.SaveAppData(MainWindow.appData);
+                    CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
                 }
-            } 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/Other/PasswordDialog.xaml

@@ -0,0 +1,75 @@
+<Border x:Class="GeekDesk.Control.Other.PasswordDialog"
+        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"
+        xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
+        CornerRadius="6"
+        Width="300"
+        Height="150"
+        BorderThickness="0"
+        >
+    <Border.Resources>
+        <Style x:Key="PassBox" TargetType="PasswordBox" BasedOn="{StaticResource PasswordBoxBaseStyle}">
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="Width" Value="40"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="Focusable" Value="True"/>
+            <Setter Property="MaxLength" Value="1"/>
+            <EventSetter Event="PasswordChanged" Handler="PasswordBox_PasswordChanged"/>
+            <EventSetter Event="PreviewKeyDown" Handler="PasswordBox_KeyDown"/>
+        </Style>
+        <Style x:Key="NextTB" TargetType="TextBlock">
+            <Setter Property="Foreground" Value="#408CCB"/>
+            <Setter Property="TextDecorations" Value="Underline"/>
+            <Style.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter Property="Foreground" Value="Red"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </Border.Resources>
+    <Border.Background>
+        <SolidColorBrush Color="White" Opacity="0.7"/>
+    </Border.Background>
+    <StackPanel VerticalAlignment="Center">
+        <hc:UniformSpacingPanel Spacing="10"  VerticalAlignment="Center" HorizontalAlignment="Center">
+            <TextBlock x:Name="Title" Text="请输入密码"
+                       FontSize="15"/>
+        </hc:UniformSpacingPanel>
+        <Grid Height="65" x:Name="PasswordGrid" Visibility="Visible" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=Visibility}">
+            <TextBlock x:Name="HintMsg"
+                       Visibility="Hidden"
+                       VerticalAlignment="Top" 
+                       HorizontalAlignment="Center" 
+                       Width="250" 
+                       TextAlignment="Center" 
+                       Margin="0,3,0,0" 
+                       Text="提示:"
+                       hc:Poptip.Content="{Binding ElementName=HintMsg, Path=Text}"
+                       Foreground="Gray"/>
+            <hc:UniformSpacingPanel Margin="0,20,0,0" Spacing="10"  VerticalAlignment="Center" HorizontalAlignment="Center">
+                <PasswordBox x:Name="P1" Tag="P1" Style="{StaticResource PassBox}"/>
+                <PasswordBox x:Name="P2" Tag="P2" Style="{StaticResource PassBox}"/>
+                <PasswordBox x:Name="P3" Tag="P3" Style="{StaticResource PassBox}"/>
+                <PasswordBox x:Name="P4" Tag="P4" Style="{StaticResource PassBox}"/>
+            </hc:UniformSpacingPanel>
+            <TextBlock HorizontalAlignment="Right"
+                   x:Name="ErrorMsg"
+                   Margin="0,65,37,-65" 
+                   Foreground="Red" 
+                   Text="密码输入错误"
+                   Visibility="Visible"/>
+        </Grid>
+        <Grid Height="65" x:Name="HintGrid" Visibility="Collapsed" Margin="0,20,0,0" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeIn}, Event=Visibility}">
+            <hc:UniformSpacingPanel Spacing="10"  VerticalAlignment="Top" HorizontalAlignment="Center">
+                <hc:TextBox x:Name="HintBox" TextAlignment="Left" Width="220"/>
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Spacing="10" Margin="202,35,0,0"  VerticalAlignment="Top" HorizontalAlignment="Left">
+                <TextBlock Text="跳过" MouseLeftButtonDown="NextTB_MouseLeftButtonDown"  Style="{StaticResource NextTB}"/>
+                <TextBlock Text="完成" MouseLeftButtonDown="DoneTB_MouseLeftButtonDown" Style="{StaticResource NextTB}"/>
+            </hc:UniformSpacingPanel>
+        </Grid>
+    </StackPanel>
+</Border>

Control/Other/PasswordDialog.xaml.cs

@@ -0,0 +1,280 @@
+using GeekDesk.Constant;
+using GeekDesk.Util;
+using GeekDesk.ViewModel;
+using Microsoft.Win32;
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media.Imaging;
+using System.Windows.Threading;
+
+namespace GeekDesk.Control.Other
+{
+    /// <summary>
+    /// TextDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class PasswordDialog
+    {
+        private AppData appData = MainWindow.appData;
+        
+        public PasswordType type;
+        public MenuInfo menuInfo;
+        public int count = 0;
+        private string tempPassword = null;
+        private PasswordType tempType;
+        public PasswordDialog()
+        {
+            InitializeComponent();
+        }
+        private void PasswordBox_PasswordChanged(object sender, RoutedEventArgs e)
+        {
+            PasswordBox pb = sender as PasswordBox;
+            if (!string.IsNullOrEmpty(pb.Password))
+            {
+                char c = pb.Password.ToCharArray()[0];
+                if (c > '9' || c < '0')
+                {
+                    pb.Password = "";
+                    return;
+                }
+            }
+            string tag = pb.Tag.ToString();
+            switch (tag)
+            {
+                case "P1":
+                    if (!string.IsNullOrEmpty(pb.Password))
+                    {
+                        P2.Focus();
+                    }
+                    break;
+                case "P2":
+                    if (!string.IsNullOrEmpty(pb.Password))
+                    {
+                        P3.Focus();
+                    }
+                    break;
+                case "P3":
+                    if (!string.IsNullOrEmpty(pb.Password))
+                    {
+                        P4.Focus();
+                    }
+                    break;
+                case "P4":
+                    if (string.IsNullOrEmpty(pb.Password))
+                    {
+                        P3.Focus();
+                    }
+                    break;
+            }
+
+            if (!string.IsNullOrEmpty(P1.Password)
+                    && !string.IsNullOrEmpty(P2.Password)
+                    && !string.IsNullOrEmpty(P3.Password)
+                    && !string.IsNullOrEmpty(P4.Password))
+            {
+                string pw = P1.Password
+                    + P2.Password
+                    + P3.Password
+                    + P4.Password;
+                pw = MD5Util.CreateMD5(pw);
+                if (type == PasswordType.INPUT || type == PasswordType.CANCEL)
+                {
+                    if (pw.Equals(appData.AppConfig.MenuPassword))
+                    {
+                        //隐藏弹框
+                        MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Collapsed;
+                        //赋值
+                        MainWindow.appData.AppConfig.SelectedMenuIcons
+                            = appData.MenuList[
+                                MainWindow.mainWindow.LeftCard.MenuListBox.SelectedIndex
+                                ].IconList;
+                        //显示数据托盘
+                        MainWindow.mainWindow.RightCard.WrapUFG.Visibility = Visibility.Visible;
+                        //取消加密操作
+                        if (type == PasswordType.CANCEL)
+                        {
+                            menuInfo.IsEncrypt = false;
+                        }
+                    } else
+                    {
+                        //密码比对不一致
+                        ErrorMsg.Text = "密码输入错误";
+                        ErrorMsg.Visibility = Visibility.Visible;
+                        if (!string.IsNullOrEmpty(appData.AppConfig.PasswordHint))
+                        {
+                            //显示提示信息
+                            HintMsg.Visibility = Visibility.Visible;
+                        }
+                    }
+                } else if (type == PasswordType.CREATE)
+                {
+                    //创建密码
+                    if (count == 0)
+                    {
+                        count++;
+                        tempPassword = pw;
+                        Title.Text = "再次输入密码";
+                        ClearVal();
+                        SetFocus(0);
+                    } else
+                    {
+                        if (tempPassword.Equals(pw))
+                        {
+                            //两次密码设置一致  显示提示输入框
+                            Title.Text = "填写密码提示";
+                            PasswordGrid.Visibility = Visibility.Collapsed;
+                            HintGrid.Visibility = Visibility.Visible;
+                            HintBox.Focus();
+                        } else
+                        {
+                            ErrorMsg.Text = "两次密码输入不一致";
+                            ErrorMsg.Visibility = Visibility.Visible;
+                        }
+                    }
+                } else if (type == PasswordType.ALTER)
+                {
+                    //修改密码
+                    if (appData.AppConfig.MenuPassword.Equals(pw))
+                    {
+                        tempType = type;
+                        type = PasswordType.CREATE;
+                        Title.Text = "设置新密码";
+                        ClearVal();
+                        SetFocus(0);
+                    } else
+                    {
+                        //密码比对不一致
+                        ErrorMsg.Text = "密码输入错误";
+                        ErrorMsg.Visibility = Visibility.Visible;
+                        HintMsg.Text = MainWindow.appData.AppConfig.PasswordHint;
+                        HintMsg.Visibility = Visibility.Visible;
+                    }
+                }
+            } else
+            {
+                //密码未输入完全  隐藏错误信息
+                if (ErrorMsg.IsVisible)
+                {
+                    ErrorMsg.Visibility = Visibility.Hidden;
+                    HintMsg.Visibility = Visibility.Hidden;
+                    HintMsg.Visibility = Visibility.Hidden;
+                }
+            }
+        }
+
+        public void SetFocus(int time = 100)
+        {
+            new Thread(() =>
+            {
+                Thread.Sleep(time);
+                Dispatcher.Invoke(() =>
+                {
+                    if (string.IsNullOrEmpty(P1.Password))
+                    {
+                        P1.Focus();
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(P2.Password))
+                    {
+                        P2.Focus();
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(P3.Password))
+                    {
+                        P3.Focus();
+                        return;
+                    }
+                    P4.Focus();
+                });
+            }).Start();
+        }
+
+        public void ClearVal()
+        {
+            P1.Clear();
+            P2.Clear();
+            P3.Clear();
+            P4.Clear();
+        }
+
+        /// <summary>
+        /// 跳过设置密码提示
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void NextTB_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            appData.AppConfig.PasswordHint = "";
+            DonePassword();
+        }
+
+        private void DoneTB_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            string hint = HintBox.Text.Trim();
+            appData.AppConfig.PasswordHint = hint;
+            DonePassword();
+        }
+
+        private void DonePassword()
+        {
+            appData.AppConfig.MenuPassword = tempPassword;
+            CommonCode.SavePassword(tempPassword);
+            MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Collapsed;
+            PasswordGrid.Visibility = Visibility.Visible;
+            HintGrid.Visibility = Visibility.Collapsed;
+            if (tempType == PasswordType.ALTER)
+            {
+                HandyControl.Controls.Growl.Success("密码修改成功!", "MainWindowGrowl");
+            } else
+            {
+                menuInfo.IsEncrypt = true;
+                HandyControl.Controls.Growl.Success(menuInfo.MenuName + " 已加密!", "MainWindowGrowl");
+            }
+
+        }
+
+        private void PasswordBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Back)
+            {
+                if (P2.IsKeyboardFocused)
+                {
+                    if (string.IsNullOrEmpty(P2.Password))
+                    {
+                        P1.Password = "";
+                    } else
+                    {
+                        P2.Password = "";
+                    }
+                }
+
+                if (P3.IsKeyboardFocused)
+                {
+                    if (string.IsNullOrEmpty(P3.Password))
+                    {
+                        P2.Password = "";
+                    }
+                    else
+                    {
+                        P3.Password = "";
+                    }
+                }
+
+                if (P4.IsKeyboardFocused)
+                {
+                    if (string.IsNullOrEmpty(P4.Password))
+                    {
+                        P3.Password = "";
+                    }
+                    else
+                    {
+                        P4.Password = "";
+                    }
+                }
+            }
+            SetFocus(0);
+        }
+    }
+}

Control/UserControls/Config/AboutControl.xaml

@@ -4,6 +4,7 @@
              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:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
              xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              mc:Ignorable="d" 
@@ -16,20 +17,28 @@
     <Grid MouseDown="DragMove">
         <hc:SimplePanel Margin="20,50,20,20" >
             <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top">
-                <Image Source="/Resource/Image/About.png" Width="400" Height="100"/>
+                <Image Source="/Resource/Image/About.png"
+                       Width="400"
+                       Height="100"
+                       xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndContract}, Delay=250}"
+                       />
                 <TextBlock x:Name="AppInfo"  TextAlignment="Center"  Text="Copyright ©  2021 GeekDesk V"/>
                 <hc:UniformSpacingPanel Spacing="5" HorizontalAlignment="Center" Margin="10,10,0,0" VerticalAlignment="Center">
                     <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" 
           >
@@ -80,15 +84,7 @@
                 </CheckBox>
             </hc:UniformSpacingPanel>
 
-            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="主窗口动画效果" IsChecked="{Binding AppAnimation}" Click="Animation_Checked">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
-            </hc:UniformSpacingPanel>
+            
 
             <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="面板关闭方式" VerticalAlignment="Center"/>
@@ -105,34 +101,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,128 @@ namespace GeekDesk.Control.UserControls.Config
         /// <param name="e"></param>
         private void HotKeyDown(object sender, KeyEventArgs e)
         {
-            string tag = (sender as TextBox).Tag.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;
+
+                
+                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;
+                            }
+                            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();
+                            if (keyProp.character == '\x00')
+                            {
+                                downKeyStr = downKey.ToString();
+                            }
+                            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 +211,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 +232,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>
@@ -267,15 +306,6 @@ namespace GeekDesk.Control.UserControls.Config
             }
         }
 
-        private void Animation_Checked(object sender, RoutedEventArgs e)
-        {
-            if (MainWindow.mainWindow.Visibility == Visibility.Collapsed)
-            {
-                MainWindow.mainWindow.Visibility = Visibility.Visible;
-                // 执行一下动画 防止太过突兀
-                MainWindow.FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
-            }
-        }
 
 
         /// <summary>
@@ -295,5 +325,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

@@ -93,6 +93,16 @@
                              Foreground="Black"
                              IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=2}"/>
                 </hc:UniformSpacingPanel>
+                
+                <TextBlock Text="其它"  Margin="0,25,0,0"/>
+                <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
+                    <Button Content="备份数据" 
+                            hc:Poptip.Content="当数据文件损坏时, 以便能够恢复部分数据 (损坏时将有操作提示)"
+                            hc:Poptip.Placement="TopLeft"
+                            hc:Poptip.Offset="10"
+                            Style="{StaticResource Btn1}" 
+                            Click="BakDataFile"/>
+                </hc:UniformSpacingPanel>
             </StackPanel>
         </hc:SimplePanel>
     </Grid>

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
 {
@@ -118,5 +107,10 @@ namespace GeekDesk.Control.UserControls.Config
                 CountLowSort.Visibility = Visibility.Visible;
             }
         }
+
+        private void BakDataFile(object sender, RoutedEventArgs e)
+        {
+            CommonCode.BakAppData();
+        }
     }
 }

Control/UserControls/Config/ThemeControl.xaml

@@ -2,35 +2,116 @@
              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}">
+                <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,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  Content="主窗口动画" IsChecked="{Binding AppAnimation}" Click="Animation_Checked">
                         <CheckBox.Background>
                             <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                                 <GradientStop Color="#FF9EA3A6"/>
@@ -38,8 +119,16 @@
                         </CheckBox.Background>
                     </CheckBox>
                 </hc:UniformSpacingPanel>
-
-                <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0"  Grid.ColumnSpan="4">
+                <hc:UniformSpacingPanel Spacing="10" Margin="5,10,0,0" Grid.ColumnSpan="4">
+                    <CheckBox  Content="列表展开动画" IsChecked="{Binding ItemSpradeAnimation}">
+                        <CheckBox.Background>
+                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                <GradientStop Color="#FF9EA3A6"/>
+                            </LinearGradientBrush>
+                        </CheckBox.Background>
+                    </CheckBox>
+                </hc:UniformSpacingPanel>
+                <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 +138,20 @@
                     </CheckBox>
                 </hc:UniformSpacingPanel>
 
-                <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
+                <hc:UniformSpacingPanel Spacing="10" Margin="5,10,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 +164,17 @@
                         </hc:PreviewSlider>
                     </hc:UniformSpacingPanel>
 
+                   
 
                     <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" 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 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>
@@ -82,7 +182,7 @@
                     </hc:UniformSpacingPanel>
 
 
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                    <!--<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">
@@ -95,7 +195,7 @@
                                 <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
                             </hc:PreviewSlider.PreviewContent>
                         </hc:PreviewSlider>
-                    </hc:UniformSpacingPanel>
+                    </hc:UniformSpacingPanel>-->
 
                     <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                         <TextBlock Text="主面板圆角大小" VerticalAlignment="Center"/>
@@ -131,28 +231,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,47 @@ 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");
+        }
+
+
+        private void Animation_Checked(object sender, RoutedEventArgs e)
+        {
+            if (MainWindow.mainWindow.Visibility == Visibility.Collapsed)
+            {
+                appConfig.IsShow = true;
+            }
+            appConfig.IsShow = null;
+        }
 
     }
 }

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

@@ -6,9 +6,11 @@
              xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
+             xmlns:cst="clr-namespace:GeekDesk.Constant"
              xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="450" d:DesignWidth="800"
+             >
     <UserControl.Resources>
 
         <!--左侧栏样式动画-->
@@ -17,11 +19,18 @@
             <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="AllowDrop" Value="True"/>
+            <EventSetter Event="Drop" Handler="Menu_Drop"/>
+            <EventSetter Event="PreviewDragEnter" Handler="Menu_PreviewDragEnter"/>
+            <EventSetter Event="PreviewDragLeave" Handler="Menu_PreviewDragLeave"/>
+            <EventSetter Event="MouseLeave" Handler="Menu_MouseLeave"/>
             <Setter Property="FocusVisualStyle" Value="{x:Null}" />
             <EventSetter Event="MouseEnter" Handler="Menu_MouseEnter"/>
+            <EventSetter Event="PreviewMouseLeftButtonDown" Handler="ListBoxItem_MouseDown"/>
+            <EventSetter Event="PreviewMouseRightButtonDown" Handler="ListBoxItem_PreviewMouseRightButtonDown"/>
             <!--<EventSetter Event="Unselected" Handler="Lbi_Unselected"/>-->
             <Style.Triggers>
                 <MultiTrigger>
@@ -44,7 +53,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>
@@ -65,109 +78,149 @@
                     <Setter Property="Foreground" Value="Black"/>
                 </Trigger>-->
                 <Trigger Property="IsMouseOver" Value="False">
-                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="Background" Value="#00FFFFFF"/>
                     <Setter Property="Foreground" Value="Black"/>
                 </Trigger>
 
 
             </Style.Triggers>
         </Style>
+        <Style x:Key="MyPoptipStyle" TargetType="Border">
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Background" Value="White"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
+            <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
+            <!--<Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="hc:Poptip">
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+                            <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>-->
+        </Style>
+
         <cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
+        <cvt:StringAppendConvert x:Key="StringAppendConvert"/>
     </UserControl.Resources>
-    <!--左侧栏-->
-    <hc:Card x:Name="MyCard"
-             BorderThickness="1"
-             Effect="{DynamicResource EffectShadow2}" 
-             Margin="5,0,0,5"
-             MouseDown="MyCard_MouseDown"
-             >
-        <hc:Card.Background>
-            <SolidColorBrush Color="#FFFFFFFF" hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
+    <Grid Background="Transparent">
+        <Popup Name="MyPoptip" FlowDirection="LeftToRight" 
+               PopupAnimation="None" Placement="Mouse" IsOpen="False"
+               AllowsTransparency="True"
+               >
+            <Grid Background="Transparent">
+                <Border Style="{StaticResource MyPoptipStyle}">
+                    <TextBlock Name="MyPoptipContent" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" Text="Test" FontSize="14"/>
+                </Border>
+            </Grid>
+        </Popup>
 
-            </SolidColorBrush>
-        </hc:Card.Background>
-        <hc:Card.BorderBrush>
-            <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
-        </hc:Card.BorderBrush>
-        <hc:Card.ContextMenu>
-            <ContextMenu Width="200">
-                <MenuItem Header="新建菜单" Click="CreateMenu"/>
-            </ContextMenu>
-        </hc:Card.ContextMenu>
-        <WrapPanel Orientation="Horizontal">
-            <ListBox x:Name="MenuListBox"
-                     Padding="2,3,0,2"
-                     ItemsSource="{Binding MenuList}"
-                     Tag="{Binding AppConfig.MenuCardWidth}"
-                     BorderThickness="0" Foreground="{x:Null}"
-                     SelectedIndex="{Binding AppConfig.SelectedMenuIndex}"
-                     VirtualizingPanel.VirtualizationMode="Recycling"
-                     SelectionChanged="Menu_SelectionChanged"
-                     >
-                <ListBox.Resources>
-                    <ContextMenu x:Key="MenuDialog" Width="200">
-                        <MenuItem Header="新建菜单" Click="CreateMenu"/>
-                        <MenuItem Header="重命名"  Click="RenameMenu" Tag="{Binding}"/>
-                        <MenuItem Header="修改图标"  Click="EditMenuGeometry" Tag="{Binding}"/>
-                        <MenuItem Header="删除" Click="DeleteMenu" Tag="{Binding}"/>
-                    </ContextMenu>
-                </ListBox.Resources>
+        <!--左侧栏-->
+        <hc:Card x:Name="MyCard"
+                 BorderThickness="1"
+                 Effect="{DynamicResource EffectShadow2}" 
+                 Margin="5,0,0,5"
+                 MouseDown="MyCard_MouseDown"
+                 PreviewMouseRightButtonDown="MyCard_PreviewMouseRightButtonDown"
+                 >
+            <hc:Card.Background>
+                <SolidColorBrush Color="#FFFFFFFF" hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
 
-                <ListBox.ItemContainerStyle>
-                    <Style TargetType="ListBoxItem" BasedOn="{StaticResource MenuStyle}">
-                        <Setter Property="ContextMenu" Value="{StaticResource MenuDialog}"/>
-                    </Style>
-                </ListBox.ItemContainerStyle>
-                <ListBox.Background>
-                    <SolidColorBrush Color="AliceBlue" Opacity="0"/>
-                </ListBox.Background>
+                </SolidColorBrush>
+            </hc:Card.Background>
+            <hc:Card.BorderBrush>
+                <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
+            </hc:Card.BorderBrush>
+            <hc:Card.ContextMenu>
+                <ContextMenu Width="200">
+                    <MenuItem Header="新建菜单" Click="CreateMenu"/>
+                    <MenuItem x:Name="AlterPW1" Header="修改密码" Click="AlterPassword"/>
+                </ContextMenu>
+            </hc:Card.ContextMenu>
 
-                <ListBox.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <DraggAnimatedPanel:DraggAnimatedPanel ItemsHeight="33" ItemsWidth="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=10}"   HorizontalAlignment="Center" VerticalAlignment="Top" SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
-                    </ItemsPanelTemplate>
-                </ListBox.ItemsPanel>
+            <WrapPanel Orientation="Horizontal">
+                <ListBox x:Name="MenuListBox"
+                         Padding="2,3,0,2"
+                         ItemsSource="{Binding MenuList}"
+                         Tag="{Binding AppConfig.MenuCardWidth}"
+                         BorderThickness="0" Foreground="{x:Null}"
+                         SelectedIndex="{Binding AppConfig.SelectedMenuIndex}"
+                         VirtualizingPanel.VirtualizationMode="Recycling"
+                         SelectionChanged="Menu_SelectionChanged"
+                         PreviewMouseWheel="Menu_MouseWheel"
+                         PreviewMouseRightButtonDown="MyCard_PreviewMouseRightButtonDown"
+                         >
+                    <ListBox.Resources>
+                        <ContextMenu x:Key="MenuDialog" Width="200">
+                            <MenuItem Header="新建菜单" Click="CreateMenu"/>
+                            <MenuItem Header="重命名"  Click="RenameMenu" Tag="{Binding}"/>
+                            <MenuItem Header="加密此列表"  Click="EncryptMenu" Tag="{Binding}"/>
+                            <MenuItem x:Name="AlterPW2" Header="修改密码" Click="AlterPassword"/>
+                            <MenuItem Header="修改图标"  Click="EditMenuGeometry" Tag="{Binding}"/>
+                            <MenuItem Header="删除" Click="DeleteMenu" Tag="{Binding}"/>
+                        </ContextMenu>
+                    </ListBox.Resources>
 
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Tag="{Binding}" MouseDown="ListBoxItem_MouseDown">
-                            <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}"
-                                    FontSize="16"
-                                    Height="28"
-                                    VerticalAlignment="Center"
-                                    TextAlignment="Left"
-                                    LostFocus="LostFocusOrEnterDown"
-                                    KeyDown="LostFocusOrEnterDown"
-                                    Tag="{Binding}"
-                                    Padding="2"
+                    <ListBox.ItemContainerStyle>
+                        <Style TargetType="ListBoxItem" BasedOn="{StaticResource MenuStyle}">
+                            <Setter Property="ContextMenu" Value="{StaticResource MenuDialog}"/>
+                        </Style>
+                    </ListBox.ItemContainerStyle>
+                    <ListBox.Background>
+                        <SolidColorBrush Color="AliceBlue" Opacity="0"/>
+                    </ListBox.Background>
+
+                    <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <DraggAnimatedPanel:DraggAnimatedPanel ItemsHeight="33" ItemsWidth="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=10}"   HorizontalAlignment="Center" VerticalAlignment="Top" SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
+                        </ItemsPanelTemplate>
+                    </ListBox.ItemsPanel>
+
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <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}"
+                                FontSize="16"
+                                Height="28"
+                                VerticalAlignment="Center"
+                                TextAlignment="Left"
+                                LostFocus="LostFocusOrEnterDown"
+                                KeyDown="LostFocusOrEnterDown"
+                                Tag="{Binding}"
+                                Padding="2"
+                                BorderThickness="0"
+                                IsVisibleChanged="MenuEditWhenVisibilityChanged"
+                                Visibility="{Binding MenuEdit}"/>
+                                <StackPanel Orientation="Horizontal"
+                                IsVisibleChanged="MenuWhenVisibilityChanged"
+                                Visibility="{Binding NotMenuEdit}">
+                                    <Button Background="Transparent" 
                                     BorderThickness="0"
-                                    IsVisibleChanged="MenuEditWhenVisibilityChanged"
-                                    Visibility="{Binding MenuEdit}"/>
-                            <StackPanel Orientation="Horizontal"
-                                    IsVisibleChanged="MenuWhenVisibilityChanged"
-                                    Visibility="{Binding NotMenuEdit}">
-                                <Button Background="Transparent" 
-                                        BorderThickness="0"
-                                        hc:IconElement.Geometry="{Binding MenuGeometry}"
-                                        hc:IconElement.Height="18"
-                                        hc:IconElement.Width="18"
-                                        IsEnabled="False"
-                                        Opacity="1"
-                                        Foreground="{Binding GeometryColor}"
+                                    hc:IconElement.Geometry="{Binding MenuGeometry}"
+                                    hc:IconElement.Height="18"
+                                    hc:IconElement.Width="18"
+                                    IsEnabled="False"
+                                    Opacity="1"
+                                    Foreground="{Binding GeometryColor}"
+                                    />
+                                    <TextBlock Text="{Binding MenuName}"
+                                        HorizontalAlignment="Center"
+                                        TextAlignment="Center"
+                                        VerticalAlignment="Center"
                                         />
-                                <TextBlock Text="{Binding MenuName}"
-                                           HorizontalAlignment="Center"
-                                           TextAlignment="Center"
-                                           VerticalAlignment="Center"
-                                            />
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
-        </WrapPanel>
-    </hc:Card>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </WrapPanel>
+        </hc:Card>
+    </Grid>
 </UserControl>

Control/UserControls/PannelCard/LeftCardControl.xaml.cs

@@ -1,7 +1,7 @@
 using DraggAnimatedPanelExample;
 using GeekDesk.Constant;
+using GeekDesk.Control.Other;
 using GeekDesk.Control.Windows;
-using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using System;
@@ -10,10 +10,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
 {
@@ -27,13 +25,10 @@ namespace GeekDesk.Control.UserControls.PannelCard
         private SolidColorBrush bac = new SolidColorBrush(Color.FromRgb(236, 236, 236));
 
 
-        //是否正在修改菜单
-        private static bool IS_EDIT = false;
-
         public LeftCardControl()
         {
             InitializeComponent();
-           
+
 
             this.Loaded += (s, e) =>
             {
@@ -44,7 +39,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
 
         private void SetMenuListBoxItemEvent()
-        {            
+        {
             int size = MenuListBox.Items.Count;
             for (int i = 0; i < size; i++)
             {
@@ -87,7 +82,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
         }
 
-    DelegateCommand<int[]> _swap;
+        DelegateCommand<int[]> _swap;
 
         public DelegateCommand<int[]> SwapCommand
         {
@@ -208,9 +203,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void RenameMenu(object sender, RoutedEventArgs e)
         {
+            RunTimeStatus.IS_MENU_EDIT = true;
             MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
             menuInfo.MenuEdit = (int)Visibility.Visible;
-            IS_EDIT = true;
         }
 
         /// <summary>
@@ -278,7 +273,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
                     menuInfo.MenuName = text;
                     menuInfo.MenuEdit = Visibility.Collapsed;
                 }
-                IS_EDIT = false;
+                RunTimeStatus.IS_MENU_EDIT = false;
+                //为了解决无法修改菜单的问题
+                MainWindow.mainWindow.SearchBox.Focus();
                 MenuListBox.SelectedIndex = menuSelectIndexTemp;
             }
         }
@@ -312,6 +309,14 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
         private void Menu_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
+            if (RunTimeStatus.IS_MENU_EDIT) return;
+
+            if (appData.AppConfig.ItemSpradeAnimation)
+            {
+                //是否启用列表展开动画
+                MainWindow.mainWindow.RightCard.WrapUFG.Visibility = Visibility.Collapsed;
+            }
+
             //设置对应菜单的图标列表
             if (MenuListBox.SelectedIndex == -1)
             {
@@ -319,8 +324,20 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
             else
             {
-                appData.AppConfig.SelectedMenuIcons = appData.MenuList[MenuListBox.SelectedIndex].IconList;
+                if (appData.MenuList[MenuListBox.SelectedIndex].IsEncrypt)
+                {
+                    appData.AppConfig.SelectedMenuIcons = null;
+                    RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
+                    MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入密码";
+                    MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Collapsed;
+                    appData.AppConfig.SelectedMenuIcons = appData.MenuList[MenuListBox.SelectedIndex].IconList;
+                }
             }
+            MainWindow.mainWindow.RightCard.WrapUFG.Visibility = Visibility.Visible;
         }
 
 
@@ -331,9 +348,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void Menu_MouseEnter(object sender, MouseEventArgs e)
         {
-            if (appData.AppConfig.HoverMenu && !IS_EDIT)
+            if (appData.AppConfig.HoverMenu && !RunTimeStatus.IS_MENU_EDIT)
             {
-                new Thread(() =>
+                Thread t = new Thread(() =>
                 {
                     Thread.Sleep(200);
                     this.Dispatcher.Invoke(() =>
@@ -345,7 +362,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
                             MenuListBox.SelectedIndex = index;
                         }
                     });
-                }).Start();
+                });
+                t.IsBackground = true;
+                t.Start();
             }
         }
 
@@ -356,11 +375,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 +416,163 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 MainWindow.mainWindow.HidedSearchBox();
             }
         }
+
+        private void Menu_MouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            if (RunTimeStatus.IS_MENU_EDIT) return;
+            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;
+            }
+        }
+       
+
+        private void Menu_PreviewDragLeave(object sender, DragEventArgs e)
+        {
+            MyPoptip.IsOpen = false;
+        }
+
+        private void Menu_PreviewDragEnter(object sender, DragEventArgs e)
+        {
+            MenuInfo mi = (sender as ListBoxItem).DataContext as MenuInfo;
+            MyPoptipContent.Text = "移动至:" + mi.MenuName;
+            MyPoptip.VerticalOffset = 30;
+            MyPoptip.IsOpen = true;
+        }
+
+        private void Menu_MouseLeave(object sender, MouseEventArgs e)
+        {
+            MyPoptip.IsOpen = false;
+        }
+
+        private void Menu_Drop(object sender, DragEventArgs e)
+        {
+            MyPoptip.IsOpen = false;
+
+            MenuInfo mi = (sender as ListBoxItem).DataContext as MenuInfo;
+            IconInfo iconInfo = (IconInfo)e.Data.GetData(typeof(IconInfo));
+
+            appData.MenuList[MenuListBox.SelectedIndex].IconList.Remove(iconInfo);
+            appData.MenuList[MenuListBox.Items.IndexOf(mi)].IconList.Add(iconInfo);
+        }
+
+        private void EncryptMenu(object sender, RoutedEventArgs e)
+        {
+            MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
+            if (menuInfo.IsEncrypt)
+            {
+                MainWindow.mainWindow.RightCard.PDDialog.menuInfo = menuInfo;
+                MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入密码";
+                MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.CANCEL;
+                RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
+                MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
+                //单独设置焦点
+                MainWindow.mainWindow.RightCard.PDDialog.SetFocus();
+            } else
+            {
+                if (string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
+                {
+                    MainWindow.mainWindow.RightCard.PDDialog.menuInfo = menuInfo;
+                    MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "设置新密码";
+                    MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.CREATE;
+                    RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;                    
+                    MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    menuInfo.IsEncrypt = true;
+                    HandyControl.Controls.Growl.Success(menuInfo.MenuName + " 已加密!", "MainWindowGrowl");
+                }
+            }
+        }
+
+        private void AlterPassword(object sender, RoutedEventArgs e)
+        {
+            MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入旧密码";
+            MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.ALTER;
+            MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
+            //单独设置焦点
+            MainWindow.mainWindow.RightCard.PDDialog.SetFocus();
+        }
+
+        /// <summary>
+        /// 右键点击进行处理 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MyCard_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            RunTimeStatus.SHOW_RIGHT_BTN_MENU = true;
+            new Thread(() =>
+            {
+                Thread.Sleep(50);
+                RunTimeStatus.SHOW_RIGHT_BTN_MENU = false;
+            }).Start();
+
+            //在没有设置密码的情况下不弹出修改密码菜单
+            if (string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
+            {
+                AlterPW1.Visibility = Visibility.Collapsed;
+            } else
+            {
+                AlterPW1.Visibility = Visibility.Visible;
+            }
+        }
+
+        private void ListBoxItem_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            ListBoxItem lbi = sender as ListBoxItem;
+            MenuInfo info = lbi.DataContext as MenuInfo;
+
+            ItemCollection ics =  lbi.ContextMenu.Items;
+
+            foreach (object obj in ics)
+            {
+                MenuItem mi = (MenuItem)obj;
+                if (mi.Header.Equals("修改密码"))
+                {
+                    if (string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
+                    {
+                        mi.Visibility = Visibility.Collapsed;
+                    }
+                    else
+                    {
+                        mi.Visibility = Visibility.Visible;
+                    }
+                    break;
+                }
+                if (mi.Header.Equals("加密此列表") || mi.Header.Equals("取消加密此列表"))
+                {
+                    if (info.IsEncrypt)
+                    {
+                        mi.Header = "取消加密此列表";
+                    } else
+                    {
+                        mi.Header = "加密此列表";
+                    }
+                }
+            }
+
+        }
     }
 }

Control/UserControls/PannelCard/RightCardControl.xaml

@@ -7,6 +7,8 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
              xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
+             xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
+             xmlns:ot="clr-namespace:GeekDesk.Control.Other"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
              >
@@ -19,15 +21,6 @@
                 </Trigger>
             </Style.Triggers>
         </Style>-->
-
-        <Storyboard x:Key="Custom1Transition" x:Shared="False">
-            <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-                <DoubleAnimation.EasingFunction>
-                    <ElasticEase Oscillations="1"/>
-                </DoubleAnimation.EasingFunction>
-            </DoubleAnimation>
-        </Storyboard>
-
         <Style x:Key="ImageStyle" TargetType="Image">
             <Setter Property="Width"   Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageWidth, Mode=OneWay}"/>
             <Setter Property="Height"  Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageHeight, Mode=OneWay}"/>
@@ -46,6 +39,48 @@
             </Setter>
         </Style>
 
+        <Style x:Key="SearchListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                        <Border>
+                            <Border.Style>
+                                <Style TargetType="Border">
+                                    <Setter Property="VerticalAlignment" Value="Center"/>
+                                </Style>
+                            </Border.Style>
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Storyboard x:Key="Custom1Transition1" x:Shared="False">
+            <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+                <DoubleAnimation.EasingFunction>
+                    <ElasticEase Oscillations="1"/>
+                </DoubleAnimation.EasingFunction>
+            </DoubleAnimation>
+        </Storyboard>
+        <Storyboard x:Key="Custom2Transition2" x:Shared="False">
+            <DoubleAnimation From="10" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
+                <DoubleAnimation.EasingFunction>
+                    <ElasticEase Oscillations="1"/>
+                </DoubleAnimation.EasingFunction>
+            </DoubleAnimation>
+        </Storyboard>
+
+        <Storyboard x:Key="Custom3Transition3" x:Shared="False">
+            <DoubleAnimation From=".8" To="1" Duration="0:0:0.4">
+                <DoubleAnimation.EasingFunction>
+                    <ElasticEase Oscillations="1"/>
+                </DoubleAnimation.EasingFunction>
+            </DoubleAnimation>
+        </Storyboard>
+
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
         <cvt:SearchResWidth x:Key="SearchResWidth"/>
         <temp:SearchIconList x:Key="SearchIconList"/>
@@ -58,7 +93,10 @@
                  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:Dialog.Token="RightWrapCardDialog"
+                 >
             <hc:Card.Background>
                 <SolidColorBrush Color="AliceBlue"  hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"/>
             </hc:Card.Background>
@@ -69,89 +107,103 @@
                 <ContextMenu Width="200">
                     <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
                     <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
+                    <MenuItem x:Name="CardLockCM" Header="锁定主面板" Click="LockAppPanel"/>
                 </ContextMenu>
             </hc:Card.ContextMenu>
-            <Grid>
-                <StackPanel Panel.ZIndex="1" Margin="0,-10,-300,0" hc:Growl.GrowlParent="True" hc:Growl.Token="MainWindowGrowl"/>
-                <WrapPanel Orientation="Horizontal" VirtualizingPanel.VirtualizationMode="Recycling"  
-                   VirtualizingPanel.IsVirtualizing="True" 
-                   VirtualizingPanel.IsContainerVirtualizable="True"
-                   >
-                    <ListBox x:Name="IconListBox" ItemsSource="{Binding AppConfig.SelectedMenuIcons, Mode=OneWay}" 
-                                 BorderThickness="0"
+            <hc:DialogContainer>
+                <Grid>
+                    <ot:PasswordDialog xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=Visibility, Duration=50, Delay=0}"
+                                       x:Name="PDDialog"
+                                       Panel.ZIndex="99"
+                                       IsVisibleChanged="PDDialog_IsVisibleChanged"
+                                       Margin="0,-100,0,0"/>
+                    <StackPanel Panel.ZIndex="1" Margin="0,-10,-0,0"/>
+                    <WrapPanel Orientation="Horizontal" 
+                            VirtualizingPanel.VirtualizationMode="Recycling"  
+                            VirtualizingPanel.IsVirtualizing="True" 
+                            VirtualizingPanel.IsContainerVirtualizable="True"
+                            >
+                        <UniformGrid x:Name="WrapUFG" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=Visibility}">
+                            <!--<hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom3Transition3}">-->
+                            <ListBox x:Name="IconListBox" 
+                                ItemsSource="{Binding AppConfig.SelectedMenuIcons, Mode=OneWay}" 
+                                BorderThickness="0"
                                 Padding="0,10,0,0"
-                                 >
-                        <ListBox.Background>
-                            <SolidColorBrush Opacity="0"/>
-                        </ListBox.Background>
-                        <ListBox.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <DraggAnimatedPanel:DraggAnimatedPanel Background="#00FFFFFF"
-                                                               ItemsWidth="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"
-                                                               ItemsHeight="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}"
-                                                               HorizontalAlignment="Center" 
-                                                               SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
-                            </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
+                                >
+                                <ListBox.Background>
+                                    <SolidColorBrush Opacity="0"/>
+                                </ListBox.Background>
+                                <ListBox.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <!--<DraggAnimatedPanel:DraggAnimatedPanel Background="#00FFFFFF"
+                                                        ItemsWidth="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"
+                                                        ItemsHeight="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}"
+                                                        HorizontalAlignment="Center" 
+                                                        SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>-->
+                                        <WrapPanel />
+                                    </ItemsPanelTemplate>
+                                </ListBox.ItemsPanel>
 
-                        <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}"/>
-                                <MenuItem Header="从列表移除" Click="RemoveIcon" 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}"/>
+                                        <MenuItem Header="从列表移除" Click="RemoveIcon" 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.ItemTemplate>
-                            <DataTemplate>
-                                <hc:SimpleStackPanel Tag="{Binding}"
-                                                     Height="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}" 
-                                                     Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"
-                                                     HorizontalAlignment="Center"
-                                                     hc:Poptip.Content="{Binding Content}"
-                                                     hc:Poptip.Placement="BottomLeft"
-                                                     Background="#00FFFFFF"
-                                                     MouseEnter="StackPanel_MouseEnter"
-                                                     MouseLeave="StackPanel_MouseLeave"
-                                                     MouseLeftButtonDown="Icon_MouseLeftButtonDown"
-                                                     MouseLeftButtonUp="Icon_MouseLeftButtonUp"
-                                                     >
-                                    <!--<StackPanel Background="#00FFFFFF"
-                                                MouseEnter="CursorPanel_MouseEnter"
-                                                MouseLeave="CursorPanel_MouseLeave"
-                                                Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageWidth, Mode=OneWay}">-->
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+
+                                        <hc:SimpleStackPanel Tag="{Binding}"
+                                                    Height="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}" 
+                                                    Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"
+                                                    HorizontalAlignment="Center"
+                                                    hc:Poptip.Content="{Binding Content}"
+                                                    hc:Poptip.Placement="BottomLeft"
+                                                    Background="#00FFFFFF"
+                                                    MouseEnter="StackPanel_MouseEnter"
+                                                    MouseLeave="StackPanel_MouseLeave"
+                                                    MouseLeftButtonDown="Icon_MouseLeftButtonDown"
+                                                    MouseLeftButtonUp="Icon_MouseLeftButtonUp"
+                                                    >
+                                            <!--<StackPanel Background="#00FFFFFF"
+                                            MouseEnter="CursorPanel_MouseEnter"
+                                            MouseLeave="CursorPanel_MouseLeave"
+                                            Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageWidth, Mode=OneWay}">-->
                                             <Image Style="{StaticResource ImageStyle}"  
-                                                   RenderOptions.BitmapScalingMode="HighQuality"/>
+                                                RenderOptions.BitmapScalingMode="HighQuality"/>
                                             <TextBlock MaxWidth="80"
-                                                       Margin="0,5,0,0"
-                                                       MaxHeight="40"
-                                                       FontSize="13"
-                                                       TextWrapping="Wrap" 
-                                                       TextTrimming="WordEllipsis"
-                                                       TextAlignment="Center" 
-                                                       VerticalAlignment="Center" 
-                                                       Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
-                                                       Text="{Binding Name}"/>
-                                    <!--</StackPanel>-->
-                                    
-                                </hc:SimpleStackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
+                                                    Margin="0,5,0,0"
+                                                    MaxHeight="40"
+                                                    FontSize="13"
+                                                    TextWrapping="Wrap" 
+                                                    TextTrimming="WordEllipsis"
+                                                    TextAlignment="Center" 
+                                                    VerticalAlignment="Center" 
+                                                    Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
+                                                    Text="{Binding Name}"/>
+                                            <!--</StackPanel>-->
 
-                </WrapPanel>
-
-            </Grid>
+                                        </hc:SimpleStackPanel>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                            <!--</hc:TransitioningContentControl>-->
+                        </UniformGrid>
+                    </WrapPanel>
+                </Grid>
+            </hc:DialogContainer>
         </hc:Card>
 
         <hc:Card x:Name="VerticalCard"
@@ -170,78 +222,98 @@
                 <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
             </hc:Card.BorderBrush>
             <Grid>
-                <StackPanel Panel.ZIndex="1" Margin="0,-10,-300,0" hc:Growl.GrowlParent="True" hc:Growl.Token="MainWindowGrowl"/>
                 <WrapPanel Orientation="Horizontal" VirtualizingPanel.VirtualizationMode="Recycling"  
                    VirtualizingPanel.IsVirtualizing="True"  
                    VirtualizingPanel.IsContainerVirtualizable="True"
                    >
-                    <hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom1Transition}">
-                        <ListBox ItemsSource="{Binding Source={StaticResource SearchIconList},Path=IconList}" 
-                             BorderThickness="0"
-                             Padding="0,10,0,0"
-                             >
-                            <ListBox.Background>
-                                <SolidColorBrush Opacity="0"/>
-                            </ListBox.Background>
+                    <UniformGrid x:Name="VerticalUFG" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeIn}, OffsetY= -10, Event=Visibility}">
+                        <!--<hc:TransitioningContentControl TransitionMode="Left2RightWithFade">-->
+                            <ListBox ItemsSource="{Binding Source={StaticResource SearchIconList},Path=IconList}" 
+                                     BorderThickness="0"
+                                     Padding="0,10,0,0"
+                                     x:Name="SearchListBox"
+                                     SelectionChanged="SearchListBox_SelectionChanged"
+                                     >
+                                <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 SearchListBoxItemStyle}">
+                                        <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}"
-                                           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"
-                                           hc:Poptip.HitMode="None"
-                                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                           hc:Poptip.Content="{Binding Content}"
-                                           hc:Poptip.Placement="BottomLeft"
-                                           Background="#00FFFFFF"
-                                           MouseLeftButtonDown="Icon_MouseLeftButtonDown"
-                                           MouseLeftButtonUp="Icon_MouseLeftButtonUp"
-                                           Margin="25,20,0,0"
-                                           >
-                                        <Image Style="{StaticResource ImageStyle}"  RenderOptions.BitmapScalingMode="HighQuality"/>
-                                        <TextBlock
-                                           Margin="10,5,0,0"
-                                           MaxHeight="40"
-                                           FontSize="13"
-                                           TextWrapping="Wrap" 
-                                           TextTrimming="WordEllipsis"
-                                           TextAlignment="Left" 
-                                           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>
-                    
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Border CornerRadius="8">
+                                        <Border.Style>
+                                            <Style TargetType="Border">
+                                                <Setter Property="VerticalAlignment" Value="Center"/>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem }}}"
+                                                                 Value="True">
+                                                        <Setter Property="Background">
+                                                            <Setter.Value>
+                                                                <SolidColorBrush Color="White" Opacity="0.68"/>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </Border.Style>
+                                        <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"
+                                                   VerticalAlignment="Center"
+                                                   hc:Poptip.HitMode="None"
+                                                   hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                                                   hc:Poptip.Content="{Binding Content}"
+                                                   hc:Poptip.Placement="BottomLeft"
+                                                   Background="#00FFFFFF"
+                                                   MouseLeftButtonDown="Icon_MouseLeftButtonDown"
+                                                   MouseLeftButtonUp="Icon_MouseLeftButtonUp"
+                                                   Margin="25,10,0,10"
+                                                   >
+                                            <Image Style="{StaticResource ImageStyle}"  RenderOptions.BitmapScalingMode="HighQuality"/>
+                                            <TextBlock
+                                               Margin="10,5,0,0"
+                                               MaxHeight="40"
+                                               FontSize="13"
+                                               TextWrapping="Wrap" 
+                                               TextTrimming="WordEllipsis"
+                                               TextAlignment="Left" 
+                                               VerticalAlignment="Center" 
+                                               Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
+                                               Text="{Binding Name}"/>
+                                        </WrapPanel>
+                                    </Border>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
 
+                        <!--</hc:TransitioningContentControl>-->
+                    </UniformGrid>
                 </WrapPanel>
 
             </Grid>

Control/UserControls/PannelCard/RightCardControl.xaml.cs

@@ -9,13 +9,13 @@ 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;
 using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;
+using System.Windows.Threading;
 
 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -26,68 +26,76 @@ namespace GeekDesk.Control.UserControls.PannelCard
     {
         private AppData appData = MainWindow.appData;
 
-        private volatile static bool DROP_ICON = false;
-        private Thread dropCheckThread = null;
+        ListBoxDragDropManager<IconInfo> dragMgr;
+
+        //private Thread dropCheckThread = null;
 
         public RightCardControl()
         {
             InitializeComponent();
+            this.Loaded += RightCardControl_Loaded;
+            
         }
 
-
-        #region 图标拖动
-        DelegateCommand<int[]> _swap;
-        public DelegateCommand<int[]> SwapCommand
+        private void RightCardControl_Loaded(object sender, RoutedEventArgs e)
         {
-            get
-            {
-                if (_swap == null)
-                    _swap = new DelegateCommand<int[]>(
-                        (indexes) =>
-                        {
-                            DROP_ICON = true;
-                            if (appData.AppConfig.IconSortType != SortType.CUSTOM
-                            && (dropCheckThread == null || !dropCheckThread.IsAlive))
-                            {
-                                dropCheckThread = new Thread(() =>
-                                {
-                                    do
-                                    {
-                                        DROP_ICON = false;
-                                        Thread.Sleep(1000);
-                                    } while (DROP_ICON);
-
-                                    MainWindow.appData.AppConfig.IconSortType = SortType.CUSTOM;
-                                    App.Current.Dispatcher.Invoke(() =>
-                                    {
-                                        if (MainWindow.mainWindow.Visibility == Visibility.Collapsed
-                                        || MainWindow.mainWindow.Opacity != 1)
-                                        {
-                                            Growl.WarningGlobal("已将图标排序规则重置为自定义!");
-                                        }
-                                        else
-                                        {
-                                            Growl.Warning("已将图标排序规则重置为自定义!", "MainWindowGrowl");
-                                        }
-                                    });
-                                });
-                                dropCheckThread.Start();
-                            }
-                            int fromS = indexes[0];
-                            int to = indexes[1];
-                            ObservableCollection<IconInfo> iconList = appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList;
-                            var elementSource = iconList[to];
-                            var dragged = iconList[fromS];
-
-                            iconList.Remove(dragged);
-                            iconList.Insert(to, dragged);
-                        }
-                    );
-                return _swap;
-            }
+            this.dragMgr = new ListBoxDragDropManager<IconInfo>(this.IconListBox);
         }
 
-        #endregion 图标拖动
+
+        //#region 图标拖动
+        //DelegateCommand<int[]> _swap;
+        //public DelegateCommand<int[]> SwapCommand
+        //{
+        //    get
+        //    {
+        //        if (_swap == null)
+        //            _swap = new DelegateCommand<int[]>(
+        //                (indexes) =>
+        //                {
+        //                    DROP_ICON = true;
+        //                    if (appData.AppConfig.IconSortType != SortType.CUSTOM
+        //                    && (dropCheckThread == null || !dropCheckThread.IsAlive))
+        //                    {
+        //                        dropCheckThread = new Thread(() =>
+        //                        {
+        //                            do
+        //                            {
+        //                                DROP_ICON = false;
+        //                                Thread.Sleep(1000);
+        //                            } while (DROP_ICON);
+
+        //                            MainWindow.appData.AppConfig.IconSortType = SortType.CUSTOM;
+        //                            App.Current.Dispatcher.Invoke(() =>
+        //                            {
+        //                                if (MainWindow.mainWindow.Visibility == Visibility.Collapsed
+        //                                || MainWindow.mainWindow.Opacity != 1)
+        //                                {
+        //                                    Growl.WarningGlobal("已将图标排序规则重置为自定义!");
+        //                                }
+        //                                else
+        //                                {
+        //                                    Growl.Warning("已将图标排序规则重置为自定义!", "MainWindowGrowl");
+        //                                }
+        //                            });
+        //                        });
+        //                        dropCheckThread.Start();
+        //                    }
+        //                    int fromS = indexes[0];
+        //                    int to = indexes[1];
+        //                    ObservableCollection<IconInfo> iconList = appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList;
+        //                    var elementSource = iconList[to];
+        //                    var dragged = iconList[fromS];
+
+        //                    iconList.Remove(dragged);
+        //                    iconList.Insert(to, dragged);
+        //                }
+        //            );
+        //        return _swap;
+        //    }
+        //}
+
+        //#endregion 图标拖动
 
 
 
@@ -164,33 +172,51 @@ namespace GeekDesk.Control.UserControls.PannelCard
             StartIconApp(icon, IconStartType.SHOW_IN_EXPLORE);
         }
 
-        private void StartIconApp(IconInfo icon, IconStartType type)
+        private void StartIconApp(IconInfo icon, IconStartType type, bool useRelativePath = false)
         {
+            
             try
             {
                 using (Process p = new Process())
                 {
                     string startArg = icon.StartArg;
-
+                    
                     if (startArg != null && Constants.SYSTEM_ICONS.ContainsKey(startArg))
                     {
                         StartSystemApp(startArg, type);
                     }
                     else
                     {
-                        p.StartInfo.FileName = icon.Path;
+                        string path;
+                        if (useRelativePath)
+                        {
+                            string fullPath = Path.Combine(Constants.APP_DIR, icon.RelativePath);
+                            path = Path.GetFullPath(fullPath);
+                        } else
+                        {
+                            path = icon.Path;
+                        }
+                        p.StartInfo.FileName = path;
                         if (!StringUtil.IsEmpty(startArg))
                         {
                             p.StartInfo.Arguments = startArg;
                         }
                         if (icon.IconType == IconType.OTHER)
                         {
-                            if (!File.Exists(icon.Path) && !Directory.Exists(icon.Path))
+                            if (!File.Exists(path) && !Directory.Exists(path))
                             {
-                                HandyControl.Controls.Growl.WarningGlobal("程序启动失败(文件路径不存在或已删除)!");
-                                return;
+                                //如果没有使用相对路径  那么使用相对路径启动一次
+                                if (!useRelativePath)
+                                {
+                                    StartIconApp(icon, type, true);
+                                    return;
+                                } else
+                                {
+                                    HandyControl.Controls.Growl.WarningGlobal("程序启动失败(文件路径不存在或已删除)!");
+                                    return;
+                                }
                             }
-                            p.StartInfo.WorkingDirectory = icon.Path.Substring(0, icon.Path.LastIndexOf("\\"));
+                            p.StartInfo.WorkingDirectory = path.Substring(0, path.LastIndexOf("\\"));
                             switch (type)
                             {
                                 case IconStartType.ADMIN_STARTUP:
@@ -199,12 +225,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 +243,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 +267,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)
@@ -258,6 +284,11 @@ namespace GeekDesk.Control.UserControls.PannelCard
                             }
                         }
                         p.Start();
+                        if (useRelativePath)
+                        {
+                            //如果使用相对路径启动成功 那么重新设置程序绝对路径
+                            icon.Path = path;
+                        }
                     }
                 }
                 icon.Count++;
@@ -270,8 +301,15 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
             catch (Exception e)
             {
-                HandyControl.Controls.Growl.WarningGlobal("程序启动失败(不支持的启动方式)!");
-                LogUtil.WriteErrorLog(e, "程序启动失败:path=" + icon.Path + ",type=" + type);
+                if (!useRelativePath)
+                {
+                    StartIconApp(icon, type, true);
+                }
+                else
+                {
+                    HandyControl.Controls.Growl.WarningGlobal("程序启动失败(可能为不支持的启动方式)!");
+                    LogUtil.WriteErrorLog(e, "程序启动失败:path=" + icon.Path + ",type=" + type);
+                }
             }
         }
 
@@ -369,7 +407,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 MainWindow.appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList.Add(iconInfo);
             }
             CommonCode.SortIconList();
-            CommonCode.SaveAppData(MainWindow.appData);
+            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
         }
 
         /// <summary>
@@ -406,11 +444,11 @@ namespace GeekDesk.Control.UserControls.PannelCard
             {
                 case IconType.URL:
                     IconInfoUrlDialog urlDialog = new IconInfoUrlDialog(info);
-                    urlDialog.dialog = HandyControl.Controls.Dialog.Show(urlDialog, "IconInfoDialog");
+                    urlDialog.dialog = HandyControl.Controls.Dialog.Show(urlDialog, "MainWindowDialog");
                     break;
                 default:
                     IconInfoDialog dialog = new IconInfoDialog(info);
-                    dialog.dialog = HandyControl.Controls.Dialog.Show(dialog, "IconInfoDialog");
+                    dialog.dialog = HandyControl.Controls.Dialog.Show(dialog, "MainWindowDialog");
                     break;
             }
         }
@@ -422,12 +460,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 +493,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 +601,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 +612,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);
@@ -564,7 +675,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
         private void AddUrlIcon(object sender, RoutedEventArgs e)
         {
             IconInfoUrlDialog urlDialog = new IconInfoUrlDialog();
-            urlDialog.dialog = HandyControl.Controls.Dialog.Show(urlDialog, "IconInfoDialog");
+            urlDialog.dialog = HandyControl.Controls.Dialog.Show(urlDialog, "MainWindowDialog");
         }
 
         /// <summary>
@@ -623,5 +734,89 @@ 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 = "锁定主面板";
+            }
+        }
+
+        public void SearchListBoxIndexAdd()
+        {
+            if (SearchListBox.Items.Count > 0)
+            {
+                if (SearchListBox.SelectedIndex < SearchListBox.Items.Count - 1)
+                {
+                    SearchListBox.SelectedIndex += 1;
+                }
+            }
+        }
+
+        public void SearchListBoxIndexSub()
+        {
+            if (SearchListBox.Items.Count > 0)
+            {
+                if (SearchListBox.SelectedIndex > 0)
+                {
+                    SearchListBox.SelectedIndex -= 1;
+                }
+            }
+        }
+
+        public void StartupSelectionItem()
+        {
+            if (SearchListBox.SelectedItem != null)
+            {
+                IconInfo icon = SearchListBox.SelectedItem as IconInfo;
+                if (icon.AdminStartUp)
+                {
+                    StartIconApp(icon, IconStartType.ADMIN_STARTUP);
+                }
+                else
+                {
+                    StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
+                }
+            }
+        }
+
+        private void SearchListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            SearchListBox.ScrollIntoView(SearchListBox.SelectedItem);
+        }
+
+        private void PDDialog_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (PDDialog.Visibility == Visibility.Visible)
+            {
+                RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
+                PDDialog.ClearVal();
+                PDDialog.ErrorMsg.Visibility = Visibility.Collapsed;
+                PDDialog.PasswordGrid.Visibility = Visibility.Visible;
+                PDDialog.HintGrid.Visibility = Visibility.Collapsed;
+                PDDialog.count = 0;
+                PDDialog.SetFocus();
+            }
+            else
+            {
+                RunTimeStatus.SHOW_MENU_PASSWORDBOX = false;
+                PDDialog.ClearVal();
+                MainWindow.mainWindow.Focus();
+            }
+        }
     }
 }

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,13 +35,14 @@ 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);
             }
             menuInfo.IconList.Add(iconInfo);
-            CommonCode.SaveAppData(MainWindow.appData);
+            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
         }
     }
 }

Control/UserControls/ToDo/TodoControl.xaml

@@ -9,22 +9,54 @@
              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 +69,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

@@ -1,21 +1,13 @@
-using GeekDesk.Control.Windows;
+using GeekDesk.Constant;
+using GeekDesk.Control.Windows;
 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
 {
@@ -51,7 +43,7 @@ namespace GeekDesk.Control.UserControls.Backlog
                     {
                         MainWindow.appData.HiToDoList.Remove(info);
                     }
-                    CommonCode.SaveAppData(MainWindow.appData);
+                    CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
                 }
                 return true;
             }, "DeleteConfirm");
@@ -80,7 +72,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

@@ -4,6 +4,7 @@
            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
            xmlns:hc="https://handyorg.github.io/handycontrol"
+           xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
            xmlns:local="clr-namespace:GeekDesk"
            Title="Setting"
            mc:Ignorable="d"
@@ -24,30 +25,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 +59,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 +74,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 +90,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 +105,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" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeIn}, Event=Visibility, Delay=0}">
+                                <!--<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)
@@ -32,10 +36,12 @@ namespace GeekDesk.Control.Windows
             RightCard.Content = about;
             this.Topmost = true;
             this.mainWindow = mainWindow;
+            UFG.Visibility = Visibility.Collapsed;
+            UFG.Visibility = Visibility.Visible;
         }
 
-         
-        
+
+
 
         /// <summary>
         /// 点击关闭按钮
@@ -53,16 +59,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/IconfontWindow.xaml.cs

@@ -138,7 +138,7 @@ namespace GeekDesk.Control.Windows
             }
             window.Show();
             Keyboard.Focus(window);
-            ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0, false);
+            ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0);
         }
 
         private void CustomButton_Click(object sender, RoutedEventArgs e)

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;
-                
+
             //}
         }
 
@@ -281,7 +280,7 @@ namespace GeekDesk.Control.Windows
             }
             window.Show();
             Keyboard.Focus(window);
-            ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0, false);
+            ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0);
         }
 
 

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,12 +172,13 @@ namespace GeekDesk.Control.Windows
                 int h = minutes / 60;
                 Growl.SuccessGlobal("设置待办任务成功, 系统将在 " + h + " 小时零 " + m + " 分钟后提醒您!");
 
-            } else
+            }
+            else
             {
                 Growl.SuccessGlobal("设置待办任务成功, 系统将在 " + minutes + " 分钟后提醒您!");
             }
 
-            CommonCode.SaveAppData(MainWindow.appData);
+            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
             this.Close();
         }
 
@@ -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;
 
@@ -14,12 +10,21 @@ namespace GeekDesk.Converts
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             int val = int.Parse(value.ToString());
+            var param = 0;
+            if (parameter != null)
+            {
+                param = int.Parse(parameter.ToString());
+            }
+            if (val + param > 0)
+            {
+                val += param;
+            }
             return new CornerRadius(val);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            throw new NotImplementedException();
+            return null;
         }
     }
 }

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/ReverseBoolConvert.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace GeekDesk.Converts
+{
+    internal class ReverseBoolConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null) return null;
+            bool val = (bool)value;
+            return !val;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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,39 @@
+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)
+            {
+                value = "";
+            }
+            if (parameter == null)
+            {
+                return value.ToString();
+            }
+            else
+            {
+                string val = value.ToString();
+                if (string.IsNullOrEmpty(val))
+                {
+                    return parameter.ToString()
+                        .Replace("\\n", "")
+                        .Replace("{}", "");
+                }
+                string param = parameter.ToString();
+                param = param.Replace("\\n", "\n");
+                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;
+            }
+        }
+    }
+}

DraggAnimatedPanel/DraggAnimatedPanel.cs

@@ -21,6 +21,7 @@ namespace DraggAnimatedPanel
         #endregion
         static DraggAnimatedPanel()
         {
+
             DefaultStyleKeyProperty.OverrideMetadata(typeof(DraggAnimatedPanel), new FrameworkPropertyMetadata(typeof(DraggAnimatedPanel)));
         }
 

GeekDesk.csproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
+  <Import Project="packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
+  <Import Project="packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,6 +18,23 @@
     <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>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -29,7 +49,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -37,6 +57,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>GeekDesk.App</StartupObject>
@@ -98,12 +120,19 @@
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
+    <Reference Include="System.Reactive, Version=5.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -117,6 +146,9 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="XamlFlair.WPF, Version=1.2.13.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\XamlFlair.WPF.1.2.13\lib\net472\XamlFlair.WPF.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -127,19 +159,35 @@
     <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\PasswordType.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\GlobalMsgNotification.xaml.cs">
+      <DependentUpon>GlobalMsgNotification.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Control\Other\BacklogNotificatin.xaml.cs">
       <DependentUpon>BacklogNotificatin.xaml</DependentUpon>
     </Compile>
     <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\PasswordDialog.xaml.cs">
+      <DependentUpon>PasswordDialog.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 +203,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 +245,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,38 +256,57 @@
     <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\ReverseBoolConvert.cs" />
+    <Compile Include="Converts\Visibility2BooleanConverter.cs" />
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.cs" />
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.Drag.cs" />
     <Compile Include="Converts\HideTypeConvert.cs" />
     <Compile Include="Interface\IWindowCommon.cs" />
+    <Compile Include="MyThread\RelativePathThread.cs" />
     <Compile Include="Task\ToDoTask.cs" />
     <Compile Include="MyThread\MouseHookThread.cs" />
     <Compile Include="MyThread\DispatcherBuild.cs" />
     <Compile Include="MyThread\UpdateThread.cs" />
     <Compile Include="Util\AeroGlassHelper.cs" />
+    <Compile Include="Util\BGSettingUtil.cs" />
+    <Compile Include="Util\BlurGlassUtil.cs" />
+    <Compile Include="Util\ColorUtil.cs" />
+    <Compile Include="Util\DragAdorner.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\ListBoxDragDropManager.cs" />
     <Compile Include="Util\LogUtil.cs" />
     <Compile Include="Util\MarginHide.cs" />
     <Compile Include="Util\HttpUtil.cs" />
     <Compile Include="Util\ImageUtil.cs" />
     <Compile Include="Converts\MenuWidthConvert.cs" />
+    <Compile Include="Util\MD5Util.cs" />
     <Compile Include="Util\MouseUtil.cs" />
     <Compile Include="Util\RegisterUtil.cs" />
+    <Compile Include="Util\RelayCommand.cs" />
     <Compile Include="Util\ShellContextMenu.cs" />
     <Compile Include="Util\ShowWindowFollowMouse.cs" />
     <Compile Include="Util\StringUtil.cs" />
     <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" />
     <Compile Include="ViewModel\IconInfo.cs" />
     <Compile Include="ViewModel\MenuInfo.cs" />
+    <Page Include="Control\Other\GlobalMsgNotification.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Control\Other\BacklogNotificatin.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -238,6 +315,18 @@
       <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\PasswordDialog.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 +347,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>
@@ -326,6 +423,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resource\Dictionary\XamlFlairSettings.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -402,5 +504,45 @@
     <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://beaujs.com/schema.json" />
+    </VisualStudio>
+  </ProjectExtensions>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
+    <Error Condition="!Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
+    <Error Condition="!Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
+    <Error Condition="!Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
+  </Target>
+  <Import Project="packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
+  <Import Project="packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
+  <Import Project="packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>; Move all assemblies and related files to lib folder
+ROBOCOPY "$(TargetDir) " "$(TargetDir)lib\ " /XF Data *.exe *.config *.manifest /XD lib logs bak /E /IS /MOVE
+if %25errorlevel%25 leq 4 exit 0 else exit %25errorlevel%25</PostBuildEvent>
+  </PropertyGroup>
 </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,15 +1,9 @@
-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
 {
     public interface IWindowCommon
     {
-        void OnKeyDown(object sender, KeyEventArgs e);
+        void OnKeyDown(object sender, KeyEventArgs e); 
     }
 }

LICENSE.md

@@ -1,2 +1,2 @@
-- 这是个人开发的程序,任何人可任意修改和免费使用(未做较大功能性改动不允许修改赞赏码,重新修改发布需注明出处)
+- 这是个人开发的程序,任何人可任意修改和免费使用(未做较大功能性改动不允许修改赞赏码,重新修改发布需注明出处) 
 - 商用需联系作者

MainWindow.xaml

@@ -4,10 +4,14 @@
         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"
+        xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
+        xmlns:local="clr-namespace:GeekDesk"
         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"
@@ -15,62 +19,56 @@
         AllowsTransparency="True"
         Background="Transparent"
         ShowInTaskbar="False"
-        Opacity="0"
-        Deactivated="App_LostFocus"
+        Opacity="1"
+        Deactivated="AppWindow_Deactivated"
         SizeChanged="Window_SizeChanged"
-        KeyDown="OnKeyDown"
+        PreviewKeyDown="OnKeyDown"
         Focusable="True"
         MouseDown="MainWindow_MouseDown"
         MouseEnter="MainWindow_MouseEnter"
+        GotFocus="Window_GotFocus"
+        Loaded="Window_Loaded"          
         >
-    <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"/>
+        <cvt:ReverseBoolConvert x:Key="ReverseBoolConvert"/>
     </Window.Resources>
+    
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0" CornerRadius="30" ResizeBorderThickness="15"/>
+    </WindowChrome.WindowChrome>
+    
     <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"/>
     </Window.CommandBindings>
 
-    <Window.Effect>
-        <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"
-                              RenderingBias="Quality" ShadowDepth="2"/>
-    </Window.Effect>
-    <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"
+    <!--Opacity="{Binding AppConfig.PannelOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"-->
+    <Border Margin="20" CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  
+            BorderThickness="0"
             Focusable="True"
+            x:Name="BGBorder"
+            hc:Dialog.Token="MainWindowDialog"
+            xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=None}"
+            xf:Animations.PrimaryBinding="{Binding AppConfig.IsShow, Mode=OneWay}"
+            xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource  FadeOut}, Event=None}"
+            xf:Animations.SecondaryBinding="{Binding AppConfig.IsShow, Mode=OneWay, Converter={StaticResource ReverseBoolConvert}}"
+            xf:Animations.SecondaryCompletionCommand="{Binding HideCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
+            xf:Animations.AllowOpacityReset="False"
             >
-        <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>
-
-
+        <Border.Effect>
+            <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"
+                              RenderingBias="Quality" ShadowDepth="2"/>
+        </Border.Effect>
+            <hc:DialogContainer Focusable="True">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="40" MouseMove="DragMove"></RowDefinition>
@@ -81,15 +79,16 @@
                         <ColumnDefinition x:Name="RightColumn" Width="*"></ColumnDefinition>
                     </Grid.ColumnDefinitions>
 
-                    <!--获取焦点用-->
-                    <TextBox x:Name="EmptyTextBox" Width="0"/>
+                    <CheckBox x:Name="ShowBox" Visibility="Hidden" Panel.ZIndex="2"/>
+                    <CheckBox x:Name="HideBox" Visibility="Hidden" Panel.ZIndex="2"/>
 
+                    <StackPanel HorizontalAlignment="Right" Panel.ZIndex="99" hc:Growl.GrowlParent="False" hc:Growl.Token="MainWindowGrowl" Grid.Column="1" Grid.Row="1"/>
 
                     <DockPanel Grid.Row="0" Grid.Column="0" MouseMove="DragMove">
                         <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">
@@ -98,38 +97,39 @@
                         </DockPanel.Background>
                         <hc:UniformSpacingPanel Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Center">
                             <Button Background="Transparent"
-                                BorderThickness="0"
-                                hc:IconElement.Geometry="M917.930667 512c0-57.6 36.181333-106.496 86.869333-125.952a505.429333 505.429333 0 0 0-55.210667-133.461333A134.826667 134.826667 0 0 1 771.413333 74.410667 507.733333 507.733333 0 0 0 637.952 19.2 135.168 135.168 0 0 1 512 106.069333 134.912 134.912 0 0 1 386.048 19.2 505.429333 505.429333 0 0 0 252.586667 74.410667c22.186667 49.749333 13.141333 109.824-27.562667 150.528a135.168 135.168 0 0 1-150.528 27.648 502.016 502.016 0 0 0-55.296 133.461333c50.688 19.626667 86.869333 68.437333 86.869333 125.952 0 57.6-36.181333 106.496-86.869333 125.952 12.117333 47.530667 30.72 92.330667 55.210667 133.461333a134.826667 134.826667 0 0 1 178.090666 178.176 507.733333 507.733333 0 0 0 133.546667 55.210667A135.168 135.168 0 0 1 512 917.930667c57.6 0 106.496 36.181333 125.952 86.869333a505.429333 505.429333 0 0 0 133.461333-55.210667 134.912 134.912 0 0 1 27.562667-150.528 135.168 135.168 0 0 1 150.528-27.648 502.016 502.016 0 0 0 55.296-133.461333A134.912 134.912 0 0 1 917.930667 512zM512 647.338667a135.338667 135.338667 0 1 1 0.085333-270.762667A135.338667 135.338667 0 0 1 512 647.338667z"
-                                hc:IconElement.Height="18"
-                                hc:IconElement.Width="18"
-                                HorizontalAlignment="Right"
-                                Click="ConfigButtonClick"
-                                Initialized="SettingButton_Initialized"
-                                x:Name="SettingButton"
-                                FocusVisualStyle="{x:Null}"
-                                >
-                                <Button.ContextMenu>
-                                    <ContextMenu x:Name="SettingMenus" Width="130">
-                                        <MenuItem Header="设置" Click="ConfigMenuClick"/>
-                                        <MenuItem Header="待办" Click="BacklogMenuClick"/>
-                                    </ContextMenu>
-                                </Button.ContextMenu>
+                                    BorderThickness="0"
+                                    hc:IconElement.Geometry="M917.930667 512c0-57.6 36.181333-106.496 86.869333-125.952a505.429333 505.429333 0 0 0-55.210667-133.461333A134.826667 134.826667 0 0 1 771.413333 74.410667 507.733333 507.733333 0 0 0 637.952 19.2 135.168 135.168 0 0 1 512 106.069333 134.912 134.912 0 0 1 386.048 19.2 505.429333 505.429333 0 0 0 252.586667 74.410667c22.186667 49.749333 13.141333 109.824-27.562667 150.528a135.168 135.168 0 0 1-150.528 27.648 502.016 502.016 0 0 0-55.296 133.461333c50.688 19.626667 86.869333 68.437333 86.869333 125.952 0 57.6-36.181333 106.496-86.869333 125.952 12.117333 47.530667 30.72 92.330667 55.210667 133.461333a134.826667 134.826667 0 0 1 178.090666 178.176 507.733333 507.733333 0 0 0 133.546667 55.210667A135.168 135.168 0 0 1 512 917.930667c57.6 0 106.496 36.181333 125.952 86.869333a505.429333 505.429333 0 0 0 133.461333-55.210667 134.912 134.912 0 0 1 27.562667-150.528 135.168 135.168 0 0 1 150.528-27.648 502.016 502.016 0 0 0 55.296-133.461333A134.912 134.912 0 0 1 917.930667 512zM512 647.338667a135.338667 135.338667 0 1 1 0.085333-270.762667A135.338667 135.338667 0 0 1 512 647.338667z"
+                                    hc:IconElement.Height="18"
+                                    hc:IconElement.Width="18"
+                                    HorizontalAlignment="Right"
+                                    Click="ConfigButtonClick"
+                                    Initialized="SettingButton_Initialized"
+                                    PreviewMouseLeftButtonDown="AppButton_PreviewMouseLeftButtonDown"
+                                    x:Name="SettingButton"
+                                    FocusVisualStyle="{x:Null}"
+                                    >
+                                    <Button.ContextMenu>
+                                        <ContextMenu x:Name="SettingMenus" Width="130">
+                                            <MenuItem Header="设置" Click="ConfigMenuClick"/>
+                                            <MenuItem Header="待办" Click="BacklogMenuClick"/>
+                                        </ContextMenu>
+                                    </Button.ContextMenu>
                             </Button>
                             <Button Background="Transparent" 
-                                BorderThickness="0"
-                                hc:IconElement.Geometry="M828.770654 148.714771C641.293737-20.89959 354.184117-19.590868 168.245698 152.630946c-212.062907 196.418185-212.062907 522.329912 0 718.748098 185.93842 172.221815 473.048039 173.520546 660.524956 3.916176 219.435707-198.536117 219.435707-528.054322 0-726.580449z m-121.880976 569.643707c-11.708566 11.708566-30.680039 11.708566-42.388605 0L502.729054 556.586459c-0.659356-0.659356-1.728312-0.659356-2.397659 0L338.609327 718.318517c-11.708566 11.708566-30.680039 11.708566-42.388605 0l-0.039961-0.039961c-11.708566-11.708566-11.708566-30.680039 0-42.388605l161.732059-161.732058c0.659356-0.659356 0.659356-1.728312 0-2.397659L296.1408 350.008195c-11.708566-11.708566-11.708566-30.680039 0-42.388605l0.039961-0.039961c11.708566-11.708566 30.680039-11.708566 42.388605 0l161.772019 161.77202c0.659356 0.659356 1.728312 0.659356 2.397659 0L664.551024 307.539668c11.708566-11.708566 30.680039-11.708566 42.388605 0l0.039961 0.039961c11.708566 11.708566 11.708566 30.680039 0 42.388605L545.15762 511.770224c-0.659356 0.659356-0.659356 1.728312 0 2.397659L706.919649 675.939902c11.708566 11.708566 11.708566 30.680039 0 42.388605l-0.029971 0.029971z" 
-                                hc:IconElement.Height="18"
-                                hc:IconElement.Width="18"
-                                HorizontalAlignment="Right"
-                                Click="CloseButtonClick"
-                                FocusVisualStyle="{x:Null}"
-                                />
+                                    BorderThickness="0"
+                                    hc:IconElement.Geometry="M828.770654 148.714771C641.293737-20.89959 354.184117-19.590868 168.245698 152.630946c-212.062907 196.418185-212.062907 522.329912 0 718.748098 185.93842 172.221815 473.048039 173.520546 660.524956 3.916176 219.435707-198.536117 219.435707-528.054322 0-726.580449z m-121.880976 569.643707c-11.708566 11.708566-30.680039 11.708566-42.388605 0L502.729054 556.586459c-0.659356-0.659356-1.728312-0.659356-2.397659 0L338.609327 718.318517c-11.708566 11.708566-30.680039 11.708566-42.388605 0l-0.039961-0.039961c-11.708566-11.708566-11.708566-30.680039 0-42.388605l161.732059-161.732058c0.659356-0.659356 0.659356-1.728312 0-2.397659L296.1408 350.008195c-11.708566-11.708566-11.708566-30.680039 0-42.388605l0.039961-0.039961c11.708566-11.708566 30.680039-11.708566 42.388605 0l161.772019 161.77202c0.659356 0.659356 1.728312 0.659356 2.397659 0L664.551024 307.539668c11.708566-11.708566 30.680039-11.708566 42.388605 0l0.039961 0.039961c11.708566 11.708566 11.708566 30.680039 0 42.388605L545.15762 511.770224c-0.659356 0.659356-0.659356 1.728312 0 2.397659L706.919649 675.939902c11.708566 11.708566 11.708566 30.680039 0 42.388605l-0.029971 0.029971z" 
+                                    hc:IconElement.Height="18"
+                                    hc:IconElement.Width="18"
+                                    HorizontalAlignment="Right"
+                                    Click="CloseButtonClick"
+                                    PreviewMouseLeftButtonDown="AppButton_PreviewMouseLeftButtonDown"
+                                    FocusVisualStyle="{x:Null}"
+                                    />
                         </hc:UniformSpacingPanel>
-
                     </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 +137,22 @@
                     <!--搜索输入框-->
                     <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="BakDataFile"/>
                                 <MenuItem Header="隐藏图标" Click="CloseBarIcon"/>
                                 <MenuItem Header="待办"  Click="BacklogMenuClick"/>
                                 <MenuItem Header="程序目录"  Click="OpenThisDir"/>
@@ -162,12 +161,13 @@
                                 <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>
-        </hc:DialogContainer>
+            </hc:DialogContainer>
     </Border>
 
 </Window>

MainWindow.xaml.cs

@@ -1,23 +1,26 @@
 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 Microsoft.Win32;
+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.Interop;
 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,17 +35,22 @@ 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()
         {
+            //加载数据
             LoadData();
             InitializeComponent();
-            mainWindow = this;
-            this.Topmost = true;
-            this.Loaded += Window_Loaded;
-            this.SizeChanged += MainWindow_Resize;
-            ToDoTask.BackLogCheck();
 
+            //用于其他类访问
+            mainWindow = this;
+
+            //置于顶层
+            this.Topmost = true;
+
+            //执行待办提醒
+            ToDoTask.BackLogCheck();
 
             ////实例化隐藏 Hide类，进行时间timer设置
             MarginHide.ReadyHide(this);
@@ -50,18 +58,33 @@ namespace GeekDesk
             {
                 MarginHide.StartHide();
             }
+
+        }
+
+       
+
+
+        /// <summary>
+        /// 搜索快捷键按下
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SearchHotKeyDown(object sender, CanExecuteRoutedEventArgs e)
+        {
+            if (appData.AppConfig.SearchType == SearchType.HOT_KEY)
+            {
+                ShowSearchBox();
+            }
         }
 
         /// <summary>
         /// 显示搜索框
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SearchItem(object sender, CanExecuteRoutedEventArgs e)
+        private void ShowSearchBox()
         {
             RunTimeStatus.SEARCH_BOX_SHOW = true;
             RightCard.VisibilitySearchCard(Visibility.Visible);
-            SearchBox.Visibility = Visibility.Visible;
+            SearchBox.Width = 400;
             SearchBox.Focus();
         }
         /// <summary>
@@ -71,7 +94,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 +129,27 @@ namespace GeekDesk
             {
                 SearchIconList.IconList.Clear();
             }
+            if (RightCard.SearchListBox.Items.Count > 0)
+            {
+                RightCard.SearchListBox.SelectedIndex = 0;
+            }
+            RightCard.VerticalUFG.Visibility = Visibility.Visible;
         }
 
+        /// <summary>
+        /// 隐藏搜索框
+        /// </summary>
         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 +158,6 @@ namespace GeekDesk
         /// </summary>
         private void LoadData()
         {
-            GC.KeepAlive(appData); // 持活
             this.DataContext = appData;
             if (appData.MenuList.Count == 0)
             {
@@ -129,16 +176,10 @@ namespace GeekDesk
         /// <param name="e"></param>
         void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            BGSettingUtil.BGSetting();
             if (!appData.AppConfig.StartedShowPanel)
             {
-                if (appData.AppConfig.AppAnimation)
-                {
-                    this.Opacity = 0;
-                }
-                else
-                {
-                    this.Visibility = Visibility.Collapsed;
-                }
+                this.Visibility = Visibility.Collapsed;
             }
             else
             {
@@ -149,8 +190,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)
@@ -166,6 +218,12 @@ namespace GeekDesk
 
             //更新线程开启  检测更新
             UpdateThread.Update();
+
+            //建立相对路径
+            RelativePathThread.MakeRelativePath();
+
+            //毛玻璃  暂时未解决阴影问题
+            //BlurGlassUtil.EnableBlur(this);
         }
 
         /// <summary>
@@ -175,9 +233,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 +249,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 +281,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,24 +311,45 @@ namespace GeekDesk
             }
         }
 
-
         /// <summary>
-        /// 重置窗体大小 写入缓存
+        /// 注册新建待办的热键
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void MainWindow_Resize(object sender, System.EventArgs e)
+        public static void RegisterColorPickerHotKey(bool first)
         {
-            if (this.DataContext != null)
+            try
             {
-                AppData appData = this.DataContext as AppData;
-                appData.AppConfig.WindowWidth = this.Width;
-                appData.AppConfig.WindowHeight = this.Height;
+                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>
         /// 程序窗体拖动
         /// </summary>
@@ -311,14 +392,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 +426,20 @@ namespace GeekDesk
             //    return;
             //}
 
-            //修改贴边隐藏状态为未隐藏
+            MainWindow.mainWindow.Activate();
+            mainWindow.Show();
+            //mainWindow.Visibility = Visibility.Visible;
+            if (appData.AppConfig.AppAnimation)
+            {
+                appData.AppConfig.IsShow = true;
+            } else
+            {
+                appData.AppConfig.IsShow = null;
+            }
+
             if (MarginHide.ON_HIDE)
             {
+                //修改贴边隐藏状态为未隐藏
                 MarginHide.IS_HIDE = false;
                 if (!CommonCode.MouseInWindow(mainWindow))
                 {
@@ -365,41 +450,55 @@ namespace GeekDesk
 
             if (appData.AppConfig.FollowMouse)
             {
-                ShowWindowFollowMouse.Show(mainWindow, MousePosition.CENTER, 0, 0, false);
+                ShowWindowFollowMouse.Show(mainWindow, MousePosition.CENTER, 0, 0);
             }
+            
 
-            FadeStoryBoard(1, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Visible);
+            //FadeStoryBoard(1, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Visible);
 
-            Keyboard.Focus(mainWindow.EmptyTextBox);
+            Keyboard.Focus(mainWindow);
+            if (RunTimeStatus.SHOW_MENU_PASSWORDBOX)
+            {
+                mainWindow.RightCard.PDDialog.SetFocus();
+            } else
+            {
+                Keyboard.Focus(mainWindow.SearchBox);
+            }
         }
 
         public static void HideApp()
         {
-            if (!MarginHide.IS_HIDE)
+            if (appData.AppConfig.AppAnimation)
             {
-                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();
-                }
-                else
-                {
-                    FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
-                }
-            } else
+                appData.AppConfig.IsShow = false;
+            }
+            else
             {
-                ShowApp();
+                appData.AppConfig.IsShow = null;
+                HideAppVis();
             }
             
         }
 
+        private static void HideAppVis()
+        {
+            //关闭锁定
+            RunTimeStatus.LOCK_APP_PANEL = false;
+            if (RunTimeStatus.SEARCH_BOX_SHOW)
+            {
+                mainWindow.HidedSearchBox();
+            }
+            mainWindow.Visibility = Visibility.Collapsed;
+            //if (!MarginHide.IS_HIDE)
+            //{
+               
+            //}
+            //else
+            //{
+            //    ShowApp();
+            //}
+        }
+
         /// <summary>
         /// 淡入淡出效果
         /// </summary>
@@ -529,10 +628,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 +642,7 @@ namespace GeekDesk
             }
         }
 
+
         private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this.DataContext != null)
@@ -600,12 +701,34 @@ namespace GeekDesk
 
         public void OnKeyDown(object sender, KeyEventArgs e)
         {
+            //char c = (char)e.Key;
+
             if (e.Key == Key.Escape)
             {
                 HideApp();
             }
+
+            if (RunTimeStatus.SEARCH_BOX_SHOW && (e.Key == Key.Up 
+                || e.Key == Key.Down 
+                || e.Key == Key.Tab
+                || e.Key == Key.Enter
+                ))
+            {
+                if (e.Key == Key.Down || e.Key == Key.Tab)
+                {
+                    RightCard.SearchListBoxIndexAdd();
+                } else if (e.Key == Key.Up)
+                {
+                    RightCard.SearchListBoxIndexSub();
+                } else if (e.Key == Key.Enter)
+                {
+                    RightCard.StartupSelectionItem();
+                }
+            } 
         }
 
+
+
         /// <summary>
         /// 为了让修改菜单的textBox失去焦点
         /// </summary>
@@ -613,7 +736,7 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void MainWindow_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            EmptyTextBox.Focus();
+            SearchBox.Focus();
         }
 
         /// <summary>
@@ -626,5 +749,95 @@ 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 (!RunTimeStatus.IS_MENU_EDIT
+                && !RunTimeStatus.SHOW_RIGHT_BTN_MENU
+                && !RunTimeStatus.APP_BTN_IS_DOWN)
+            {
+                if (RunTimeStatus.SHOW_MENU_PASSWORDBOX)
+                {
+                    //必须在其它文本框没有工作的时候才给密码框焦点
+                    RightCard.PDDialog.SetFocus();
+                }
+                else
+                {
+                    //必须在其它文本框没有工作的时候才给搜索框焦点
+                    Keyboard.Focus(SearchBox);
+                }
+                
+            }
+            
+        }
+
+        private void AppWindow_Deactivated(object sender, EventArgs e)
+        {
+            AppWindowLostFocus();
+        }
+
+        /// <summary>
+        /// 备份数据文件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        [Obsolete]
+        private void BakDataFile(object sender, RoutedEventArgs e)
+        {
+            Thread t = new Thread(() =>
+            {
+                CommonCode.BakAppData();
+            });
+            t.ApartmentState = ApartmentState.STA;
+            t.Start();
+        }
+
+        private void AppButton_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            //点击了面板
+            RunTimeStatus.APP_BTN_IS_DOWN = true;
+            new Thread(() =>
+            {
+                Thread.Sleep(50);
+                RunTimeStatus.APP_BTN_IS_DOWN = false;
+            }).Start();
+        }
+
+
+        private ICommand _hideCommand;
+        public ICommand HideCommand
+        {
+            get
+            {
+                if (_hideCommand == null)
+                {
+                    _hideCommand = new RelayCommand(
+                        p =>
+                        {
+                            return true;
+                        },
+                        p =>
+                        {
+                            HideAppVis();
+                        });
+                }
+                return _hideCommand;
+            }
+        }
+
+
+
     }
 }

MainWindow.xaml.rej

@@ -1,3 +1,4 @@
+# BookerLiu
 diff a/MainWindow.xaml b/MainWindow.xaml	(rejected hunks)
 @@ -20,6 +20,7 @@
          SizeChanged="Window_SizeChanged"

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/RelativePathThread.cs

@@ -0,0 +1,42 @@
+using GeekDesk.Constant;
+using GeekDesk.Util;
+using GeekDesk.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace GeekDesk.MyThread
+{
+    public class RelativePathThread
+    {
+        public static void MakeRelativePath()
+        {
+            new Thread(() =>
+            {
+                ObservableCollection<MenuInfo> menuList = MainWindow.appData.MenuList;
+
+                string myExePath = Constants.APP_DIR + "GeekDesk.exe";
+                foreach (MenuInfo mi in menuList)
+                {
+                    ObservableCollection<IconInfo> iconList = mi.IconList;
+                    foreach (IconInfo icon in iconList)
+                    {
+                        string relativePath = FileUtil.MakeRelativePath(myExePath, icon.Path);
+                        if (File.Exists(icon.Path) 
+                            && !string.IsNullOrEmpty(relativePath) 
+                            && !relativePath.Equals(icon.Path)) {
+                            icon.RelativePath_NoWrite = relativePath;
+                        }
+                    }
+                }
+                CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+                CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_BAK_PATH);
+            }).Start();
+        }
+    }
+}

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

@@ -4,11 +4,11 @@ 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.5.1.0")]
+[assembly: AssemblyFileVersion("2.5.1.0")]

Resource/Dictionary/XamlFlairSettings.xaml

@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF">
+<!--组合动画-->
+
+
+</ResourceDictionary>

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
@@ -65,7 +60,7 @@ namespace GeekDesk.Task
             if (Environment.OSVersion.Platform == PlatformID.Win32NT)
             {
                 SetProcessWorkingSetSize(System.Diagnostics.Process.GetCurrentProcess().Handle, -1, -1);
-            }
+            } 
         }
 
         #region 内存回收

Update.json

@@ -1,9 +1,9 @@
 {
 	"title": "GeekDesk版本更新",
-	"subTitle": "V2.4.14",
+	"subTitle": "V2.5.10",
 	"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', '这个版本有一些优化点, 大家可以自行探索, 另外征集新Logo的设计, 要求美观并能体现\\'极客\\'风格','本次重新打包了程序文件(文件目录更清爽了,注意,这次不要使用覆盖升级), 可以将旧版本根目录下的Data文件复制到新版本根目录, 然后使用新版本启动','增加可拖动图标到其它菜单的功能,取消了拖动时的动画','增加了列表展开动画的开关','增加了数据备份功能','优化大部分动画','优化搜索功能(达到了可只用键盘或只用鼠标启动所需目标)','增加了相对路径(实验性,可能有bug)','增加列表加密功能(实验性,可能有bug)','其它已知问题修复']",
+	"githubUrl": "https://github.com/BookerLiu/GeekDesk/releases",
+	"giteeUrl": "https://gitee.com/BookerLiu/GeekDesk/releases",
+	"version": "2.5.10"
 }

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();
+                lgb.Opacity = (double)(Math.Round((decimal)(appConfig.BgOpacity / 100.00), 2));
+                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/BlurGlassUtil.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Interop;
+
+namespace GeekDesk.Util
+{
+    public class BlurGlassUtil
+    {
+        internal enum AccentState
+        {
+            ACCENT_DISABLED = 1,
+            ACCENT_ENABLE_GRADIENT = 0,
+            ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
+            ACCENT_ENABLE_BLURBEHIND = 3,
+            ACCENT_INVALID_STATE = 4
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct AccentPolicy
+        {
+            public AccentState AccentState;
+            public int AccentFlags;
+            public int GradientColor;
+            public int AnimationId;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct WindowCompositionAttributeData
+        {
+            public WindowCompositionAttribute Attribute;
+            public IntPtr Data;
+            public int SizeOfData;
+        }
+
+        internal enum WindowCompositionAttribute
+        {
+            // ...
+            WCA_ACCENT_POLICY = 19
+            // ...
+        }
+
+        [DllImport("user32.dll")]
+        internal static extern int SetWindowCompositionAttribute(IntPtr hwnd, ref WindowCompositionAttributeData data);
+
+
+        public static void EnableBlur(Window window)
+        {
+            WindowInteropHelper windowHelper = new WindowInteropHelper(window);
+
+            AccentPolicy accent = new AccentPolicy
+            {
+                AccentState = AccentState.ACCENT_ENABLE_BLURBEHIND
+            };
+
+            int accentStructSize = Marshal.SizeOf(accent);
+
+            IntPtr accentPtr = Marshal.AllocHGlobal(accentStructSize);
+            Marshal.StructureToPtr(accent, accentPtr, false);
+
+            WindowCompositionAttributeData data = new WindowCompositionAttributeData
+            {
+                Attribute = WindowCompositionAttribute.WCA_ACCENT_POLICY,
+                SizeOfData = accentStructSize,
+                Data = accentPtr
+            };
+
+            SetWindowCompositionAttribute(windowHelper.Handle, ref data);
+
+            Marshal.FreeHGlobal(accentPtr);
+        }
+    }
+}

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/CommonCode.cs

@@ -1,5 +1,9 @@
 using GeekDesk.Constant;
+using GeekDesk.Control.Other;
 using GeekDesk.ViewModel;
+using HandyControl.Data;
+using Microsoft.Win32;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -8,6 +12,7 @@ using System.Runtime.InteropServices;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using static GeekDesk.Control.Other.GlobalMsgNotification;
 
 /// <summary>
 /// 提取一些代码
@@ -28,30 +33,112 @@ namespace GeekDesk.Util
             {
                 using (FileStream fs = File.Create(Constants.DATA_FILE_PATH)) { }
                 appData = new AppData();
-                SaveAppData(appData);
-
+                SaveAppData(appData, Constants.DATA_FILE_PATH);
             }
             else
             {
-                using (FileStream fs = new FileStream(Constants.DATA_FILE_PATH, FileMode.Open))
+                try
                 {
-                    BinaryFormatter bf = new BinaryFormatter();
-                    appData = bf.Deserialize(fs) as AppData;
+                    using (FileStream fs = new FileStream(Constants.DATA_FILE_PATH, FileMode.Open))
+                    {
+                        BinaryFormatter bf = new BinaryFormatter();
+                        appData = bf.Deserialize(fs) as AppData;
+                    }
+                } 
+                catch
+                {
+                    if (File.Exists(Constants.DATA_FILE_BAK_PATH))
+                    {
+                        try
+                        {
+                            using (FileStream fs = new FileStream(Constants.DATA_FILE_BAK_PATH, FileMode.Open))
+                            {
+                                BinaryFormatter bf = new BinaryFormatter();
+                                appData = bf.Deserialize(fs) as AppData;
+                            }
+
+                            DialogMsg msg = new DialogMsg();
+                            msg.msg = "不幸的是, GeekDesk当前的数据文件已经损坏, " +
+                                "现在已经启用系统自动备份的数据\n\n" +
+                                "如果你有较新的备份, " +
+                                "请退出GeekDesk, " +
+                                "将备份文件重命名为:Data, " +
+                                "然后将Data覆盖到GeekDesk的根目录即可\n\n" +
+                                "系统上次备份时间: \n" + appData.AppConfig.SysBakTime +
+                                "\n\n如果当前数据就是你想要的数据, 那么请不用管它";
+                            GlobalMsgNotification gm = new GlobalMsgNotification(msg);
+                            HandyControl.Controls.Notification ntf = HandyControl.Controls.Notification.Show(gm, ShowAnimation.Fade, true);
+                            gm.ntf = ntf;
+                        } catch 
+                        {
+                            MessageBox.Show("不幸的是, GeekDesk当前的数据文件已经损坏\n如果你有备份, 请将备份文件重命名为:Data 然后将Data覆盖到GeekDesk的根目录即可!");
+                            Application.Current.Shutdown();
+                            return null;
+                        }
+                        
+                    } else
+                    {
+                        MessageBox.Show("不幸的是, GeekDesk当前的数据文件已经损坏\n如果你有备份, 请将备份文件重命名为:Data 然后将Data覆盖到GeekDesk的根目录即可!");
+                        Application.Current.Shutdown();
+                        return null;
+                    }
+                    
                 }
             }
             return appData;
         }
 
+        private readonly static object _MyLock = new object();
         /// <summary>
         /// 保存app 数据
         /// </summary>
         /// <param name="appData"></param>
-        public static void SaveAppData(AppData appData)
+        public static void SaveAppData(AppData appData, string filePath)
         {
-            using (FileStream fs = new FileStream(Constants.DATA_FILE_PATH, FileMode.Create))
+            lock (_MyLock)
             {
-                BinaryFormatter bf = new BinaryFormatter();
-                bf.Serialize(fs, appData);
+                if (filePath.Equals(Constants.DATA_FILE_BAK_PATH))
+                {
+                    appData.AppConfig.SysBakTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                }
+                if (!Directory.Exists(filePath.Substring(0, filePath.LastIndexOf("\\"))))
+                {
+                    Directory.CreateDirectory(filePath.Substring(0, filePath.LastIndexOf("\\")));
+                }
+                using (FileStream fs = new FileStream(filePath, FileMode.Create))
+                {
+                    BinaryFormatter bf = new BinaryFormatter();
+                    bf.Serialize(fs, appData);
+                }
+            }
+        }
+
+
+        public static void SavePassword(string password)
+        {
+            using (StreamWriter sw = new StreamWriter(Constants.PW_FILE_BAK_PATH))
+            {
+                sw.Write(password);
+            }
+        }
+
+
+        public static void BakAppData()
+        {
+
+            SaveFileDialog sfd = new SaveFileDialog
+            {
+                Title = "备份文件",
+                Filter = "bak文件(*.bak)|*.bak",
+                FileName = "Data-GD-" + DateTime.Now.ToString("yyMMdd") + ".bak",
+            };
+            if (sfd.ShowDialog() == true)
+            {
+                using (FileStream fs = new FileStream(sfd.FileName, FileMode.Create))
+                {
+                    BinaryFormatter bf = new BinaryFormatter();
+                    bf.Serialize(fs, MainWindow.appData);
+                }
             }
         }
 
@@ -92,7 +179,7 @@ namespace GeekDesk.Util
             //    ext = System.IO.Path.GetExtension(path).ToLower();
             //}
 
-            string iconPath = null;
+            string iconPath;
             //if (".lnk".Equals(ext))
             //{
 
@@ -111,16 +198,21 @@ namespace GeekDesk.Util
             BitmapImage bi = ImageUtil.GetBitmapIconByPath(iconPath);
             IconInfo iconInfo = new IconInfo
             {
-                Path = path,
-                LnkPath = tempPath,
-                BitmapImage = bi,
-                StartArg = FileUtil.GetArgByLnk(tempPath)
+                Path_NoWrite = path,
+                LnkPath_NoWrite = tempPath,
+                BitmapImage_NoWrite = bi,
+                StartArg_NoWrite = FileUtil.GetArgByLnk(tempPath)
             };
-            iconInfo.DefaultImage = iconInfo.ImageByteArr;
-            iconInfo.Name = System.IO.Path.GetFileNameWithoutExtension(tempPath);
+            iconInfo.DefaultImage_NoWrite = iconInfo.ImageByteArr;
+            iconInfo.Name_NoWrite = System.IO.Path.GetFileNameWithoutExtension(tempPath);
             if (StringUtil.IsEmpty(iconInfo.Name))
             {
-                iconInfo.Name = path;
+                iconInfo.Name_NoWrite = path;
+            }
+            string relativePath = FileUtil.MakeRelativePath(Constants.APP_DIR + "GeekDesk.exe", iconInfo.Path);
+            if (!string.IsNullOrEmpty(relativePath) && !relativePath.Equals(iconInfo.Path))
+            {
+                iconInfo.RelativePath_NoWrite = relativePath;
             }
             return iconInfo;
         }

Util/DragAdorner.cs

@@ -0,0 +1,175 @@
+// Copyright (C) Josh Smith - January 2007
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Documents;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using System.Windows.Media.Animation;
+using System.Windows.Controls;
+
+namespace GeekDesk.Util
+{
+	/// <summary>
+	/// Renders a visual which can follow the mouse cursor, 
+	/// such as during a drag-and-drop operation.
+	/// </summary>
+	public class DragAdorner : Adorner
+	{
+		#region Data
+
+		private Rectangle child = null;
+		private double offsetLeft = 0;
+		private double offsetTop = 0;
+
+		#endregion // Data
+
+		#region Constructor
+
+		/// <summary>
+		/// Initializes a new instance of DragVisualAdorner.
+		/// </summary>
+		/// <param name="adornedElement">The element being adorned.</param>
+		/// <param name="size">The size of the adorner.</param>
+		/// <param name="brush">A brush to with which to paint the adorner.</param>
+		public DragAdorner( UIElement adornedElement, Size size, Brush brush )
+			: base( adornedElement )
+		{
+			Rectangle rect = new Rectangle();
+			rect.Fill = brush;
+			rect.Width = size.Width;
+			rect.Height = size.Height;
+			rect.IsHitTestVisible = false;
+			this.child = rect;
+		}
+
+		#endregion // Constructor
+
+		#region Public Interface
+
+		#region GetDesiredTransform
+
+		/// <summary>
+		/// Override.
+		/// </summary>
+		/// <param name="transform"></param>
+		/// <returns></returns>
+		public override GeneralTransform GetDesiredTransform( GeneralTransform transform )
+		{
+			GeneralTransformGroup result = new GeneralTransformGroup();
+			result.Children.Add( base.GetDesiredTransform( transform ) );
+			result.Children.Add( new TranslateTransform( this.offsetLeft, this.offsetTop ) );
+			return result;
+		}
+
+		#endregion // GetDesiredTransform
+
+		#region OffsetLeft
+
+		/// <summary>
+		/// Gets/sets the horizontal offset of the adorner.
+		/// </summary>
+		public double OffsetLeft
+		{
+			get { return this.offsetLeft; }
+			set
+			{
+				this.offsetLeft = value;
+				UpdateLocation();
+			}
+		}
+
+		#endregion // OffsetLeft
+
+		#region SetOffsets
+
+		/// <summary>
+		/// Updates the location of the adorner in one atomic operation.
+		/// </summary>
+		/// <param name="left"></param>
+		/// <param name="top"></param>
+		public void SetOffsets( double left, double top )
+		{
+			this.offsetLeft = left;
+			this.offsetTop = top;
+			this.UpdateLocation();
+		}
+
+		#endregion // SetOffsets
+
+		#region OffsetTop
+
+		/// <summary>
+		/// Gets/sets the vertical offset of the adorner.
+		/// </summary>
+		public double OffsetTop
+		{
+			get { return this.offsetTop; }
+			set
+			{
+				this.offsetTop = value;
+				UpdateLocation();
+			}
+		}
+
+		#endregion // OffsetTop
+
+		#endregion // Public Interface
+
+		#region Protected Overrides
+
+		/// <summary>
+		/// Override.
+		/// </summary>
+		/// <param name="constraint"></param>
+		/// <returns></returns>
+		protected override Size MeasureOverride( Size constraint )
+		{
+			this.child.Measure( constraint );
+			return this.child.DesiredSize;
+		}
+
+		/// <summary>
+		/// Override.
+		/// </summary>
+		/// <param name="finalSize"></param>
+		/// <returns></returns>
+		protected override Size ArrangeOverride( Size finalSize )
+		{
+			this.child.Arrange( new Rect( finalSize ) );
+			return finalSize;
+		}
+
+		/// <summary>
+		/// Override.
+		/// </summary>
+		/// <param name="index"></param>
+		/// <returns></returns>
+		protected override Visual GetVisualChild( int index )
+		{
+			return this.child;
+		}
+
+		/// <summary>
+		/// Override.  Always returns 1.
+		/// </summary>
+		protected override int VisualChildrenCount
+		{
+			get { return 1; }
+		}
+
+		#endregion // Protected Overrides
+
+		#region Private Helpers
+
+		private void UpdateLocation()
+		{
+			AdornerLayer adornerLayer = this.Parent as AdornerLayer;
+			if( adornerLayer != null )
+				adornerLayer.Update( this.AdornedElement );
+		}
+
+		#endregion // Private Helpers
+	}
+}

Util/FileIcon.cs

@@ -1,5 +1,5 @@
-using IWshRuntimeLibrary;
-using System;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -11,27 +11,42 @@ namespace GeekDesk.Util
 {
     public class FileIcon
     {
-
-        private static List<string> GetBlurExts()
-        {
-            List<string> list = new List<string>();
-            list.Add(".exe");
-            list.Add(".cer");
-            list.Add(".lnk");
-            return list;
+        static List<string> blurExtsList;
+        static List<int[]> pixelList;
+        static FileIcon() {
+            blurExtsList = new List<string>
+            {
+                ".exe",
+                ".cer",
+                ".lnk",
+                ".chm"
+            };
+            pixelList = new List<int[]>
+            {
+                new int[]{ 256 / 4, 256 / 4 },
+                new int[]{ 256 / 2, 256 / 4 },
+                new int[]{ 256 / 4 * 3, 256 / 4 },
+                new int[]{ 256 / 4, 256 / 2 },
+                new int[]{ 256 / 4, 256 / 4 * 3 },
+                new int[]{ 256 / 4 * 3, 256 / 2 },
+                new int[]{ 256 / 4 * 3, 256 / 4 * 3 },
+                new int[]{ 256 / 2, 256 / 4 * 3 },
+            };
         }
 
-          [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)
@@ -54,7 +69,7 @@ namespace GeekDesk.Util
                 ip = hIcons[0];
                 ico = Icon.FromHandle(ip);
             }
-            else if (GetBlurExts().Contains(ext))
+            else if (blurExtsList.Contains(ext))
             {
                 ico = Icon.ExtractAssociatedIcon(filePath);
             }
@@ -62,8 +77,14 @@ namespace GeekDesk.Util
             {
                 ip = GetJumboIcon(GetIconIndex(filePath));
                 ico = Icon.FromHandle(ip);
+                if (CheckIsSmallIco(ico.ToBitmap()))
+                {
+                    ico = Icon.ExtractAssociatedIcon(filePath);
+                }
             }
 
+            
+
             Bitmap bmp = ico.ToBitmap();
             MemoryStream strm = new MemoryStream();
 
@@ -74,6 +95,7 @@ namespace GeekDesk.Util
             myEncoderParameters.Param[0] = myEncoderParameter;
 
             bmp.Save(strm, myImageCodecInfo, myEncoderParameters);
+
             BitmapImage bmpImage = new BitmapImage();
             bmpImage.BeginInit();
             strm.Seek(0, SeekOrigin.Begin);
@@ -83,6 +105,7 @@ namespace GeekDesk.Util
             {
                 Shell32.DestroyIcon(ip);
             }
+            DeleteObject(bmp.GetHbitmap());
             return bmpImage.Clone();
         }
 
@@ -99,6 +122,30 @@ namespace GeekDesk.Util
             return null;
         }
 
+        private static bool CheckIsSmallIco(Bitmap bm)
+        {
+            Color color;
+            int count = 0;
+            foreach (int[] arr in pixelList)
+            {
+                color = bm.GetPixel(arr[0], arr[1]);
+                if (color.A == 0)
+                {
+                    count++;
+                }
+            }
+            DeleteObject(bm.GetHbitmap());
+            if (count >= 6)
+            {
+                return true;
+            }
+            return false;
+        }
+
+
+        [System.Runtime.InteropServices.DllImport("gdi32.dll")]
+        public static extern bool DeleteObject(IntPtr onj);
+
 
 
         public static int GetIconIndex(string pszFile)

Util/FileUtil.cs

@@ -1,11 +1,9 @@
 using IWshRuntimeLibrary;
 using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace GeekDesk.Util
 {
@@ -159,5 +157,20 @@ namespace GeekDesk.Util
             }
         }
 
+        public static string MakeRelativePath(string fromPath, string toPath)
+        {
+            if (string.IsNullOrEmpty(toPath) || string.IsNullOrEmpty(fromPath)) return null;
+            Uri file = new Uri(@toPath);
+            // Must end in a slash to indicate folder
+            Uri folder = new Uri(@fromPath);
+            string relativePath =
+            Uri.UnescapeDataString(
+                folder.MakeRelativeUri(file)
+                    .ToString()
+                    .Replace('/', Path.DirectorySeparatorChar)
+                );
+            return relativePath;
+        }
+
     }
 }

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/ListBoxDragDropManager.cs

@@ -0,0 +1,892 @@
+// Copyright (C) Josh Smith - January 2007
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Input;
+using GeekDesk.Util;
+using GeekDesk.Constant;
+using HandyControl.Controls;
+
+namespace GeekDesk.Util
+{
+	#region ListBoxDragDropManager
+
+	/// <summary>
+	/// Manages the dragging and dropping of ListBoxItems in a ListBox.
+	/// The ItemType type parameter indicates the type of the objects in
+	/// the ListBox's items source.  The ListBox's ItemsSource must be 
+	/// set to an instance of ObservableCollection of ItemType, or an 
+	/// Exception will be thrown.
+	/// </summary>
+	/// <typeparam name="ItemType">The type of the ListBox's items.</typeparam>
+	public class ListBoxDragDropManager<ItemType> where ItemType : class
+	{
+		#region Data
+
+		bool canInitiateDrag;
+		DragAdorner dragAdorner;
+		double dragAdornerOpacity;
+		int indexToSelect;
+		bool isDragInProgress;
+		ItemType itemUnderDragCursor;
+		ListBox listBox;
+		Point ptMouseDown;
+		bool showDragAdorner;
+
+		#endregion // Data
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of ListBoxDragManager.
+		/// </summary>
+		public ListBoxDragDropManager()
+		{
+			this.canInitiateDrag = false;
+			this.dragAdornerOpacity = 0.7;
+			this.indexToSelect = -1;
+			this.showDragAdorner = true;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of ListBoxDragManager.
+		/// </summary>
+		/// <param name="listBox"></param>
+		public ListBoxDragDropManager( ListBox listBox )
+			: this()
+		{
+			this.ListBox = listBox;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of ListBoxDragManager.
+		/// </summary>
+		/// <param name="listBox"></param>
+		/// <param name="dragAdornerOpacity"></param>
+		public ListBoxDragDropManager( ListBox listBox, double dragAdornerOpacity )
+			: this( listBox )
+		{
+			this.DragAdornerOpacity = dragAdornerOpacity;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of ListBoxDragManager.
+		/// </summary>
+		/// <param name="listBox"></param>
+		/// <param name="showDragAdorner"></param>
+		public ListBoxDragDropManager( ListBox listBox, bool showDragAdorner )
+			: this( listBox )
+		{
+			this.ShowDragAdorner = showDragAdorner;
+		}
+
+		#endregion // Constructors
+
+		#region Public Interface
+
+			#region DragAdornerOpacity
+
+		/// <summary>
+		/// Gets/sets the opacity of the drag adorner.  This property has no
+		/// effect if ShowDragAdorner is false. The default value is 0.7
+		/// </summary>
+		public double DragAdornerOpacity
+		{
+			get { return this.dragAdornerOpacity; }
+			set
+			{
+				if( this.IsDragInProgress )
+					throw new InvalidOperationException( "Cannot set the DragAdornerOpacity property during a drag operation." );
+
+				if( value < 0.0 || value > 1.0 )
+					throw new ArgumentOutOfRangeException( "DragAdornerOpacity", value, "Must be between 0 and 1." );
+
+				this.dragAdornerOpacity = value;
+			}
+		}
+
+			#endregion // DragAdornerOpacity
+
+			#region IsDragInProgress
+
+		/// <summary>
+		/// Returns true if there is currently a drag operation being managed.
+		/// </summary>
+		public bool IsDragInProgress
+		{
+			get { return this.isDragInProgress; }
+			private set { this.isDragInProgress = value; }
+		}
+
+			#endregion // IsDragInProgress
+
+			#region ListBox
+
+		/// <summary>
+		/// Gets/sets the ListBox whose dragging is managed.  This property
+		/// can be set to null, to prevent drag management from occuring.  If
+		/// the ListBox's AllowDrop property is false, it will be set to true.
+		/// </summary>
+		public ListBox ListBox
+		{
+			get { return listBox; }
+			set
+			{
+				if( this.IsDragInProgress )
+					throw new InvalidOperationException( "Cannot set the ListBox property during a drag operation." );
+
+				if( this.listBox != null )
+				{
+					#region Unhook Events
+
+					this.listBox.PreviewMouseLeftButtonDown -= LIstBox_PreviewMouseLeftButtonDown;
+					this.listBox.PreviewMouseMove -= LIstBox_PreviewMouseMove;
+					this.listBox.DragOver -= LIstBox_DragOver;
+					this.listBox.DragLeave -= LIstBox_DragLeave;
+					this.listBox.DragEnter -= LIstBox_DragEnter;
+					this.listBox.Drop -= LIstBox_Drop;
+
+					#endregion // Unhook Events
+				}
+
+				this.listBox = value;
+
+				if( this.listBox != null )
+				{
+					if( !this.listBox.AllowDrop )
+						this.listBox.AllowDrop = true;
+
+					#region Hook Events
+
+					this.listBox.PreviewMouseLeftButtonDown += LIstBox_PreviewMouseLeftButtonDown;
+					this.listBox.PreviewMouseMove += LIstBox_PreviewMouseMove;
+					this.listBox.DragOver += LIstBox_DragOver;
+					this.listBox.DragLeave += LIstBox_DragLeave;
+					this.listBox.DragEnter += LIstBox_DragEnter;
+					this.listBox.Drop += LIstBox_Drop;
+
+					#endregion // Hook Events
+				}
+			}
+		}
+
+			#endregion // ListBox
+
+			#region ProcessDrop [event]
+
+		/// <summary>
+		/// Raised when a drop occurs.  By default the dropped item will be moved
+		/// to the target index.  Handle this event if relocating the dropped item
+		/// requires custom behavior.  Note, if this event is handled the default
+		/// item dropping logic will not occur.
+		/// </summary>
+		public event EventHandler<ProcessDropEventArgs<ItemType>> ProcessDrop;
+
+			#endregion // ProcessDrop [event]
+
+			#region ShowDragAdorner
+
+		/// <summary>
+		/// Gets/sets whether a visual representation of the ListBoxItem being dragged
+		/// follows the mouse cursor during a drag operation.  The default value is true.
+		/// </summary>
+		public bool ShowDragAdorner
+		{
+			get { return this.showDragAdorner; }
+			set
+			{
+				if( this.IsDragInProgress )
+					throw new InvalidOperationException( "Cannot set the ShowDragAdorner property during a drag operation." );
+
+				this.showDragAdorner = value;
+			}
+		}
+
+			#endregion // ShowDragAdorner
+
+		#endregion // Public Interface
+
+		#region Event Handling Methods
+
+			#region LIstBox_PreviewMouseLeftButtonDown
+
+		void LIstBox_PreviewMouseLeftButtonDown( object sender, MouseButtonEventArgs e )
+		{
+			if( this.IsMouseOverScrollbar )
+			{
+				// 4/13/2007 - Set the flag to false when cursor is over scrollbar.
+				this.canInitiateDrag = false;
+				return;
+			}
+
+			int index = this.IndexUnderDragCursor;
+			this.canInitiateDrag = index > -1;
+
+			if( this.canInitiateDrag )
+			{
+				// Remember the location and index of the ListBoxItem the user clicked on for later.
+				this.ptMouseDown = MouseUtil.GetMousePosition();
+				//this.ptMouseDown = MouseUtil.GetMousePosition( this.listBox );
+				this.indexToSelect = index;
+			}
+			else
+			{
+				this.ptMouseDown = new Point( -10000, -10000 );
+				this.indexToSelect = -1;
+			}
+		}
+
+			#endregion // LIstBox_PreviewMouseLeftButtonDown
+
+			#region LIstBox_PreviewMouseMove
+
+		void LIstBox_PreviewMouseMove( object sender, MouseEventArgs e )
+		{
+			if( !this.CanStartDragOperation )
+				return;
+
+			// Select the item the user clicked on.
+			if( this.listBox.SelectedIndex != this.indexToSelect )
+				this.listBox.SelectedIndex = this.indexToSelect;
+
+			// If the item at the selected index is null, there's nothing
+			// we can do, so just return;
+			if( this.listBox.SelectedItem == null )
+				return;
+
+			ListBoxItem itemToDrag = this.GetListBoxItem( this.listBox.SelectedIndex );
+			if( itemToDrag == null )
+				return;
+
+			AdornerLayer adornerLayer = this.ShowDragAdornerResolved ? this.InitializeAdornerLayer( itemToDrag ) : null;
+
+			this.InitializeDragOperation( itemToDrag );
+			this.PerformDragOperation();
+			this.FinishDragOperation( itemToDrag, adornerLayer );
+		}
+
+			#endregion // LIstBox_PreviewMouseMove
+
+			#region LIstBox_DragOver
+
+		void LIstBox_DragOver( object sender, DragEventArgs e )
+		{
+			e.Effects = DragDropEffects.Move;
+
+			if ( this.ShowDragAdornerResolved )
+				this.UpdateDragAdornerLocation();
+
+			// Update the item which is known to be currently under the drag cursor.
+			int index = this.IndexUnderDragCursor;
+			this.ItemUnderDragCursor = index < 0 ? null : this.ListBox.Items[index] as ItemType;
+		}
+
+			#endregion // LIstBox_DragOver
+
+			#region LIstBox_DragLeave
+
+		void LIstBox_DragLeave( object sender, DragEventArgs e )
+		{
+			if( !this.IsMouseOver( this.listBox ) )
+			{
+				if( this.ItemUnderDragCursor != null )
+					this.ItemUnderDragCursor = null;
+
+				if( this.dragAdorner != null )
+					this.dragAdorner.Visibility = Visibility.Collapsed;
+			}
+		}
+
+			#endregion // LIstBox_DragLeave
+
+			#region LIstBox_DragEnter
+
+		void LIstBox_DragEnter( object sender, DragEventArgs e )
+		{
+			if( this.dragAdorner != null && this.dragAdorner.Visibility != Visibility.Visible )
+			{
+				// Update the location of the adorner and then show it.				
+				this.UpdateDragAdornerLocation();
+				this.dragAdorner.Visibility = Visibility.Visible;
+			}
+		}
+	
+			#endregion // LIstBox_DragEnter
+
+			#region LIstBox_Drop
+
+		void LIstBox_Drop( object sender, DragEventArgs e )
+		{
+			if( this.ItemUnderDragCursor != null )
+				this.ItemUnderDragCursor = null;
+
+			e.Effects = DragDropEffects.None;
+
+			if( !e.Data.GetDataPresent( typeof( ItemType ) ) )
+				return;
+
+			// Get the data object which was dropped.
+			ItemType data = e.Data.GetData( typeof( ItemType ) ) as ItemType;
+			if( data == null )
+				return;
+
+			// Get the ObservableCollection<ItemType> which contains the dropped data object.
+			ObservableCollection<ItemType> itemsSource = this.listBox.ItemsSource as ObservableCollection<ItemType>;
+			if( itemsSource == null )
+				throw new Exception(
+					"A ListBox managed by ListBoxDragManager must have its ItemsSource set to an ObservableCollection<ItemType>." );
+
+			int oldIndex = itemsSource.IndexOf( data );
+			int newIndex = this.IndexUnderDragCursor;
+
+			if( newIndex < 0 )
+			{
+				// The drag started somewhere else, and our ListBox is empty
+				// so make the new item the first in the list.
+				if( itemsSource.Count == 0 )
+					newIndex = 0;
+
+				// The drag started somewhere else, but our ListBox has items
+				// so make the new item the last in the list.
+				else if( oldIndex < 0 )
+					newIndex = itemsSource.Count;
+
+				// The user is trying to drop an item from our ListBox into
+				// our ListBox, but the mouse is not over an item, so don't
+				// let them drop it.
+				else
+					return;
+			}
+
+			// Dropping an item back onto itself is not considered an actual 'drop'.
+			if( oldIndex == newIndex )
+				return;
+
+			if( this.ProcessDrop != null )
+			{
+				// Let the client code process the drop.
+				ProcessDropEventArgs<ItemType> args = new ProcessDropEventArgs<ItemType>( itemsSource, data, oldIndex, newIndex, e.AllowedEffects );
+				this.ProcessDrop( this, args );
+				e.Effects = args.Effects;
+			}
+			else
+			{
+				// Move the dragged data object from it's original index to the
+				// new index (according to where the mouse cursor is).  If it was
+				// not previously in the ListBox, then insert the item.
+				if( oldIndex > -1 )
+                {
+					// <20>ⲿҵ<E2B2BF><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+					itemsSource.Move(oldIndex, newIndex);
+					if (MainWindow.appData.AppConfig.IconSortType != SortType.CUSTOM)
+                    {
+						MainWindow.appData.AppConfig.IconSortType = SortType.CUSTOM;
+						if (MainWindow.mainWindow.Visibility == Visibility.Collapsed
+										|| MainWindow.mainWindow.Opacity != 1)
+						{
+							Growl.WarningGlobal("<22>ѽ<EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD>!");
+						}
+						else
+						{
+							Growl.Warning("<22>ѽ<EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD>!", "MainWindowGrowl");
+						}
+					}
+				}
+				else
+                {
+					itemsSource.Insert(newIndex, data);
+				}
+
+				// Set the Effects property so that the call to DoDragDrop will return 'Move'.
+				e.Effects = DragDropEffects.Move;
+			}
+		}
+
+			#endregion // LIstBox_Drop
+
+		#endregion // Event Handling Methods
+
+		#region Private Helpers
+
+			#region CanStartDragOperation
+
+		bool CanStartDragOperation
+		{
+			get
+			{
+				if( Mouse.LeftButton != MouseButtonState.Pressed )
+					return false;
+
+				if( !this.canInitiateDrag )
+					return false;
+
+				if( this.indexToSelect == -1 )
+					return false;
+
+				if( !this.HasCursorLeftDragThreshold )
+					return false;
+
+				return true;
+			}
+		}
+
+			#endregion // CanStartDragOperation
+
+			#region FinishDragOperation
+
+		void FinishDragOperation( ListBoxItem draggedItem, AdornerLayer adornerLayer )
+		{
+			// Let the ListBoxItem know that it is not being dragged anymore.
+			ListBoxItemDragState.SetIsBeingDragged( draggedItem, false );
+
+			this.IsDragInProgress = false;
+
+			if( this.ItemUnderDragCursor != null )
+				this.ItemUnderDragCursor = null;
+
+			// Remove the drag adorner from the adorner layer.
+			if( adornerLayer != null )
+			{
+				adornerLayer.Remove( this.dragAdorner );
+				this.dragAdorner = null;
+			}
+		}
+
+			#endregion // FinishDragOperation
+
+			#region GetListBoxItem
+
+		ListBoxItem GetListBoxItem( int index )
+		{
+			if( this.listBox.ItemContainerGenerator.Status != GeneratorStatus.ContainersGenerated )
+				return null;
+
+			return this.listBox.ItemContainerGenerator.ContainerFromIndex( index ) as ListBoxItem;
+		}
+
+		ListBoxItem GetListBoxItem( ItemType dataItem )
+		{
+			if( this.listBox.ItemContainerGenerator.Status != GeneratorStatus.ContainersGenerated )
+				return null;
+
+			return this.listBox.ItemContainerGenerator.ContainerFromItem( dataItem ) as ListBoxItem;
+		}
+
+			#endregion // GetListBoxItem
+
+			#region HasCursorLeftDragThreshold
+
+		bool HasCursorLeftDragThreshold
+		{
+			get
+			{
+				if( this.indexToSelect < 0 )
+					return false;
+
+				ListBoxItem item = this.GetListBoxItem( this.indexToSelect );
+				Rect bounds = VisualTreeHelper.GetDescendantBounds( item );
+				Point ptInItem = this.listBox.TranslatePoint( this.ptMouseDown, item );
+
+				// In case the cursor is at the very top or bottom of the ListBoxItem
+				// we want to make the vertical threshold very small so that dragging
+				// over an adjacent item does not select it.
+				double topOffset = Math.Abs( ptInItem.Y );
+				double btmOffset = Math.Abs( bounds.Height - ptInItem.Y );
+				double vertOffset = Math.Min( topOffset, btmOffset );
+
+				double width = SystemParameters.MinimumHorizontalDragDistance * 2;
+				double height = Math.Min( SystemParameters.MinimumVerticalDragDistance, vertOffset ) * 2;
+				Size szThreshold = new Size( width, height );
+
+				Rect rect = new Rect( this.ptMouseDown, szThreshold );
+				rect.Offset( szThreshold.Width / -2, szThreshold.Height / -2 );
+                //Point ptInListBox = MouseUtil.GetMousePosition(this.listBox);
+                Point ptInListBox = MouseUtil.GetMousePosition();
+                return !rect.Contains( ptInListBox );
+			}
+		}
+
+			#endregion // HasCursorLeftDragThreshold
+
+			#region IndexUnderDragCursor
+
+		/// <summary>
+		/// Returns the index of the ListBoxItem underneath the
+		/// drag cursor, or -1 if the cursor is not over an item.
+		/// </summary>
+		int IndexUnderDragCursor
+		{
+			get
+			{
+				int index = -1;
+				for( int i = 0; i < this.listBox.Items.Count; ++i )
+				{
+					ListBoxItem item = this.GetListBoxItem( i );
+					if( this.IsMouseOver( item ) )
+					{
+						index = i;
+						break;
+					}
+				}
+				return index;
+			}
+		}
+
+			#endregion // IndexUnderDragCursor
+
+			#region InitializeAdornerLayer
+
+		AdornerLayer InitializeAdornerLayer( ListBoxItem itemToDrag )
+		{
+			// Create a brush which will paint the ListBoxItem onto
+			// a visual in the adorner layer.
+			VisualBrush brush = new VisualBrush( itemToDrag );
+
+			// Create an element which displays the source item while it is dragged.
+			this.dragAdorner = new DragAdorner( this.listBox, itemToDrag.RenderSize, brush );
+			
+			// Set the drag adorner's opacity.		
+			this.dragAdorner.Opacity = this.DragAdornerOpacity;
+
+			AdornerLayer layer = AdornerLayer.GetAdornerLayer( this.listBox );
+			layer.Add( dragAdorner );
+
+            // Save the location of the cursor when the left mouse button was pressed.
+            this.ptMouseDown = MouseUtil.GetMousePosition(this.listBox);
+            //this.ptMouseDown = MouseUtil.GetMousePosition();
+
+            return layer;
+		}
+
+			#endregion // InitializeAdornerLayer
+
+			#region InitializeDragOperation
+
+		void InitializeDragOperation( ListBoxItem itemToDrag )
+		{
+			// Set some flags used during the drag operation.
+			this.IsDragInProgress = true;
+			this.canInitiateDrag = false;
+
+			// Let the ListBoxItem know that it is being dragged.
+			ListBoxItemDragState.SetIsBeingDragged( itemToDrag, true );
+		}
+
+			#endregion // InitializeDragOperation
+
+			#region IsMouseOver
+
+		bool IsMouseOver( Visual target )
+		{
+			// We need to use MouseUtil to figure out the cursor
+			// coordinates because, during a drag-drop operation, the WPF
+			// mechanisms for getting the coordinates behave strangely.
+
+			Rect bounds = VisualTreeHelper.GetDescendantBounds( target );
+			Point mousePos = MouseUtil.GetMousePosition( target );
+			return bounds.Contains( mousePos );
+		}
+
+			#endregion // IsMouseOver
+
+			#region IsMouseOverScrollbar
+
+		/// <summary>
+		/// Returns true if the mouse cursor is over a scrollbar in the ListBox.
+		/// </summary>
+		bool IsMouseOverScrollbar
+		{
+			get
+			{
+				Point ptMouse = MouseUtil.GetMousePosition( this.listBox );
+				HitTestResult res = VisualTreeHelper.HitTest( this.listBox, ptMouse );
+				if( res == null )
+					return false;
+
+				DependencyObject depObj = res.VisualHit;
+				while( depObj != null )
+				{
+					if( depObj is ScrollBar )
+						return true;
+
+					// VisualTreeHelper works with objects of type Visual or Visual3D.
+					// If the current object is not derived from Visual or Visual3D,
+					// then use the LogicalTreeHelper to find the parent element.
+					if( depObj is Visual || depObj is System.Windows.Media.Media3D.Visual3D )
+						depObj = VisualTreeHelper.GetParent( depObj );
+					else
+						depObj = LogicalTreeHelper.GetParent( depObj );
+				}
+
+				return false;
+			}
+		}
+
+			#endregion // IsMouseOverScrollbar
+
+			#region ItemUnderDragCursor
+
+		ItemType ItemUnderDragCursor
+		{
+			get { return this.itemUnderDragCursor; }
+			set
+			{
+				if( this.itemUnderDragCursor == value )
+					return;
+
+				// The first pass handles the previous item under the cursor.
+				// The second pass handles the new one.
+				for( int i = 0; i < 2; ++i )
+				{
+					if( i == 1 )
+						this.itemUnderDragCursor = value;
+
+					if( this.itemUnderDragCursor != null )
+					{
+						ListBoxItem listBoxItem = this.GetListBoxItem( this.itemUnderDragCursor );
+						if( listBoxItem != null )
+							ListBoxItemDragState.SetIsUnderDragCursor( listBoxItem, i == 1 );
+					}
+				}
+			}
+		}
+
+			#endregion // ItemUnderDragCursor
+
+			#region PerformDragOperation
+
+		void PerformDragOperation()
+		{
+			ItemType selectedItem = this.listBox.SelectedItem as ItemType;
+			DragDropEffects allowedEffects = DragDropEffects.Move | DragDropEffects.Move | DragDropEffects.Link;
+			if( DragDrop.DoDragDrop( this.listBox, selectedItem, allowedEffects ) != DragDropEffects.None )
+			{
+				// The item was dropped into a new location,
+				// so make it the new selected item.
+				this.listBox.SelectedItem = selectedItem;
+			}
+		}
+
+			#endregion // PerformDragOperation
+
+			#region ShowDragAdornerResolved
+
+		bool ShowDragAdornerResolved
+		{
+			get { return this.ShowDragAdorner && this.DragAdornerOpacity > 0.0; }
+		}
+
+			#endregion // ShowDragAdornerResolved
+
+			#region UpdateDragAdornerLocation
+
+		void UpdateDragAdornerLocation()
+		{
+			if( this.dragAdorner != null )
+			{
+				//Point ptCursor = MouseUtil.GetMousePosition(this.ListBox);
+
+
+				Point ptCursor = MouseUtil.GetMousePosition(this.ListBox);
+
+                //double left = ptCursor.X - this.ptMouseDown.X;
+                //double left2 = ptCursor.X;
+
+				ListBoxItem itemBeingDragged = this.GetListBoxItem(this.indexToSelect);
+
+				// 4/13/2007 - Made the top offset relative to the item being dragged.
+				Point itemLoc = itemBeingDragged.TranslatePoint( new Point( 0, 0 ), this.ListBox );
+				double top = itemLoc.Y + ptCursor.Y - this.ptMouseDown.Y;
+				double left = itemLoc.X + ptCursor.X - this.ptMouseDown.X;
+
+				this.dragAdorner.SetOffsets(left, top );
+			}
+		}
+
+			#endregion // UpdateDragAdornerLocation
+
+		#endregion // Private Helpers
+	}
+
+	#endregion // ListBoxDragDropManager
+
+	#region ListBoxItemDragState
+
+	/// <summary>
+	/// Exposes attached properties used in conjunction with the ListBoxDragDropManager class.
+	/// Those properties can be used to allow triggers to modify the appearance of ListBoxItems
+	/// in a ListBox during a drag-drop operation.
+	/// </summary>
+	public static class ListBoxItemDragState
+	{
+		#region IsBeingDragged
+
+		/// <summary>
+		/// Identifies the ListBoxItemDragState's IsBeingDragged attached property.  
+		/// This field is read-only.
+		/// </summary>
+		public static readonly DependencyProperty IsBeingDraggedProperty =
+			DependencyProperty.RegisterAttached(
+				"IsBeingDragged",
+				typeof( bool ),
+				typeof( ListBoxItemDragState ),
+				new UIPropertyMetadata( false ) );
+
+		/// <summary>
+		/// Returns true if the specified ListBoxItem is being dragged, else false.
+		/// </summary>
+		/// <param name="item">The ListBoxItem to check.</param>
+		public static bool GetIsBeingDragged( ListBoxItem item )
+		{
+			return (bool)item.GetValue( IsBeingDraggedProperty );
+		}
+
+		/// <summary>
+		/// Sets the IsBeingDragged attached property for the specified ListBoxItem.
+		/// </summary>
+		/// <param name="item">The ListBoxItem to set the property on.</param>
+		/// <param name="value">Pass true if the element is being dragged, else false.</param>
+		internal static void SetIsBeingDragged( ListBoxItem item, bool value )
+		{
+			item.SetValue( IsBeingDraggedProperty, value );
+		}
+
+		#endregion // IsBeingDragged
+
+		#region IsUnderDragCursor
+
+		/// <summary>
+		/// Identifies the ListBoxItemDragState's IsUnderDragCursor attached property.  
+		/// This field is read-only.
+		/// </summary>
+		public static readonly DependencyProperty IsUnderDragCursorProperty =
+			DependencyProperty.RegisterAttached(
+				"IsUnderDragCursor",
+				typeof( bool ),
+				typeof( ListBoxItemDragState ),
+				new UIPropertyMetadata( false ) );
+
+		/// <summary>
+		/// Returns true if the specified ListBoxItem is currently underneath the cursor 
+		/// during a drag-drop operation, else false.
+		/// </summary>
+		/// <param name="item">The ListBoxItem to check.</param>
+		public static bool GetIsUnderDragCursor( ListBoxItem item )
+		{
+			return (bool)item.GetValue( IsUnderDragCursorProperty );
+		}
+
+		/// <summary>
+		/// Sets the IsUnderDragCursor attached property for the specified ListBoxItem.
+		/// </summary>
+		/// <param name="item">The ListBoxItem to set the property on.</param>
+		/// <param name="value">Pass true if the element is underneath the drag cursor, else false.</param>
+		internal static void SetIsUnderDragCursor( ListBoxItem item, bool value )
+		{
+			item.SetValue( IsUnderDragCursorProperty, value );
+		}
+
+		#endregion // IsUnderDragCursor
+	}
+
+	#endregion // ListBoxItemDragState
+
+	#region ProcessDropEventArgs
+
+	/// <summary>
+	/// Event arguments used by the ListBoxDragDropManager.ProcessDrop event.
+	/// </summary>
+	/// <typeparam name="ItemType">The type of data object being dropped.</typeparam>
+	public class ProcessDropEventArgs<ItemType> : EventArgs where ItemType : class
+	{
+		#region Data
+
+		ObservableCollection<ItemType> itemsSource;
+		ItemType dataItem;
+		int oldIndex;
+		int newIndex;
+		DragDropEffects allowedEffects = DragDropEffects.None;
+		DragDropEffects effects = DragDropEffects.None;
+
+		#endregion // Data
+
+		#region Constructor
+
+		internal ProcessDropEventArgs( 
+			ObservableCollection<ItemType> itemsSource, 
+			ItemType dataItem, 
+			int oldIndex, 
+			int newIndex, 
+			DragDropEffects allowedEffects )
+		{
+			this.itemsSource = itemsSource;
+			this.dataItem = dataItem;
+			this.oldIndex = oldIndex;
+			this.newIndex = newIndex;
+			this.allowedEffects = allowedEffects;
+		}
+
+		#endregion // Constructor
+
+		#region Public Properties
+
+		/// <summary>
+		/// The items source of the ListBox where the drop occurred.
+		/// </summary>
+		public ObservableCollection<ItemType> ItemsSource
+		{
+			get { return this.itemsSource; }
+		}
+
+		/// <summary>
+		/// The data object which was dropped.
+		/// </summary>
+		public ItemType DataItem
+		{
+			get { return this.dataItem; }
+		}
+
+		/// <summary>
+		/// The current index of the data item being dropped, in the ItemsSource collection.
+		/// </summary>
+		public int OldIndex
+		{
+			get { return this.oldIndex; }
+		}
+
+		/// <summary>
+		/// The target index of the data item being dropped, in the ItemsSource collection.
+		/// </summary>
+		public int NewIndex
+		{
+			get { return this.newIndex; }
+		}
+
+		/// <summary>
+		/// The drag drop effects allowed to be performed.
+		/// </summary>
+		public DragDropEffects AllowedEffects
+		{
+			get { return allowedEffects; }
+		}
+
+		/// <summary>
+		/// The drag drop effect(s) performed on the dropped item.
+		/// </summary>
+		public DragDropEffects Effects
+		{
+			get { return effects; }
+			set { effects = value; }
+		}
+
+		#endregion // Public Properties
+	}
+
+	#endregion // ProcessDropEventArgs
+}

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
 {
@@ -15,7 +12,10 @@ namespace GeekDesk.Util
             try
             {
                 Exception ex = exception as Exception;
-
+                if (!Directory.Exists(Constants.ERROR_FILE_PATH.Substring(0, Constants.ERROR_FILE_PATH.LastIndexOf("\\"))))
+                {
+                    Directory.CreateDirectory(Constants.ERROR_FILE_PATH.Substring(0, Constants.ERROR_FILE_PATH.LastIndexOf("\\")));
+                }
                 using (FileStream fs = File.Open(Constants.ERROR_FILE_PATH, FileMode.OpenOrCreate, FileAccess.ReadWrite))
                 {
                     fs.Seek(0, SeekOrigin.End);
@@ -48,27 +48,34 @@ 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);
+                if (!Directory.Exists(Constants.LOG_FILE_PATH.Substring(0, Constants.LOG_FILE_PATH.LastIndexOf("\\"))))
+                {
+                    Directory.CreateDirectory(Constants.LOG_FILE_PATH.Substring(0, Constants.LOG_FILE_PATH.LastIndexOf("\\")));
+                }
+                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 { }
         }