已知问题修复

App.config

@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+	<configSections>
+		<section name="SystemIcons" type="System.Configuration.DictionarySectionHandler" />
+	</configSections>
+	<SystemIcons>
+		<add key="Calculator" value="计算器" />
+		<add key="Computer" value="此电脑" />
+		<add key="GroupPolicy" value="组策略" />
+		<add key="Network" value="网络连接" />
+		<add key="RecycleBin" value="回收站" />
+		<add key="Registry" value="注册表编辑器" />
+		<add key="Notepad" value="记事本" />
+		<add key="Mstsc" value="远程桌面连接" />
+		<add key="Control" value="控制面板" />
+		<add key="CMD" value="命令行" />
+		<add key="Services" value="服务" />
+	</SystemIcons>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
@@ -28,12 +44,13 @@
     </assemblyBinding>
   </runtime>
   <appSettings>
-    <add key="Version" value="2.3.20" />
+    <add key="Version" value="2.4.13" />
     <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" />
   </appSettings>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">

App.xaml.cs

@@ -1,7 +1,9 @@
 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.Threading;
@@ -19,6 +21,8 @@ namespace GeekDesk
         public App()
         {
             this.Startup += new StartupEventHandler(App_Startup);
+            Application.Current.DispatcherUnhandledException += Current_DispatcherUnhandledException;
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
         }
 
         private void App_Startup(object sender, StartupEventArgs e)
@@ -35,47 +39,24 @@ namespace GeekDesk
                 }
             }
         }
+
+        void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+        {
+            e.Handled = true;//使用这一行代码告诉运行时，该异常被处理了，不再作为UnhandledException抛出了。
+            LogUtil.WriteErrorLog(e, "未捕获异常!");
+            if (Constants.DEV)
+            {
+                MessageBox.Show("GeekDesk遇到一个问题, 不用担心, 这不影响其它操作!");
+            }
+        }
+
+        void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            LogUtil.WriteErrorLog(e, "严重异常!");
+            MessageBox.Show("GeekDesk遇到未知问题崩溃!");
+        }
+
+
     }
 
-
-
-      
-    //    private void WriteLog(object exception)
-    //    {
-    //        Exception ex = exception as Exception;
-
-    //        using (FileStream fs = File.Open(".//ErrorLog.txt", 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() + "\r\n");
-    //            fs.Write(buffer, 0, buffer.Length);
-
-    //            if (ex != null)
-    //            {
-    //                buffer = Encoding.Default.GetBytes("成员名: " + ex.TargetSite + "\r\n");
-    //                fs.Write(buffer, 0, buffer.Length);
-
-    //                buffer = Encoding.Default.GetBytes("引发异常的类: " + ex.TargetSite.DeclaringType + "\r\n");
-    //                fs.Write(buffer, 0, buffer.Length);
-
-    //                buffer = Encoding.Default.GetBytes("异常信息: " + ex.Message + "\r\n");
-    //                fs.Write(buffer, 0, buffer.Length);
-
-    //                buffer = Encoding.Default.GetBytes("引发异常的程序集或对象: " + ex.Source + "\r\n");
-    //                fs.Write(buffer, 0, buffer.Length);
-
-    //                buffer = Encoding.Default.GetBytes("栈：" + ex.StackTrace + "\r\n");
-    //                fs.Write(buffer, 0, buffer.Length);
-    //            }
-    //            else
-    //            {
-    //                buffer = Encoding.Default.GetBytes("应用程序错误: " + exception.ToString() + "\r\n");
-    //                fs.Write(buffer, 0, buffer.Length);
-    //            }
-    //        }
-
-    //}
 }

Constant/CommonEnum.cs

@@ -5,8 +5,8 @@ namespace GeekDesk.Constant
 {
     public enum CommonEnum
     {
-        WINDOW_WIDTH = 666, //默认窗体宽度
-        WINDOW_HEIGHT = 500, //默认窗体高度
+        WINDOW_WIDTH = 850, //默认窗体宽度
+        WINDOW_HEIGHT = 600, //默认窗体高度
         MENU_CARD_WIDHT = 165, //默认菜单栏宽度
         IMAGE_WIDTH = 45, //默认图标宽度
         IMAGE_HEIGHT = 45, //默认图标高度

Constant/SortType.cs

@@ -3,7 +3,9 @@
     public enum SortType
     {
         CUSTOM = 1, //自定义排序
-        NAME = 2, //按名称排序
-        COUNT = 3 //按使用次数排序
+        COUNT_UP = 2, //按使用次数升序
+        COUNT_LOW = 3, //按使用次数降序
+        NAME_UP = 4, //按名称升序
+        NAME_LOW = 5, //按名称降序
     }
 }

Control/Other/BacklogNotificatin.xaml

@@ -15,7 +15,7 @@
 
         <Image Source="/Resource/Image/BacklogImg.png" Margin="22,35,22,361" />
 
-        
+
         <hc:Card MaxWidth="250" Height="200" BorderThickness="0" Effect="{DynamicResource EffectShadow2}" Margin="8">
             <!--Card 的内容部分-->
             <Border CornerRadius="4,4,0,0" Width="160" Height="160">

Control/Other/BacklogNotificatin.xaml.cs

@@ -40,13 +40,15 @@ namespace GeekDesk.Control.Other
             if (info.ExecType == TodoTaskExecType.CRON)
             {
                 CronExpression exp = new CronExpression(info.Cron);
-                DateTime dtNow = DateTime.Now;
-                DateTimeOffset ddo = DateTime.SpecifyKind(dtNow, DateTimeKind.Local);
-                string nextExecTime = ddo.LocalDateTime.ToString("yyyy-MM-dd HH:mm:ss");
-                info.ExeTime = nextExecTime;
+                DateTime nowTime = DateTime.Now;
 
-                DateTime nextTime = ddo.LocalDateTime;
-                TimeSpan ts = nextTime.Subtract(dtNow);
+                //计算下次执行时间
+                DateTime nextTime = DateTime.SpecifyKind(exp.GetNextValidTimeAfter(nowTime).Value.LocalDateTime, DateTimeKind.Local);
+
+                string nextTimeStr = nextTime.ToString("yyyy-MM-dd HH:mm:ss");
+                info.ExeTime = nextTimeStr;
+
+                TimeSpan ts = nextTime.Subtract(nowTime);
                 int minutes = (int)Math.Ceiling(ts.TotalMinutes);
                 if (minutes < 0)
                 {
@@ -62,7 +64,8 @@ namespace GeekDesk.Control.Other
                 {
                     Growl.SuccessGlobal("下次任务将在 " + minutes + " 分钟后提醒您!");
                 }
-            } else
+            }
+            else
             {
                 appData.ToDoList.Remove(info); //执行任务删除
                 appData.HiToDoList.Add(info);  //添加历史任务
@@ -120,7 +123,7 @@ namespace GeekDesk.Control.Other
             ToDoInfo info = this.DataContext as ToDoInfo;
             int time = int.Parse(DelayTime.Text);
             string type = DelayType.Text;
-            switch(type)
+            switch (type)
             {
                 case "分":
                     info.ExeTime = DateTime.Now.AddMinutes(time).ToString("yyyy-MM-dd HH:mm:ss");

Control/Other/CustomIconUrlDialog.xaml

@@ -17,7 +17,7 @@
     </Border.Resources>
     <StackPanel Margin="10">
         <Grid Margin="8,20,8,20">
-            
+
             <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,-10">
                 <WrapPanel  HorizontalAlignment="Center" VerticalAlignment="Center">
                     <TextBlock Text="SVG 图标地址:"  Style="{StaticResource LeftTB}"/>
@@ -35,9 +35,11 @@
             </hc:UniformSpacingPanel>
             <TextBlock Text="注: 需配置正确的url方可加载远程图标!" Foreground="Red" Margin="10,95,-10,-92" />
 
-            <hc:UniformSpacingPanel Spacing="10" Margin="246.206,124.551,-246.206,-124.551">
-                <Button Content="取消" Command="hc:ControlCommands.Close" 
+            <hc:UniformSpacingPanel Spacing="10" Margin="203,125,-203,-125">
+                <Button Content="取消" Command="hc:ControlCommands.Close" HorizontalAlignment="Stretch" Margin="-1,1,1,1" VerticalAlignment="Stretch" 
                             />
+                <Button Content="教程" Click="Teach_Click" 
+                        Style="{StaticResource Btn1}"/>
                 <Button Content="保存" Click="Confirm_Click" 
                         Command="hc:ControlCommands.Close"
                         Style="{StaticResource Btn1}"/>

Control/Other/CustomIconUrlDialog.xaml.cs

@@ -3,6 +3,8 @@ 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;
@@ -32,13 +34,21 @@ namespace GeekDesk.Control.Other
             AppConfig appConfig = this.DataContext as AppConfig;
             appConfig.CustomIconJsonUrl = JsonUrl.Text.Trim();
             appConfig.CustomIconUrl = IconUrl.Text.Trim();
-            if (!StringUtil.IsEmpty(IconUrl.Text) && !StringUtil.IsEmpty(JsonUrl.Text)) 
+            if (!StringUtil.IsEmpty(IconUrl.Text) && !StringUtil.IsEmpty(JsonUrl.Text))
             {
                 IconfontWindow.vm.IsSettingUrl = "true";
-            } else
+            }
+            else
             {
                 IconfontWindow.vm.IsSettingUrl = "false";
             }
         }
+
+
+        private void Teach_Click(object sender, RoutedEventArgs e)
+        {
+            string url = ConfigurationManager.AppSettings["CustomIconTeachUrl"];
+            Process.Start(url);
+        }
     }
 }

Control/Other/IconInfoDialog.xaml

@@ -3,13 +3,13 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:hc="https://handyorg.github.io/handycontrol"
         CornerRadius="4"
-        Width="300"
-        Height="340"
+        Width="350"
+        Height="450"
         Style="{StaticResource BorderBG}"
         >
     <Border.Resources>
         <Style x:Key="LeftTB" TargetType="TextBlock" BasedOn="{StaticResource TextBlockBaseStyle}">
-            <Setter Property="Width" Value="40"/>
+            <Setter Property="Width" Value="75"/>
             <Setter Property="TextAlignment" Value="Center"/>
             <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
@@ -22,7 +22,7 @@
             <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">
                 <TextBlock Text="名称:"  Style="{StaticResource LeftTB}"/>
-                <TextBox x:Name="IconName" Text="{Binding Name, Mode=OneWay}" Width="180" FontSize="14"/>
+                <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">
@@ -42,8 +42,12 @@
                 </CheckBox>
             </hc:UniformSpacingPanel>
             <hc:Divider LineStrokeDashArray="3,3"  LineStroke="Black" Grid.ColumnSpan="4"/>
+            <hc:UniformSpacingPanel Spacing="10">
+                <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">
-                <Button Content="保存" Style="{StaticResource Btn1}" Click="SaveProperty" Margin="208,0,0,0"/>
+                <Button Content="保存" Style="{StaticResource Btn1}" Click="SaveProperty" Margin="265,10,0,0"/>
             </hc:UniformSpacingPanel>
         </StackPanel>
     </hc:SimplePanel>

Control/Other/IconInfoDialog.xaml.cs

@@ -38,6 +38,7 @@ namespace GeekDesk.Control.Other
             info.BitmapImage = IconImg.Source as BitmapImage;
             info.Name = IconName.Text;
             info.AdminStartUp = IconIsAdmin.IsChecked.Value;
+            info.StartArg = StartArg.Text;
             CommonCode.SaveAppData(MainWindow.appData);
             dialog.Close();
         }
@@ -74,11 +75,13 @@ namespace GeekDesk.Control.Other
                     info.BitmapImage = ImageUtil.GetBitmapIconByPath(ofd.FileName);
                     CommonCode.SaveAppData(MainWindow.appData);
                 }
-            } catch (Exception)
+            }
+            catch (Exception e1)
             {
                 HandyControl.Controls.Growl.WarningGlobal("修改图标失败,已重置为默认图标!");
+                LogUtil.WriteErrorLog(e1, "修改图标失败!");
             }
-            
+
         }
     }
 }

Control/Other/IconInfoUrlDialog.xaml.cs

@@ -89,9 +89,10 @@ namespace GeekDesk.Control.Other
                     info.BitmapImage = ImageUtil.GetBitmapIconByPath(ofd.FileName);
                     CommonCode.SaveAppData(MainWindow.appData);
                 }
-            } catch (Exception)
+            } catch (Exception ex)
             {
                 HandyControl.Controls.Growl.WarningGlobal("修改图标失败,已重置为默认图标!");
+                LogUtil.WriteErrorLog(ex, "修改图标失败!");
             }
             
         }

Control/UserControls/Config/AboutControl.xaml

@@ -4,7 +4,6 @@
              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:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              mc:Ignorable="d" 
              Background="Transparent"
@@ -22,14 +21,14 @@
                     <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"
+                    <hc:Shield Subject="GitHub" Visibility="Visible" Status="Star"
                            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" 
+                    <hc:Shield Subject="Gitee" Visibility="Visible" Status="Star" 
                            Command="hc:ControlCommands.OpenLink" 
                            CommandParameter="https://gitee.com/demo_liu/GeekDesk" 
-                           Margin="0,5,10,0" Color="#C71D23"/>
+                           Margin="0,0,10,0" Color="#C71D23"/>
 
 
                 </hc:UniformSpacingPanel>
@@ -62,17 +61,9 @@
                         </hc:Poptip.Instance>
                     </hc:Shield>
                 </hc:UniformSpacingPanel>
-                <TextBlock Margin="0,20,0,0" FontSize="13" Width="200" TextAlignment="Center" Text="这是个人开发的程序,所有人可任意修改和免费使用(商用请联系作者)" TextWrapping="Wrap"/>
+                <TextBlock Margin="0,20,0,0" FontSize="13" Width="200" TextAlignment="Center" 
+                           Text="这是个人开发的程序,所有人可任意修改和免费使用(商用请联系作者)" TextWrapping="Wrap"/>
 
-                <!--<hc:UniformSpacingPanel Spacing="10" Visibility="Visible" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,0">
-                <TextBlock Text="更新源:" TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Content="Gitee"
-                         IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=1}"/>
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
-                         Style="{StaticResource RadioButtonIcon}" Content="GitHub" 
-                         IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=2}"/>
-            </hc:UniformSpacingPanel>-->
             </StackPanel>
         </hc:SimplePanel>
     </Grid>

Control/UserControls/Config/MotionControl.xaml

@@ -41,7 +41,27 @@
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="鼠标中间呼出" Checked="MouseMiddle_Changed" IsChecked="{Binding MouseMiddleShow}">
+                <CheckBox  Content="鼠标中键呼出" Click="MouseMiddle_Changed" IsChecked="{Binding MouseMiddleShow}">
+                    <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">
+                <CheckBox  Content="双击启动" IsChecked="{Binding DoubleOpen}">
+                    <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">
+                <CheckBox  Content="悬停切换菜单" IsChecked="{Binding HoverMenu}">
                     <CheckBox.Background>
                         <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                             <GradientStop Color="#FF9EA3A6"/>
@@ -51,7 +71,7 @@
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="贴边隐藏" IsChecked="{Binding MarginHide}" Checked="MarginHide_Changed" Unchecked="MarginHide_Changed">
+                <CheckBox  Content="贴边隐藏" IsChecked="{Binding MarginHide}" Click="MarginHide_Changed">
                     <CheckBox.Background>
                         <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                             <GradientStop Color="#FF9EA3A6"/>
@@ -61,7 +81,7 @@
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="主窗口动画效果" IsChecked="{Binding AppAnimation}" Checked="Animation_Checked">
+                <CheckBox  Content="主窗口动画效果" IsChecked="{Binding AppAnimation}" Click="Animation_Checked">
                     <CheckBox.Background>
                         <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                             <GradientStop Color="#FF9EA3A6"/>
@@ -69,7 +89,7 @@
                     </CheckBox.Background>
                 </CheckBox>
             </hc:UniformSpacingPanel>
-            
+
             <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="面板关闭方式" VerticalAlignment="Center"/>
             </hc:UniformSpacingPanel>
@@ -102,8 +122,8 @@
                         />
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-            <TextBlock Text="新建待办:"  Width="55"/>
-            <hc:TextBox HorizontalAlignment="Left" 
+                <TextBlock Text="新建待办:"  Width="55"/>
+                <hc:TextBox HorizontalAlignment="Left" 
                         Tag="ToDo"
                         VerticalAlignment="Top" 
                         IsReadOnly="True" 
@@ -113,9 +133,9 @@
                         KeyDown="HotKeyDown"
                         KeyUp="HotKeyUp"
                         />
-        </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
         </StackPanel>
     </Grid>
-   
-   
+
+
 </UserControl>

Control/UserControls/Config/MotionControl.xaml.cs

@@ -1,5 +1,6 @@
 using GeekDesk.Constant;
 using GeekDesk.Control.Windows;
+using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Data;
@@ -61,7 +62,7 @@ namespace GeekDesk.Control.UserControls.Config
                 main = true;
             }
 
-            if (prevKeyTemp == Key.None || prevKeyTemp!=downKey)
+            if (prevKeyTemp == Key.None || prevKeyTemp != downKey)
             {
                 if (hotkeyFinished)
                 {
@@ -70,7 +71,8 @@ namespace GeekDesk.Control.UserControls.Config
                         appConfig.Hotkey = 0;
                         appConfig.HotkeyStr = "";
                         appConfig.HotkeyModifiers = 0;
-                    } else
+                    }
+                    else
                     {
                         appConfig.ToDoHotkey = 0;
                         appConfig.ToDoHotkeyStr = "";
@@ -79,7 +81,7 @@ namespace GeekDesk.Control.UserControls.Config
                     hotkeyFinished = false;
                 }
                 //首次按下按键
-                if ((main && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0)) 
+                if ((main && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0))
                     || (!main && (appConfig.ToDoHotkeyStr == null || appConfig.ToDoHotkeyStr.Length == 0)))
                 {
                     if (CheckModifierKeys(downKey))
@@ -89,7 +91,8 @@ namespace GeekDesk.Control.UserControls.Config
                         {
                             appConfig.HotkeyStr = GetKeyName(downKey);
                             appConfig.HotkeyModifiers = GetModifierKeys(downKey);
-                        } else
+                        }
+                        else
                         {
                             appConfig.ToDoHotkeyStr = GetKeyName(downKey);
                             appConfig.ToDoHotkeyModifiers = GetModifierKeys(downKey);
@@ -110,7 +113,8 @@ namespace GeekDesk.Control.UserControls.Config
                         {
                             appConfig.Hotkey = downKey;
                             appConfig.HotkeyStr += downKey.ToString();
-                        } else
+                        }
+                        else
                         {
                             appConfig.ToDoHotkey = downKey;
                             appConfig.ToDoHotkeyStr += downKey.ToString();
@@ -124,12 +128,13 @@ namespace GeekDesk.Control.UserControls.Config
                         {
                             appConfig.HotkeyStr += GetKeyName(downKey);
                             appConfig.HotkeyModifiers |= GetModifierKeys(downKey);
-                        } else
+                        }
+                        else
                         {
                             appConfig.ToDoHotkeyStr += GetKeyName(downKey);
                             appConfig.ToDoHotkeyModifiers |= GetModifierKeys(downKey);
                         }
-                        
+
                         prevKeyTemp = downKey;
                         keysTemp.Add(e);
                     }
@@ -142,7 +147,8 @@ namespace GeekDesk.Control.UserControls.Config
             if (key == Key.LeftCtrl || key == Key.RightCtrl)
             {
                 return "Ctrl + ";
-            } else if (key == Key.LWin || key == Key.RWin)
+            }
+            else if (key == Key.LWin || key == Key.RWin)
             {
                 return "Win + ";
             }
@@ -186,7 +192,7 @@ namespace GeekDesk.Control.UserControls.Config
 
 
         [MethodImpl(MethodImplOptions.Synchronized)]
-        private  void HotKeyUp(object sender, KeyEventArgs e)
+        private void HotKeyUp(object sender, KeyEventArgs e)
         {
             string tag = (sender as TextBox).Tag.ToString();
             bool main = false;
@@ -194,7 +200,7 @@ namespace GeekDesk.Control.UserControls.Config
             {
                 main = true;
             }
-            lock(this)
+            lock (this)
             {
                 bool allKeyUp = true;
                 //判断所有键是否都松开
@@ -220,7 +226,8 @@ namespace GeekDesk.Control.UserControls.Config
                             GlobalHotKey.Dispose(MainWindow.hotKeyId);
                         }
                         MainWindow.RegisterHotKey(false);
-                    } else
+                    }
+                    else
                     {
                         if (MainWindow.toDoHotKeyId != -1)
                         {
@@ -230,7 +237,7 @@ namespace GeekDesk.Control.UserControls.Config
                         MainWindow.RegisterCreateToDoHotKey(false);
                     }
 
-                    
+
                 }
             }
         }
@@ -252,13 +259,11 @@ namespace GeekDesk.Control.UserControls.Config
         {
             if (appConfig.MarginHide)
             {
-                MainWindow.hide.TimerSet();
-            } else
+                MarginHide.StartHide();
+            }
+            else
             {
-                if (MainWindow.hide.timer != null)
-                {
-                    MainWindow.hide.TimerStop();
-                }
+                MarginHide.StopHide();
             }
         }
 
@@ -280,12 +285,15 @@ namespace GeekDesk.Control.UserControls.Config
         /// <param name="e"></param>
         private void MouseMiddle_Changed(object sender, RoutedEventArgs e)
         {
-     
+            if (appConfig.MouseMiddleShow)
+            {
+                MouseHookThread.MiddleHook();
+            }
+            else
+            {
+                MouseHookThread.Dispose();
+            }
         }
 
-        private void HookListener_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e)
-        {
-            Console.WriteLine(e.KeyChar);
-        }
     }
 }

Control/UserControls/Config/OtherControl.xaml

@@ -13,6 +13,7 @@
 
     <UserControl.Resources>
         <cvt:UpdateTypeConvert x:Key="UpdateTypeConvert"/>
+        <cvt:SortTypeConvert x:Key="SortTypeConvert"/>
     </UserControl.Resources>
     <Grid MouseDown="DragMove" Background="Transparent">
         <hc:SimplePanel Margin="20" >
@@ -40,6 +41,45 @@
                         </CheckBox.Background>
                     </CheckBox>
                 </hc:UniformSpacingPanel>
+                <TextBlock Text="排序方式"  Margin="0,25,0,0"/>
+                
+                <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
+                    <RadioButton x:Name="CustomSort" Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
+                                 Style="{StaticResource RadioButtonIcon}" Content="自定义"
+                                 Tag="1"
+                                 hc:IconElement.Geometry="{StaticResource CustomSort}"
+                                 PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
+                                 IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=1}"/>
+                    
+                    <RadioButton x:Name="CountUpSort" Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
+                                 hc:IconElement.Geometry="{StaticResource UpSort}"
+                                 Style="{StaticResource RadioButtonIcon}" Content="使用次数" 
+                                 Tag="2"
+                                 PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
+                                 IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=2}"/>
+                    
+                    <RadioButton x:Name="CountLowSort" Margin="10,0,0,0" Visibility="Collapsed" Background="{DynamicResource SecondaryRegionBrush}"
+                                 hc:IconElement.Geometry="{StaticResource LowSort}"
+                                 Style="{StaticResource RadioButtonIcon}" Content="使用次数" 
+                                 Tag="3"
+                                 PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
+                                 IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=3}"/>
+                    
+                    <RadioButton x:Name="NameUpSort" Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
+                                 hc:IconElement.Geometry="{StaticResource UpSort}"
+                                 Style="{StaticResource RadioButtonIcon}" Content="名称" 
+                                 Tag="4"
+                                 PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
+                                 IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=4}"/>
+                    
+                    <RadioButton x:Name="NameLowSort" Margin="10,0,0,0" Visibility="Collapsed" Background="{DynamicResource SecondaryRegionBrush}"
+                                 hc:IconElement.Geometry="{StaticResource LowSort}"
+                                 Style="{StaticResource RadioButtonIcon}" Content="名称" 
+                                 Tag="5"
+                                 PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
+                                 IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=5}"/>
+
+                </hc:UniformSpacingPanel>
                 <TextBlock Text="更新源"  Margin="0,25,0,0"/>
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
                     <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 

Control/UserControls/Config/OtherControl.xaml.cs

@@ -26,6 +26,13 @@ namespace GeekDesk.Control.UserControls.Config
         public OtherControl()
         {
             InitializeComponent();
+            this.Loaded += OtherControl_Loaded;
+            
+        }
+
+        private void OtherControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            Sort_Check();
         }
 
         private void SelfStartUpBox_Click(object sender, RoutedEventArgs e)
@@ -46,5 +53,70 @@ namespace GeekDesk.Control.UserControls.Config
                 Window.GetWindow(this).DragMove();
             }
         }
+
+        private void SortType_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            RadioButton rb = sender as RadioButton;
+            SortType type = (SortType)int.Parse(rb.Tag.ToString());
+
+            SortType resType = type;
+            switch (type)
+            {
+                case SortType.CUSTOM:
+                    break;
+                case SortType.COUNT_UP:
+                    if (rb.IsChecked == true)
+                    {
+                        CountLowSort.IsChecked = true;
+                        CountUpSort.Visibility = Visibility.Collapsed;
+                        CountLowSort.Visibility = Visibility.Visible;
+                        resType = SortType.COUNT_LOW;
+                    }
+                    break;
+                case SortType.COUNT_LOW:
+                    if (rb.IsChecked == true)
+                    {
+                        CountUpSort.IsChecked = true;
+                        CountLowSort.Visibility = Visibility.Collapsed;
+                        CountUpSort.Visibility = Visibility.Visible;
+                        resType = SortType.COUNT_UP;
+                    }
+                    break;
+                case SortType.NAME_UP:
+                    if (rb.IsChecked == true)
+                    {
+                        NameLowSort.IsChecked = true;
+                        NameUpSort.Visibility = Visibility.Collapsed;
+                        NameLowSort.Visibility = Visibility.Visible;
+                        resType = SortType.NAME_LOW;
+                    }
+                    break;
+                case SortType.NAME_LOW:
+                    if (rb.IsChecked == true)
+                    {
+                        NameUpSort.IsChecked = true;
+                        NameLowSort.Visibility = Visibility.Collapsed;
+                        NameUpSort.Visibility = Visibility.Visible;
+                        resType = SortType.NAME_UP;
+                    }
+                    break;
+            }
+            MainWindow.appData.AppConfig.IconSortType = resType;
+            CommonCode.SortIconList();
+        }
+
+        private void Sort_Check()
+        {
+            if (NameLowSort.IsChecked == true)
+            {
+                NameUpSort.Visibility = Visibility.Collapsed;
+                NameLowSort.Visibility = Visibility.Visible;
+            }
+            if (CountLowSort.IsChecked == true)
+            {
+                CountUpSort.Visibility = Visibility.Collapsed;
+                CountLowSort.Visibility = Visibility.Visible;
+            }
+        }
     }
 }

Control/UserControls/Config/ThemeControl.xaml

@@ -3,7 +3,6 @@
              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:local="clr-namespace:GeekDesk.Control.UserControls.Config"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              mc:Ignorable="d" 
              Background="Transparent"
@@ -12,13 +11,13 @@
 
     <Grid>
         <Grid  MouseDown="DragMove" Background="Transparent">
-            <StackPanel Margin="20" >
-                <hc:UniformSpacingPanel Spacing="10" 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" 
+                <StackPanel Margin="20" >
+                    <hc:UniformSpacingPanel Spacing="10" 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" 
@@ -26,126 +25,133 @@
                            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,0,0,0"  Grid.ColumnSpan="4">
-                    <CheckBox x:Name="IconIsAdmin" Content="毛玻璃效果" IsChecked="{Binding BlurEffect}">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
-                </hc:UniformSpacingPanel>
-
-                <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0"  Grid.ColumnSpan="4">
-                    <CheckBox x:Name="BarIcon" Content="显示托盘图标" IsChecked="{Binding ShowBarIcon}">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
-                </hc:UniformSpacingPanel>
-
-                <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
-
-                <StackPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
-                        <TextBlock Text="托盘不透明度" VerticalAlignment="Center"/>
+                        <Button Content="修改" Click="BGButton_Click"/>
+                        <Button Content="默认" Click="DefaultButton_Click"/>
                     </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                        <hc:PreviewSlider Value="{Binding CardOpacity}"
+
+                    <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0"  Grid.ColumnSpan="4">
+                        <CheckBox x:Name="IconIsAdmin" Content="毛玻璃效果" IsChecked="{Binding BlurEffect}">
+                            <CheckBox.Background>
+                                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                    <GradientStop Color="#FF9EA3A6"/>
+                                </LinearGradientBrush>
+                            </CheckBox.Background>
+                        </CheckBox>
+                    </hc:UniformSpacingPanel>
+
+                    <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0"  Grid.ColumnSpan="4">
+                        <CheckBox x:Name="BarIcon" Content="显示托盘图标" IsChecked="{Binding ShowBarIcon}">
+                            <CheckBox.Background>
+                                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                    <GradientStop Color="#FF9EA3A6"/>
+                                </LinearGradientBrush>
+                            </CheckBox.Background>
+                        </CheckBox>
+                    </hc:UniformSpacingPanel>
+
+                    <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
+
+                    <StackPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
+                            <TextBlock Text="托盘不透明度" VerticalAlignment="Center"/>
+                        </hc:UniformSpacingPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                            <hc:PreviewSlider Value="{Binding CardOpacity}"
                                   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>
-                        </hc:PreviewSlider>
-                    </hc:UniformSpacingPanel>
+                                <hc:PreviewSlider.PreviewContent>
+                                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                                </hc:PreviewSlider.PreviewContent>
+                            </hc:PreviewSlider>
+                        </hc:UniformSpacingPanel>
 
 
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                        <TextBlock Text="背景图片不透明度" VerticalAlignment="Center"/>
-                    </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                        <hc:PreviewSlider Value="{Binding BgOpacity}"
+                        <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                            <TextBlock Text="背景图片不透明度" VerticalAlignment="Center"/>
+                        </hc:UniformSpacingPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                            <hc:PreviewSlider Value="{Binding BgOpacity}"
                                   Maximum="100"
                                   Width="350"
                                   >
-                            <hc:PreviewSlider.PreviewContent>
-                                <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                            </hc:PreviewSlider.PreviewContent>
-                        </hc:PreviewSlider>
-                    </hc:UniformSpacingPanel>
+                                <hc:PreviewSlider.PreviewContent>
+                                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                                </hc:PreviewSlider.PreviewContent>
+                            </hc:PreviewSlider>
+                        </hc:UniformSpacingPanel>
 
 
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                        <TextBlock Text="主面板不透明度" VerticalAlignment="Center"/>
-                    </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                        <hc:PreviewSlider Value="{Binding PannelOpacity}"
+                        <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                            <TextBlock Text="主面板不透明度" VerticalAlignment="Center"/>
+                        </hc:UniformSpacingPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                            <hc:PreviewSlider Value="{Binding PannelOpacity}"
                                   Minimum="50"
                                   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>
-                        </hc:PreviewSlider>
-                    </hc:UniformSpacingPanel>
+                                <hc:PreviewSlider.PreviewContent>
+                                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                                </hc:PreviewSlider.PreviewContent>
+                            </hc:PreviewSlider>
+                        </hc:UniformSpacingPanel>
 
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                        <TextBlock Text="主面板圆角大小" VerticalAlignment="Center"/>
-                    </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                        <hc:PreviewSlider Value="{Binding PannelCornerRadius}"
+                        <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                            <TextBlock Text="主面板圆角大小" VerticalAlignment="Center"/>
+                        </hc:UniformSpacingPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                            <hc:PreviewSlider Value="{Binding PannelCornerRadius}"
                                   Maximum="25"
                                   Width="350"
                                   >
-                            <hc:PreviewSlider.PreviewContent>
-                                <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                            </hc:PreviewSlider.PreviewContent>
-                        </hc:PreviewSlider>
-                    </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                        <TextBlock Text="图标大小" VerticalAlignment="Center"/>
-                    </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4"
+                                <hc:PreviewSlider.PreviewContent>
+                                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                                </hc:PreviewSlider.PreviewContent>
+                            </hc:PreviewSlider>
+                        </hc:UniformSpacingPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                            <TextBlock Text="图标大小" VerticalAlignment="Center"/>
+                        </hc:UniformSpacingPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4"
                                             Background="#00FFFFFF"
                                             PreviewMouseLeftButtonDown="PreviewSlider_MouseLeftButtonUp"
                                             >
-                        <hc:PreviewSlider Value="{Binding ImageWidth, Mode=TwoWay}"
+                            <hc:PreviewSlider Value="{Binding ImageWidth, Mode=TwoWay}"
                                           Minimum="40"
                                           Maximum="60"
                                           Width="350"
                                           >
-                            <hc:PreviewSlider.PreviewContent>
-                                <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                            </hc:PreviewSlider.PreviewContent>
-                        </hc:PreviewSlider>
+                                <hc:PreviewSlider.PreviewContent>
+                                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                                </hc:PreviewSlider.PreviewContent>
+                            </hc:PreviewSlider>
+                        </hc:UniformSpacingPanel>
+                    </StackPanel>
+                    <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"/>
                     </hc:UniformSpacingPanel>
                 </StackPanel>
-                <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="选择"  Click="ColorButton_Click"/>
-                </hc:UniformSpacingPanel>
-            </StackPanel>
-        </Grid>
+            </Grid>
             
-        <StackPanel x:Name="ColorPanel" Visibility="Collapsed" VerticalAlignment="Center">
+        <StackPanel x:Name="ColorPanel" Panel.ZIndex="1" 
+                    Visibility="Collapsed"
+                    Height="500"
+                    Width="450"
+                    VerticalAlignment="Center">
             <StackPanel.Background>
                 <SolidColorBrush Color="AliceBlue" Opacity="0"/>
             </StackPanel.Background>
-            <hc:ColorPicker
-                            Name="ColorPicker" 
-                            Canceled="ColorPicker_Canceled" 
-                            SelectedColorChanged="ColorPicker_SelectedColorChanged"/>
+            
+            <hc:ColorPicker Name="MyColorPicker" 
+                            ToggleButton.Checked="MyColorPicker_Checked"
+                            Canceled="MyColorPicker_Canceled"
+                            Confirmed="MyColorPicker_Confirmed"
+                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>
+            
         </StackPanel>
     </Grid>
         

Control/UserControls/Config/ThemeControl.xaml.cs

@@ -6,13 +6,17 @@ 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;
@@ -27,6 +31,8 @@ namespace GeekDesk.Control.UserControls.Config
     {
 
         private static AppConfig appConfig = MainWindow.appData.AppConfig;
+
+        private System.Windows.Controls.Primitives.ToggleButton toggleButton = null;
         public ThemeControl()
         {
             InitializeComponent();
@@ -39,7 +45,7 @@ namespace GeekDesk.Control.UserControls.Config
         /// <param name="e"></param>
         private void BGButton_Click(object sender, RoutedEventArgs e)
         {
-           
+
             try
             {
                 OpenFileDialog ofd = new OpenFileDialog
@@ -53,8 +59,9 @@ namespace GeekDesk.Control.UserControls.Config
                     appConfig.BacImgName = ofd.FileName;
                 }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                LogUtil.WriteErrorLog(ex, "修改背景失败,已重置为默认背景!");
                 HandyControl.Controls.Growl.WarningGlobal("修改背景失败,已重置为默认背景!");
             }
 
@@ -69,8 +76,9 @@ namespace GeekDesk.Control.UserControls.Config
                 appConfig.BitmapImage = ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_BAC_IMAGE_BASE64);
                 appConfig.BacImgName = "系统默认";
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                LogUtil.WriteErrorLog(ex, "修改背景失败2,已重置为默认背景!");
                 HandyControl.Controls.Growl.WarningGlobal("修改背景失败,已重置为默认背景!");
             }
 
@@ -82,16 +90,24 @@ namespace GeekDesk.Control.UserControls.Config
             ColorPanel.Visibility = Visibility.Visible;
         }
 
-        private void ColorPicker_Canceled(object sender, EventArgs e)
+        /// <summary>
+        /// 取消按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MyColorPicker_Canceled(object sender, EventArgs e)
         {
-            ColorPanel.Visibility = Visibility.Collapsed;
+            MyColorPickerClose(sender);
+        }
+        private void MyColorPicker_Confirmed(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
+        {
+            MyColorPickerClose(sender);
         }
 
-        private void ColorPicker_SelectedColorChanged(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
+        private void MyColorPicker_SelectedColorChanged(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
         {
-            SolidColorBrush scb =  ColorPicker.SelectedBrush;
+            SolidColorBrush scb = MyColorPicker.SelectedBrush;
             appConfig.TextColor = scb.ToString();
-            ColorPanel.Visibility = Visibility.Collapsed;
         }
 
         /// <summary>
@@ -141,5 +157,27 @@ 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)
+        {
+            if (toggleButton != null && toggleButton.IsChecked == true)
+            {
+                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 });
+            }
+            ColorPanel.Visibility = Visibility.Collapsed;
+        }
+
+        
     }
 }

Control/UserControls/PannelCard/LeftCardControl.xaml

@@ -3,7 +3,6 @@
              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:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
              xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
@@ -20,8 +19,9 @@
                     <SolidColorBrush Opacity="0"/>
                 </Setter.Value>
             </Setter>
-            <EventSetter Event="MouseLeftButtonDown" Handler="MenuClick"/>
-            <EventSetter Event="MouseRightButtonDown" Handler="MenuClick"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+            <EventSetter Event="MouseEnter" Handler="Menu_MouseEnter"/>
+            <!--<EventSetter Event="Unselected" Handler="ListBoxItem_Unselected"/>-->
             <Style.Triggers>
                 <MultiTrigger>
                     <MultiTrigger.Conditions>
@@ -42,109 +42,136 @@
                             </Storyboard>
                         </BeginStoryboard>
                     </MultiTrigger.ExitActions>
+                    <MultiTrigger.Setters>
+                        <Setter Property="Background" Value="Transparent"/>
+                        <Setter Property="Foreground" Value="Black"/>
+                    </MultiTrigger.Setters>
                 </MultiTrigger>
-                <!--<Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="#FFE4DBDB"/>
-                </Trigger>-->
-                <Trigger Property="IsSelected" Value="true">
-                    <Setter Property="Background" Value="#FFECECEC"/>
+
+
+
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="#ECECEC"/>
                     <Setter Property="Foreground" Value="Black"/>
                 </Trigger>
+                <!--<Trigger Property="IsSelected" Value="False">
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="Foreground" Value="Black"/>
+                </Trigger>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="#ECECEC"/>
+                    <Setter Property="Foreground" Value="Black"/>
+                </Trigger>
+                
+                <Trigger Property="IsMouseOver" Value="False">
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="Foreground" Value="Black"/>
+                </Trigger>-->
+
+                <!--<MultiTrigger>
+                    <MultiTrigger.Conditions>
+                        <Condition Property=""></Condition>
+                    </MultiTrigger.Conditions>
+                </MultiTrigger>-->
+
+
             </Style.Triggers>
         </Style>
         <cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
     </UserControl.Resources>
-        <!--左侧栏-->
-        <hc:Card x:Name="MyCard"
-                 BorderThickness="1" 
+    <!--左侧栏-->
+    <hc:Card x:Name="MyCard"
+                 BorderThickness="1"
                  Effect="{DynamicResource EffectShadow2}" 
                  Margin="5,0,0,5"
                  >
-            <hc:Card.Background>
-                <SolidColorBrush Color="#FFFFFFFF" hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
-                
-                </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"
-                         ItemsSource="{Binding MenuList}"
-                         Tag="{Binding AppConfig.MenuCardWidth}"
-                         BorderThickness="0" Foreground="{x:Null}"
-                         SelectedIndex="{Binding AppConfig.SelectedMenuIndex}"
-                         VirtualizingPanel.VirtualizationMode="Recycling"
-                         SelectionChanged="menus_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}"/>
+        <hc:Card.Background>
+            <SolidColorBrush Color="#FFFFFFFF" hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
+
+            </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>
+                </ListBox.Resources>
 
-                    <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.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>
+                <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>
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
 
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                        <StackPanel MouseLeftButtonDown="MenuClick" MouseRightButtonDown="MenuClick" Tag="{Binding}">
-                            <hc: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="25"
-                                        VerticalAlignment="Center"
-                                        TextAlignment="Left"
-                                        LostFocus="LostFocusOrEnterDown"
-                                        KeyDown="LostFocusOrEnterDown"
-                                        Tag="{Binding}"
-                                        Margin="2"
-                                        IsVisibleChanged="MenuEditWhenVisibilityChanged"
-                                        Visibility="{Binding MenuEdit}"/>
-                            <StackPanel Orientation="Horizontal">
-                                    <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}"
+                <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"
+                                        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"
-                                               IsVisibleChanged="MenuWhenVisibilityChanged"
-                                               Visibility="{Binding NotMenuEdit}"
-                                               />
-                                </StackPanel>
                             </StackPanel>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
-            </WrapPanel>
-        </hc:Card>
-</UserControl>
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </WrapPanel>
+    </hc:Card>
+</UserControl>

Control/UserControls/PannelCard/LeftCardControl.xaml.cs

@@ -1,16 +1,18 @@
 using DraggAnimatedPanelExample;
 using GeekDesk.Control.Windows;
+using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using System;
 
 using System.Collections.ObjectModel;
-
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 
 using System.Windows.Input;
-
+using System.Windows.Media;
+using System.Windows.Threading;
 
 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -22,17 +24,20 @@ namespace GeekDesk.Control.UserControls.PannelCard
         private int menuSelectIndexTemp = -1;
         private AppData appData = MainWindow.appData;
 
+        //是否正在修改菜单
+        private static bool IS_EDIT = false;
+
         public LeftCardControl()
         {
             InitializeComponent();
             if (appData.AppConfig.SelectedMenuIndex >= appData.MenuList.Count || appData.AppConfig.SelectedMenuIndex == -1)
             {
                 appData.AppConfig.SelectedMenuIcons = appData.MenuList[0].IconList;
-            } else
+            }
+            else
             {
                 appData.AppConfig.SelectedMenuIcons = appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList;
             }
-
         }
 
         DelegateCommand<int[]> _swap;
@@ -60,13 +65,13 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
         }
 
-            ////菜单点击事件
-        private void MenuClick(object sender, MouseButtonEventArgs e)
-        {
-            //设置对应菜单的图标列表
-            MenuInfo mi = (MenuInfo)(((StackPanel)sender).Tag);
-            appData.AppConfig.SelectedMenuIcons = mi.IconList;
-        }
+        //////菜单点击事件
+        //private void MenuClick(object sender, MouseButtonEventArgs e)
+        //{
+        //    //设置对应菜单的图标列表
+        //    MenuInfo mi = (MenuInfo)(((StackPanel)sender).Tag);
+        //    appData.AppConfig.SelectedMenuIcons = mi.IconList;
+        //}
 
         /// <summary>
         /// 当修改菜单元素可见时 设置原菜单为不可见 并且不可选中
@@ -76,9 +81,14 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void MenuWhenVisibilityChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            TextBlock tb = sender as TextBlock;
-            if (tb.Visibility == Visibility.Collapsed)
+            StackPanel sp = sender as StackPanel;
+            
+            //ListBoxItem lbi = (sp.TemplatedParent as ContentPresenter).TemplatedParent as ListBoxItem;
+            if (sp.Visibility == Visibility.Collapsed)
             {
+                //SolidColorBrush scb = new SolidColorBrush(Colors.Red);
+                //lbi.MouseEnter += Lbi_MouseEnter;
+
                 if (MenuListBox.SelectedIndex != -1)
                 {
                     menuSelectIndexTemp = MenuListBox.SelectedIndex;
@@ -88,9 +98,33 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 {
                     MenuListBox.SelectedIndex = menuSelectIndexTemp;
                 }
+            } else
+            {
+                //SolidColorBrush bac = new SolidColorBrush(Color.FromRgb(236, 236, 236));
+                //SolidColorBrush fontColor = new SolidColorBrush(Colors.Black);
+
+                //lbi.MouseEnter += (s, me) =>
+                //{
+                //    lbi.Background = bac;
+                //};
+
+                //lbi.MouseLeave += Lbi_MouseLeave;
+
+                //lbi.Selected += (s, me) =>
+                //{
+                //    lbi.MouseLeave -= Lbi_MouseLeave;
+                //    lbi.Background = bac;
+                //    lbi.Foreground = fontColor;
+                //};
             }
         }
 
+        //private void Lbi_MouseEnter(object sender, MouseEventArgs e)
+        //{
+        //    ListBoxItem lbi = sender as ListBoxItem;
+        //    lbi.Background = Brushes.Transparent;
+        //}
+
         /// <summary>
         /// 新建菜单
         /// </summary>
@@ -104,6 +138,27 @@ namespace GeekDesk.Control.UserControls.PannelCard
             MenuListBox.SelectedIndex = appData.MenuList.Count - 1;
             appData.AppConfig.SelectedMenuIndex = MenuListBox.SelectedIndex;
             appData.AppConfig.SelectedMenuIcons = info.IconList;
+
+            //ItemCollection ic = MenuListBox.Items;
+            //SolidColorBrush bac = new SolidColorBrush(Color.FromRgb(236, 236, 236));
+            //SolidColorBrush fontColor = new SolidColorBrush(Colors.Black);
+            //foreach (var icItem in ic)
+            //{
+            //    ListBoxItem lbi = icItem as ListBoxItem;
+            //    lbi.MouseEnter += (s, me) =>
+            //    {
+            //        lbi.Background = bac;
+            //    };
+
+            //    lbi.MouseLeave += Lbi_MouseLeave;
+
+            //    lbi.Selected += (s, me) =>
+            //    {
+            //        lbi.MouseLeave -= Lbi_MouseLeave;
+            //        lbi.Background = bac;
+            //        lbi.Foreground = fontColor;
+            //    };
+            //}
         }
 
         /// <summary>
@@ -115,6 +170,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
         {
             MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
             menuInfo.MenuEdit = (int)Visibility.Visible;
+            IS_EDIT = true;
         }
 
         /// <summary>
@@ -153,6 +209,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void LostFocusOrEnterDown(object sender, EventArgs e)
         {
+            bool done = true;
             TextBox menuBox = null;
             if (e.GetType() == typeof(KeyEventArgs))
             {
@@ -160,19 +217,26 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 if (eKey.Key == Key.Enter)
                 {
                     menuBox = ((TextBox)sender);
+                } else
+                {
+                    done = false;
                 }
-            }
-            else if (e.GetType() == typeof(RoutedEventArgs))
+            } else if (e.GetType() == typeof(RoutedEventArgs))
             {
                 menuBox = ((TextBox)sender);
             }
 
-            if (menuBox != null)
+            if (done)
             {
-                MenuInfo menuInfo = menuBox.Tag as MenuInfo;
-                string text = menuBox.Text;
-                menuInfo.MenuName = text;
-                menuInfo.MenuEdit = Visibility.Collapsed;
+                if (menuBox != null)
+                {
+                    MenuInfo menuInfo = menuBox.Tag as MenuInfo;
+                    string text = menuBox.Text;
+                    menuInfo.MenuName = text;
+                    menuInfo.MenuEdit = Visibility.Collapsed;
+                }
+                IS_EDIT = false;
+                MenuListBox.SelectedIndex = menuSelectIndexTemp;
             }
         }
 
@@ -184,6 +248,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
         private void MenuEditWhenVisibilityChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
             TextBox box = sender as TextBox;
+            MenuInfo mi = box.Tag as MenuInfo;
             if (box.Visibility == Visibility.Visible)
             {
                 Keyboard.Focus(box);
@@ -202,16 +267,58 @@ namespace GeekDesk.Control.UserControls.PannelCard
             IconfontWindow.Show(SvgToGeometry.GetIconfonts(), menuInfo);
         }
 
-        private void menus_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void Menu_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             //设置对应菜单的图标列表
             if (MenuListBox.SelectedIndex == -1)
             {
-                appData.AppConfig.SelectedMenuIcons = appData.MenuList[appData.MenuList.Count-1].IconList;
-            } else
+                //appData.AppConfig.SelectedMenuIcons = appData.MenuList[appData.MenuList.Count - 1].IconList;
+            }
+            else
             {
                 appData.AppConfig.SelectedMenuIcons = appData.MenuList[MenuListBox.SelectedIndex].IconList;
             }
         }
+
+        //private void ListBoxItem_Unselected(object sender, RoutedEventArgs e)
+        //{
+        //    //添加Leave效果
+        //    ListBoxItem lbi = sender as ListBoxItem;
+        //    //lbi.Background = Brushes.Transparent;
+        //    //lbi.MouseLeave += Lbi_MouseLeave;
+        //}
+
+        //private void Lbi_MouseLeave(object sender, MouseEventArgs e)
+        //{
+        //    ListBoxItem lbi = sender as ListBoxItem;
+        //    lbi.Background = Brushes.Transparent;
+        //}
+
+        /// <summary>
+        /// 鼠标悬停切换菜单
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Menu_MouseEnter(object sender, MouseEventArgs e)
+        {
+            if (appData.AppConfig.HoverMenu && !IS_EDIT)
+            {
+                new Thread(() =>
+                {
+                    Thread.Sleep(200);
+                    this.Dispatcher.Invoke(() =>
+                    {
+                        ListBoxItem lbi = sender as ListBoxItem;
+                        if (lbi.IsMouseOver)
+                        {
+                            int index = MenuListBox.ItemContainerGenerator.IndexFromContainer(lbi);
+                            MenuListBox.SelectedIndex = index;
+                        }
+                    });
+                }).Start();
+            }
+        }
+
+    
     }
 }

Control/UserControls/PannelCard/RightCardControl.xaml

@@ -3,22 +3,30 @@
              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:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
+             xmlns:temp="clr-namespace:GeekDesk.ViewModel.Temp"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
              xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
-             
              >
     <UserControl.Resources>
         <!--右侧栏样式动画-->
+        <!--<Style x:Key="PanelStyle" TargetType="hc:SimpleStackPanel">
+            <Style.Triggers>
+                <Trigger Property="IsMouseOver" Value="true">
+                    <Setter Property="Cursor" Value="Hand"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>-->
+        
         <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}"/>
             <Setter Property="Source"  Value="{Binding BitmapImage}"/>
         </Style>
         <Style x:Key="MyListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -31,93 +39,181 @@
         </Style>
 
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
+        <cvt:SearchResWidth x:Key="SearchResWidth"/>
+        <temp:SearchIconList x:Key="SearchIconList"/>
     </UserControl.Resources>
     <!--右侧栏-->
-    <hc:Card AllowDrop="True" 
-             Drop="Wrap_Drop" 
-             BorderThickness="1" 
-             Effect="{DynamicResource EffectShadow2}" 
-             Margin="5,0,5,5" Grid.ColumnSpan="2">
-        <hc:Card.Background>
-            <SolidColorBrush Color="AliceBlue"  hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"/>
-        </hc:Card.Background>
-        <hc:Card.BorderBrush>
-            <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
-        </hc:Card.BorderBrush>
-        <hc:Card.ContextMenu>
-            <ContextMenu Width="200">
-                <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
-            </ContextMenu>
-        </hc:Card.ContextMenu>
-        <WrapPanel Orientation="Horizontal" VirtualizingPanel.VirtualizationMode="Recycling"  VirtualizingPanel.IsVirtualizing="True"  VirtualizingPanel.IsContainerVirtualizable="True">
-            <ListBox x:Name="IconListBox" ItemsSource="{Binding AppConfig.SelectedMenuIcons, Mode=TwoWay}" 
+    <Grid>
+        <hc:Card AllowDrop="True" 
+                 x:Name="WrapCard"
+                 Visibility="Visible"
+                 Drop="Wrap_Drop" 
+                 BorderThickness="1" 
+                 Effect="{DynamicResource EffectShadow2}" 
+                 Margin="5,0,5,5" Grid.ColumnSpan="2">
+            <hc:Card.Background>
+                <SolidColorBrush Color="AliceBlue"  hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"/>
+            </hc:Card.Background>
+            <hc:Card.BorderBrush>
+                <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
+            </hc:Card.BorderBrush>
+            <hc:Card.ContextMenu>
+                <ContextMenu Width="200">
+                    <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
+                    <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
+                </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=TwoWay}" 
                                  BorderThickness="0"
+                                Padding="0,10,0,0"
                                  >
-                <ListBox.Background>
-                    <SolidColorBrush Opacity="0"/>
-                </ListBox.Background>
-                <ListBox.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <DraggAnimatedPanel:DraggAnimatedPanel Background="#00FFFFFF"
+                        <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>
+                            </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="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}"/>
-                        <!--<Setter Property="Width" Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"/>
-                        <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}"/>-->
-                    </Style>
-                </ListBox.ItemContainerStyle>
-                <!--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}"-->
+                        <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.HitMode="None"
-                                        hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                        hc:Poptip.Content="{Binding Content}"
-                                        hc:Poptip.Placement="BottomLeft"
-                                        Background="#00FFFFFF"
-                                        MouseLeftButtonUp="IconClick"
-                                        MouseEnter="StackPanel_MouseEnter"
-                                        MouseLeave="StackPanel_MouseLeave"
-                                        >
-                            <Image Style="{StaticResource ImageStyle}"  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}"/>
-                        </hc:SimpleStackPanel>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
-            
-        </WrapPanel>
-    </hc:Card>
+                        <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"
+                                                 >
+                                    <Image Style="{StaticResource ImageStyle}"  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}"/>
+                                </hc:SimpleStackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+
+                </WrapPanel>
+
+            </Grid>
+        </hc:Card>
+
+        <hc:Card 
+                 x:Name="VerticalCard"
+                 Visibility="Hidden"
+                 BorderThickness="1" 
+                 Effect="{DynamicResource EffectShadow2}" 
+                 Margin="5,0,5,5" Grid.ColumnSpan="2">
+            <hc:Card.Background>
+                <SolidColorBrush Color="AliceBlue"  hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"/>
+            </hc:Card.Background>
+            <hc:Card.BorderBrush>
+                <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"
+                   >
+                    <ListBox ItemsSource="{Binding Source={StaticResource SearchIconList},Path=IconList}" 
+                                 BorderThickness="0"
+                                Padding="0,10,0,0"
+                                 >
+                        <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.ItemContainerStyle>
+                            <Style TargetType="ListBoxItem" BasedOn="{StaticResource MyListBoxItemStyle}">
+                                <Setter Property="ContextMenu" Value="{StaticResource IconDialog}"/>
+                            </Style>
+                        </ListBox.ItemContainerStyle>
+
+                        <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}}" 
+                                           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>
+
+                </WrapPanel>
+
+            </Grid>
+        </hc:Card>
+    </Grid>
 </UserControl>

Control/UserControls/PannelCard/RightCardControl.xaml.cs

@@ -1,29 +1,21 @@
 using DraggAnimatedPanelExample;
 using GeekDesk.Constant;
 using GeekDesk.Control.Other;
+using GeekDesk.Control.Windows;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Drawing.Imaging;
 using System.IO;
-using System.Linq;
-using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
-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.Animation;
 using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -34,6 +26,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
     {
         private AppData appData = MainWindow.appData;
 
+        private volatile static bool DROP_ICON = false;
+        private Thread dropCheckThread = null;
+
         public RightCardControl()
         {
             InitializeComponent();
@@ -50,6 +45,34 @@ namespace GeekDesk.Control.UserControls.PannelCard
                     _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;
@@ -68,6 +91,23 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
 
 
+
+        private void Icon_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (appData.AppConfig.DoubleOpen)
+            {
+                IconClick(sender, e);
+            }
+        }
+
+        private void Icon_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            if (!appData.AppConfig.DoubleOpen)
+            {
+                IconClick(sender, e);
+            }
+        }
+
         /// <summary>
         /// 图标点击事件
         /// </summary>
@@ -75,15 +115,31 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void IconClick(object sender, MouseButtonEventArgs e)
         {
-            IconInfo icon = (IconInfo)((SimpleStackPanel)sender).Tag;
-            if (icon.AdminStartUp)
+            if (appData.AppConfig.DoubleOpen && e.ClickCount >= 2)
             {
-                StartIconApp(icon, IconStartType.ADMIN_STARTUP);
+                IconInfo icon = (IconInfo)((SimpleStackPanel)sender).Tag;
+                if (icon.AdminStartUp)
+                {
+                    StartIconApp(icon, IconStartType.ADMIN_STARTUP);
+                }
+                else
+                {
+                    StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
+                }
             }
-            else
+            else if (!appData.AppConfig.DoubleOpen && e.ClickCount == 1)
             {
-                StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
+                IconInfo icon = (IconInfo)((SimpleStackPanel)sender).Tag;
+                if (icon.AdminStartUp)
+                {
+                    StartIconApp(icon, IconStartType.ADMIN_STARTUP);
+                }
+                else
+                {
+                    StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
+                }
             }
+
         }
 
         /// <summary>
@@ -112,30 +168,85 @@ namespace GeekDesk.Control.UserControls.PannelCard
         {
             try
             {
-                Process p = new Process();
-                p.StartInfo.FileName = icon.Path;
-                if (icon.IconType == IconType.OTHER)
+                using (Process p = new Process())
                 {
-                    if (!File.Exists(icon.Path) && !Directory.Exists(icon.Path))
+                    string startArg = icon.StartArg;
+
+                    if (startArg != null && Constants.SYSTEM_ICONS.ContainsKey(startArg))
                     {
-                        HandyControl.Controls.Growl.WarningGlobal("程序启动失败(文件路径不存在或已删除)!");
-                        return;
+                        StartSystemApp(startArg, type);
                     }
-                    p.StartInfo.WorkingDirectory = icon.Path.Substring(0, icon.Path.LastIndexOf("\\"));
-                    switch (type)
+                    else
                     {
-                        case IconStartType.ADMIN_STARTUP:
-                            p.StartInfo.Arguments = "1";//启动参数
-                            p.StartInfo.Verb = "runas";
-                            p.StartInfo.CreateNoWindow = false; //设置显示窗口
-                            p.StartInfo.UseShellExecute = false;//不使用操作系统外壳程序启动进程
-                            p.StartInfo.ErrorDialog = false;
+                        p.StartInfo.FileName = icon.Path;
+                        if (!StringUtil.IsEmpty(startArg))
+                        {
+                            p.StartInfo.Arguments = startArg;
+                        }
+                        if (icon.IconType == IconType.OTHER)
+                        {
+                            if (!File.Exists(icon.Path) && !Directory.Exists(icon.Path))
+                            {
+                                HandyControl.Controls.Growl.WarningGlobal("程序启动失败(文件路径不存在或已删除)!");
+                                return;
+                            }
+                            p.StartInfo.WorkingDirectory = icon.Path.Substring(0, icon.Path.LastIndexOf("\\"));
+                            switch (type)
+                            {
+                                case IconStartType.ADMIN_STARTUP:
+                                    //p.StartInfo.Arguments = "1";//启动参数
+                                    p.StartInfo.Verb = "runas";
+                                    //p.StartInfo.CreateNoWindow = false; //设置显示窗口
+                                    p.StartInfo.UseShellExecute = true;//不使用操作系统外壳程序启动进程
+                                    //p.StartInfo.ErrorDialog = false;
+                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
+                                    {
+                                        //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
+                                        if (appData.AppConfig.MarginHide)
+                                        {
+                                            if (!MarginHide.IS_HIDE)
+                                            {
+                                                MainWindow.HideApp();
+                                            }
+                                        }
+                                        else
+                                        {
+                                            MainWindow.HideApp();
+                                        }
+
+                                    }
+                                    break;// c#好像不能case穿透
+                                case IconStartType.DEFAULT_STARTUP:
+                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
+                                    {
+                                        //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
+                                        if (appData.AppConfig.MarginHide)
+                                        {
+                                            if (!MarginHide.IS_HIDE)
+                                            {
+                                                MainWindow.HideApp();
+                                            }
+                                        }
+                                        else
+                                        {
+                                            MainWindow.HideApp();
+                                        }
+                                    }
+                                    break;
+                                case IconStartType.SHOW_IN_EXPLORE:
+                                    p.StartInfo.FileName = "Explorer.exe";
+                                    p.StartInfo.Arguments = "/e,/select," + icon.Path;
+                                    break;
+                            }
+                        }
+                        else
+                        {
                             if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
                             {
                                 //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
                                 if (appData.AppConfig.MarginHide)
                                 {
-                                    if (!MainWindow.hide.IsMargin())
+                                    if (!MarginHide.IS_HIDE)
                                     {
                                         MainWindow.HideApp();
                                     }
@@ -144,43 +255,103 @@ namespace GeekDesk.Control.UserControls.PannelCard
                                 {
                                     MainWindow.HideApp();
                                 }
-
                             }
-                            break;// c#好像不能case穿透
-                        case IconStartType.DEFAULT_STARTUP:
-                            if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
-                            {
-                                //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
-                                if (appData.AppConfig.MarginHide)
-                                {
-                                    if (!MainWindow.hide.IsMargin())
-                                    {
-                                        MainWindow.HideApp();
-                                    }
-                                } else
-                                {
-                                    MainWindow.HideApp();
-                                }
-                            }
-                            break;
-                        case IconStartType.SHOW_IN_EXPLORE:
-                            p.StartInfo.FileName = "Explorer.exe";
-                            p.StartInfo.Arguments = "/e,/select," + icon.Path;
-                            break;
+                        }
+                        p.Start();
                     }
                 }
-                p.Start();
                 icon.Count++;
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 HandyControl.Controls.Growl.WarningGlobal("程序启动失败(不支持的启动方式)!");
+                LogUtil.WriteErrorLog(e, "程序启动失败:path=" + icon.Path + ",type=" + type);
             }
         }
 
 
 
+        private void StartSystemApp(string startArg, IconStartType type)
+        {
+            if (type == IconStartType.SHOW_IN_EXPLORE)
+            {
+                Growl.WarningGlobal("系统项目不支持打开文件位置操作!");
+                return;
+            }
+            switch (startArg)
+            {
+                case "Calculator":
+                    Process.Start("calc.exe");
+                    break;
+                case "Computer":
+                    Process.Start("explorer.exe");
+                    break;
+                case "GroupPolicy":
+                    Process.Start("gpedit.msc");
+                    break;
+                case "Notepad":
+                    Process.Start("notepad");
+                    break;
+                case "Network":
+                    Process.Start("ncpa.cpl");
+                    break;
+                case "RecycleBin":
+                    Process.Start("shell:RecycleBinFolder");
+                    break;
+                case "Registry":
+                    Process.Start("regedit.exe");
+                    break;
+                case "Mstsc":
+                    if (type == IconStartType.ADMIN_STARTUP)
+                    {
+                        Process.Start("mstsc", "-admin");
+                    }
+                    else
+                    {
+                        Process.Start("mstsc");
+                    }
+                    break;
+                case "Control":
+                    Process.Start("Control");
+                    break;
+                case "CMD":
+                    if (type == IconStartType.ADMIN_STARTUP)
+                    {
+                        using (Process process = new Process())
+                        {
+                            process.StartInfo.FileName = "cmd.exe";
+                            process.StartInfo.Verb = "runas";
+                            process.Start();
+                        }
+                    }
+                    else
+                    {
+                        Process.Start("cmd");
+                    }
+                    break;
+                case "Services":
+                    Process.Start("services.msc");
+                    break;
+            }
+            //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
+            if (appData.AppConfig.MarginHide)
+            {
+                if (!MarginHide.IS_HIDE)
+                {
+                    MainWindow.HideApp();
+                }
+            }
+            else
+            {
+                MainWindow.HideApp();
+            }
+        }
 
+        /// <summary>
+        /// 拖动添加项目
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Wrap_Drop(object sender, DragEventArgs e)
         {
             Array dropObject = (System.Array)e.Data.GetData(DataFormats.FileDrop);
@@ -188,35 +359,11 @@ namespace GeekDesk.Control.UserControls.PannelCard
             foreach (object obj in dropObject)
             {
                 string path = (string)obj;
-
-                //string base64 = ImageUtil.FileImageToBase64(path, ImageFormat.Png);
-
-                string ext = System.IO.Path.GetExtension(path).ToLower();
-
-                if (".lnk".Equals(ext))
-                {
-                    string targetPath = FileUtil.GetTargetPathByLnk(path);
-                    if (targetPath!=null)
-                    {
-                        path = targetPath;
-                    }
-                }
-
-                BitmapImage bi = ImageUtil.GetBitmapIconByPath(path);
-                IconInfo iconInfo = new IconInfo
-                {
-                    Path = path,
-                    BitmapImage = bi
-                };
-                iconInfo.DefaultImage = iconInfo.ImageByteArr;
-                iconInfo.Name = System.IO.Path.GetFileNameWithoutExtension(path);
-                if (StringUtil.IsEmpty(iconInfo.Name))
-                {
-                    iconInfo.Name = path;
-                }
+                IconInfo iconInfo = CommonCode.GetIconInfoByPath(path);
                 MainWindow.appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList.Add(iconInfo);
-                CommonCode.SaveAppData(MainWindow.appData);
             }
+            CommonCode.SortIconList();
+            CommonCode.SaveAppData(MainWindow.appData);
         }
 
         /// <summary>
@@ -285,7 +432,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
             Panel sp = sender as Panel;
 
-            DependencyObject dos =  sp.Parent;
+            DependencyObject dos = sp.Parent;
 
             Image img = sp.Children[0] as Image;
 
@@ -294,16 +441,16 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
             //动画定义
             Storyboard myStoryboard = new Storyboard();
-           
 
 
-            DoubleAnimation heightAnimation = new DoubleAnimation 
+
+            DoubleAnimation heightAnimation = new DoubleAnimation
             {
                 From = afterHeight,
                 To = height,
                 Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds))
             };
-            DoubleAnimation widthAnimation = new DoubleAnimation 
+            DoubleAnimation widthAnimation = new DoubleAnimation
             {
                 From = afterWidth,
                 To = width,
@@ -339,7 +486,8 @@ namespace GeekDesk.Control.UserControls.PannelCard
                     ThreadStart ts = new ThreadStart(crs.Remove);
                     System.Threading.Thread t = new System.Threading.Thread(ts);
                     t.Start();
-                } else
+                }
+                else
                 {
                     img.BeginAnimation(WidthProperty, null);
                     img.BeginAnimation(HeightProperty, null);
@@ -402,10 +550,38 @@ namespace GeekDesk.Control.UserControls.PannelCard
             sb2.Remove();
         }
 
+        /// <summary>
+        /// 添加URL项目
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void AddUrlIcon(object sender, RoutedEventArgs e)
         {
             IconInfoUrlDialog urlDialog = new IconInfoUrlDialog();
             urlDialog.dialog = HandyControl.Controls.Dialog.Show(urlDialog, "IconInfoDialog");
         }
+
+        /// <summary>
+        /// 添加系统项目
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void AddSystemIcon(object sender, RoutedEventArgs e)
+        {
+            SystemItemWindow.Show();
+        }
+
+        public void VisibilitySearchCard(Visibility vb)
+        {
+            VerticalCard.Visibility = vb;
+            if (vb == Visibility.Visible)
+            {
+                WrapCard.Visibility = Visibility.Collapsed;
+            } else
+            {
+                WrapCard.Visibility = Visibility.Visible;
+            }
+        }
+
     }
 }

Control/UserControls/SystemItem/SystemItem.xaml

@@ -0,0 +1,57 @@
+<UserControl x:Class="GeekDesk.Control.UserControls.SystemItem.SystemItem"
+             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:hc="https://handyorg.github.io/handycontrol"
+             xmlns:local="clr-namespace:GeekDesk.Control.UserControls.IconFont"
+             mc:Ignorable="d"
+             Background="#00FFFFFF"
+             >
+    <WrapPanel  HorizontalAlignment="Center" VerticalAlignment="Top" Background="Transparent">
+        <ListBox x:Name="ItemListBox" ItemsSource="{Binding IconInfos}" BorderThickness="0"
+                 VirtualizingPanel.IsVirtualizing="True"  
+                 VirtualizingPanel.IsContainerVirtualizable="True"
+                 >
+            <ListBox.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <WrapPanel Orientation="Horizontal" Background="#00FFFFFF"/>
+                </ItemsPanelTemplate>
+            </ListBox.ItemsPanel>
+            <ListBox.Background>
+                <SolidColorBrush Opacity="0"/>
+            </ListBox.Background>
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                </Style>
+            </ListBox.ItemContainerStyle>
+            
+
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Width="80" Height="80" HorizontalAlignment="Center"
+                                Background="#00FFFFFF"
+                                hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                                hc:Poptip.Content="{Binding Content_NoWrite, Mode=OneWay}"
+                                Tag="{Binding}"
+                                MouseLeftButtonDown="Icon_MouseLeftButtonDown"
+                                hc:Poptip.Placement="BottomLeft"
+                                hc:Poptip.HitMode="None"
+                                >
+                        <Image Source="{Binding BitmapImage_NoWrite, Mode=OneWay}" Width="45" Height="45"  RenderOptions.BitmapScalingMode="HighQuality" />
+                        <TextBlock TextAlignment="Center" 
+                                   HorizontalAlignment="Center" 
+                                   VerticalAlignment="Center" 
+                                   TextWrapping="Wrap"
+                                   MaxHeight="40"
+                                   FontSize="13"
+                                   TextTrimming="WordEllipsis"
+                                   Width="65" Text="{Binding Name_NoWrite, Mode=OneWay}" 
+                                   />
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+    </WrapPanel>
+</UserControl>

Control/UserControls/SystemItem/SystemItem.xaml.cs

@@ -0,0 +1,60 @@
+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
+{
+    /// <summary>
+    /// IconPannel.xaml 的交互逻辑
+    /// </summary>
+    public partial class SystemItem : UserControl
+    {
+        public SystemItem()
+        {
+            InitializeComponent();
+        }
+        private void Icon_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            IconInfo thisInfo = (sender as StackPanel).Tag as IconInfo;
+
+            MenuInfo menuInfo = MainWindow.appData.MenuList[MainWindow.appData.AppConfig.SelectedMenuIndex];
+
+            string startArg = thisInfo.StartArg;
+            IconInfo iconInfo;
+            if (Constants.SYSTEM_ICONS.ContainsKey(startArg))
+            {
+                //系统项
+                iconInfo = new IconInfo
+                {
+                    Name_NoWrite = thisInfo.Name_NoWrite,
+                    Path_NoWrite = thisInfo.Path_NoWrite,
+                    StartArg_NoWrite = thisInfo.StartArg_NoWrite,
+                    BitmapImage_NoWrite = thisInfo.BitmapImage_NoWrite
+                };
+                iconInfo.Content_NoWrite = iconInfo.Name_NoWrite
+                    + "\n使用次数:" + iconInfo.Count;
+            } else
+            {
+                //startupMenu or Store
+                iconInfo = CommonCode.GetIconInfoByPath(thisInfo.LnkPath_NoWrite);
+            }
+            menuInfo.IconList.Add(iconInfo);
+            CommonCode.SortIconList();
+            CommonCode.SaveAppData(MainWindow.appData);
+        }
+    }
+}

Control/UserControls/ToDo/TodoControl.xaml

@@ -8,8 +8,8 @@
              mc:Ignorable="d" 
              Background="Transparent"
              >
-    
-   <hc:SimplePanel Margin="20" Background="Transparent">
+
+    <hc:SimplePanel Margin="20" Background="Transparent">
         <Grid Background="Transparent">
             <DataGrid x:Name="BacklogList" 
                   HeadersVisibility="All"  
@@ -27,11 +27,10 @@
                 <DataGrid.RowStyle>
                     <Style TargetType="DataGridRow" BasedOn="{StaticResource DataGridRowStyle}">
                         <EventSetter Event="MouseRightButtonDown" Handler="DataGridRow_MouseRightButtonDown" />
-                        <EventSetter Event="Selected" Handler="DataGridRow_Selected"/>
                         <Setter Property="Background" Value="White"/>
                         <Style.Triggers>
                             <Trigger Property="IsSelected" Value="True">
-                                <Setter Property="Background" Value="#5BC0DE"/>
+                                <Setter Property="Background" Value="{StaticResource BtnBG}"/>
                             </Trigger>
                             <Trigger Property="IsSelected" Value="False">
                                 <Setter Property="Background" Value="White"/>

Control/Windows/ConfigWindow.xaml

@@ -15,6 +15,8 @@
            AllowsTransparency="True"
            Background="#00FFFFFF" ShowInTaskbar="False"
            BorderThickness="0"
+           Focusable="True"
+           KeyDown="OnKeyDown"
            >
 
     <Grid Margin="30">

Control/Windows/ConfigWindow.xaml.cs

@@ -2,6 +2,7 @@
 using GeekDesk.Constant;
 using GeekDesk.Control.UserControls;
 using GeekDesk.Control.UserControls.Config;
+using GeekDesk.Interface;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
@@ -15,7 +16,7 @@ namespace GeekDesk.Control.Windows
     /// <summary>
     /// ConfigDialog.xaml 的交互逻辑
     /// </summary>
-    public partial class ConfigWindow
+    public partial class ConfigWindow : IWindowCommon
     {
         private static readonly AboutControl about = new AboutControl();
         private static readonly ThemeControl theme = new ThemeControl();
@@ -87,6 +88,16 @@ namespace GeekDesk.Control.Windows
                 window = new ConfigWindow(appConfig, mainWindow);
             }
             window.Show();
+            Keyboard.Focus(window);
+        }
+
+        public void OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                this.DataContext = null;
+                this.Close();
+            }
         }
     }
 }

Control/Windows/IconfontWindow.xaml

@@ -14,6 +14,8 @@
         AllowsTransparency="True"
         Background="Transparent" ShowInTaskbar="False"
         BorderThickness="0"
+        Focusable="True"
+        KeyDown="OnKeyDown"
         >
 
     <Window.Resources>
@@ -39,7 +41,7 @@
             <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"
                               RenderingBias="Quality" ShadowDepth="2"/>
         </Grid.Effect>
-        <Border MouseDown="DragMove" Style="{StaticResource BorderBG}">
+        <Border MouseDown="DragMove" Style="{StaticResource BorderBG}"  hc:Dialog.Token="IconUrlDialog">
             <!--<Border.Background>
                 --><!--<SolidColorBrush Color="AliceBlue" Opacity="0.9"/>--><!--
                 <LinearGradientBrush Opacity="0.97">
@@ -47,9 +49,10 @@
                     <GradientStop Color="#97D282" Offset="1"/>
                 </LinearGradientBrush>
             </Border.Background>-->
-            <Grid MouseDown="DragMove">
-                <TextBox x:Name="CheckSettingUrl" Visibility="Collapsed" Text="{Binding IsSettingUrl}" TextChanged="CheckSettingUrl_TextChanged"/>
-                <hc:TabControl x:Name="MyTabControl" 
+            <hc:DialogContainer>
+                <Grid MouseDown="DragMove">
+                    <TextBox x:Name="CheckSettingUrl" Visibility="Collapsed" Text="{Binding IsSettingUrl}" TextChanged="CheckSettingUrl_TextChanged"/>
+                    <hc:TabControl x:Name="MyTabControl" 
                                IsAnimationEnabled="True" 
                                SelectionChanged="TabControl_SelectionChanged" 
                                ShowContextMenu="True"  
@@ -58,24 +61,25 @@
                                Height="350" 
                                VerticalAlignment="Top"
                                Style="{StaticResource HcTabControl}">
-                    <hc:TabItem Tag="System"  IsSelected="True" Header="系统图标" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource SystemIcon}" Style="{StaticResource TabTitle}">
-                        <hc:SimplePanel>
-                            <uc:IconPannel x:Name="SystemIcon"/>
-                        </hc:SimplePanel>
-                    </hc:TabItem>
-                    <hc:TabItem Tag="Custom" Header="自定义图标" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource CustomIcon}" Style="{StaticResource TabTitle}">
-                        <hc:SimplePanel>
-                            <uc:IconPannel x:Name="CustomIcon"/>
-                            <hc:LoadingCircle x:Name="LoadingEle"/>
-                        </hc:SimplePanel>
-                    </hc:TabItem>
-                </hc:TabControl>
+                        <hc:TabItem Tag="System"  IsSelected="True" Header="系统图标" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource SystemIcon}" Style="{StaticResource TabTitle}">
+                            <hc:SimplePanel>
+                                <uc:IconPannel x:Name="SystemIcon"/>
+                            </hc:SimplePanel>
+                        </hc:TabItem>
+                        <hc:TabItem Tag="Custom" Header="自定义图标" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource CustomIcon}" Style="{StaticResource TabTitle}">
+                            <hc:SimplePanel>
+                                <uc:IconPannel x:Name="CustomIcon"/>
+                                <hc:LoadingCircle x:Name="LoadingEle"/>
+                            </hc:SimplePanel>
+                        </hc:TabItem>
+                    </hc:TabControl>
 
 
-                <Button Content="取消" Click="Close_Click" Margin="391,397.5,163,22.5"/>
-                <Button Content="自定义设置" Click="CustomButton_Click" IsEnabled="False" Name="CustomButton" Style="{StaticResource Btn1}" Margin="447,397.5,71,22.5"/>
-                <Button Content="确定" Click="Confirm_Click" Style="{StaticResource Btn1}" Margin="534,397.5,20,22.5" />
-            </Grid>
+                    <Button Content="取消" Click="Close_Click" Margin="391,397.5,163,22.5"/>
+                    <Button Content="自定义设置" Click="CustomButton_Click" IsEnabled="False" Name="CustomButton" Style="{StaticResource Btn1}" Margin="447,397.5,71,22.5"/>
+                    <Button Content="确定" Click="Confirm_Click" Style="{StaticResource Btn1}" Margin="534,397.5,20,22.5" />
+                </Grid>
+            </hc:DialogContainer>
         </Border>
     </Grid>
 

Control/Windows/IconfontWindow.xaml.cs

@@ -1,4 +1,5 @@
 using GeekDesk.Control.Other;
+using GeekDesk.Interface;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 
@@ -17,7 +18,7 @@ namespace GeekDesk.Control.Windows
     /// <summary>
     /// IconfontWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class IconfontWindow : Window
+    public partial class IconfontWindow : Window, IWindowCommon
     {
         private static AppConfig appConfig = MainWindow.appData.AppConfig;
         private static MenuInfo menuInfo;
@@ -26,7 +27,7 @@ namespace GeekDesk.Control.Windows
         public static IconfontViewModel vm;
         private IconfontWindow(List<IconfontInfo> icons, MenuInfo menuInfo)
         {
-            
+
             InitializeComponent();
 
             systemIcons = icons;
@@ -56,6 +57,7 @@ namespace GeekDesk.Control.Windows
 
         private void Close_Click(object sender, RoutedEventArgs e)
         {
+            this.DataContext = null;
             this.Close();
         }
 
@@ -71,14 +73,16 @@ namespace GeekDesk.Control.Windows
                     {
                         LoadingEle.Visibility = Visibility.Visible;
                         CustomIcon.Visibility = Visibility.Collapsed;
-                        HandyControl.Controls.Dialog.Show(new CustomIconUrlDialog(appConfig));
-                    } else
+                        HandyControl.Controls.Dialog.Show(new CustomIconUrlDialog(appConfig), "IconUrlDialog");
+                    }
+                    else
                     {
                         if (customIcons == null)
                         {
                             vm.Iconfonts = null;
                             LoadingOnlineIcon();
-                        } else
+                        }
+                        else
                         {
                             vm.Iconfonts = customIcons;
                             LoadingEle.Visibility = Visibility.Collapsed;
@@ -120,6 +124,7 @@ namespace GeekDesk.Control.Windows
                     }
                     break;
             }
+            this.DataContext = null;
             this.Close();
         }
 
@@ -132,12 +137,13 @@ namespace GeekDesk.Control.Windows
                 window = new IconfontWindow(listInfo, menuInfo);
             }
             window.Show();
+            Keyboard.Focus(window);
             ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0, false);
         }
 
         private void CustomButton_Click(object sender, RoutedEventArgs e)
         {
-            HandyControl.Controls.Dialog.Show(new CustomIconUrlDialog(appConfig));
+            HandyControl.Controls.Dialog.Show(new CustomIconUrlDialog(appConfig), "IconUrlDialog");
         }
 
 
@@ -146,7 +152,8 @@ namespace GeekDesk.Control.Windows
             if (CheckSettingUrl.Text == "true")
             {
                 LoadingOnlineIcon();
-            } else
+            }
+            else
             {
                 LoadingEle.IsRunning = true;
                 CustomIcon.Visibility = Visibility.Collapsed;
@@ -166,12 +173,21 @@ namespace GeekDesk.Control.Windows
                 LoadingEle.Visibility = Visibility.Collapsed;
                 CustomIcon.Visibility = Visibility.Visible;
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 HandyControl.Controls.Growl.WarningGlobal("加载远程图标异常!");
+                LogUtil.WriteErrorLog(e, "加载远程图标异常!");
             }
         }
 
+        public void OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                this.DataContext = null;
+                this.Close();
+            }
+        }
 
         public class IconfontViewModel : INotifyPropertyChanged
         {

Control/Windows/SystemItemWindow.xaml

@@ -0,0 +1,100 @@
+<Window x:Class="GeekDesk.Control.Windows.SystemItemWindow"
+        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"
+        xmlns:uc="clr-namespace:GeekDesk.Control.UserControls.SystemItem"
+        xmlns:cvt="clr-namespace:GeekDesk.Converts"
+        mc:Ignorable="d"
+        Title="Svg"
+        Height="520" Width="700"
+        WindowStyle="None"
+        ResizeMode="NoResize"
+        AllowsTransparency="True"
+        Background="Transparent" ShowInTaskbar="False"
+        BorderThickness="0"
+        Focusable="True"
+        KeyDown="OnKeyDown"
+        >
+    <Window.Resources>
+        <Style x:Key="HcTabControl" TargetType="hc:TabControl" BasedOn="{StaticResource TabControlInLine}">
+            <Style.Setters>
+                <Setter Property="Background" Value="Transparent"/>
+            </Style.Setters>
+        </Style>
+
+        <Style x:Key="TabTitle" TargetType="hc:TabItem" BasedOn="{StaticResource TabItemInLine}">
+            <Style.Setters>
+                <Setter Property="Background">
+                    <Setter.Value>
+                        <SolidColorBrush Color="White" Opacity="0.68"/>
+                    </Setter.Value>
+                </Setter>
+            </Style.Setters>
+        </Style>
+        <cvt:MenuInfoConvert x:Key="MenuInfoConvert"/>
+    </Window.Resources>
+
+    <Grid Margin="20">
+        <Grid.Effect>
+            <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"
+                              RenderingBias="Quality" ShadowDepth="2"/>
+        </Grid.Effect>
+        <Border MouseDown="DragMove" Style="{StaticResource BorderBG}"  hc:Dialog.Token="IconUrlDialog">
+            <hc:DialogContainer>
+                <Grid MouseDown="DragMove">
+                    <StackPanel HorizontalAlignment="Center" Margin="10">
+                        <Border CornerRadius="8" Height="30" Width="150">
+                            <Border.Background>
+                                <SolidColorBrush Color="White" Opacity="0.7"/>
+                            </Border.Background>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                <Button Background="Transparent" 
+                                            BorderThickness="0"                                        
+                                            hc:IconElement.Geometry="{Binding AppConfig.SelectedMenuIndex, Mode=OneWay, Converter={StaticResource MenuInfoConvert}, ConverterParameter=1}"
+                                            hc:IconElement.Height="18"
+                                            hc:IconElement.Width="18"
+                                            IsEnabled="False"
+                                            Opacity="1"
+                                            >
+                                </Button>
+                                <TextBlock x:Name="MenuName" Text="{Binding AppConfig.SelectedMenuIndex, Mode=OneWay, Converter={StaticResource MenuInfoConvert}, ConverterParameter=2}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Border>
+                    </StackPanel>
+                    <hc:TabControl x:Name="MyTabControl" 
+                               IsAnimationEnabled="True" 
+                               SelectionChanged="TabControl_SelectionChanged" 
+                               ShowContextMenu="True"
+                               IsTabFillEnabled="True"
+                               Margin="20,60,20,20" 
+                               Height="350" 
+                               VerticalAlignment="Top"
+                               Style="{StaticResource HcTabControl}">
+                        <hc:TabItem Tag="System"  IsSelected="True" Header="系统应用" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource SystemIcon}" Style="{StaticResource TabTitle}">
+                            <hc:SimplePanel>
+                                <uc:SystemItem x:Name="SystemItem"/>
+                            </hc:SimplePanel>
+                        </hc:TabItem>
+                        <hc:TabItem x:Name="StartMenu" Tag="StartMenu" Header="开始菜单应用" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource SystemIcon}" Style="{StaticResource TabTitle}">
+                            <hc:SimplePanel>
+                                <uc:SystemItem x:Name="StartMenuItem"/>
+                                <hc:LoadingCircle x:Name="StartMenuLoading"/>
+                            </hc:SimplePanel>
+                        </hc:TabItem>
+                        <!--<hc:TabItem Tag="Store" Header="商店应用(未开放)" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource CustomIcon}" Style="{StaticResource TabTitle}">
+                            <hc:SimplePanel>
+                                <uc:SystemItem x:Name="StoreItem"/>
+                            </hc:SimplePanel>
+                        </hc:TabItem>-->
+                    </hc:TabControl>
+                    <Button Content="关闭" Click="Close_Click" Margin="594,420,20,31.5"/>
+                </Grid>
+            </hc:DialogContainer>
+        </Border>
+    </Grid>
+
+
+</Window>

Control/Windows/SystemItemWindow.xaml.cs

@@ -0,0 +1,301 @@
+using GeekDesk.Constant;
+using GeekDesk.Control.Other;
+using GeekDesk.Interface;
+using GeekDesk.Util;
+using GeekDesk.ViewModel;
+
+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;
+
+namespace GeekDesk.Control.Windows
+{
+    /// <summary>
+    /// SystemItemWindow.xaml 的交互逻辑
+    /// 添加系统项目到对应菜单
+    /// </summary>
+    public partial class SystemItemWindow : Window, IWindowCommon
+    {
+        private static AppConfig appConfig = MainWindow.appData.AppConfig;
+        private static SystemItemViewModel vm;
+        private List<IconInfo> systemIcons;
+        private List<IconInfo> startMenuIcons;
+        private List<IconInfo> storeIcons;
+
+        private SystemItemWindow()
+        {
+            vm = new SystemItemViewModel();
+            this.DataContext = vm;
+            InitializeComponent();
+            this.Topmost = true;
+        }
+
+        /// <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)
+            {
+                DragMove();
+            }
+        }
+
+        private void Close_Click(object sender, RoutedEventArgs e)
+        {
+            this.DataContext = null;
+            this.Close();
+        }
+
+        /// <summary>
+        /// 切换选项卡
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            TabItem ti = this.MyTabControl.SelectedItem as TabItem;
+
+            List<IconInfo> systemInfos = vm.IconInfos;
+            if (systemInfos == null)
+            {
+                systemInfos = new List<IconInfo>();
+            }
+            switch (ti.Tag.ToString())
+            {
+                case "StartMenu": //开始菜单
+                    if (startMenuIcons == null)
+                    {
+                        vm.IconInfos = null;
+                        System.Threading.Thread t = new System.Threading.Thread(new ThreadStart(GetStartMenuInfos))
+                        {
+                            IsBackground = true
+                        };
+                        t.Start();
+                    } else
+                    {
+                        StartMenuLoading.Visibility = Visibility.Collapsed;
+                        vm.IconInfos = startMenuIcons;
+                    }
+                    break;
+                case "Store": //应用商店
+                    if (storeIcons == null)
+                    {
+                        vm.IconInfos = null;
+                        storeIcons = new List<IconInfo>();
+                        vm.IconInfos = storeIcons;
+                    }
+                    else
+                    {
+                        vm.IconInfos = storeIcons;
+                    }
+                    break;
+                default: //默认系统项
+                    if (systemIcons == null)
+                    {
+                        vm.IconInfos = null;
+                        systemIcons = GetSysteIconInfos();
+                        vm.IconInfos = systemIcons;
+                    } else
+                    {
+                        vm.IconInfos = systemIcons;
+                    }
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// 获取开始菜单路径下项目
+        /// </summary>
+        /// <returns></returns>
+        private void GetStartMenuInfos()
+        {
+            App.Current.Dispatcher.Invoke((Action)(() =>
+            {
+                StartMenuLoading.Visibility = Visibility.Visible;
+            }));
+
+            List<IconInfo> infos = new List<IconInfo>();
+            //获取开始菜单路径
+            string path = Environment.GetFolderPath(Environment.SpecialFolder.StartMenu) + "\\Programs";
+            //递归获取信息
+            GetInfos(path, infos);
+            App.Current.Dispatcher.Invoke((Action)(() =>
+            {
+                if (StartMenu.IsSelected)
+                {
+                    startMenuIcons = infos;
+                    vm.IconInfos = startMenuIcons;
+                }
+                StartMenuLoading.Visibility = Visibility.Collapsed;
+            }));
+            
+        }
+
+        /// <summary>
+        /// 递归获取文件信息
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="listInfos"></param>
+        private void GetInfos(string filePath, List<IconInfo> listInfos)
+        {
+            DirectoryInfo di = new DirectoryInfo(filePath);
+            string[] filePaths = Directory.GetFiles(filePath);
+            string[] dirPaths = Directory.GetDirectories(filePath);
+
+            string[] paths = new string[filePaths.Length + dirPaths.Length];
+            filePaths.CopyTo(paths, 0);
+            if (filePaths == null || filePaths.Length == 0)
+            {
+                dirPaths.CopyTo(paths, 0);
+            } else
+            {
+                dirPaths.CopyTo(paths, filePaths.Length - 1);
+            }
+
+            foreach (string path in paths)
+            {
+                if (File.Exists(path))
+                {
+                    string ext = Path.GetExtension(path).ToLower();
+                    if (".exe".Equals(ext) || ".lnk".Equals(ext))
+                    {
+                        try
+                        {
+                            IconInfo iconInfo = CommonCode.GetIconInfoByPath_NoWrite(path);
+                            if (iconInfo.Path_NoWrite != null)
+                            {
+                                iconInfo.Content_NoWrite = iconInfo.Path_NoWrite + "\n" + iconInfo.Name_NoWrite;
+                                listInfos.Add(iconInfo);
+                            }
+                        }
+                        catch (Exception) { }
+                    }
+                }
+                else if (Directory.Exists(path))
+                {
+                    GetInfos(path, listInfos);
+                }
+            }
+
+            //FileSystemInfo[] fileInfoArr = di.GetFileSystemInfos();
+            //foreach(FileSystemInfo fi in fileInfoArr)
+            //{
+            //    string path = fi.FullName;
+                
+            //}
+        }
+
+        /// <summary>
+        /// 获取系统项目
+        /// </summary>
+        /// <returns></returns>
+        private List<IconInfo> GetSysteIconInfos()
+        {
+            List<IconInfo> iconInfos = new List<IconInfo>();
+
+            Hashtable systemIcons = Constants.SYSTEM_ICONS;
+            IconInfo iconInfo;
+            foreach (object key in systemIcons.Keys)
+            {
+                string keyStr = key.ToString();
+                iconInfo = new IconInfo
+                {
+                    Name_NoWrite = systemIcons[key].ToString()
+                };
+                iconInfo.BitmapImage_NoWrite = new BitmapImage(
+                        new Uri("pack://application:,,,/GeekDesk;component/Resource/Image/SystemIcon/" + keyStr + ".png"
+                        , UriKind.RelativeOrAbsolute));
+                iconInfo.StartArg = keyStr;
+                iconInfo.Content_NoWrite = iconInfo.Name_NoWrite;
+                iconInfos.Add(iconInfo);
+            }
+            return iconInfos;
+        }
+
+        public class SystemItemViewModel : INotifyPropertyChanged
+        {
+            private List<IconInfo> iconInfos;
+            private AppConfig appConfig;
+
+            public SystemItemViewModel()
+            {
+                this.AppConfig = MainWindow.appData.AppConfig;
+            }
+
+            public AppConfig AppConfig
+            {
+                get
+                {
+                    return appConfig;
+                }
+                set
+                {
+                    appConfig = value;
+                    OnPropertyChanged("AppConfig");
+                }
+            }
+            public List<IconInfo> IconInfos
+            {
+                get
+                {
+                    return iconInfos;
+                }
+                set
+                {
+                    iconInfos = value;
+                    OnPropertyChanged("IconInfos");
+                }
+            }
+
+
+            public event PropertyChangedEventHandler PropertyChanged;
+            private void OnPropertyChanged(string propertyName)
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+
+
+
+        private static System.Windows.Window window = null;
+        public static void Show()
+        {
+            if (window == null || !window.Activate())
+            {
+                window = new SystemItemWindow();
+            }
+            window.Show();
+            Keyboard.Focus(window);
+            ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0, false);
+        }
+
+
+        public void OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                this.DataContext = null;
+                this.Close();
+            }
+        }
+
+
+
+
+    }
+}

Control/Windows/ToDoInfoWindow.xaml

@@ -11,9 +11,12 @@
            Height="450" 
            Width="510" 
            WindowStyle="None"
+           Title=""
            AllowsTransparency="True"
            Background="Transparent" ShowInTaskbar="False"
-        >
+           Focusable="True"
+           KeyDown="OnKeyDown"
+            >
     <Window.Resources>
         <cvt:TodoTaskExecConvert x:Key="TodoTaskExecConvert"/>
     </Window.Resources>
@@ -27,6 +30,7 @@
             <Border.Resources>
                 <Style x:Key="LeftTB" TargetType="TextBlock" BasedOn="{StaticResource TextBlockBaseStyle}">
                     <Setter Property="Width" Value="67"/>
+                    <Setter Property="Margin" Value="0,5,0,0"/>
                     <Setter Property="HorizontalAlignment" Value="Left"/>
                     <Setter Property="VerticalAlignment" Value="Center"/>
                     <Setter Property="TextAlignment" Value="Center"/>
@@ -64,13 +68,15 @@
                          IsChecked="{Binding ExecType, Mode=OneWay, Converter={StaticResource TodoTaskExecConvert}, ConverterParameter=2}"/>
                     </hc:UniformSpacingPanel>
 
-                    <hc:UniformSpacingPanel x:Name="SetTimePanel" Visibility="Visible" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
-                        <TextBlock Text="指定时间:"  Style="{StaticResource LeftTB}"/>
-                        <TextBlock Text="*" Foreground="Red" Margin="-10,0,0,0"/>
-                        <hc:DateTimePicker x:Name="ExeTime" Text="{Binding ExeTime, Mode=OneWay}" ErrorStr="Error!"  Width="200" Margin="-5.2,0,0,0"/>
+                    <hc:UniformSpacingPanel x:Name="SetTimePanel" Height="30" Visibility="Visible" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
+                        <WrapPanel VerticalAlignment="Center">
+                            <TextBlock Text="指定时间:"  Style="{StaticResource LeftTB}"/>
+                            <TextBlock Text="*" Foreground="Red"/>
+                        </WrapPanel>
+                        <hc:DateTimePicker x:Name="ExeTime" Text="{Binding ExeTime, Mode=OneWay}" ErrorStr="Error!"  Width="200" Margin="1.6,0,0,0"/>
                     </hc:UniformSpacingPanel>
 
-                    <hc:UniformSpacingPanel x:Name="CronPanel" Visibility="Collapsed" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
+                    <hc:UniformSpacingPanel x:Name="CronPanel" Height="30" Visibility="Collapsed" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
                         <WrapPanel VerticalAlignment="Center">
                             <TextBlock Text="CRON:"  Style="{StaticResource LeftTB}"/>
                             <TextBlock Text="*" Foreground="Red" />
@@ -81,8 +87,10 @@
 
 
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
-                        <TextBlock Text="完成时间:"  Style="{StaticResource LeftTB}"/>
-                        <TextBlock x:Name="DoneTime" Text="{Binding DoneTime, Mode=OneWay}" Width="200"/>
+                        <WrapPanel VerticalAlignment="Center">
+                            <TextBlock Text="完成时间:"  Style="{StaticResource LeftTB}"/>
+                        </WrapPanel>
+                        <TextBlock x:Name="DoneTime" VerticalAlignment="Center" Margin="5,6,0,0" Text="{Binding DoneTime, Mode=OneWay}" Width="200"/>
                     </hc:UniformSpacingPanel>
 
 

Control/Windows/ToDoInfoWindow.xaml.cs

@@ -1,4 +1,5 @@
 using GeekDesk.Constant;
+using GeekDesk.Interface;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
@@ -22,7 +23,7 @@ namespace GeekDesk.Control.Windows
     /// <summary>
     /// BacklogInfoWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class ToDoInfoWindow
+    public partial class ToDoInfoWindow : IWindowCommon
     {
 
         private static int windowType = -1;
@@ -150,8 +151,15 @@ namespace GeekDesk.Control.Windows
             };
             if (windowType != NEW_TODO)
             {
-                appData.HiToDoList.Remove(this.DataContext as ToDoInfo);
-            } 
+                ToDoInfo tdi = this.DataContext as ToDoInfo;
+                if (appData.HiToDoList.Contains(tdi))
+                {
+                    appData.HiToDoList.Remove(tdi);
+                } else if (appData.ToDoList.Contains(tdi))
+                {
+                    appData.ToDoList.Remove(tdi);
+                }
+            }
             appData.ToDoList.Add(info);
 
             DateTime dtNow = DateTime.Now;
@@ -207,6 +215,7 @@ namespace GeekDesk.Control.Windows
             {
                 window = new ToDoInfoWindow();
                 window.Show();
+                Keyboard.Focus(window);
             }
             window.Visibility = Visibility.Collapsed;
             windowType = NEW_TODO;
@@ -222,6 +231,7 @@ namespace GeekDesk.Control.Windows
             }
             windowType = DETAIL_TODO;
             window2.Show();
+            Keyboard.Focus(window2);
         }
 
         private void ExecType_Checked(object sender, RoutedEventArgs e)
@@ -239,5 +249,14 @@ namespace GeekDesk.Control.Windows
                     break;
             }
         }
+
+        public void OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                this.DataContext = null;
+                this.Close();
+            }
+        }
     }
 }

Control/Windows/ToDoWindow.xaml

@@ -13,6 +13,8 @@
            WindowStyle="None"
            AllowsTransparency="True"
            Background="Transparent" ShowInTaskbar="False"
+           Focusable="True"
+           KeyDown="OnKeyDown"
         >
 
     <Grid Margin="50">

Control/Windows/ToDoWindow.xaml.cs

@@ -1,4 +1,5 @@
 using GeekDesk.Control.UserControls.Backlog;
+using GeekDesk.Interface;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using System;
@@ -21,7 +22,7 @@ namespace GeekDesk.Control.Windows
     /// <summary>
     /// BacklogWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class ToDoWindow
+    public partial class ToDoWindow : IWindowCommon
     {
         private static TodoControl backlog = new TodoControl();
         private AppData appData = MainWindow.appData;
@@ -94,8 +95,16 @@ namespace GeekDesk.Control.Windows
                 window = new ToDoWindow();
             }
             window.Show();
+            Keyboard.Focus(window);
         }
 
-        
+        public void OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                this.DataContext = null;
+                this.Close();
+            }
+        }
     }
 }

Control/Windows/UpdateWindow.xaml

@@ -9,7 +9,10 @@
         Height="460" Width="610"
         WindowStyle="None"
         AllowsTransparency="True"
-        Background="Transparent" ShowInTaskbar="False">
+        Title=""
+        Background="Transparent" ShowInTaskbar="False"
+        Focusable="True"
+        KeyDown="OnKeyDown">
     <Grid Margin="20">
         <Grid.Effect>
             <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"

Control/Windows/UpdateWindow.xaml.cs

@@ -1,4 +1,5 @@
 using GeekDesk.Constant;
+using GeekDesk.Interface;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using Newtonsoft.Json.Linq;
@@ -23,7 +24,7 @@ namespace GeekDesk.Control.Windows
     /// <summary>
     /// UpdateWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class UpdateWindow : Window
+    public partial class UpdateWindow : Window, IWindowCommon
     {
         private static AppConfig appConfig = MainWindow.appData.AppConfig;
         private static string githubUrl = "";
@@ -103,6 +104,16 @@ namespace GeekDesk.Control.Windows
                 window = new UpdateWindow(jo);
             }
             window.Show();
+            Keyboard.Focus(window);
+        }
+
+        public void OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                this.DataContext = null;
+                this.Close();
+            }
         }
     }
 }

Converts/MenuInfoConvert.cs

@@ -0,0 +1,45 @@
+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 MenuInfoConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            int menuIndex = MainWindow.appData.AppConfig.SelectedMenuIndex;
+            if (menuIndex == -1)
+            {
+                return "";
+            } else
+            {
+                string type = parameter.ToString();
+                if ("1".Equals(type))
+                {
+                    return MainWindow.appData.MenuList[menuIndex].MenuGeometry;
+                }
+                else
+                {
+                    return MainWindow.appData.MenuList[menuIndex].MenuName;
+                }
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return null;
+            //bool isChecked = (bool)value;
+            //if (!isChecked)
+            //{
+            //    return null;
+            //}
+            //return (AppHideType)int.Parse(parameter.ToString());
+        }
+    }
+}

Converts/SearchResWidth.cs

@@ -0,0 +1,25 @@
+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
+{
+    class SearchResWidth : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            double menuLeftWidth = double.Parse(value.ToString());
+            return MainWindow.mainWindow.Width - menuLeftWidth;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
+}

Converts/SortTypeConvert.cs

@@ -0,0 +1,29 @@
+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 SortTypeConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (SortType)value == (SortType)int.Parse(parameter.ToString());
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool isChecked = (bool)value;
+            if (!isChecked)
+            {
+                return null;
+            }
+            return (SortType)int.Parse(parameter.ToString());
+        }
+    }
+}

GeekDesk.csproj

@@ -72,6 +72,9 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="NPinyin.Core, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\NPinyin.Core.3.0.0\lib\net45\NPinyin.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Quartz, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
       <HintPath>packages\Quartz.3.3.3\lib\net472\Quartz.dll</HintPath>
     </Reference>
@@ -142,12 +145,18 @@
     <Compile Include="Control\UserControls\Config\OtherControl.xaml.cs">
       <DependentUpon>OtherControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Control\UserControls\SystemItem\SystemItem.xaml.cs">
+      <DependentUpon>SystemItem.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Control\UserControls\ToDo\TodoControl.xaml.cs">
       <DependentUpon>TodoControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Control\UserControls\IconFont\IconPannel.xaml.cs">
       <DependentUpon>IconPannel.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Control\Windows\SystemItemWindow.xaml.cs">
+      <DependentUpon>SystemItemWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Control\Windows\ToDoInfoWindow.xaml.cs">
       <DependentUpon>ToDoInfoWindow.xaml</DependentUpon>
     </Compile>
@@ -181,7 +190,10 @@
     <Compile Include="Control\Windows\UpdateWindow.xaml.cs">
       <DependentUpon>UpdateWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Converts\SearchResWidth.cs" />
     <Compile Include="Converts\DoubleToGridLength.cs" />
+    <Compile Include="Converts\SortTypeConvert.cs" />
+    <Compile Include="Converts\MenuInfoConvert.cs" />
     <Compile Include="Converts\TodoTaskExecConvert.cs" />
     <Compile Include="Converts\IntToCornerRadius.cs" />
     <Compile Include="Converts\OpcityConvert.cs" />
@@ -189,10 +201,11 @@
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.cs" />
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.Drag.cs" />
     <Compile Include="Converts\HideTypeConvert.cs" />
+    <Compile Include="Interface\IWindowCommon.cs" />
     <Compile Include="Task\ToDoTask.cs" />
-    <Compile Include="Thread\MouseHookThread.cs" />
-    <Compile Include="Thread\DispatcherBuild.cs" />
-    <Compile Include="Thread\UpdateThread.cs" />
+    <Compile Include="MyThread\MouseHookThread.cs" />
+    <Compile Include="MyThread\DispatcherBuild.cs" />
+    <Compile Include="MyThread\UpdateThread.cs" />
     <Compile Include="Util\AeroGlassHelper.cs" />
     <Compile Include="Util\GlobalHotKey.cs" />
     <Compile Include="Util\CommonCode.cs" />
@@ -200,6 +213,7 @@
     <Compile Include="Util\DragAdorner.cs" />
     <Compile Include="Util\FileIcon.cs" />
     <Compile Include="Util\FileUtil.cs" />
+    <Compile Include="Util\LogUtil.cs" />
     <Compile Include="Util\MarginHide.cs" />
     <Compile Include="Util\HttpUtil.cs" />
     <Compile Include="Util\ImageUtil.cs" />
@@ -214,6 +228,7 @@
     <Compile Include="Util\SvgToGeometry.cs" />
     <Compile Include="ViewModel\AppConfig.cs" />
     <Compile Include="ViewModel\AppData.cs" />
+    <Compile Include="ViewModel\Temp\SearchIconList.cs" />
     <Compile Include="ViewModel\ToDoInfo.cs" />
     <Compile Include="ViewModel\IconfontInfo.cs" />
     <Compile Include="ViewModel\IconInfo.cs" />
@@ -234,6 +249,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Control\UserControls\SystemItem\SystemItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Control\UserControls\ToDo\TodoControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -242,6 +261,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Control\Windows\SystemItemWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Control\Windows\ToDoInfoWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -367,5 +390,21 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resource\Image\SystemIcon\Services.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resource\Image\SystemIcon\Calculator.png" />
+    <Resource Include="Resource\Image\SystemIcon\CMD.png" />
+    <Resource Include="Resource\Image\SystemIcon\Computer.png" />
+    <Resource Include="Resource\Image\SystemIcon\Control.png" />
+    <Resource Include="Resource\Image\SystemIcon\GroupPolicy.png" />
+    <Resource Include="Resource\Image\SystemIcon\Mstsc.png" />
+    <Resource Include="Resource\Image\SystemIcon\Network.png" />
+    <Resource Include="Resource\Image\SystemIcon\Notepad.png" />
+    <Resource Include="Resource\Image\SystemIcon\RecycleBin.png" />
+    <Resource Include="Resource\Image\SystemIcon\Registry.png" />
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Interface/IWindowCommon.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace GeekDesk.Interface
+{
+    public interface IWindowCommon
+    {
+        void OnKeyDown(object sender, KeyEventArgs e);
+    }
+}

MainWindow.xaml

@@ -3,45 +3,55 @@
         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"
         xmlns:uc="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
         mc:Ignorable="d"
         xmlns:cvt="clr-namespace:GeekDesk.Converts"
-        xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
         x:Name="window"
-        xmlns:hc="https://handyorg.github.io/handycontrol" 
+        xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:AppData}"
         Title="GeekDesk" 
-        d:DesignHeight="500" d:DesignWidth="700"
+        MinWidth="600"
+        MinHeight="400"
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
         ShowInTaskbar="False"
         Opacity="0"
-        Deactivated="Window_Deactivated"
+        Deactivated="App_LostFocus"
         SizeChanged="Window_SizeChanged"
+        KeyDown="OnKeyDown"
+        Focusable="True"
+        MouseDown="MainWindow_MouseDown"
         >
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="0" ResizeBorderThickness="15"/>
     </WindowChrome.WindowChrome>
     <Window.Resources>
-       
+        <RoutedUICommand x:Key="SearchItem" Text="SearchItem"/>
+
         <cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
         <cvt:IntToCornerRadius x:Key="IntToCornerRadius"/>
         <cvt:DoubleToGridLength x:Key="DoubleToGridLength"/>
     </Window.Resources>
+    <Window.InputBindings>
+        <KeyBinding Gesture="Ctrl+F" Key="F"  Command="{StaticResource SearchItem}"/>
+    </Window.InputBindings>
+    <Window.CommandBindings>
+        <CommandBinding Command="{StaticResource SearchItem}" CanExecute="SearchItem"/>
+    </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" LostFocus="App_LostFocus"
+    <Border Margin="20" CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0"
+            Background="AliceBlue"
             Opacity="{Binding AppConfig.PannelOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"
             VirtualizingPanel.VirtualizationMode="Recycling"  VirtualizingPanel.IsVirtualizing="True"  VirtualizingPanel.IsContainerVirtualizable="True"
             hc:Dialog.Token="IconInfoDialog"
+            Focusable="True"
             >
-        <hc:DialogContainer>
+        <hc:DialogContainer Focusable="True">
 
             <Border CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0">
                 <!--背景图片-->
@@ -59,6 +69,7 @@
                     </VisualBrush>
                 </Border.Background>
 
+
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="40" MouseMove="DragMove"></RowDefinition>
@@ -66,9 +77,11 @@
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition x:Name="LeftColumn" MinWidth="80" Width="{Binding AppConfig.MenuCardWidth, Mode=TwoWay, Converter={StaticResource DoubleToGridLength}}" MaxWidth="200"></ColumnDefinition>
-                        <ColumnDefinition Width="*"></ColumnDefinition>
+                        <ColumnDefinition x:Name="RightColumn" Width="*"></ColumnDefinition>
                     </Grid.ColumnDefinitions>
 
+                    <!--获取焦点用-->
+                    <TextBox x:Name="EmptyTextBox" Width="0"/>
 
 
                     <DockPanel Grid.Row="0" Grid.Column="0" MouseMove="DragMove">
@@ -92,6 +105,7 @@
                                 Click="ConfigButtonClick"
                                 Initialized="SettingButton_Initialized"
                                 x:Name="SettingButton"
+                                FocusVisualStyle="{x:Null}"
                                 >
                                 <Button.ContextMenu>
                                     <ContextMenu x:Name="SettingMenus" Width="130">
@@ -107,24 +121,40 @@
                                 hc:IconElement.Width="18"
                                 HorizontalAlignment="Right"
                                 Click="CloseButtonClick"
+                                FocusVisualStyle="{x:Null}"
                                 />
                         </hc:UniformSpacingPanel>
 
                     </DockPanel>
 
 
-                    <uc:LeftCardControl  Grid.Row="1" Grid.Column="0"/>
+                    <uc:LeftCardControl Grid.Row="1" Grid.Column="0"/>
+
                     <!--分割线-->
                     <GridSplitter Opacity="0" Grid.Row="1" Grid.Column="0" Width="1"  VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
 
-                    <uc:RightCardControl Grid.Row="1" Grid.Column="1"/>
+                    <!--搜索输入框-->
+                    <TextBox Panel.ZIndex="2" Grid.Row="0" Grid.Column="1" 
+                             x:Name="SearchBox"
+                             Visibility="Collapsed"
+                             LostFocus="SearchBox_LostFocus"
+                             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.ContextMenu>
                             <ContextMenu Width="130">
                                 <MenuItem Header="打开面板" Click="ShowApp"/>
-                                <MenuItem Header="关闭图标" Click="CloseBarIcon"/>
+                                <MenuItem Header="隐藏图标" Click="CloseBarIcon"/>
                                 <MenuItem Header="待办"  Click="BacklogMenuClick"/>
                                 <MenuItem Header="程序目录"  Click="OpenThisDir"/>
                                 <MenuItem Header="设置"  Click="ConfigApp"/>

MainWindow.xaml.cs

@@ -1,27 +1,22 @@
-using DraggAnimatedPanelExample;
-using GeekDesk.Constant;
-using GeekDesk.Control;
+using GeekDesk.Constant;
 using GeekDesk.Control.UserControls.Config;
 using GeekDesk.Control.Windows;
+using GeekDesk.Interface;
 using GeekDesk.Task;
-using GeekDesk.Thread;
+using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using Gma.System.MouseKeyHook;
-using HandyControl.Data;
 
 using System;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Drawing;
-using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Media;
 using System.Windows.Media.Animation;
 using static GeekDesk.Util.ShowWindowFollowMouse;
+using System.Collections.ObjectModel;
+using NPinyin;
+using GeekDesk.ViewModel.Temp;
 
 namespace GeekDesk
 {
@@ -29,18 +24,14 @@ namespace GeekDesk
     /// MainWindow.xaml 的交互逻辑
     /// </summary>
     /// 
-    public partial class MainWindow : Window
+    public partial class MainWindow : Window, IWindowCommon
     {
 
-        //public IKeyboardMouseEvents m_GlobalHook = Hook.GlobalEvents();
-
         public static AppData appData = CommonCode.GetAppDataByFile();
-        //public static ToDoInfoWindow toDoInfoWindow = (ToDoInfoWindow)ToDoInfoWindow.GetThis();
         public static ToDoInfoWindow toDoInfoWindow;
         public static int hotKeyId = -1;
         public static int toDoHotKeyId = -1;
         public static MainWindow mainWindow;
-        public static MarginHide hide;
         public MainWindow()
         {
             LoadData();
@@ -51,27 +42,82 @@ namespace GeekDesk
             this.SizeChanged += MainWindow_Resize;
             ToDoTask.BackLogCheck();
 
+
             ////实例化隐藏 Hide类，进行时间timer设置
-            hide = new MarginHide(this);
+            MarginHide.ReadyHide(this);
             if (appData.AppConfig.MarginHide)
             {
-                hide.TimerSet();
+                MarginHide.StartHide();
             }
         }
 
+        /// <summary>
+        /// 显示搜索框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SearchItem(object sender, CanExecuteRoutedEventArgs e)
+        {
+            RightCard.VisibilitySearchCard(Visibility.Visible);
+            SearchBox.Visibility = Visibility.Visible;
+            SearchBox.Focus();
+        }
+        /// <summary>
+        /// 搜索开始
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            string inputText = SearchBox.Text.ToLower();
+            if (!string.IsNullOrEmpty(inputText))
+            {
+                SearchIconList.IconList.Clear();
+                ObservableCollection<MenuInfo> menuList = appData.MenuList;
+                foreach (MenuInfo menu in menuList)
+                {
+                    ObservableCollection<IconInfo> iconList = menu.IconList;
+                    foreach (IconInfo icon in iconList)
+                    {
+                        string pyName = Pinyin.GetInitials(icon.Name).ToLower();
+                        if (icon.Name.Contains(inputText) || pyName.Contains(inputText)) {
+                            SearchIconList.IconList.Add(icon);
+                        }
+                    }
+                }
+            } else
+            {
+                SearchIconList.IconList.Clear();
+            }
+        }
+        /// <summary>
+        /// 隐藏搜索框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SearchBox_LostFocus(object sender, RoutedEventArgs e)
+        {
+            SearchIconList.IconList.Clear();
+            RightCard.VisibilitySearchCard(Visibility.Collapsed);
+            SearchBox.Visibility = Visibility.Collapsed;
+            SearchBox.Text = "";
+        }
+
+
         /// <summary>
         /// 加载缓存数据
         /// </summary>
         private void LoadData()
         {
+            GC.KeepAlive(appData); // 持活
             this.DataContext = appData;
             if (appData.MenuList.Count == 0)
             {
-                appData.MenuList.Add(new MenuInfo() { MenuName = "NewMenu", MenuId = System.Guid.NewGuid().ToString(), MenuEdit = Visibility.Collapsed});
+                appData.MenuList.Add(new MenuInfo() { MenuName = "NewMenu", MenuId = System.Guid.NewGuid().ToString(), MenuEdit = Visibility.Collapsed });
             }
 
             this.Width = appData.AppConfig.WindowWidth;
-            this.Height = appData.AppConfig.WindowHeight;            
+            this.Height = appData.AppConfig.WindowHeight;
         }
 
         /// <summary>
@@ -86,15 +132,18 @@ namespace GeekDesk
                 if (appData.AppConfig.AppAnimation)
                 {
                     this.Opacity = 0;
-                } else
+                }
+                else
                 {
                     this.Visibility = Visibility.Collapsed;
                 }
-            } else
+            }
+            else
             {
                 ShowApp();
             }
 
+            //给任务栏图标一个名字
             BarIcon.Text = Constants.MY_NAME;
 
             //注册热键
@@ -108,36 +157,15 @@ namespace GeekDesk
             }
 
             //注册鼠标中键监听事件
-            //m_GlobalHook.MouseUpExt += M_GlobalHook_MouseUpExt;
-            MouseHookThread.MiddleHook();
+            if (appData.AppConfig.MouseMiddleShow)
+            {
+                MouseHookThread.MiddleHook();
+            }
 
             //更新线程开启  检测更新
             UpdateThread.Update();
         }
 
-        /// <summary>
-        /// 鼠标中键呼出
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //private void M_GlobalHook_MouseUpExt(object sender, System.Windows.Forms.MouseEventArgs e)
-        //{
-        //    if (appData.AppConfig.MouseMiddleShow && e.Button == System.Windows.Forms.MouseButtons.Middle)
-        //    {
-        //        if (MotionControl.hotkeyFinished)
-        //        {
-        //            if (mainWindow.Visibility == Visibility.Collapsed || mainWindow.Opacity == 0)
-        //            {
-        //                ShowApp();
-        //            }
-        //            else
-        //            {
-        //                HideApp();
-        //            }
-        //        }
-        //    }
-        //}
-
         /// <summary>
         /// 注册当前窗口的热键
         /// </summary>
@@ -152,7 +180,7 @@ namespace GeekDesk
                     {
                         if (MotionControl.hotkeyFinished)
                         {
-                            if (mainWindow.Visibility == Visibility.Collapsed || mainWindow.Opacity == 0)
+                            if (mainWindow.Visibility == Visibility.Collapsed || mainWindow.Opacity == 0 || MarginHide.IS_HIDE)
                             {
                                 ShowApp();
                             }
@@ -182,44 +210,7 @@ namespace GeekDesk
             }
         }
 
-        /// <summary>
-        /// 淡入淡出效果
-        /// </summary>
-        /// <param name="opacity"></param>
-        /// <param name="milliseconds"></param>
-        /// <param name="visibility"></param>
-        public static void FadeStoryBoard(int opacity, int milliseconds, Visibility visibility)
-        {
-            if (appData.AppConfig.AppAnimation)
-            {
-                DoubleAnimation opacityAnimation = new DoubleAnimation
-                {
-                    From = mainWindow.Opacity,
-                    To = opacity,
-                    Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds))
-                };
-                opacityAnimation.Completed += (s, e) =>
-                {
-                    mainWindow.BeginAnimation(OpacityProperty, null);
-                    if (visibility == Visibility.Visible)
-                    {
-                        mainWindow.Opacity = 1;
-                    } else
-                    {
-                        mainWindow.Opacity = 0;
-                    }
-                };
-                Timeline.SetDesiredFrameRate(opacityAnimation, 30);
-                mainWindow.BeginAnimation(OpacityProperty, opacityAnimation);
-            } else
-            {
-                //防止关闭动画后 窗体仍是0透明度
-                mainWindow.Opacity = 1;
-                mainWindow.Visibility = visibility;
-            }
-            
 
-        }
 
         /// <summary>
         /// 注册新建待办的热键
@@ -229,7 +220,7 @@ namespace GeekDesk
             try
             {
 
-                if (appData.AppConfig.ToDoHotkeyModifiers!=0)
+                if (appData.AppConfig.ToDoHotkeyModifiers != 0)
                 {
                     //加载完毕注册热键
                     toDoHotKeyId = GlobalHotKey.RegisterHotKey(appData.AppConfig.ToDoHotkeyModifiers, appData.AppConfig.ToDoHotkey, () =>
@@ -275,7 +266,7 @@ namespace GeekDesk
         }
 
 
-       
+
         /// <summary>
         /// 程序窗体拖动
         /// </summary>
@@ -283,10 +274,6 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void DragMove(object sender, MouseEventArgs e)
         {
-            //if (e.LeftButton == MouseButtonState.Pressed)
-            //{
-            //    this.DragMove();
-            //}
 
             if (e.LeftButton == MouseButtonState.Pressed)
             {
@@ -303,7 +290,6 @@ namespace GeekDesk
                 (When clicking the drag area, make the window follow) */
                 DragMove();
 
-
                 if (this.ResizeMode != windowMode)
                 {
                     this.ResizeMode = windowMode;
@@ -326,13 +312,14 @@ namespace GeekDesk
             if (appData.AppConfig.AppAnimation)
             {
                 FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
-            } else
+            }
+            else
             {
                 this.Visibility = Visibility.Collapsed;
             }
         }
 
-       
+
 
         ///// <summary>
         ///// 左侧栏宽度改变 持久化
@@ -344,7 +331,7 @@ namespace GeekDesk
         //    appData.AppConfig.MenuCardWidth = LeftColumn.Width.Value;
         //}
 
-       
+
 
         /// <summary>
         /// 右键任务栏图标 显示主面板
@@ -362,17 +349,65 @@ namespace GeekDesk
             //{
             //    return;
             //}
+            //修改贴边隐藏状态为未隐藏
+            mainWindow.Activate();
+
+            MarginHide.IS_HIDE = false;
             if (appData.AppConfig.FollowMouse)
             {
                 ShowWindowFollowMouse.Show(mainWindow, MousePosition.CENTER, 0, 0, false);
             }
             FadeStoryBoard(1, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Visible);
-            Keyboard.Focus(mainWindow);
+            mainWindow.Focus();           
         }
 
         public static void HideApp()
         {
-            FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
+            FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);            
+        }
+
+        /// <summary>
+        /// 淡入淡出效果
+        /// </summary>
+        /// <param name="opacity"></param>
+        /// <param name="milliseconds"></param>
+        /// <param name="visibility"></param>
+        public static void FadeStoryBoard(int opacity, int milliseconds, Visibility visibility)
+        {
+            if (appData.AppConfig.AppAnimation)
+            {
+                DoubleAnimation opacityAnimation = new DoubleAnimation
+                {
+                    From = mainWindow.Opacity,
+                    To = opacity,
+                    Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds))
+                };
+                opacityAnimation.Completed += (s, e) =>
+                {
+                    mainWindow.BeginAnimation(OpacityProperty, null);
+                    if (visibility == Visibility.Visible)
+                    {
+                        mainWindow.Opacity = 1;
+                    }
+                    else
+                    {
+                        mainWindow.Opacity = 0;
+                        CommonCode.SortIconList();
+                    }
+                };
+                Timeline.SetDesiredFrameRate(opacityAnimation, 60);
+                mainWindow.BeginAnimation(OpacityProperty, opacityAnimation);
+            }
+            else
+            {
+                //防止关闭动画后 窗体仍是0透明度
+                mainWindow.Opacity = 1;
+                mainWindow.Visibility = visibility;
+                if (visibility == Visibility.Collapsed)
+                {
+                    CommonCode.SortIconList();
+                }
+            }
         }
 
 
@@ -419,16 +454,6 @@ namespace GeekDesk
             p.Start();
         }
 
-        /// <summary>
-        /// 右键任务栏图标退出
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ExitApp(object sender, RoutedEventArgs e)
-        {
-            MouseHookThread.Dispose();
-            Application.Current.Shutdown();
-        }
 
 
 
@@ -470,26 +495,19 @@ namespace GeekDesk
             SettingButton.ContextMenu = null;
         }
 
-        private void App_LostFocus(object sender, RoutedEventArgs e)
+        private void App_LostFocus(object sender, EventArgs e)
         {
-            if (appData.AppConfig.AppHideType == AppHideType.LOST_FOCUS)
+            if (appData.AppConfig.AppHideType == AppHideType.LOST_FOCUS
+                && this.Opacity == 1)
             {
                 //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
-                if (appData.AppConfig.MarginHide && !hide.IsMargin())
+                if (!appData.AppConfig.MarginHide || (appData.AppConfig.MarginHide && !MarginHide.IS_HIDE))
                 {
-                    this.Visibility = Visibility.Collapsed;
+                    HideApp();
                 }
             }
         }
 
-        private void Window_Deactivated(object sender, EventArgs e)
-        {
-            if (appData.AppConfig.AppHideType == AppHideType.LOST_FOCUS)
-            {
-                this.Visibility = Visibility.Collapsed;
-            }
-        }
-
         private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this.DataContext != null)
@@ -500,6 +518,21 @@ namespace GeekDesk
             }
         }
 
+
+
+        /// <summary>
+        /// 右键任务栏图标退出
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ExitApp(object sender, RoutedEventArgs e)
+        {
+            if (appData.AppConfig.MouseMiddleShow)
+            {
+                MouseHookThread.Dispose();
+            }
+            Application.Current.Shutdown();
+        }
         /// <summary>
         /// 重启
         /// </summary>
@@ -507,10 +540,13 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void ReStartApp(object sender, RoutedEventArgs e)
         {
-            MouseHookThread.Dispose();
+            if (appData.AppConfig.MouseMiddleShow)
+            {
+                MouseHookThread.Dispose();
+            }
 
             Process p = new Process();
-            p.StartInfo.FileName = Constants.APP_DIR + Constants.MY_NAME + ".exe";
+            p.StartInfo.FileName = Constants.APP_DIR + "GeekDesk.exe";
             p.StartInfo.WorkingDirectory = Constants.APP_DIR;
             p.Start();
 
@@ -526,9 +562,25 @@ namespace GeekDesk
         {
             appData.AppConfig.ShowBarIcon = false;
         }
+
+
+        public void OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                HideApp();
+            }
+        }
+
+        /// <summary>
+        /// 为了让修改菜单的textBox失去焦点
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MainWindow_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            EmptyTextBox.Focus();
+        }
+
     }
-
-
-
-
 }

MyThread/DispatcherBuild.cs

@@ -6,7 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Threading;
 
-namespace GeekDesk.Thread
+namespace GeekDesk.MyThread
 {
     public class DispatcherBuild
     {

MyThread/MouseHookThread.cs

@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
 
-namespace GeekDesk.Thread
+namespace GeekDesk.MyThread
 {
     public class MouseHookThread
     {

MyThread/UpdateThread.cs

@@ -12,7 +12,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace GeekDesk.Thread
+namespace GeekDesk.MyThread
 {
     public class UpdateThread
     {
@@ -59,12 +59,9 @@ namespace GeekDesk.Thread
                         }));
                     }
                 }
-#pragma warning disable CS0168 // 声明了变量“e”，但从未使用过
-            } catch (Exception e)
-#pragma warning restore CS0168 // 声明了变量“e”，但从未使用过
+            } catch (Exception ex)
             {
-                //不做处理
-                //MessageBox.Show(e.Message);
+                LogUtil.WriteErrorLog(ex, "获取更新失败!");
             }
         }
     }

Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.2.0")]
-[assembly: AssemblyFileVersion("2.3.2.0")]
+[assembly: AssemblyVersion("2.4.1.3")]
+[assembly: AssemblyFileVersion("2.4.1.3")]

Resource/Dictionary/CommonStyle.xaml

@@ -3,6 +3,7 @@
                     xmlns:hc="https://handyorg.github.io/handycontrol">
 
 
+    <!--整体样式-->
     <Style x:Key="BorderBG" TargetType="Border">
         <Style.Setters>
             <Setter Property="Background">
@@ -18,18 +19,29 @@
         </Style.Setters>
     </Style>
 
+    <LinearGradientBrush x:Key="BtnBG" Opacity="0.97">
+        <GradientStop Color="White" Offset="0"/>
+        <GradientStop Color="White" Offset="1"/>
+    </LinearGradientBrush>
+
+    <!--按钮样式-->
     <Style x:Key="Btn1" TargetType="Button" BasedOn="{StaticResource ButtonInfo}">
-        <Setter Property="Background">
+        <Setter Property="Background" Value="{StaticResource BtnBG}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderBrush">
             <Setter.Value>
-                <LinearGradientBrush Opacity="0.97">
-                    <GradientStop Color="#5BC0DE" Offset="0"/>
-                    <GradientStop Color="#5BC0DE" Offset="1"/>
-                </LinearGradientBrush>
+                <SolidColorBrush Color="#E5E5E2"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="Foreground" Value="Black"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#E5E5E2"/>
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
+    <!--菜单样式-->
     <Style x:Key="MyMenuStyle" TargetType="hc:SideMenuItem" BasedOn="{StaticResource SideMenuItemBaseStyle}">
         <Style.Setters>
             <Setter Property="Background" Value="Transparent"/>
@@ -43,6 +55,6 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-    
-    
+
+
 </ResourceDictionary>

Resource/Dictionary/Geometry.xaml

@@ -37,6 +37,7 @@
         M512 0c282.775704 0 512 229.224296 512 512S794.775704 1024 512 1024 0 794.775704 0 512 229.224296 0 512 0zM303.407407 455.111111a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z m208.592593 0a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z m208.592593 0a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z
     </Geometry>
 
+    <!--更新源-->
     <Geometry x:Key="Gitee">
         M512 0C230.4 0 0 230.4 0 512s230.4 512 512 512 512-230.4 512-512S793.6 0 512 0z m284.8 313.6c0 12.8-12.8 25.6-25.6 25.6H416c-41.6 0-76.8 35.2-76.8 76.8v243.2c0 12.8 12.8 25.6 25.6 25.6h240c41.6 0 76.8-35.2 76.8-76.8v-12.8c0-12.8-12.8-25.6-25.6-25.6H480c-12.8 0-25.6-12.8-25.6-25.6v-64c0-12.8 12.8-25.6 25.6-25.6h291.2c12.8 0 25.6 12.8 25.6 25.6v144c0 92.8-76.8 169.6-169.6 169.6H252.8c-12.8 0-25.6-12.8-25.6-25.6V412.8C227.2 310.4 310.4 224 416 224h355.2c12.8 0 25.6 12.8 25.6 25.6v64z
     </Geometry>
@@ -44,6 +45,23 @@
     <Geometry x:Key="GitHub">
         M1021.72444445 512a495.16088889 495.16088889 0 0 1-97.57582223 299.64515555 500.62222222 500.62222222 0 0 1-250.85724444 184.22897778 30.58346667 30.58346667 0 0 1-26.2144-4.73315555 25.85031111 25.85031111 0 0 1-8.00995556-20.02488889v-139.81013334a119.05706667 119.05706667 0 0 0-34.58844444-94.29902222 473.31555555 473.31555555 0 0 0 67.72053333-11.65084444 248.30862222 248.30862222 0 0 0 62.2592-26.2144 187.50577778 187.50577778 0 0 0 53.52106667-43.69066667 209.35111111 209.35111111 0 0 0 36.40888889-69.90506667 334.2336 334.2336 0 0 0 13.83537778-100.12444444 191.87484445 191.87484445 0 0 0-52.7928889-136.53333333 176.21902222 176.21902222 0 0 0-5.09724444-135.44106667 87.01724445 87.01724445 0 0 0-53.52106666 7.28177778 341.87946667 341.87946667 0 0 0-61.16693334 29.12711111l-25.12213333 15.65582222a473.31555555 473.31555555 0 0 0-254.86222223 0c-7.28177778-5.09724445-16.384-10.55857778-28.03484444-17.84035555A371.00657778 371.00657778 0 0 0 300.82844445 220.72888889a94.29902222 94.29902222 0 0 0-57.16195556-9.10222222 178.40355555 178.40355555 0 0 0-4.73315556 136.53333333 197.70026667 197.70026667 0 0 0-52.4288 137.26151111A327.68 327.68 0 0 0 200.33991111 584.81777778a223.55057778 223.55057778 0 0 0 36.40888889 69.90506667 172.94222222 172.94222222 0 0 0 53.52106667 44.41884444 304.7424 304.7424 0 0 0 62.2592 26.2144 471.13102222 471.13102222 0 0 0 68.08462222 11.65084444 105.22168889 105.22168889 0 0 0-32.768 68.44871112 112.86755555 112.86755555 0 0 1-30.21937778 9.4663111 190.41848889 190.41848889 0 0 1-36.40888889 3.2768A78.6432 78.6432 0 0 1 274.61404445 803.27111111a124.5184 124.5184 0 0 1-36.4088889-41.50613333 109.22666667 109.22666667 0 0 0-32.03982222-34.58844445 91.7504 91.7504 0 0 0-32.768-16.01991111h-13.1072a47.33155555 47.33155555 0 0 0-19.29671111 2.91271111q-5.46133333 3.2768-3.2768 7.64586667a50.24426667 50.24426667 0 0 0 6.18951111 9.10222222 62.98737778 62.98737778 0 0 0 8.73813334 8.37404445l4.73315555 2.91271111a88.83768889 88.83768889 0 0 1 29.12711111 25.12213333 179.49582222 179.49582222 0 0 1 20.75306667 33.49617778l6.5536 15.29173333a82.28408889 82.28408889 0 0 0 29.12711111 41.14204445 109.22666667 109.22666667 0 0 0 44.05475556 18.93262222 223.18648889 223.18648889 0 0 0 45.8752 4.73315556 207.16657778 207.16657778 0 0 0 36.40888888-2.54862223l15.29173334-2.54862222v95.39128889a26.2144 26.2144 0 0 1-8.73813334 20.02488889 31.67573333 31.67573333 0 0 1-26.57848888 4.73315555 498.43768889 498.43768889 0 0 1-249.40088889-185.32124444A486.78684445 486.78684445 0 0 1 2.27555555 512a497.70951111 497.70951111 0 0 1 68.44871112-254.86222222A504.6272 504.6272 0 0 1 257.13777778 70.72426667 497.70951111 497.70951111 0 0 1 512 2.27555555a497.70951111 497.70951111 0 0 1 254.86222222 68.44871112A504.6272 504.6272 0 0 1 953.27573333 257.13777778 496.98133333 496.98133333 0 0 1 1021.72444445 512z
     </Geometry>
+    <!--更新源-->
+    
+    <!--排序方式-->
+    <Geometry x:Key="CustomSort">
+        M950.896028 907.262252 799.11209 753.232157c-12.108782-12.302187-31.893384-12.434194-44.163849-0.325411-12.286838 12.103666-12.434194 31.878035-0.325411 44.163849l151.783938 154.030096c6.110161 6.206352 14.177907 9.31311 22.24463 9.31311 7.919367 0 15.839757-2.989077 21.919219-8.987698C962.857455 939.323459 963.004811 919.54909 950.896028 907.262252z
+        M884.039341 602.546226c30.65723-17.944697 39.848567-39.624463 42.156122-54.645574 2.26253-14.700817 0.147356-37.530778-22.773679-62.84021-44.830021-49.441039-119.794363-128.689964-142.222165-152.352897-5.586229-32.177863-24.425296-139.980101-37.535895-206.1655-4.869914-24.50716-19.174712-44.387953-39.248909-54.53915-19.896142-10.060123-43.38102-9.739828-66.149583 0.919952-61.168128 28.716019-160.318312 77.455069-189.568497 91.861174-32.803103-3.975545-145.002488-17.466814-211.030297-24.145933-21.283746-2.170432-42.202171 5.363148-57.380872 20.608364-15.971763 16.038278-24.099884 38.928614-21.751397 61.238736 7.060813 67.115584 20.99415 179.407066 25.055652 211.919551-14.049994 29.635971-62.535265 132.146693-90.514503 194.163141-13.837146 30.555923-8.352225 53.30402-1.311879 67.004043 9.378601 18.249643 27.083845 31.165814 48.677653 35.461653 64.594157 12.617365 177.831174 32.345686 211.060997 38.104853 23.967878 22.915919 104.747669 99.984179 153.59826 144.738475 19.759019 18.116613 38.028105 22.941502 51.890834 22.941502 3.360538 0 6.461155-0.284479 9.261944-0.726547 14.365172-2.292206 34.922371-11.127432 51.245128-40.153512 33.336246-59.07342 87.722924-160.679539 103.425557-190.086289 28.390607-15.70775 124.57218-69.067029 183.102225-103.293551C884.029108 602.551342 884.034225 602.551342 884.039341 602.546226zM852.482625 548.642548c-68.234057 39.898709-188.638311 106.333794-189.842743 106.998943-5.301749 2.922563-9.642614 7.324826-12.484336 12.672624-0.681522 1.276063-68.345598 128.328737-107.075691 196.964954-2.948145 5.236258-5.428639 7.848759-6.699586 8.860808-1.514493-0.568958-4.666276-2.272763-9.06854-6.308683-57.065693-52.281737-158.473291-149.420101-159.490457-150.396335-4.493338-4.306072-10.17678-7.172353-16.312524-8.230452-1.428535-0.243547-143.858432-24.786523-218.98548-39.45664-2.917446-0.579191-4.793166-1.942235-5.195326-2.725064-0.457418-0.889253-0.873903-4.900613 2.673899-12.728906 32.568766-72.198346 93.310176-200.045105 93.920066-201.331401 2.562359-5.383614 3.523243-11.391445 2.780323-17.309224-0.178055-1.408069-17.827017-141.622508-26.047236-219.706911-0.381693-3.634784 1.183965-7.90504 3.89368-10.623965 2.115174-2.124384 4.122901-2.592035 5.779633-2.592035 0.37146 0 0.721431 0.020466 1.057075 0.056282 76.915787 7.777127 217.582527 24.954345 218.995713 25.127284 6.019087 0.726547 12.164041-0.310062 17.619286-2.99931 1.245364-0.615007 125.360126-61.899792 196.786898-95.439676 4.895497-2.297322 9.063423-2.922563 11.437493-1.733481 2.699482 1.367137 5.118578 5.67321 6.17156 10.959609 15.310707 77.302597 38.628786 212.590839 38.862099 213.947743 1.046842 6.089695 3.883447 11.732206 8.138354 16.211217 0.950651 0.9967 95.328136 100.345406 147.737786 158.14788 5.880941 6.491855 7.284917 10.608615 7.345292 11.30037C864.163665 539.349905 861.291245 543.483038 852.482625 548.642548z
+        M348.905458 492.080322c-12.169157-12.220323-31.948643-12.266371-44.168965-0.085958-12.220323 12.169157-12.261255 31.943526-0.085958 44.168965l22.676465 22.768563c6.099928 6.125511 14.111392 9.190313 22.127973 9.190313 7.970532 0 15.94618-3.035126 22.040992-9.104355 12.220323-12.169157 12.261255-31.948643 0.085958-44.168965L348.905458 492.080322z    
+        M508.766352 376.774179c6.105045 6.125511 14.116509 9.190313 22.127973 9.190313 7.970532 0 15.94618-3.035126 22.040992-9.104355 12.220323-12.174274 12.261255-31.948643 0.085958-44.168965l-22.681582-22.768563c-12.17939-12.220323-31.948643-12.256138-44.168965-0.085958-12.220323 12.174274-12.261255 31.948643-0.085958 44.168965L508.766352 376.774179z
+        M564.67878 441.515692c-16.851806 3.680832-27.53103 20.322861-23.856337 37.174668 0.056282 0.248663 4.707209 25.564235-11.290137 41.621956-15.524578 15.575744-39.035038 11.153014-40.616046 10.832719-16.673751-3.715625-33.310663 6.668886-37.225833 23.352871-3.934612 16.790408 6.486738 33.596166 23.281239 37.535895 6.003737 1.408069 13.852496 2.409886 22.748097 2.409886 22.895453 0 52.745295-6.634094 76.067466-30.04734 32.16763-32.289404 32.777521-77.43972 28.065196-99.023294C598.167498 448.51613 581.51933 437.856349 564.67878 441.515692z
+    </Geometry>
+    <Geometry x:Key="UpSort">
+        M470.016 976.896q-44.032 0-59.392-20.48t-15.36-65.536q0-20.48-0.512-64.512t-1.024-93.696-1.536-96.768-1.024-74.752q0-39.936-7.68-62.464t-35.328-21.504q-20.48 0-48.64-1.024t-49.664 0q-35.84 0-45.568-19.456t13.824-50.176q24.576-30.72 57.344-72.704t67.584-86.016 68.096-87.04 58.88-75.776q23.552-29.696 45.568-30.72t46.592 26.624q24.576 29.696 56.832 69.632t67.072 82.432 68.608 83.968 60.416 73.216q29.696 35.84 23.04 58.88t-43.52 23.04q-11.264 0-25.088 0.512t-29.184 1.024-30.208 1.024-27.136 0.512q-25.6 1.024-32.256 16.384t-5.632 41.984q0 29.696 0.512 77.824t1.024 100.352 1.536 101.376 1.024 79.872q0 13.312-2.048 27.648t-9.728 26.112-21.504 19.968-36.352 8.192q-27.648 0-52.736 0.512t-56.832 1.536z
+    </Geometry>
+    <Geometry x:Key="LowSort">
+        M564.224 44.032q43.008 0 58.368 20.48t15.36 65.536q0 20.48 0.512 64.512t0.512 93.696 0.512 96.768 0.512 74.752q0 38.912 7.68 61.952t35.328 22.016q19.456 0 48.128 1.024t49.152 1.024q35.84 0 45.568 18.944t-13.824 49.664q-24.576 30.72-57.344 72.704t-68.096 86.016-69.12 86.528-59.392 75.264q-23.552 29.696-45.568 30.72t-45.568-27.648q-24.576-29.696-57.344-69.632t-67.072-82.432-67.584-83.968-59.904-74.24q-29.696-35.84-22.528-58.88t44.032-23.04l24.576 0q14.336 0 29.696-0.512t30.208-1.536 26.112-1.024q26.624 0 32.768-15.36t6.144-41.984q0-29.696-0.512-77.824t-0.512-100.352-0.512-101.376-0.512-79.872q0-13.312 2.048-27.648t9.728-26.112 20.992-19.456 36.864-7.68q27.648 0 53.248-0.512t57.344-0.512z
+    </Geometry>
+    <!--排序方式-->
 
 
 </ResourceDictionary>

Update.json

@@ -1,9 +1,9 @@
 {
-	"title": "<EFBFBD>汾<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-	"subTitle": "V2.3.20 <20><>ʽ<EFBFBD><CABD>",
-	"msgTitle": "<EFBFBD><EFBFBD><EFBFBD>θ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-	"msg": "['һ<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20>޸<EFBFBD><DEB8><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>bug<75><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˲<EFBFBD><CBB2>ֹ<EFBFBD><D6B9><EFBFBD>','<27>޸<EFBFBD><DEB8>޷<EFBFBD><DEB7>޸IJ˵<C4B2>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD>bug','<27>޸<EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״bug','<27>޸<EFBFBD><DEB8>ȼ<EFBFBD><C8BC><EFBFBD>֧<EFBFBD><D6A7>Alt<6C><74>bug','<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>м<EFBFBD><D0BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͼ<EFBFBD>깦<EFBFBD><EAB9A6>','<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><><EFBFBD><EFBFBD>ȥ<EFBFBD><C8A5><EFBFBD>ҵ<EFBFBD><D2B5><EFBFBD>star<61><72>']",
+	"title": "GeekDesk版本更新",
+	"subTitle": "V2.4.12",
+	"msgTitle": "本次更新内容如下",
+	"msg": "['各位兄弟去给我点个免费Star呗','这是个修复版本,主要修复上个版本的bug','修复图标无法拖动','修复界面遮挡任务栏']",
 	"githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases",
 	"giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases",
-	"version": "2.3.20"
+	"version": "2.4.12"
 }

Update.json.bak

@@ -1,9 +0,0 @@
-{
-	"title": "版本更新",
-	"subTitle": "V2.3.20 正式版",
-	"msgTitle": "本次更新内容如下",
-	"msg": "['一个小更新, 修复了一部分bug并增加了部分功能','修复无法修改菜单图标的bug','修复图标锯齿状bug','修复热键不支持Alt的bug','增加鼠标中键呼出功能','增加隐藏托盘图标功能','界面美化等','最后去给我点个star呗']",
-	"githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases",
-	"giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases",
-	"version": "2.3.20"
-}

Util/CommonCode.cs

@@ -1,10 +1,13 @@
 using GeekDesk.Constant;
 using GeekDesk.ViewModel;
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Windows;
+using System.Windows.Media.Imaging;
 
 /// <summary>
 /// 提取一些代码
@@ -45,7 +48,6 @@ namespace GeekDesk.Util
         /// <param name="appData"></param>
         public static void SaveAppData(AppData appData)
         {
-
             using (FileStream fs = new FileStream(Constants.DATA_FILE_PATH, FileMode.Create))
             {
                 BinaryFormatter bf = new BinaryFormatter();
@@ -74,6 +76,100 @@ namespace GeekDesk.Util
             return false;
         }
 
+        /// <summary>
+        /// 根据路径获取文件图标等信息
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static IconInfo GetIconInfoByPath(string path)
+        {
+            string tempPath = path;
+
+            //string base64 = ImageUtil.FileImageToBase64(path, System.Drawing.Imaging.ImageFormat.Png);
+            //string ext = "";
+            //if (!ImageUtil.IsSystemItem(path))
+            //{
+            //    ext = System.IO.Path.GetExtension(path).ToLower();
+            //}
+
+            string iconPath = null;
+            //if (".lnk".Equals(ext))
+            //{
+
+            string targetPath = FileUtil.GetTargetPathByLnk(path);
+            iconPath = FileUtil.GetIconPathByLnk(path);
+            if (targetPath != null)
+            {
+                path = targetPath;
+            }
+            //}
+            if (StringUtil.IsEmpty(iconPath))
+            {
+                iconPath = path;
+            }
+
+            BitmapImage bi = ImageUtil.GetBitmapIconByPath(iconPath);
+            IconInfo iconInfo = new IconInfo
+            {
+                Path = path,
+                LnkPath = tempPath,
+                BitmapImage = bi,
+                StartArg = FileUtil.GetArgByLnk(tempPath)
+            };
+            iconInfo.DefaultImage = iconInfo.ImageByteArr;
+            iconInfo.Name = System.IO.Path.GetFileNameWithoutExtension(tempPath);
+            if (StringUtil.IsEmpty(iconInfo.Name))
+            {
+                iconInfo.Name = path;
+            }
+            return iconInfo;
+        }
+
+
+        public static IconInfo GetIconInfoByPath_NoWrite(string path)
+        {
+            string tempPath = path;
+
+            //string base64 = ImageUtil.FileImageToBase64(path, System.Drawing.Imaging.ImageFormat.Png);
+            string ext = "";
+            if (!ImageUtil.IsSystemItem(path))
+            {
+                ext = System.IO.Path.GetExtension(path).ToLower();
+            }
+
+            string iconPath = null;
+            if (".lnk".Equals(ext))
+            {
+
+                string targetPath = FileUtil.GetTargetPathByLnk(path);
+                iconPath = FileUtil.GetIconPathByLnk(path);
+                if (targetPath != null)
+                {
+                    path = targetPath;
+                }
+            }
+            if (StringUtil.IsEmpty(iconPath))
+            {
+                iconPath = path;
+            }
+
+            BitmapImage bi = ImageUtil.GetBitmapIconByPath(iconPath);
+            IconInfo iconInfo = new IconInfo
+            {
+                Path_NoWrite = path,
+                LnkPath_NoWrite = tempPath,
+                BitmapImage_NoWrite = bi,
+                StartArg_NoWrite = FileUtil.GetArgByLnk(tempPath)
+            };
+            iconInfo.DefaultImage_NoWrite = iconInfo.ImageByteArr;
+            iconInfo.Name = System.IO.Path.GetFileNameWithoutExtension(tempPath);
+            if (StringUtil.IsEmpty(iconInfo.Name))
+            {
+                iconInfo.Name_NoWrite = path;
+            }
+            return iconInfo;
+        }
+
 
         [StructLayout(LayoutKind.Sequential)]
         private struct RECT
@@ -92,8 +188,39 @@ namespace GeekDesk.Util
 
 
 
-
-
+        /// <summary>
+        /// 排序图标
+        /// </summary>
+        public static void SortIconList()
+        {
+            if (MainWindow.appData.AppConfig.IconSortType != SortType.CUSTOM)
+            {
+                ObservableCollection<MenuInfo> menuList = MainWindow.appData.MenuList;
+                //List<IconInfo> list = new List<IconInfo>(menuList[MainWindow.appData.AppConfig.SelectedMenuIndex].IconList);
+                List<IconInfo> list;
+                foreach (MenuInfo menuInfo in menuList)
+                {
+                    list = new List<IconInfo>(menuInfo.IconList);
+                    switch (MainWindow.appData.AppConfig.IconSortType)
+                    {
+                        case SortType.COUNT_UP:
+                            list.Sort((x, y) => x.Count.CompareTo(y.Count));
+                            break;
+                        case SortType.COUNT_LOW:
+                            list.Sort((x, y) => y.Count.CompareTo(x.Count));
+                            break;
+                        case SortType.NAME_UP:
+                            list.Sort((x, y) => x.Name.CompareTo(y.Name));
+                            break;
+                        case SortType.NAME_LOW:
+                            list.Sort((x, y) => y.Name.CompareTo(x.Name));
+                            break;
+                    }
+                    menuInfo.IconList = new ObservableCollection<IconInfo>(list);
+                }
+                MainWindow.appData.AppConfig.SelectedMenuIcons = MainWindow.appData.MenuList[MainWindow.appData.AppConfig.SelectedMenuIndex].IconList;
+            }
+        }
 
     }
 }

Util/FileIcon.cs

@@ -74,7 +74,6 @@ namespace GeekDesk.Util
             myEncoderParameters.Param[0] = myEncoderParameter;
 
             bmp.Save(strm, myImageCodecInfo, myEncoderParameters);
-            bmp.Save("d:\\test.png", myImageCodecInfo, myEncoderParameters);
             BitmapImage bmpImage = new BitmapImage();
             bmpImage.BeginInit();
             strm.Seek(0, SeekOrigin.Begin);

Util/FileUtil.cs

@@ -2,7 +2,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace GeekDesk.Util
@@ -10,25 +12,152 @@ namespace GeekDesk.Util
     public class FileUtil
     {
 
+        private static readonly string NO_PATH = "{(.*)}";
+        private static readonly string NO_ICO = "^,(.*)";
+        private static readonly string HAVE_ICO = "(.*),(.*)";
+
         public static string GetTargetPathByLnk(string filePath)
         {
             try
             {
                 WshShell shell = new WshShell();
                 IWshRuntimeLibrary.IWshShortcut shortcut = (IWshRuntimeLibrary.IWshShortcut)shell.CreateShortcut(filePath);
-
                 if (StringUtil.IsEmpty(shortcut.TargetPath))
                 {
                     return null;
                 }
-                return shortcut.TargetPath;
+                string path = shortcut.TargetPath;
+                if (path == null || Regex.IsMatch(path, NO_PATH))
+                {
+                    path = ParseShortcut(filePath);
+                }
+                return path;
             }
-#pragma warning disable CS0168 // 声明了变量“e”，但从未使用过
             catch (Exception e)
-#pragma warning restore CS0168 // 声明了变量“e”，但从未使用过
+            {
+                LogUtil.WriteErrorLog(e, "获取目标路径失败! filePath=" + filePath);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 获取启动参数
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <returns></returns>
+        public static string GetArgByLnk(string filePath)
+        {
+            try
+            {
+                WshShell shell = new WshShell();
+                IWshRuntimeLibrary.IWshShortcut shortcut = (IWshRuntimeLibrary.IWshShortcut)shell.CreateShortcut(filePath);
+                return shortcut.Arguments;
+            }
+            catch (Exception e)
+            {
+                LogUtil.WriteErrorLog(e, "获取启动参数失败! filePath=" + filePath);
+                return "";
+            }
+        }
+
+        /// <summary>
+        /// 获取iconpath
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <returns></returns>
+        public static string GetIconPathByLnk(string filePath)
+        {
+            try
+            {
+                WshShell shell = new WshShell();
+                IWshRuntimeLibrary.IWshShortcut shortcut = (IWshRuntimeLibrary.IWshShortcut)shell.CreateShortcut(filePath);
+                var iconPath = shortcut.IconLocation;
+
+                if (StringUtil.IsEmpty(iconPath)
+                    || Regex.IsMatch(iconPath, NO_ICO)
+                    || Regex.IsMatch(iconPath, NO_PATH)
+                    || !Regex.IsMatch(iconPath, HAVE_ICO))
+                {
+                    return null;
+                }
+                else
+                {
+                    return iconPath.Split(',')[0];
+                }
+            }
+            catch (Exception e)
+            {
+                LogUtil.WriteErrorLog(e, "获取图标路径失败! filePath=" + filePath);
+                return null;
+            }
+        }
+
+
+        /*
+        UINT MsiGetShortcutTarget(
+            LPCTSTR szShortcutTarget,
+            LPTSTR szProductCode,
+            LPTSTR szFeatureId,
+            LPTSTR szComponentCode
+        );
+        */
+        [DllImport("msi.dll", CharSet = CharSet.Auto)]
+        static extern int MsiGetShortcutTarget(string targetFile, StringBuilder productCode, StringBuilder featureID, StringBuilder componentCode);
+
+        public enum InstallState
+        {
+            NotUsed = -7,
+            BadConfig = -6,
+            Incomplete = -5,
+            SourceAbsent = -4,
+            MoreData = -3,
+            InvalidArg = -2,
+            Unknown = -1,
+            Broken = 0,
+            Advertised = 1,
+            Removed = 1,
+            Absent = 2,
+            Local = 3,
+            Source = 4,
+            Default = 5
+        }
+
+        public const int MaxFeatureLength = 38;
+        public const int MaxGuidLength = 38;
+        public const int MaxPathLength = 1024;
+
+        /*
+        INSTALLSTATE MsiGetComponentPath(
+          LPCTSTR szProduct,
+          LPCTSTR szComponent,
+          LPTSTR lpPathBuf,
+          DWORD* pcchBuf
+        );
+        */
+        [DllImport("msi.dll", CharSet = CharSet.Auto)]
+        static extern InstallState MsiGetComponentPath(string productCode, string componentCode, StringBuilder componentPath, ref int componentPathBufferSize);
+
+        public static string ParseShortcut(string file)
+        {
+            StringBuilder product = new StringBuilder(MaxGuidLength + 1);
+            StringBuilder feature = new StringBuilder(MaxFeatureLength + 1);
+            StringBuilder component = new StringBuilder(MaxGuidLength + 1);
+
+            MsiGetShortcutTarget(file, product, feature, component);
+
+            int pathLength = MaxPathLength;
+            StringBuilder path = new StringBuilder(pathLength);
+
+            InstallState installState = MsiGetComponentPath(product.ToString(), component.ToString(), path, ref pathLength);
+            if (installState == InstallState.Local)
+            {
+                return path.ToString();
+            }
+            else
             {
                 return null;
             }
         }
+
     }
 }

Util/ImageUtil.cs

@@ -4,6 +4,7 @@ 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;
@@ -13,6 +14,7 @@ namespace GeekDesk.Util
 {
     class ImageUtil
     {
+        private static readonly string SYSTEM_ITEM = "::{.*}";
 
         /// <summary>
         /// 图片数组转 BitmapImage
@@ -84,18 +86,37 @@ namespace GeekDesk.Util
         /// <returns></returns>
         public static BitmapImage GetBitmapIconByPath(string filePath)
         {
-            if (File.Exists(filePath))
+            if (filePath.Contains("%windir%"))
             {
-                if (IsImage(filePath)) {
+                filePath = filePath.Replace("%windir%", System.Environment.GetEnvironmentVariable("windir"));
+            }
+
+            if (File.Exists(filePath) || IsSystemItem(filePath))
+            {
+                if (IsImage(filePath))
+                {
                     //图片
                     return GetThumbnailByFile(filePath, 256, 256);
-                } else
+                }
+                else
                 { //其它文件
                     return FileIcon.GetBitmapImage(filePath);
                 }
-            } else if(Directory.Exists(filePath)) {
-                //文件夹
-                return ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_DIR_IMAGE_BASE64);
+            }
+            else if (Directory.Exists(filePath))
+            {
+
+                if ((filePath.IndexOf("\\") == filePath.LastIndexOf("\\")) && filePath.IndexOf("\\") == filePath.Length - 1)
+                {
+                    //磁盘
+                    return ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_DISK_IMAGE_BASE64);
+                }
+                else
+                {
+                    //文件夹
+                    return ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_DIR_IMAGE_BASE64);
+                }
+
             }
             return null;
         }
@@ -200,11 +221,12 @@ namespace GeekDesk.Util
                     return bm;
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                LogUtil.WriteErrorLog(e, "获取文件缩略图失败!filePath=" + filePath);
                 return Base64ToBitmapImage(Constants.DEFAULT_IMG_IMAGE_BASE64);
             }
-            
+
         }
 
 
@@ -300,8 +322,9 @@ namespace GeekDesk.Util
                 ms.Close();
                 return Convert.ToBase64String(arr);
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                LogUtil.WriteErrorLog(e, "图片文件转base64失败!Imagefilename=" + Imagefilename + ",ImageFormat=" + format);
                 return null;
             }
         }
@@ -334,5 +357,15 @@ namespace GeekDesk.Util
         }
 
 
+        /// <summary>
+        /// 判断是否为系统项
+        /// </summary>
+        /// <returns></returns>
+        public static bool IsSystemItem(string path)
+        {
+            return Regex.IsMatch(path, SYSTEM_ITEM);
+        }
+
+
     }
 }

Util/LogUtil.cs

@@ -0,0 +1,76 @@
+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
+{
+    public class LogUtil
+    {
+        public static void WriteErrorLog(object exception, string msg = "")
+        {
+            try
+            {
+                Exception ex = exception as Exception;
+
+                using (FileStream fs = File.Open(Constants.ERROR_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);
+
+                    if (ex != null)
+                    {
+                        buffer = Encoding.Default.GetBytes("成员名: " + ex.TargetSite + "\r\n");
+                        fs.Write(buffer, 0, buffer.Length);
+
+                        buffer = Encoding.Default.GetBytes("引发异常的类: " + ex.TargetSite.DeclaringType + "\r\n");
+                        fs.Write(buffer, 0, buffer.Length);
+
+                        buffer = Encoding.Default.GetBytes("异常信息: " + ex.Message + "\r\n");
+                        fs.Write(buffer, 0, buffer.Length);
+
+                        buffer = Encoding.Default.GetBytes("引发异常的程序集或对象: " + ex.Source + "\r\n");
+                        fs.Write(buffer, 0, buffer.Length);
+
+                        buffer = Encoding.Default.GetBytes("栈：" + ex.StackTrace + "\r\n");
+                        fs.Write(buffer, 0, buffer.Length);
+                    }
+                    else
+                    {
+                        buffer = Encoding.Default.GetBytes("应用程序错误: " + exception.ToString() + "\r\n");
+                        fs.Write(buffer, 0, buffer.Length);
+                    }
+                }
+            } catch
+            {
+
+            }
+           
+        }
+
+
+        public static void WriteLog(string msg)
+        {
+            try {
+                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);
+            }
+            } catch { }
+        }
+
+
+    }
+}

Util/MarginHide.cs

@@ -1,45 +1,45 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-using System.Drawing; //添加引用
-using System.Windows.Forms;//添加引用
-using MouseEventArgs = System.Windows.Input.MouseEventArgs;
+using System.Windows.Forms;
 using System.Windows;
 using System.Windows.Media.Animation;
-using System.Windows.Media;
+using GeekDesk.Constant;
 
 namespace GeekDesk.Util
 {
 
-    enum HidePosition
+    enum HideType
     {
-        TOP = 1,
-        LEFT = 2,
-        RIGHT = 3
+        TOP_SHOW = 1,
+        LEFT_SHOW = 2,
+        RIGHT_SHOW = 3,
+        TOP_HIDE = 4,
+        LEFT_HIDE = 5,
+        RIGHT_HIDE = 6
     }
 
+
     public class MarginHide
     {
-        readonly Window window;//定义使用该方法的窗体
+        private static Window window;//定义使用该方法的窗体
 
-        private readonly int hideTime = 80;
+        private static readonly int hideTime = 200;
+        private static readonly int fadeHideTime = 180;
+        private static readonly int fadeShowTime = 200;
+        private static readonly int taskTime = 250;
 
-        private readonly int taskTime = 200;
+        public static readonly int shadowWidth = 20;
 
-        private double showMarginWidth = 1;
 
-#pragma warning disable CS0414 // 字段“MarginHide.isHide”已被赋值，但从未使用过它的值
-        private bool isHide;
-#pragma warning restore CS0414 // 字段“MarginHide.isHide”已被赋值，但从未使用过它的值
+        private static double showMarginWidth = 1;
 
-        public Timer timer;
-        //构造函数，传入将要匹配的窗体      
-        public MarginHide(Window window)
+        public static bool IS_HIDE = false;
+
+        private static Timer timer = null;
+
+        public static void ReadyHide(Window window)
         {
-            this.window = window;
+            MarginHide.window = window;           
         }
 
 
@@ -47,7 +47,7 @@ namespace GeekDesk.Util
         /// 窗体是否贴边
         /// </summary>
         /// <returns></returns>
-        public bool IsMargin()
+        public static bool IsMargin()
         {
             double screenLeft = SystemParameters.VirtualScreenLeft;
             double screenTop = SystemParameters.VirtualScreenTop;
@@ -64,10 +64,10 @@ namespace GeekDesk.Util
                 || windowLeft + windowWidth + Math.Abs(screenLeft) >= screenWidth);
         }
 
-   
+
 
         #region 窗体贴边隐藏功能
-        private void TimerDealy(object o, EventArgs e)
+        private static void HideWindow(object o, EventArgs e)
         {
             if (window.Visibility != Visibility.Visible) return;
 
@@ -87,47 +87,59 @@ namespace GeekDesk.Util
             double mouseY = p.Y;
 
             //鼠标不在窗口上
-            if (mouseX < windowLeft || mouseX > windowLeft + windowWidth
-                || mouseY < windowTop || mouseY > windowTop + windowHeight)
+            if ((mouseX < windowLeft || mouseX > windowLeft + windowWidth
+                || mouseY < windowTop || mouseY > windowTop + windowHeight) && !IS_HIDE)
             {
                 //上方隐藏条件
                 if (windowTop <= screenTop)
                 {
-                    HideAnimation(windowTop, screenTop - windowHeight + showMarginWidth, Window.TopProperty);
-                    isHide = true;
+                    IS_HIDE = true;
+                    FadeAnimation(1, 0);
+                    HideAnimation(windowTop, screenTop - windowHeight + showMarginWidth, Window.TopProperty, HideType.TOP_HIDE);
                     return;
                 }
                 //左侧隐藏条件
                 if (windowLeft <= screenLeft)
                 {
-                    HideAnimation(windowLeft, screenLeft - windowWidth + showMarginWidth, Window.LeftProperty);
+                    IS_HIDE = true;
+                    FadeAnimation(1, 0);
+                    HideAnimation(windowLeft, screenLeft - windowWidth + showMarginWidth, Window.LeftProperty, HideType.LEFT_HIDE);
                     return;
                 }
                 //右侧隐藏条件
                 if (windowLeft + windowWidth + Math.Abs(screenLeft) >= screenWidth)
                 {
-                    HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - showMarginWidth, Window.LeftProperty);
+                    IS_HIDE = true;
+                    FadeAnimation(1, 0);
+                    HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - showMarginWidth, Window.LeftProperty, HideType.RIGHT_HIDE);
                     return;
                 }
-            } else if (mouseX >= windowLeft && mouseX <= windowLeft + windowWidth 
-                && mouseY >= windowTop && mouseY <= windowTop + windowHeight)
+            }
+            else if (mouseX >= windowLeft && mouseX <= windowLeft + windowWidth
+              && mouseY >= windowTop && mouseY <= windowTop + windowHeight && IS_HIDE)
             {
                 //上方显示
                 if (windowTop <= screenTop - showMarginWidth)
                 {
-                    HideAnimation(windowTop, screenTop, Window.TopProperty);
+                    IS_HIDE = false;
+                    HideAnimation(windowTop, screenTop, Window.TopProperty, HideType.TOP_SHOW);
+                    FadeAnimation(0, 1);
                     return;
                 }
                 //左侧显示
                 if (windowLeft <= screenLeft - showMarginWidth)
                 {
-                    HideAnimation(windowLeft, screenLeft, Window.LeftProperty);
+                    IS_HIDE = false;
+                    HideAnimation(windowLeft, screenLeft, Window.LeftProperty, HideType.LEFT_SHOW);
+                    FadeAnimation(0, 1);
                     return;
                 }
                 //右侧显示
                 if (windowLeft + Math.Abs(screenLeft) == screenWidth - showMarginWidth)
                 {
-                    HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - windowWidth, Window.LeftProperty);
+                    IS_HIDE = false;
+                    HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - windowWidth, Window.LeftProperty, HideType.RIGHT_SHOW);
+                    FadeAnimation(0, 1);
                     return;
                 }
             }
@@ -136,71 +148,153 @@ namespace GeekDesk.Util
         #endregion 
 
 
-        public void TimerSet()
+        public static void StartHide()
         {
             if (timer != null) return;
-            timer = new Timer();//添加timer计时器，隐藏功能
-            #region 计时器设置，隐藏功能
-            timer.Interval = taskTime;
-            timer.Tick += TimerDealy;
+            timer = new Timer
+            {
+                Interval = taskTime
+            };//添加timer计时器，隐藏功能
+            timer.Tick += HideWindow;
             timer.Start();
-            #endregion
         }
 
-        public void TimerStop()
+        public static void StopHide()
         {
+            if (timer == null) return;
             timer.Stop();
             timer.Dispose();
             timer = null;
             //功能关闭 如果界面是隐藏状态  那么要显示界面 ↓
-
-            double screenLeft = SystemParameters.VirtualScreenLeft;
-            double screenTop = SystemParameters.VirtualScreenTop;
-            double screenWidth = SystemParameters.VirtualScreenWidth;
-
-            double windowWidth = window.Width;
-
-            double windowTop = window.Top;
-            double windowLeft = window.Left;
-
-            //左侧显示
-            if (windowLeft <= screenLeft - showMarginWidth)
+            if (IS_HIDE)
             {
-                HideAnimation(windowLeft, screenLeft, Window.LeftProperty);
-                return;
-            }
+                double screenLeft = SystemParameters.VirtualScreenLeft;
+                double screenTop = SystemParameters.VirtualScreenTop;
+                double screenWidth = SystemParameters.VirtualScreenWidth;
 
-            //上方显示
-            if (windowTop <= screenTop - showMarginWidth)
-            {
-                HideAnimation(windowTop, screenTop, Window.TopProperty);
-                return;
-            }
+                double windowWidth = window.Width;
 
-            //右侧显示
-            if (windowLeft + Math.Abs(screenLeft) == screenWidth - showMarginWidth)
-            {
-                HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - windowWidth, Window.LeftProperty);
-                return;
+                double windowTop = window.Top;
+                double windowLeft = window.Left;
+
+                //左侧显示
+                if (windowLeft <= screenLeft - showMarginWidth)
+                {
+                    IS_HIDE = false;
+                    FadeAnimation(0, 1);
+                    HideAnimation(windowLeft, screenLeft, Window.LeftProperty, HideType.LEFT_SHOW);
+                    return;
+                }
+
+                //上方显示
+                if (windowTop <= screenTop - showMarginWidth)
+                {
+                    IS_HIDE = false;
+                    FadeAnimation(0, 1);
+                    HideAnimation(windowTop, screenTop, Window.TopProperty, HideType.TOP_SHOW);
+                    return;
+                }
+
+                //右侧显示
+                if (windowLeft + Math.Abs(screenLeft) == screenWidth - showMarginWidth)
+                {
+                    IS_HIDE = false;
+                    FadeAnimation(0, 1);
+                    HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - windowWidth, Window.LeftProperty, HideType.RIGHT_SHOW);
+                    return;
+                }
             }
         }
 
 
-        private void HideAnimation(double from, double to, DependencyProperty property)
+        private static void HideAnimation(double from, double to, DependencyProperty property, HideType hideType)
         {
+
+            double toTemp = to;
+            double leftT = window.Width / 4 * 3;
+            double topT = window.Height / 4 * 3;
+            switch (hideType)
+            {
+                case HideType.LEFT_HIDE:
+                    to += leftT;
+                    break;
+                case HideType.LEFT_SHOW:
+                    to -= leftT;
+                    break;
+                case HideType.RIGHT_HIDE:
+                    to -= leftT;
+                    break;
+                case HideType.RIGHT_SHOW:
+                    to += leftT;
+                    break;
+                case HideType.TOP_HIDE:
+                    to += topT;
+                    break;
+                case HideType.TOP_SHOW:
+                    to -= topT;
+                    break;
+            }
             DoubleAnimation da = new DoubleAnimation
             {
                 From = from,
                 To = to,
                 Duration = new Duration(TimeSpan.FromMilliseconds(hideTime))
             };
+            // 如果是显示 则贴屏幕侧不显示阴影
+            bool isShow = false;
+            int shadowWidthTemp = Constants.SHADOW_WIDTH;
+            if (hideType <= HideType.RIGHT_SHOW)
+            {
+                isShow = true;
+                if (hideType == HideType.RIGHT_SHOW)
+                {
+                    shadowWidthTemp = -shadowWidthTemp;
+                }
+            }
             da.Completed += (s, e) =>
             {
+                if ("Top".Equals(property.Name))
+                {
+                    window.Top = isShow ? toTemp - shadowWidthTemp : toTemp;
+                }
+                else
+                {
+                    window.Left = isShow ? toTemp - shadowWidthTemp : toTemp;
+                }
                 window.BeginAnimation(property, null);
             };
+
             Timeline.SetDesiredFrameRate(da, 60);
             window.BeginAnimation(property, da);
         }
+
+        private static void FadeAnimation(double from, double to)
+        {
+            double time;
+            if (to == 0D)
+            {
+                time = fadeHideTime;
+            }
+            else
+            {
+                time = fadeShowTime;
+            }
+            DoubleAnimation opacityAnimation = new DoubleAnimation
+            {
+                From = from,
+                To = to,
+                Duration = new Duration(TimeSpan.FromMilliseconds(time))
+            };
+            opacityAnimation.Completed += (s, e) =>
+            {
+                //window.Opacity = to;
+                window.BeginAnimation(Window.OpacityProperty, null);
+            };
+            Timeline.SetDesiredFrameRate(opacityAnimation, 60);
+            window.BeginAnimation(Window.OpacityProperty, opacityAnimation);
+        }
+
+
     }
 }
 

Util/RegisterUtil.cs

@@ -48,10 +48,9 @@ namespace GeekDesk.Util
                         key.Close();
 
                     }
-#pragma warning disable CS0168 // 声明了变量“ex”，但从未使用过
                     catch (Exception ex)
-#pragma warning restore CS0168 // 声明了变量“ex”，但从未使用过
                     {
+                        LogUtil.WriteErrorLog(ex, "设置开机/取消失败!started=" + started);
                         return false;
                     }
                 }
@@ -62,19 +61,17 @@ namespace GeekDesk.Util
                         key.DeleteValue(exeName);//取消开机启动
                         key.Close();
                     }
-#pragma warning disable CS0168 // 声明了变量“ex”，但从未使用过
                     catch (Exception ex)
-#pragma warning restore CS0168 // 声明了变量“ex”，但从未使用过
                     {
+                        LogUtil.WriteErrorLog(ex, "取消开机启动失败!started=" + started);
                         return false;
                     }
                 }
                 return true;
             }
-#pragma warning disable CS0168 // 声明了变量“ex”，但从未使用过
             catch (Exception ex)
-#pragma warning restore CS0168 // 声明了变量“ex”，但从未使用过
             {
+                LogUtil.WriteErrorLog(ex, "取消/开机/失败!started=" + started);
                 if (key != null)
                 {
                     key.Close();

Util/ShowWindowFollowMouse.cs

@@ -1,4 +1,5 @@
-using System;
+using GeekDesk.Constant;
+using System;
 using System.Windows;
 
 namespace GeekDesk.Util
@@ -27,7 +28,7 @@ namespace GeekDesk.Util
             double left = SystemParameters.VirtualScreenLeft;
             double top = SystemParameters.VirtualScreenTop;
             double width = SystemParameters.VirtualScreenWidth;
-            double height = SystemParameters.VirtualScreenHeight;
+            double height = SystemParameters.WorkArea.Height;
             double right = width - Math.Abs(left);
             double bottom = height - Math.Abs(top);
 
@@ -73,12 +74,12 @@ namespace GeekDesk.Util
             if (p.X - afterWidth < left)
             {
                 //判断是否在最左边缘
-                window.Left = left;
+                window.Left = left - Constants.SHADOW_WIDTH;
             }
             else if (p.X + afterWidth > right)
             {
                 //判断是否在最右边缘
-                window.Left = right - window.Width;
+                window.Left = right - window.Width + Constants.SHADOW_WIDTH;
             }
             else
             {
@@ -89,12 +90,12 @@ namespace GeekDesk.Util
             if (p.Y - afterHeight < top)
             {
                 //判断是否在最上边缘
-                window.Top = top;
+                window.Top = top - Constants.SHADOW_WIDTH;
             }
             else if (p.Y + afterHeight > bottom)
             {
                 //判断是否在最下边缘
-                window.Top = bottom - window.Height;
+                window.Top = bottom - window.Height + Constants.SHADOW_WIDTH;
             }
             else
             {

ViewModel/AppConfig.cs

@@ -1,6 +1,7 @@
 
 using GeekDesk.Constant;
 using GeekDesk.Util;
+using Newtonsoft.Json;
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -70,7 +71,38 @@ namespace GeekDesk.ViewModel
 
         private bool showBarIcon = true; //显示托盘图标  默认显示
 
+        private bool doubleOpen = false; //双击打开项目  默认关闭
+
+        private bool hoverMenu = false; //悬停切换菜单  默认关闭
+
         #region GetSet
+
+        public bool HoverMenu
+        {
+            get
+            {
+                return hoverMenu;
+            }
+            set
+            {
+                hoverMenu = value;
+                OnPropertyChanged("HoverMenu");
+            }
+        }
+
+        public bool DoubleOpen
+        {
+            get
+            {
+                return doubleOpen;
+            }
+            set
+            {
+                doubleOpen = value;
+                OnPropertyChanged("DoubleOpen");
+            }
+        }
+
         public bool ShowBarIcon
         {
             get
@@ -105,18 +137,19 @@ namespace GeekDesk.ViewModel
                 if (imageWidth == 0)
                 {
                     return (int)CommonEnum.IMAGE_WIDTH;
-                } else
+                }
+                else
                 {
                     return imageWidth;
                 }
-                
+
             }
             set
             {
                 imageWidth = value;
                 //同时设置高度
                 ImageHeight = value;
-                
+
 
                 //计算 容器宽度因子
                 double i = ((double)imageWidth - (double)CommonEnum.IMAGE_WIDTH) / 5d;
@@ -126,7 +159,7 @@ namespace GeekDesk.ViewModel
                 {
                     i /= 10d;
                 }
-                
+
                 if (i > 0d)
                 {
                     s -= i;
@@ -380,7 +413,8 @@ namespace GeekDesk.ViewModel
                 if (blurEffect)
                 {
                     BlurValue = 100;
-                } else
+                }
+                else
                 {
                     BlurValue = 0;
                 }
@@ -552,7 +586,8 @@ namespace GeekDesk.ViewModel
                     bacImgName = "系统默认";
                     //Image image = ImageUtil.ByteArrayToImage(Convert.FromBase64String(Constants.DEFAULT_BAC_IMAGE_BASE64));
                     return ImageUtil.ByteArrToImage(Convert.FromBase64String(Constants.DEFAULT_BAC_IMAGE_BASE64));
-                } else
+                }
+                else
                 {
                     return ImageUtil.ByteArrToImage(ImageByteArr);
                 }
@@ -707,5 +742,9 @@ namespace GeekDesk.ViewModel
 
         #endregion
 
+        public override String ToString()
+        {
+            return JsonConvert.SerializeObject(this);
+        }
     }
 }

ViewModel/IconInfo.cs

@@ -1,8 +1,11 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
+using Newtonsoft.Json;
 using System;
 using System.ComponentModel;
 using System.IO;
+using System.Reflection;
+using System.Text;
 using System.Windows.Media.Imaging;
 
 /// <summary>
@@ -22,10 +25,60 @@ namespace GeekDesk.ViewModel
         private string content; //显示信息
         private bool adminStartUp = false; //始终管理员方式启动  默认否
         private byte[] defaultImage; //默认图标
+        private string startArg; //启动参数
+        private string lnkPath;
 
         private IconType iconType = IconType.OTHER;
 
 
+        public string LnkPath_NoWrite
+        {
+            get
+            {
+                return lnkPath;
+            }
+            set
+            {
+                lnkPath = value;
+            }
+        }
+        public string LnkPath
+        {
+            get
+            {
+                return lnkPath;
+            }
+            set
+            {
+                lnkPath = value;
+                OnPropertyChanged("LnkPath");
+            }
+        }
+
+        public string StartArg
+        {
+            get
+            {
+                return startArg;
+            }
+            set
+            {
+                startArg = value;
+                OnPropertyChanged("StartArg");
+            }
+        }
+        public string StartArg_NoWrite
+        {
+            get
+            {
+                return startArg;
+            }
+            set
+            {
+                startArg = value;
+            }
+        }
+
         public IconType IconType
         {
             get
@@ -53,6 +106,18 @@ namespace GeekDesk.ViewModel
             }
         }
 
+        public byte[] DefaultImage_NoWrite
+        {
+            get
+            {
+                return defaultImage;
+            }
+            set
+            {
+                defaultImage = value;
+            }
+        }
+
         public bool AdminStartUp
         {
             get
@@ -75,7 +140,14 @@ namespace GeekDesk.ViewModel
             set
             {
                 count = value;
-                Content = Path + "\n" + Name + "\n使用次数: " + Count;
+                if (StringUtil.IsEmpty(Path))
+                {
+                    Content = Name + "\n使用次数: " + Count;
+                }
+                else
+                {
+                    Content = Path + "\n" + Name + "\n使用次数: " + Count;
+                }
                 OnPropertyChanged("Count");
             }
         }
@@ -89,11 +161,30 @@ namespace GeekDesk.ViewModel
             set
             {
                 name = value;
-                Content = Path + "\n" + Name + "\n使用次数: " + Count;
+                if (StringUtil.IsEmpty(Path))
+                {
+                    Content = Name + "\n使用次数: " + Count;
+                }
+                else
+                {
+                    Content = Path + "\n" + Name + "\n使用次数: " + Count;
+                }
                 OnPropertyChanged("Name");
             }
         }
 
+        public string Name_NoWrite
+        {
+            get
+            {
+                return name;
+            }
+            set
+            {
+                name = value;
+            }
+        }
+
         public string Path
         {
             get
@@ -103,11 +194,31 @@ namespace GeekDesk.ViewModel
             set
             {
                 path = value;
-                Content = Path + "\n" + Name + "\n使用次数: " + Count;
+                if (StringUtil.IsEmpty(Path))
+                {
+                    Content = Name + "\n使用次数: " + Count;
+                }
+                else
+                {
+                    Content = Path + "\n" + Name + "\n使用次数: " + Count;
+                }
                 OnPropertyChanged("Path");
             }
         }
 
+        public string Path_NoWrite
+        {
+            get
+            {
+                return path;
+            }
+            set
+            {
+                path = value;
+            }
+        }
+
+
         public BitmapImage BitmapImage
         {
             get
@@ -123,6 +234,20 @@ namespace GeekDesk.ViewModel
             }
         }
 
+        public BitmapImage BitmapImage_NoWrite
+        {
+            get
+            {
+                return ImageUtil.ByteArrToImage(ImageByteArr_NoWrite);
+            }
+            set
+            {
+                bitmapImage = value;
+                ImageByteArr_NoWrite = ImageUtil.BitmapImageToByte(bitmapImage);
+            }
+        }
+
+
         public byte[] ImageByteArr
         {
             get
@@ -137,6 +262,19 @@ namespace GeekDesk.ViewModel
             }
         }
 
+        public byte[] ImageByteArr_NoWrite
+        {
+            get
+            {
+
+                return imageByteArr;
+            }
+            set
+            {
+                imageByteArr = value;
+            }
+        }
+
         public string Content
         {
             get
@@ -150,10 +288,18 @@ namespace GeekDesk.ViewModel
             }
         }
 
-       
-
-
 
+        public string Content_NoWrite
+        {
+            get
+            {
+                return content;
+            }
+            set
+            {
+                content = value;
+            }
+        }
 
 
         [field: NonSerializedAttribute()]

ViewModel/MenuInfo.cs

@@ -1,6 +1,8 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
+using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Windows;
@@ -11,17 +13,35 @@ namespace GeekDesk.ViewModel
     [Serializable]
     public class MenuInfo : INotifyPropertyChanged
     {
-       
+
 
         private string menuName;
         private string menuId;
         private Visibility menuEdit = Visibility.Collapsed;
         private Visibility notMenuEdit = Visibility.Visible;
+        private bool isEdit = false;
         private string menuGeometry;  //菜单几何图标
         private string geometryColor; //几何图标颜色
         private ObservableCollection<IconInfo> iconList = new ObservableCollection<IconInfo>();
 
 
+
+        [field: NonSerializedAttribute()]
+        private static string[] NO_WRITE_ARR = new string[] { "IsEdit"};
+
+
+        public bool IsEdit
+        {
+            get
+            {
+                return isEdit;
+            }
+            set
+            {
+                isEdit = value;
+                OnPropertyChanged("IsEdit");
+            }
+        }
         public string MenuGeometry
         {
             get
@@ -65,7 +85,7 @@ namespace GeekDesk.ViewModel
             set
             {
                 menuName = value;
-                OnPropertyChanged("MenuName");               
+                OnPropertyChanged("MenuName");
             }
         }
 
@@ -93,9 +113,12 @@ namespace GeekDesk.ViewModel
                 menuEdit = value;
                 if (menuEdit == Visibility.Visible)
                 {
+                    IsEdit = true;
                     NotMenuEdit = Visibility.Collapsed;
-                } else
+                }
+                else
                 {
+                    IsEdit = false;
                     NotMenuEdit = Visibility.Visible;
                 }
                 OnPropertyChanged("MenuEdit");
@@ -128,12 +151,24 @@ namespace GeekDesk.ViewModel
             }
         }
 
+        public override String ToString()
+        {
+            return JsonConvert.SerializeObject(this);
+        }
+
         [field: NonSerializedAttribute()]
         public event PropertyChangedEventHandler PropertyChanged;
         private void OnPropertyChanged(string propertyName)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            foreach (string field in NO_WRITE_ARR)
+            {
+                if (field.Equals(propertyName))
+                {
+                    return;
+                }
+            }
             CommonCode.SaveAppData(MainWindow.appData);
         }
     }
-}
+}

ViewModel/Temp/SearchIconList.cs

@@ -0,0 +1,31 @@
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+
+namespace GeekDesk.ViewModel.Temp
+{
+    public class SearchIconList
+    {
+
+        private static ObservableCollection<IconInfo> iconList = new ObservableCollection<IconInfo>();
+
+        public static ObservableCollection<IconInfo> IconList
+        {
+            get
+            {
+                return iconList;
+            }
+            set
+            {
+                iconList = value;
+                OnPropertyChanged("IconList");
+            }
+        }
+
+
+        public static event PropertyChangedEventHandler PropertyChanged;
+        private static void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(null, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}

packages.config

@@ -6,6 +6,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net472" />
   <package id="MouseKeyHook" version="5.6.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="NPinyin.Core" version="3.0.0" targetFramework="net472" />
   <package id="Quartz" version="3.3.3" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net472" />