修改样式

App.config

@@ -1,86 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<configSections>
-		<section name="SystemIcons" type="System.Configuration.DictionarySectionHandler" />
-		<section name="ShowSecondsSettings" type="System.Configuration.DictionarySectionHandler" />
-		<section name="SystemBGs" type="System.Collections.ObjectModel.ObservableCollection" />
-		<section name="GradientBGParam" type="GeekDesk.ViewModel.GradientBGParam" />
+		<section
+		  name="SystemIcons"
+		  type="System.Configuration.DictionarySectionHandler" />
 	</configSections>
-	<ShowSecondsSettings>
-		<add key="Version" value="1.0.01" />
-		<add key="LProportion" value="0.82" />
-		<add key="TProportion" value="0.03" />
-		<add key="DelayTime" value="1500" />
-	</ShowSecondsSettings>
 	<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="服务" />
+		<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="命令行"/>
 	</SystemIcons>
-	<SystemBGs>
-		<GradientBGParam Color1="#FCCF31" Color2="#F55555" Name="诸神黄昏" />
-	</SystemBGs>
-	<startup>
-		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-	</startup>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<probing privatePath="lib;Plugins\EveryThing\lib" />
-			<dependentAssembly>
-				<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-2.0.6.0" newVersion="2.0.6.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-	<appSettings>
-		<add key="Version" value="2.5.14" />
-		<add key="GitHubUrl" value="https://github.com/BookerLiu/GeekDesk" />
-		<add key="GiteeUrl" value="https://gitee.com/BookerLiu/GeekDesk/tree/master" />
-		<add key="GitHubUpdateUrl" value="https://raw.githubusercontent.com/BookerLiu/GeekDesk/master/Update.json" />
-		<add key="GiteeUpdateUrl" value="https://gitee.com/BookerLiu/GeekDesk/raw/master/Update.json" />
-		<!--<add key="GiteeUpdateUrl" value="file:///D:/WorkSpace/workspace-VS/GeekDesk/Update.json" />-->
-		<add key="ClientSettingsProvider.ServiceUri" value="" />
-		<add key="CustomIconTeachUrl" value="https://mp.weixin.qq.com/s/LxoHAekho9HBVl4FRw_Law" />
-		<add key="ShowPublicWeChat" value="Y" />
-	</appSettings>
-	<system.web>
-		<membership defaultProvider="ClientAuthenticationMembershipProvider">
-			<providers>
-				<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
-			</providers>
-		</membership>
-		<roleManager defaultProvider="ClientRoleProvider" enabled="true">
-			<providers>
-				<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
-			</providers>
-		</roleManager>
-	</system.web>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.6.0" newVersion="2.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <appSettings>
+    <add key="Version" value="2.4.10" />
+    <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">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
 </configuration>

App.xaml

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

App.xaml.cs

@@ -1,8 +1,11 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
+using Microsoft.Win32;
 using System;
+using System.IO;
+using System.Text;
 using System.Windows;
-using System.Windows.Input;
+using System.Windows.Media.Animation;
 using System.Windows.Threading;
 
 namespace GeekDesk
@@ -24,6 +27,7 @@ namespace GeekDesk
 
         private void App_Startup(object sender, StartupEventArgs e)
         {
+
             mutex = new System.Threading.Mutex(true, Constants.MY_NAME, out bool ret);
             if (!ret)
             {
@@ -31,10 +35,6 @@ namespace GeekDesk
                 mutex = new System.Threading.Mutex(true, Constants.MY_NAME, out ret);
                 if (!ret)
                 {
-                    MessageUtil.SendMsgByWName(
-                        "GeekDesk_Main_" + Constants.MY_UUID,
-                        "ShowApp"
-                        );
                     Environment.Exit(0);
                 }
             }
@@ -43,7 +43,6 @@ namespace GeekDesk
         void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
             e.Handled = true;//使用这一行代码告诉运行时，该异常被处理了，不再作为UnhandledException抛出了。
-            Mouse.OverrideCursor = null;
             LogUtil.WriteErrorLog(e, "未捕获异常!");
             if (Constants.DEV)
             {
@@ -54,22 +53,10 @@ namespace GeekDesk
         void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
             LogUtil.WriteErrorLog(e, "严重异常!");
-            //MessageBox.Show("GeekDesk遇到未知问题崩溃!");
-        }
-        public static void DoEvents()
-        {
-            var frame = new DispatcherFrame();
-            Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Background,
-                new DispatcherOperationCallback(
-                    delegate (object f)
-                    {
-                        ((DispatcherFrame)f).Continue = false;
-                        return null;
-                    }), frame);
-            Dispatcher.PushFrame(frame);
+            MessageBox.Show("GeekDesk遇到未知问题崩溃!");
         }
 
 
     }
-
+    
 }

Constant/BGStyle.cs

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

Constant/CommonEnum.cs

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

Constant/Constants.cs

@@ -1,6 +1,10 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace GeekDesk.Constant
 {
@@ -13,33 +17,17 @@ namespace GeekDesk.Constant
 
         public static string MY_NAME = DEV ? "GeekDesk-D" : "GeekDesk";
 
-        public static string MY_UUID = "8400A17AEEF7C029";
         /// <summary>
         /// app数据文件路径
         /// </summary>
         public static string DATA_FILE_PATH = APP_DIR + "Data";  //app数据文件路径
 
-        /// <summary>
-        /// 备份文件路径
-        /// </summary>
-        public static string DATA_FILE_BAK_PATH = APP_DIR + "bak\\Data.bak";  //app备份数据文件路径
+        public static string LOG_FILE_PATH = APP_DIR + "Log.log";
 
-        public static string PW_FILE_BAK_PATH = APP_DIR + "bak\\pw.txt";  //密码文件路径
-
-        public static string UUID_FILE_BAK_PATH = APP_DIR + "bak\\uuid.txt";  //密码文件路径
-
-        public static string LOG_FILE_PATH = APP_DIR + "logs\\log.log"; //日志文件
-
-        public static string ERROR_FILE_PATH = APP_DIR + "logs\\error.log"; // 错误日志
-
-        /// <summary>
-        /// 插件文件夹
-        /// </summary>
-        public static string PLUGINS_PATH = APP_DIR + "plugins\\";
-
-
-        public static int SHADOW_WIDTH = 20;
+        public static string ERROR_FILE_PATH = APP_DIR + "Error.log";
 
+        //系统图标路径
+        public static string SYSTEM_ICON_PATH = "GeekDesk.Resource.Image.SystemIcon.*";
         //系统图标
         public static Hashtable SYSTEM_ICONS = (Hashtable)ConfigurationManager.GetSection("SystemIcons");
 

Constant/HotKeyType.cs

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

Constant/IconStartType.cs

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

Constant/IconType.cs

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

Constant/MenuType.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.Constant
-{
-    public enum MenuType
-    {
-        NORMAL, //普通菜单
-        LINK,  //关联菜单
-    }
-}

Constant/PasswordType.cs

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

Constant/RunTimeStatus.cs

@@ -1,90 +0,0 @@
-using System;
-
-namespace GeekDesk.Constant
-{
-    internal class RunTimeStatus
-    {
-
-        /// <summary>
-        /// 查询框是否在工作
-        /// </summary>
-        public static volatile bool SEARCH_BOX_SHOW = false;
-
-        /// <summary>
-        /// 查询框是否已经关闭了300毫秒   防止点击右侧区域关闭查询框时误打开列表
-        /// </summary>
-        public static volatile bool SEARCH_BOX_HIDED_300 = true;
-
-        /// <summary>
-        /// 贴边隐藏后  以非鼠标经过方式触发显示
-        /// </summary>
-        public static volatile bool MARGIN_HIDE_AND_OTHER_SHOW = false;
-
-
-        /// <summary>
-        /// 是否锁定主面板 锁定后 不执行隐藏动作
-        /// </summary>
-        public static volatile bool LOCK_APP_PANEL = false;
-
-
-        /// <summary>
-        /// 是否弹出了菜单密码框
-        /// </summary>
-        public static volatile bool SHOW_MENU_PASSWORDBOX = false;
-
-        /// <summary>
-        /// 是否弹出了右键菜单
-        /// </summary>
-        public static volatile bool SHOW_RIGHT_BTN_MENU = false;
-
-        /// <summary>
-        /// 是否点击了面板功能按钮
-        /// </summary>
-        public static volatile bool APP_BTN_IS_DOWN = false;
-
-        /// <summary>
-        /// 是否正在编辑菜单
-        /// </summary>
-        public static volatile bool IS_MENU_EDIT = false;
-
-
-        /// <summary>
-        /// 图标card 鼠标滚轮是否正在工作  
-        /// 用来控制popup的显示 否则低性能机器会造成卡顿
-        /// </summary>
-        public static volatile bool ICONLIST_MOUSE_WHEEL = false;
-        /// <summary>
-        /// 控制多少毫秒后 关闭(ICONLIST_MOUSE_WHEEL)鼠标滚轮运行状态
-        /// </summary>
-        public static volatile int MOUSE_WHEEL_WAIT_MS = 100;
-        /// <summary>
-        /// 与关闭popup 配合使用, 避免线程结束后不显示popup
-        /// </summary>
-        public static volatile bool MOUSE_ENTER_ICON = false;
-        /// <summary>
-        /// 控制每次刷新搜索结果 鼠标移动后显示popup
-        /// </summary>
-        public static volatile int MOUSE_MOVE_COUNT = 0;
-
-
-        /// <summary>
-        /// everything 新的键入搜索
-        /// </summary>
-        public static volatile bool EVERYTHING_NEW_SEARCH = false;
-
-        /// <summary>
-        /// 键入多少毫秒后  没有新的键入开启搜索
-        /// </summary>
-        public static volatile int EVERYTHING_SEARCH_DELAY_TIME = 300;
-
-        /// <summary>
-        /// 控制主界面热键按下规定时间内只执行一次show hide
-        /// </summary>
-        public static volatile bool MAIN_HOT_KEY_DOWN = false;
-        /// <summary>
-        /// 控制主界面热键按下规定时间内只执行一次show hide
-        /// </summary>
-        public static volatile int MAIN_HOT_KEY_TIME = 300;
-
-    }
-}

Constant/SearchType.cs

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

Constant/SortType.cs

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

Constant/TodoTaskExecType.cs

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

Constant/UpdateType.cs

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

Constant/WidthTypeEnum.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.Constant
-{
-    public enum WidthTypeEnum
-    {
-        LEFT_CARD = 0,  //左侧托盘宽度
-        RIGHT_CARD = 1, //右侧托盘宽度
-        RIGHT_CARD_HALF = 2, //右侧托盘宽度的一半
-        RIGHT_CARD_HALF_TEXT = 3, //右侧托盘宽度的一半 再减去左侧图像宽度
-        RIGHT_CARD_20 = 4, //右侧托盘宽度 - 20
-        RIGHT_CARD_40 = 5, //右侧托盘宽度 - 40
-        RIGHT_CARD_70 = 6, //右侧托盘宽度 - 70
-    }
-}

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">
@@ -37,17 +37,17 @@
         </hc:Card>
 
         <hc:UniformSpacingPanel Spacing="20" HorizontalAlignment="Center" Margin="45.5,310,42.5,36">
-            <hc:TextBox x:Name="DelayTime" Style="{StaticResource MyTextBoxStyle}" Height="20" Width="60" Text="10" PreviewTextInput="DelayTime_PreviewTextInput" PreviewLostKeyboardFocus="DelayTime_PreviewLostKeyboardFocus" />
+            <hc:TextBox x:Name="DelayTime" Height="20" Width="60" Text="10" PreviewTextInput="DelayTime_PreviewTextInput" PreviewLostKeyboardFocus="DelayTime_PreviewLostKeyboardFocus" />
             <ComboBox x:Name="DelayType" hc:DropDownElement.ConsistentWidth="False" SelectedIndex="0" Height="20" Width="60">
                 <ComboBox.Items>
                     <ComboBoxItem Content="分"/>
                     <ComboBoxItem Content="时"/>
                 </ComboBox.Items>
             </ComboBox>
-            <Button Style="{StaticResource MyBtnStyle}" Content="推迟提醒" Click="DelayButton_Click"/>
+            <Button Content="推迟提醒" Click="DelayButton_Click"/>
         </hc:UniformSpacingPanel>
 
 
-        <Button Style="{StaticResource MyBtnStyle}" Click="BacklogDone_Click" Content="朕已阅" Margin="10,0,10,20" Width="298" VerticalAlignment="Bottom"/>
+        <Button Click="BacklogDone_Click" Content="朕已阅" Margin="10,0,10,20" Width="298" VerticalAlignment="Bottom"/>
     </Grid>
 </Border>

Control/Other/BacklogNotificatin.xaml.cs

@@ -5,8 +5,18 @@ using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using Quartz;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
 
 namespace GeekDesk.Control.Other
 {
@@ -54,15 +64,14 @@ namespace GeekDesk.Control.Other
                 {
                     Growl.SuccessGlobal("下次任务将在 " + minutes + " 分钟后提醒您!");
                 }
-            }
-            else
+            } else
             {
                 appData.ToDoList.Remove(info); //执行任务删除
                 appData.HiToDoList.Add(info);  //添加历史任务
             }
             ToDoTask.activityBacklog[info].Close(); //关闭桌面通知
             ToDoTask.activityBacklog.Remove(info);//激活任务删除
-            CommonCode.SaveAppData(appData, Constants.DATA_FILE_PATH);
+            CommonCode.SaveAppData(appData);
         }
 
 
@@ -113,7 +122,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,13 +17,13 @@
     </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}"/>
                     <TextBlock Text="*" Foreground="Red"/>
                 </WrapPanel>
-                <TextBox x:Name="IconUrl" Style="{StaticResource MyTextBoxStyle}" Text="{Binding CustomIconUrl, Mode=OneWay}" Width="240" FontSize="14"/>
+                <TextBox x:Name="IconUrl" Text="{Binding CustomIconUrl, Mode=OneWay}" Width="240" FontSize="14"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="0,58.276,0,-58.276">
@@ -31,18 +31,18 @@
                     <TextBlock Text="JSON 配置地址:"  Style="{StaticResource LeftTB}"/>
                     <TextBlock Text="*" Foreground="Red"/>
                 </WrapPanel>
-                <TextBox x:Name="JsonUrl" Style="{StaticResource MyTextBoxStyle}" Text="{Binding CustomIconJsonUrl, Mode=OneWay}" Width="240" FontSize="14"/>
+                <TextBox x:Name="JsonUrl" Text="{Binding CustomIconJsonUrl, Mode=OneWay}" Width="240" FontSize="14"/>
             </hc:UniformSpacingPanel>
             <TextBlock Text="注: 需配置正确的url方可加载远程图标!" Foreground="Red" Margin="10,95,-10,-92" />
 
             <hc:UniformSpacingPanel Spacing="10" Margin="203,125,-203,-125">
-                <Button Style="{StaticResource MyBtnStyle}" Content="取消" Command="hc:ControlCommands.Close" HorizontalAlignment="Stretch" Margin="-1,1,1,1" VerticalAlignment="Stretch" 
+                <Button Content="取消" Command="hc:ControlCommands.Close" HorizontalAlignment="Stretch" Margin="-1,1,1,1" VerticalAlignment="Stretch" 
                             />
                 <Button Content="教程" Click="Teach_Click" 
-                        Style="{StaticResource MyBtnStyle}"/>
+                        Style="{StaticResource Btn1}"/>
                 <Button Content="保存" Click="Confirm_Click" 
                         Command="hc:ControlCommands.Close"
-                        Style="{StaticResource MyBtnStyle}"/>
+                        Style="{StaticResource Btn1}"/>
             </hc:UniformSpacingPanel>
         </Grid>
         <!--<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" Margin="0,4,4,0"/>-->

Control/Other/CustomIconUrlDialog.xaml.cs

@@ -1,9 +1,13 @@
 using GeekDesk.Control.Windows;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
+using Microsoft.Win32;
+using System;
 using System.Configuration;
 using System.Diagnostics;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media.Imaging;
 
 
 namespace GeekDesk.Control.Other
@@ -30,11 +34,10 @@ 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";
             }

Control/Other/GlobalMsgNotification.xaml

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

Control/Other/GlobalMsgNotification.xaml.cs

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

Control/Other/GradientBGDialog.xaml

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

Control/Other/GradientBGDialog.xaml.cs

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

Control/Other/IconInfoDialog.xaml

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

Control/Other/IconInfoDialog.xaml.cs

@@ -1,9 +1,9 @@
-using GeekDesk.Constant;
-using GeekDesk.Util;
+using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using Microsoft.Win32;
 using System;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Media.Imaging;
 
 
@@ -39,7 +39,7 @@ namespace GeekDesk.Control.Other
             info.Name = IconName.Text;
             info.AdminStartUp = IconIsAdmin.IsChecked.Value;
             info.StartArg = StartArg.Text;
-            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+            CommonCode.SaveAppData(MainWindow.appData);
             dialog.Close();
         }
 
@@ -52,7 +52,7 @@ namespace GeekDesk.Control.Other
         {
             IconInfo info = this.DataContext as IconInfo;
             info.BitmapImage = ImageUtil.ByteArrToImage(info.DefaultImage);
-            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+            CommonCode.SaveAppData(MainWindow.appData);
         }
 
         /// <summary>
@@ -73,15 +73,14 @@ namespace GeekDesk.Control.Other
                 {
                     IconInfo info = this.DataContext as IconInfo;
                     info.BitmapImage = ImageUtil.GetBitmapIconByPath(ofd.FileName);
-                    CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+                    CommonCode.SaveAppData(MainWindow.appData);
                 }
-            }
-            catch (Exception e1)
+            } catch (Exception e1)
             {
                 HandyControl.Controls.Growl.WarningGlobal("修改图标失败,已重置为默认图标!");
                 LogUtil.WriteErrorLog(e1, "修改图标失败!");
             }
-
+            
         }
     }
 }

Control/Other/IconInfoUrlDialog.xaml

@@ -23,23 +23,23 @@
             
             <hc:UniformSpacingPanel Spacing="10" VerticalAlignment="Center">
                 <TextBlock Text="名称:"  Style="{StaticResource LeftTB}"/>
-                <TextBox x:Name="IconName" Style="{StaticResource MyTextBoxStyle}" Text="{Binding Name, Mode=OneWay}" Width="180" FontSize="14"/>
+                <TextBox x:Name="IconName" Text="{Binding Name, Mode=OneWay}" Width="180" FontSize="14"/>
             </hc:UniformSpacingPanel>
             <hc:Divider LineStrokeDashArray="3,3"  LineStroke="Black"/>
             <hc:UniformSpacingPanel Spacing="10"  VerticalAlignment="Center">
                 <TextBlock  Text="Url:"  Style="{StaticResource LeftTB}"/>
-                <TextBox x:Name="IconUrl" Style="{StaticResource MyTextBoxStyle}" Text="{Binding Path, Mode=OneWay}"  Width="180" FontSize="14"/>
+                <TextBox x:Name="IconUrl" Text="{Binding Path, Mode=OneWay}"  Width="180" FontSize="14"/>
             </hc:UniformSpacingPanel>
             <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black"/>
             <hc:UniformSpacingPanel Spacing="10"  VerticalAlignment="Center">
                 <TextBlock  Text="图标:"  Style="{StaticResource LeftTB}"/>
                 <Image x:Name="IconImg" Source="{Binding BitmapImage, Mode=OneWay}" RenderOptions.BitmapScalingMode="HighQuality" Width="60" Height="60"/>
-                <Button Style="{StaticResource MyBtnStyle}" Content="修改" Click="EditImage"/>
-                <Button Style="{StaticResource MyBtnStyle}" Content="重置" Click="ReStoreImage"/>
+                <Button Content="修改" Click="EditImage"/>
+                <Button Content="重置" Click="ReStoreImage"/>
             </hc:UniformSpacingPanel>
             <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black"/>
             <hc:UniformSpacingPanel Spacing="10">
-                <Button Content="保存" Click="SaveProperty" Style="{StaticResource MyBtnStyle}" Margin="224,-10,-224,0" />
+                <Button Content="保存" Click="SaveProperty" Style="{StaticResource Btn1}" Margin="224,-10,-224,0" />
             </hc:UniformSpacingPanel>
         </StackPanel>
     </hc:SimplePanel>

Control/Other/IconInfoUrlDialog.xaml.cs

@@ -4,6 +4,7 @@ using GeekDesk.ViewModel;
 using Microsoft.Win32;
 using System;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Media.Imaging;
 
 
@@ -52,7 +53,7 @@ namespace GeekDesk.Control.Other
             {
                 MainWindow.appData.MenuList[MainWindow.appData.AppConfig.SelectedMenuIndex].IconList.Add(info);
             }
-            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+            CommonCode.SaveAppData(MainWindow.appData);
             dialog.Close();
         }
 
@@ -65,7 +66,7 @@ namespace GeekDesk.Control.Other
         {
             IconInfo info = this.DataContext as IconInfo;
             info.BitmapImage = ImageUtil.ByteArrToImage(info.DefaultImage);
-            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+            CommonCode.SaveAppData(MainWindow.appData);
         }
 
         /// <summary>
@@ -86,15 +87,14 @@ namespace GeekDesk.Control.Other
                 {
                     IconInfo info = this.DataContext as IconInfo;
                     info.BitmapImage = ImageUtil.GetBitmapIconByPath(ofd.FileName);
-                    CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+                    CommonCode.SaveAppData(MainWindow.appData);
                 }
-            }
-            catch (Exception ex)
+            } catch (Exception e1)
             {
                 HandyControl.Controls.Growl.WarningGlobal("修改图标失败,已重置为默认图标!");
-                LogUtil.WriteErrorLog(ex, "修改图标失败!");
+                LogUtil.WriteErrorLog(e1, "修改图标失败!");
             }
-
+            
         }
     }
 }

Control/Other/MyColorPickerDialog.xaml

@@ -1,30 +0,0 @@
-<Border x:Class="GeekDesk.Control.Other.MyColorPickerDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:hc="https://handyorg.github.io/handycontrol"
-        CornerRadius="4"
-        >
-
-    <Grid>
-        <StackPanel>
-            <Grid Width="750"
-                  Height="550"
-                  Panel.ZIndex="0"
-                  MouseDown="DragMove"
-                    >
-                <Grid.Background>
-                    <SolidColorBrush Color="Black" Opacity="0.01"/>
-                </Grid.Background>
-            </Grid>
-            <hc:ColorPicker x:Name="MyColorPicker" 
-                            Panel.ZIndex="99"
-                            Margin="0,-500,0,0"
-                    Confirmed="MyColorPicker_Confirmed"
-                    Canceled="MyColorPicker_Canceled"
-                    ToggleButton.Checked="MyColorPicker_Checked"
-                    SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>
-        </StackPanel>
-    </Grid>
-
-
-</Border>

Control/Other/MyColorPickerDialog.xaml.cs

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

Control/Other/PasswordDialog.xaml

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

Control/Other/PasswordDialog.xaml.cs

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

Control/Other/SearchResControl.xaml

@@ -1,196 +0,0 @@
-<UserControl x:Class="GeekDesk.Control.Other.SearchResControl"
-             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:local="clr-namespace:GeekDesk.Control.Other"
-             xmlns:temp="clr-namespace:GeekDesk.ViewModel.Temp"
-             xmlns:hc="https://handyorg.github.io/handycontrol"
-             xmlns:cvt="clr-namespace:GeekDesk.Converts"
-             xmlns:cst="clr-namespace:GeekDesk.Constant"
-             xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
-             xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
-             xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" 
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800"
-             >
-    <UserControl.Resources>
-        <Style x:Key="SearchListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
-            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border>
-                            <Border.Style>
-                                <Style TargetType="Border">
-                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                </Style>
-                            </Border.Style>
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <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="ImageStyleNoWrite" 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_NoWrite}"/>
-        </Style>
-
-        <cvt:OpcityConvert x:Key="OpcityConvert"/>
-        <cvt:GetWidthByWWConvert x:Key="GetWidthByWWConvert"/>
-        <cvt:Visibility2BooleanConverter x:Key="Visibility2BooleanConverter"/>
-    </UserControl.Resources>
-    <Grid>
-        <Grid>
-            <WrapPanel Orientation="Horizontal" 
-                           Margin="10"
-                       Panel.ZIndex="1"
-                           >
-                <UniformGrid x:Name="VerticalUFG" 
-                             xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeIn}, Event=Loaded}"
-                             xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource FadeOut}, Event=None}"
-                             xf:Animations.SecondaryBinding="{Binding Visibility, 
-                    Converter={StaticResource Visibility2BooleanConverter}, ConverterParameter='reverse', 
-                    ElementName=VerticalUFG}"
-                             >
-                    <!--<hc:TransitioningContentControl TransitionMode="Left2RightWithFade">-->
-                    <ListBox VirtualizingPanel.VirtualizationMode="Recycling"  
-                             VirtualizingPanel.IsVirtualizing="True" 
-                             VirtualizingPanel.IsContainerVirtualizable="True"
-                             VirtualizingPanel.ScrollUnit="Pixel"  
-                             ItemsSource="{Binding}"
-                             BorderThickness="0"
-                             Padding="0,10,0,0"
-                             x:Name="SearchListBox"
-                             SelectionChanged="SearchListBox_SelectionChanged"
-                             >
-                        <ListBox.Template>
-                            <ControlTemplate TargetType="ListBox">
-                                <hc:ScrollViewer  
-                                                     HorizontalScrollBarVisibility="Hidden" 
-                                                     VerticalScrollBarVisibility="Auto" 
-                                                     IsInertiaEnabled="True"
-                                                     CanContentScroll="True"
-                                                     PreviewMouseWheel="VerticalIconList_PreviewMouseWheel"
-                                                     ScrollChanged="VerticalCard_ScrollChanged"
-                                                     >
-                                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderBrush}">
-                                        <ItemsPresenter/>
-                                    </Border>
-                                </hc:ScrollViewer>
-                            </ControlTemplate>
-                        </ListBox.Template>
-
-                        <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="资源管理器菜单" Click="SystemContextMenu" Tag="{Binding}"/>
-                            </ContextMenu>
-                        </ListBox.Resources>
-
-                        <ListBox.ItemContainerStyle>
-                            <Style TargetType="ListBoxItem" BasedOn="{StaticResource SearchListBoxItemStyle}">
-                                <Setter Property="ContextMenu" Value="{StaticResource IconDialog}"/>
-                            </Style>
-                        </ListBox.ItemContainerStyle>
-
-                        <ListBox.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <VirtualizingStackPanel  
-                                        Orientation="Vertical"   
-                                        Background="#00FFFFFF"
-                                        VirtualizationMode="Recycling"  
-                                        IsVirtualizing="True" 
-                                        IsContainerVirtualizable="True"
-                                        VirtualizingPanel.ScrollUnit="Pixel"
-                                           Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.WindowWidth, Mode=OneWay, 
-                                                Converter={StaticResource GetWidthByWWConvert}, 
-                                                ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD}}"
-                                            />
-                            </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <Border CornerRadius="8">
-                                    <Border.Style>
-                                        <Style TargetType="Border">
-                                            <Setter Property="VerticalAlignment" Value="Center"/>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem }}}"
-                                                                 Value="True">
-                                                    <Setter Property="Background">
-                                                        <Setter.Value>
-                                                            <SolidColorBrush Color="White" Opacity="0.68"/>
-                                                        </Setter.Value>
-                                                    </Setter>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Border.Style>
-                                    <WrapPanel Tag="{Binding}"
-                                                   Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.WindowWidth, Mode=OneWay, 
-                                                        Converter={StaticResource GetWidthByWWConvert}, 
-                                                        ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD_HALF}}" 
-                                                   HorizontalAlignment="Left"
-                                                   VerticalAlignment="Center"
-                                                   hc:Poptip.HitMode="None"
-                                                   hc:Poptip.Placement="BottomLeft"
-                                                   Background="#00FFFFFF"
-                                                   MouseEnter="SearchIcon_MouseEnter"
-                                                   MouseLeave="SearchIcon_MouseLeave"
-                                                   MouseLeftButtonDown="Icon_MouseLeftButtonDown"
-                                                   MouseLeftButtonUp="Icon_MouseLeftButtonUp"
-                                                   MouseMove="SearchIcon_MouseMove"
-                                                   Margin="25,10,0,10"
-                                                   >
-                                        <Image Style="{StaticResource ImageStyleNoWrite}"  RenderOptions.BitmapScalingMode="HighQuality"/>
-                                        <StackPanel Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.WindowWidth, Mode=OneWay, 
-                                                        Converter={StaticResource GetWidthByWWConvert}, 
-                                                        ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD_HALF_TEXT}}" >
-                                            <TextBlock
-                                                   Margin="10,5,0,0"
-                                                   MaxHeight="40"
-                                                   FontSize="13"
-                                                   TextTrimming="CharacterEllipsis"
-                                                   TextAlignment="Left" 
-                                                   VerticalAlignment="Center" 
-                                                   Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
-                                                   Text="{Binding Name}"/>
-                                            <TextBlock
-                                                   Margin="10,10,0,0"
-                                                   MaxHeight="40"
-                                                   FontSize="11"
-                                                   TextTrimming="CharacterEllipsis"
-                                                   TextAlignment="Left" 
-                                                   VerticalAlignment="Center" 
-                                                   Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
-                                                   Text="{Binding Path}"/>
-                                        </StackPanel>
-                                    </WrapPanel>
-                                </Border>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-
-                    <!--</hc:TransitioningContentControl>-->
-                </UniformGrid>
-            </WrapPanel>
-
-        </Grid>
-    </Grid>
-</UserControl>

Control/Other/SearchResControl.xaml.cs

@@ -1,331 +0,0 @@
-using GeekDesk.Constant;
-using GeekDesk.Control.Windows;
-using GeekDesk.Plugins.EveryThing;
-using GeekDesk.Util;
-using GeekDesk.ViewModel;
-using GeekDesk.ViewModel.Temp;
-using HandyControl.Controls;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-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.Imaging;
-using System.Windows.Navigation;
-
-namespace GeekDesk.Control.Other
-{
-    /// <summary>
-    /// SearchResControl.xaml 的交互逻辑
-    /// </summary>
-    public partial class SearchResControl : UserControl
-    {
-        public SearchResControl(ObservableCollection<IconInfo> iconList)
-        {
-            this.DataContext = iconList;
-            InitializeComponent();
-        }
-
-
-
-        public void SearchListBoxIndexAdd()
-        {
-            //控制移动后 鼠标即使在图标上也不显示popup
-            RunTimeStatus.MOUSE_MOVE_COUNT = 0;
-            MainWindow.mainWindow.RightCard.MyPoptip.IsOpen = false;
-
-            if (SearchListBox.Items.Count > 0)
-            {
-                if (SearchListBox.SelectedIndex < SearchListBox.Items.Count - 1)
-                {
-                    SearchListBox.SelectedIndex += 1;
-                }
-            }
-        }
-
-        public void SearchListBoxIndexSub()
-        {
-            //控制移动后 鼠标即使在图标上也不显示popup
-            RunTimeStatus.MOUSE_MOVE_COUNT = 0;
-            MainWindow.mainWindow.RightCard.MyPoptip.IsOpen = false;
-
-            if (SearchListBox.Items.Count > 0)
-            {
-                if (SearchListBox.SelectedIndex > 0)
-                {
-                    SearchListBox.SelectedIndex -= 1;
-                }
-            }
-        }
-
-        public void StartupSelectionItem()
-        {
-            if (SearchListBox.SelectedItem != null)
-            {
-                IconInfo icon = SearchListBox.SelectedItem as IconInfo;
-                if (icon.AdminStartUp)
-                {
-                    ProcessUtil.StartIconApp(icon, IconStartType.ADMIN_STARTUP);
-                }
-                else
-                {
-                    ProcessUtil.StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
-                }
-            }
-        }
-
-        private void SearchListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            SearchListBox.ScrollIntoView(SearchListBox.SelectedItem);
-        }
-
-
-
-        /// <summary>
-        /// 查询结果ICON鼠标移动事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SearchIcon_MouseMove(object sender, MouseEventArgs e)
-        {
-            //控制首次刷新搜索结果后, 鼠标首次移动后显示popup
-            RunTimeStatus.MOUSE_MOVE_COUNT++;
-
-            //防止移动后不刷新popup content
-            IconInfo info = (sender as Panel).Tag as IconInfo;
-            MainWindow.mainWindow.RightCard.MyPoptipContent.Text = info.Content;
-            MainWindow.mainWindow.RightCard.MyPoptip.VerticalOffset = 30;
-
-            if (RunTimeStatus.MOUSE_MOVE_COUNT > 1 && !RunTimeStatus.ICONLIST_MOUSE_WHEEL)
-            {
-                MainWindow.mainWindow.RightCard.MyPoptip.IsOpen = true;
-            }
-        }
-
-        /// <summary>
-        /// 查询结果 ICON 鼠标进入事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SearchIcon_MouseEnter(object sender, MouseEventArgs e)
-        {
-
-            //显示popup
-            RunTimeStatus.MOUSE_ENTER_ICON = true;
-            if (!RunTimeStatus.ICONLIST_MOUSE_WHEEL)
-            {
-                new Thread(() =>
-                {
-                    this.Dispatcher.BeginInvoke(new Action(() =>
-                    {
-                        IconInfo info = (sender as Panel).Tag as IconInfo;
-                        MainWindow.mainWindow.RightCard.MyPoptipContent.Text = info.Content;
-                        MainWindow.mainWindow.RightCard.MyPoptip.VerticalOffset = 30;
-                        Thread.Sleep(100);
-                        if (!RunTimeStatus.ICONLIST_MOUSE_WHEEL && RunTimeStatus.MOUSE_MOVE_COUNT > 1)
-                        {
-                            MainWindow.mainWindow.RightCard.MyPoptip.IsOpen = true;
-                        }
-                    }));
-                }).Start();
-            }
-        }
-
-        /// <summary>
-        /// 查询结果ICON鼠标离开事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SearchIcon_MouseLeave(object sender, MouseEventArgs e)
-        {
-            RunTimeStatus.MOUSE_ENTER_ICON = false;
-            MainWindow.mainWindow.RightCard.MyPoptip.IsOpen = false;
-        }
-
-        /// <summary>
-        /// 搜索结果icon 列表鼠标滚轮预处理时间  
-        /// 主要使用自定义popup解决卡顿问题解决卡顿问题
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void VerticalIconList_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            //控制在滚动时不显示popup 否则会在低GPU性能机器上造成卡顿
-            MainWindow.mainWindow.RightCard.MyPoptip.IsOpen = false;
-            if (RunTimeStatus.ICONLIST_MOUSE_WHEEL)
-            {
-                RunTimeStatus.MOUSE_WHEEL_WAIT_MS = 500;
-            }
-            else
-            {
-                RunTimeStatus.ICONLIST_MOUSE_WHEEL = true;
-
-                new Thread(() =>
-                {
-                    while (RunTimeStatus.MOUSE_WHEEL_WAIT_MS > 0)
-                    {
-                        Thread.Sleep(1);
-                        RunTimeStatus.MOUSE_WHEEL_WAIT_MS -= 1;
-                    }
-                    if (RunTimeStatus.MOUSE_ENTER_ICON)
-                    {
-                        this.Dispatcher.BeginInvoke(new Action(() =>
-                        {
-                            MainWindow.mainWindow.RightCard.MyPoptip.IsOpen = true;
-                        }));
-                    }
-                    RunTimeStatus.MOUSE_WHEEL_WAIT_MS = 100;
-                    RunTimeStatus.ICONLIST_MOUSE_WHEEL = false;
-                }).Start();
-            }
-        }
-
-
-        private void Icon_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (MainWindow.appData.AppConfig.DoubleOpen)
-            {
-                IconClick(sender, e);
-            }
-        }
-
-        private void Icon_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            if (!MainWindow.appData.AppConfig.DoubleOpen)
-            {
-                IconClick(sender, e);
-            }
-        }
-
-        /// <summary>
-        /// 图标点击事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void IconClick(object sender, MouseButtonEventArgs e)
-        {
-            if (MainWindow.appData.AppConfig.DoubleOpen && e.ClickCount >= 2)
-            {
-                IconInfo icon = (IconInfo)((Panel)sender).Tag;
-                if (icon.AdminStartUp)
-                {
-                    ProcessUtil.StartIconApp(icon, IconStartType.ADMIN_STARTUP);
-                }
-                else
-                {
-                    ProcessUtil.StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
-                }
-            }
-            else if (!MainWindow.appData.AppConfig.DoubleOpen && e.ClickCount == 1)
-            {
-                IconInfo icon = (IconInfo)((Panel)sender).Tag;
-                if (icon.AdminStartUp)
-                {
-                    ProcessUtil.StartIconApp(icon, IconStartType.ADMIN_STARTUP);
-                }
-                else
-                {
-                    ProcessUtil.StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
-                }
-            }
-
-        }
-
-
-        private static volatile bool EveryThingRuning = false;
-        private void VerticalCard_ScrollChanged(object sender, ScrollChangedEventArgs e)
-        {
-            if (MainWindow.appData.AppConfig.EnableEveryThing == true && EveryThingUtil.HasNext())
-            {
-                HandyControl.Controls.ScrollViewer sv = sender as HandyControl.Controls.ScrollViewer;
-                if (sv.ExtentHeight - (sv.ActualHeight + sv.VerticalOffset) < 100 
-                    && EveryThingUtil.HasNext()
-                    && !EveryThingRuning)
-                {
-                    EveryThingRuning = true;
-                    MainWindow.mainWindow.RightCard.Loading_RightCard.Visibility = Visibility.Visible;
-                    int everyThingCount = Convert.ToInt32(MainWindow.mainWindow.EverythingSearchCount.Text);
-
-                    ObservableCollection<IconInfo> resList = this.DataContext as ObservableCollection<IconInfo>;
-
-                    ThreadPool.QueueUserWorkItem(state =>
-                    {
-                        ObservableCollection<IconInfo> searchRes = EveryThingUtil.NextPage();
-                        this.Dispatcher.Invoke(() =>
-                        {
-                            everyThingCount += searchRes.Count;
-                            MainWindow.mainWindow.EverythingSearchCount.Text = Convert.ToString(everyThingCount);
-                            foreach (IconInfo info in searchRes)
-                            {
-                                resList.Add(info);
-                            }
-                            MainWindow.mainWindow.RightCard.Loading_RightCard.Visibility = Visibility.Collapsed;
-                            EveryThingRuning = false;
-                        });
-                    });
-
-                }
-            }
-        }
-
-
-
-
-
-
-
-        /// <summary>
-        /// 管理员方式启动
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void IconAdminStart(object sender, RoutedEventArgs e)
-        {
-            IconInfo icon = (IconInfo)((MenuItem)sender).Tag;
-            ProcessUtil.StartIconApp(icon, IconStartType.ADMIN_STARTUP);
-        }
-
-        /// <summary>
-        /// 打开文件所在位置
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ShowInExplore(object sender, RoutedEventArgs e)
-        {
-            IconInfo icon = (IconInfo)((MenuItem)sender).Tag;
-            ProcessUtil.StartIconApp(icon, IconStartType.SHOW_IN_EXPLORE);
-        }
-
-
-        private void SystemContextMenu(object sender, RoutedEventArgs e)
-        {
-            IconInfo icon = (IconInfo)((MenuItem)sender).Tag;
-            DirectoryInfo[] folders = new DirectoryInfo[1];
-            folders[0] = new DirectoryInfo(icon.Path);
-            ShellContextMenu scm = new ShellContextMenu();
-            System.Drawing.Point p = System.Windows.Forms.Cursor.Position;
-            p.X -= 80;
-            p.Y -= 80;
-            scm.ShowContextMenu(folders, p);
-        }
-
-
-
-
-
-
-
-
-
-    }
-}

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:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
              xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              mc:Ignorable="d" 
@@ -17,42 +16,30 @@
     <Grid MouseDown="DragMove">
         <hc:SimplePanel Margin="20,50,20,20" >
             <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top">
-                <Image Source="/Resource/Image/About.png"
-                       Width="400"
-                       Height="100"
-                       xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndContract}, Delay=250}"
-                       />
+                <Image Source="/Resource/Image/About.png" Width="400" Height="100"/>
                 <TextBlock x:Name="AppInfo"  TextAlignment="Center"  Text="Copyright ©  2021 GeekDesk V"/>
                 <hc:UniformSpacingPanel Spacing="5" HorizontalAlignment="Center" Margin="10,10,0,0" VerticalAlignment="Center">
                     <hc:Shield Subject=".net" Status=">=4.72" Margin="0,0,10,0" Color="#1182c3"/>
                     <hc:Shield Subject="IDE" Status="VS2019" Margin="0,0,10,0" Color="#1182c3"/>
 
                     <hc:Shield Subject="GitHub" Visibility="Visible" Status="Star"
-                               MouseEnter="SC_MouseEnter"
-                               MouseLeave="SC_MouseLeave"
-                               Command="hc:ControlCommands.OpenLink" 
-                               CommandParameter="https://github.com/BookerLiu/GeekDesk"
-                               Margin="0,0,10,0" Color="#24292F"
-                               />
-
-                    <hc:Shield Subject="Gitee" Visibility="Visible" Status="Star"
-                               MouseEnter="SC_MouseEnter"
-                               MouseLeave="SC_MouseLeave"
-                               Command="hc:ControlCommands.OpenLink" 
-                               CommandParameter="https://gitee.com/BookerLiu/GeekDesk" 
-                               Margin="0,0,10,0" Color="#C71D23"
-                               />
+                           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="Star" 
+                           Command="hc:ControlCommands.OpenLink" 
+                           CommandParameter="https://gitee.com/demo_liu/GeekDesk" 
+                           Margin="0,0,10,0" Color="#C71D23"/>
 
 
                 </hc:UniformSpacingPanel>
                 <hc:UniformSpacingPanel Spacing="10" HorizontalAlignment="Center" Margin="0,5,0,0">
-                    <hc:Shield x:Name="PublicWeChatPanel" Subject="公众号" Visibility="Visible" Status="抓几个娃" Margin="0,0,5,0"  Color="#04913B">
+                    <hc:Shield Subject="公众号" Visibility="Visible" Status="抓几个娃" Margin="0,0,5,0"  Color="#04913B">
                         <hc:Poptip.Instance>
-                            <hc:Poptip PlacementType="Top" >
+                            <hc:Poptip PlacementType="Top">
                                 <hc:Poptip.Content>
                                     <Image x:Name="PublicWeChat" Width="150" Height="150" />
                                 </hc:Poptip.Content>
-                                
                             </hc:Poptip>
                         </hc:Poptip.Instance>
                     </hc:Shield>
@@ -80,10 +67,10 @@
                 <!--<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 MyRadioBtnStyle}" Content="Gitee"
+                         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 MyRadioBtnStyle}" Content="GitHub" 
+                         Style="{StaticResource RadioButtonIcon}" Content="GitHub" 
                          IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=2}"/>
             </hc:UniformSpacingPanel>-->
             </StackPanel>

Control/UserControls/Config/AboutControl.xaml.cs

@@ -1,9 +1,20 @@
-using GeekDesk.Constant;
-using GeekDesk.Util;
+using System;
 using System.Configuration;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using GeekDesk.Util;
+using GeekDesk.Constant;
 
 namespace GeekDesk.Control.UserControls.Config
 {
@@ -16,15 +27,6 @@ namespace GeekDesk.Control.UserControls.Config
         {
             InitializeComponent();
             AppInfo.Text += ConfigurationManager.AppSettings["Version"];
-            string showPublicWeChat = ConfigurationManager.AppSettings["ShowPublicWeChat"];
-            if ("Y".Equals(showPublicWeChat))
-            {
-                PublicWeChatPanel.Visibility = Visibility.Visible;
-            } else
-            {
-                PublicWeChatPanel.Visibility = Visibility.Collapsed;
-            }
-            
             PublicWeChat.Source = ImageUtil.Base64ToBitmapImage(Constants.PUBLIC_WE_CHAT_IMG_BASE64);
             WeChatCode.Source = ImageUtil.Base64ToBitmapImage(Constants.WE_CHAT_CODE_IMG_BASE64);
             ZFBCode.Source = ImageUtil.Base64ToBitmapImage(Constants.ZFB_CODE_IMG_BASE64);
@@ -43,14 +45,5 @@ namespace GeekDesk.Control.UserControls.Config
                 Window.GetWindow(this).DragMove();
             }
         }
-
-        private void SC_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.Cursor = Cursors.Hand;
-        }
-        private void SC_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.Cursor = Cursors.Arrow;
-        }
     }
 }

Control/UserControls/Config/MotionControl.xaml

@@ -4,17 +4,13 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              mc:Ignorable="d" 
-             xmlns:hc="https://handyorg.github.io/handycontrol" 
-             xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" 
-             d:DataContext="{d:DesignInstance Type=viewmodel:AppConfig}"
-             xmlns:cst="clr-namespace:GeekDesk.Constant"
              Background="Transparent"
-             d:DesignHeight="450" d:DesignWidth="450">
+             d:DesignHeight="300" d:DesignWidth="450">
 
     <UserControl.Resources>
         <cvt:HideTypeConvert x:Key="HideTypeConvert"/>
-        <cvt:SearchTypeConvert x:Key="SearchTypeConvert"/>
     </UserControl.Resources>
     <Grid Background="Transparent" MouseDown="DragMove" 
           >
@@ -25,143 +21,111 @@
                 <TextBlock Text="面板动作设置" VerticalAlignment="Center"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0"  Grid.ColumnSpan="4">
-                <CheckBox Style="{StaticResource MyCheckBoxStyle}" 
-                          x:Name="IconIsAdmin" 
-                          Content="启动时显示主面板" IsChecked="{Binding StartedShowPanel}"/>
+                <CheckBox x:Name="IconIsAdmin" Content="启动时显示主面板" IsChecked="{Binding StartedShowPanel}">
+                    <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 Style="{StaticResource MyCheckBoxStyle}"
-                          Content="显示时追随鼠标位置" IsChecked="{Binding FollowMouse}"/>
+                <CheckBox  Content="显示时追随鼠标位置" IsChecked="{Binding FollowMouse}">
+                    <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 Style="{StaticResource MyCheckBoxStyle}"
-                          Content="鼠标中键呼出"
-                          Click="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 Style="{StaticResource MyCheckBoxStyle}" 
-                          Content="双击启动" IsChecked="{Binding DoubleOpen}"/>
-            </hc:UniformSpacingPanel>
-
-            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0"  Grid.ColumnSpan="4">
-                <CheckBox Style="{StaticResource MyCheckBoxStyle}" 
-                          Content="悬停切换菜单" IsChecked="{Binding HoverMenu}"/>
+                <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 Style="{StaticResource MyCheckBoxStyle}" 
-                          Content="贴边隐藏" IsChecked="{Binding MarginHide}"
-                          Click="MarginHide_Changed"/>
+                <CheckBox  Content="贴边隐藏" IsChecked="{Binding MarginHide}" Click="MarginHide_Changed">
+                    <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 AppAnimation}" Click="Animation_Checked">
+                    <CheckBox.Background>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </CheckBox.Background>
+                </CheckBox>
+            </hc:UniformSpacingPanel>
             
-
             <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="面板关闭方式" VerticalAlignment="Center"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <RadioButton Margin="10,0,0,0" 
-                             Style="{StaticResource MyRadioBtnStyle}"
-                          Content="失去焦点后"
+                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
+                         Style="{StaticResource RadioButtonIcon}" Content="失去焦点后"
                          IsChecked="{Binding AppHideType, Mode=TwoWay, Converter={StaticResource HideTypeConvert}, ConverterParameter=1}"/>
-
-                <RadioButton Margin="10,0,0,0" 
-                         Style="{StaticResource MyRadioBtnStyle}" Content="运行项目后" 
+                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
+                         Style="{StaticResource RadioButtonIcon}" Content="运行项目后" 
                          IsChecked="{Binding AppHideType, Mode=TwoWay, Converter={StaticResource HideTypeConvert}, ConverterParameter=2}"/>
-                <RadioButton Margin="10,0,0,0" 
-                         Style="{StaticResource MyRadioBtnStyle}" Content="手动关闭"
+                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
+                         Style="{StaticResource RadioButtonIcon}" Content="手动关闭"
                          IsChecked="{Binding AppHideType, Mode=TwoWay, Converter={StaticResource HideTypeConvert}, ConverterParameter=3}"/>
             </hc:UniformSpacingPanel>
 
-            <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="搜索方式"
-                           VerticalAlignment="Center"
-                           />
-            </hc:UniformSpacingPanel>
-            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <RadioButton Margin="10,0,0,0"  
-                             hc:Poptip.Content="主面板显示时按下Ctrl+F开始搜索"
-                             hc:Poptip.Placement="Top"
-                             Style="{StaticResource MyRadioBtnStyle}" Content="快捷键"
-                             IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=0}"/>
-                <RadioButton Margin="10,0,0,0" 
-                             hc:Poptip.Content="主面板显示时按下按键直接搜索"
-                             hc:Poptip.Placement="Top"
-                             Style="{StaticResource MyRadioBtnStyle}" Content="按键即搜" 
-                             IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=1}"/>
-            </hc:UniformSpacingPanel>
-
             <hc:UniformSpacingPanel Spacing="10"  Margin="0,10,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="热键设置" VerticalAlignment="Center"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10"  Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="主面板:" VerticalAlignment="Center" Margin="0,5,0,0" Width="55"/>
+                <TextBlock Text="主面板:" VerticalAlignment="Center" Width="55"/>
                 <hc:TextBox HorizontalAlignment="Left" 
-                            Style="{StaticResource MyTextBoxStyle}"
-                            Tag="{x:Static cst:HotKeyType.Main}"
-                            VerticalAlignment="Top" 
-                            IsReadOnly="True" 
-                            IsReadOnlyCaretVisible="True" 
-                            Width="170"
-                            Text="{Binding HotkeyStr}" 
-                            KeyDown="HotKeyDown"
-                            KeyUp="HotKeyUp"
-                            InputMethod.IsInputMethodEnabled="False"
-                            />
-
-                <CheckBox Content="启用" 
-                          Style="{StaticResource MyCheckBoxStyle}"
-                          Click="EnableHotKey_Click" 
-                          Tag="{x:Static cst:HotKeyType.Main}" 
-                          IsChecked="{Binding EnableAppHotKey}"/>
+                        Tag="Main"
+                        VerticalAlignment="Top" 
+                        IsReadOnly="True" 
+                        IsReadOnlyCaretVisible="True" 
+                        Width="200"
+                        Text="{Binding HotkeyStr}" 
+                        KeyDown="HotKeyDown"
+                        KeyUp="HotKeyUp"
+                        />
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="待办任务:" Margin="0,5,0,0"  Width="55"/>
-                <hc:TextBox HorizontalAlignment="Left" 
-                            Style="{StaticResource MyTextBoxStyle}"
-                            Tag="{x:Static cst:HotKeyType.ToDo}"
-                            VerticalAlignment="Top" 
-                            IsReadOnly="True" 
-                            IsReadOnlyCaretVisible="True" 
-                            Width="170"
-                            Text="{Binding ToDoHotkeyStr}" 
-                            KeyDown="HotKeyDown"
-                            KeyUp="HotKeyUp"
-                            InputMethod.IsInputMethodEnabled="False"
-                            />
-
-                <CheckBox Content="启用" 
-                          Style="{StaticResource MyCheckBoxStyle}"
-                          Click="EnableHotKey_Click" 
-                          Tag="{x:Static cst:HotKeyType.ToDo}" 
-                          IsChecked="{Binding EnableTodoHotKey}"/>
-            </hc:UniformSpacingPanel>
-
-            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="拾色器:" Margin="0,5,0,0"  Width="55"/>
-                <hc:TextBox HorizontalAlignment="Left" 
-                            Style="{StaticResource MyTextBoxStyle}"
-                            Tag="{x:Static cst:HotKeyType.ColorPicker}"
-                            VerticalAlignment="Top" 
-                            IsReadOnly="True" 
-                            IsReadOnlyCaretVisible="True" 
-                            Width="170"
-                            Text="{Binding ColorPickerHotkeyStr}" 
-                            KeyDown="HotKeyDown"
-                            KeyUp="HotKeyUp"
-                            InputMethod.IsInputMethodEnabled="False"
-                            />
-                <CheckBox Content="启用" 
-                          Style="{StaticResource MyCheckBoxStyle}"
-                          Tag="{x:Static cst:HotKeyType.ColorPicker}"
-                          Click="EnableHotKey_Click"
-                          IsChecked="{Binding EnableColorPickerHotKey}"/>
-            </hc:UniformSpacingPanel>
+            <TextBlock Text="新建待办:"  Width="55"/>
+            <hc:TextBox HorizontalAlignment="Left" 
+                        Tag="ToDo"
+                        VerticalAlignment="Top" 
+                        IsReadOnly="True" 
+                        IsReadOnlyCaretVisible="True" 
+                        Width="200"
+                        Text="{Binding ToDoHotkeyStr}" 
+                        KeyDown="HotKeyDown"
+                        KeyUp="HotKeyUp"
+                        />
+        </hc:UniformSpacingPanel>
         </StackPanel>
     </Grid>
-
-
+   
+   
 </UserControl>

Control/UserControls/Config/MotionControl.xaml.cs

@@ -1,13 +1,26 @@
 using GeekDesk.Constant;
-using GeekDesk.MyThread;
+using GeekDesk.Control.Windows;
+using GeekDesk.Thread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
+using HandyControl.Data;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 using static GeekDesk.Util.GlobalHotKey;
 
 namespace GeekDesk.Control.UserControls.Config
@@ -35,128 +48,91 @@ namespace GeekDesk.Control.UserControls.Config
         /// <param name="e"></param>
         private void HotKeyDown(object sender, KeyEventArgs e)
         {
-            lock (this)
+            string tag = (sender as TextBox).Tag.ToString();
+
+            Key downKey = e.Key;
+            if (downKey == Key.System)
             {
-                HotKeyType hkType = (HotKeyType)(sender as TextBox).Tag;
+                downKey = e.SystemKey;
+            }
 
-                Key downKey = e.Key;
-                if (downKey == Key.System)
+            bool main = false;
+            if ("Main".Equals(tag))
+            {
+                main = true;
+            }
+
+            if (prevKeyTemp == Key.None || prevKeyTemp!=downKey)
+            {
+                if (hotkeyFinished)
                 {
-                    downKey = e.SystemKey;
+                    if (main)
+                    {
+                        appConfig.Hotkey = 0;
+                        appConfig.HotkeyStr = "";
+                        appConfig.HotkeyModifiers = 0;
+                    } else
+                    {
+                        appConfig.ToDoHotkey = 0;
+                        appConfig.ToDoHotkeyStr = "";
+                        appConfig.ToDoHotkeyModifiers = 0;
+                    }
+                    hotkeyFinished = false;
                 }
-
-                if (!CheckIsEnable(hkType)) return;
-
-
-                if (prevKeyTemp == Key.None || prevKeyTemp != downKey)
+                //首次按下按键
+                if ((main && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0)) 
+                    || (!main && (appConfig.ToDoHotkeyStr == null || appConfig.ToDoHotkeyStr.Length == 0)))
                 {
-                    if (hotkeyFinished)
+                    if (CheckModifierKeys(downKey))
                     {
-                        switch (hkType)
+                        //辅助键
+                        if (main)
                         {
-                            case HotKeyType.Main:
-                                appConfig.Hotkey = Key.None;
-                                appConfig.HotkeyStr = "";
-                                appConfig.HotkeyModifiers = GlobalHotKey.HotkeyModifiers.None;
-                                break;
-                            case HotKeyType.ToDo:
-                                appConfig.ToDoHotkey = Key.None;
-                                appConfig.ToDoHotkeyStr = "";
-                                appConfig.ToDoHotkeyModifiers = GlobalHotKey.HotkeyModifiers.None;
-                                break;
-                            case HotKeyType.ColorPicker:
-                                appConfig.ColorPickerHotkey = Key.None;
-                                appConfig.ColorPickerHotkeyStr = "";
-                                appConfig.ColorPickerHotkeyModifiers = GlobalHotKey.HotkeyModifiers.None;
-                                break;
+                            appConfig.HotkeyStr = GetKeyName(downKey);
+                            appConfig.HotkeyModifiers = GetModifierKeys(downKey);
+                        } else
+                        {
+                            appConfig.ToDoHotkeyStr = GetKeyName(downKey);
+                            appConfig.ToDoHotkeyModifiers = GetModifierKeys(downKey);
                         }
-                        hotkeyFinished = false;
+                        prevKeyTemp = downKey;
+                        keysTemp.Add(e);
                     }
-
-                    //首次按下按键
-                    if ((HotKeyType.Main == hkType && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0))
-                        || (HotKeyType.ToDo == hkType && (appConfig.ToDoHotkeyStr == null || appConfig.ToDoHotkeyStr.Length == 0))
-                        || (HotKeyType.ColorPicker == hkType && (appConfig.ColorPickerHotkeyStr == null || appConfig.ColorPickerHotkeyStr.Length == 0))
-                        )
+                }
+                else
+                {
+                    //非首次按下  需要判断前一个键值是否为辅助键
+                    if (CheckModifierKeys(prevKeyTemp)
+                        && ((downKey >= Key.A && downKey <= Key.Z)
+                        || (downKey >= Key.F1 && downKey <= Key.F12)
+                        || (downKey >= Key.D0 && downKey <= Key.D9)))
                     {
-                        if (CheckModifierKeys(downKey))
+                        if (main)
                         {
-                            //辅助键
-                            switch (hkType)
-                            {
-                                case HotKeyType.Main:
-                                    appConfig.HotkeyStr = GetKeyName(downKey);
-                                    appConfig.HotkeyModifiers = GetModifierKeys(downKey);
-                                    break;
-                                case HotKeyType.ToDo:
-                                    appConfig.ToDoHotkeyStr = GetKeyName(downKey);
-                                    appConfig.ToDoHotkeyModifiers = GetModifierKeys(downKey);
-                                    break;
-                                case HotKeyType.ColorPicker:
-                                    appConfig.ColorPickerHotkeyStr = GetKeyName(downKey);
-                                    appConfig.ColorPickerHotkeyModifiers = GetModifierKeys(downKey);
-                                    break;
-                            }
-                            prevKeyTemp = downKey;
-                            keysTemp.Add(e);
+                            appConfig.Hotkey = downKey;
+                            appConfig.HotkeyStr += downKey.ToString();
+                        } else
+                        {
+                            appConfig.ToDoHotkey = downKey;
+                            appConfig.ToDoHotkeyStr += downKey.ToString();
                         }
+                        prevKeyTemp = downKey;
+                        keysTemp.Add(e);
                     }
-                    else
+                    else if (CheckModifierKeys(downKey))
                     {
-                        //非首次按下  需要判断前一个键值是否为辅助键
-                        if (CheckModifierKeys(prevKeyTemp)
-                            && ((downKey >= Key.A && downKey <= Key.Z)
-                            || (downKey >= Key.F1 && downKey <= Key.F12)
-                            || (downKey >= Key.D0 && downKey <= Key.D9)
-                            || downKey == Key.Oem3
-                            ))
+                        if (main)
                         {
-                            KeyUtil.KeyProp keyProp = new KeyUtil.KeyProp();
-                            KeyUtil.KeyToChar(downKey, ref keyProp, true);
-                            string downKeyStr = keyProp.character.ToString();
-                            if (keyProp.character == '\x00')
-                            {
-                                downKeyStr = downKey.ToString();
-                            }
-                            switch (hkType)
-                            {
-                                case HotKeyType.Main:
-                                    appConfig.Hotkey = downKey;
-                                    appConfig.HotkeyStr += downKeyStr;
-                                    break;
-                                case HotKeyType.ToDo:
-                                    appConfig.ToDoHotkey = downKey;
-                                    appConfig.ToDoHotkeyStr += downKeyStr;
-                                    break;
-                                case HotKeyType.ColorPicker:
-                                    appConfig.ColorPickerHotkey = downKey;
-                                    appConfig.ColorPickerHotkeyStr += downKeyStr;
-                                    break;
-                            }
-                            prevKeyTemp = downKey;
-                            keysTemp.Add(e);
-                        }
-                        else if (CheckModifierKeys(downKey))
+                            appConfig.HotkeyStr += GetKeyName(downKey);
+                            appConfig.HotkeyModifiers |= GetModifierKeys(downKey);
+                        } else
                         {
-                            switch (hkType)
-                            {
-                                case HotKeyType.Main:
-                                    appConfig.HotkeyStr += GetKeyName(downKey);
-                                    appConfig.HotkeyModifiers |= GetModifierKeys(downKey);
-                                    break;
-                                case HotKeyType.ToDo:
-                                    appConfig.ToDoHotkeyStr += GetKeyName(downKey);
-                                    appConfig.ToDoHotkeyModifiers |= GetModifierKeys(downKey);
-                                    break;
-                                case HotKeyType.ColorPicker:
-                                    appConfig.ColorPickerHotkeyStr += GetKeyName(downKey);
-                                    appConfig.ColorPickerHotkeyModifiers |= GetModifierKeys(downKey);
-                                    break;
-                            }
-
-                            prevKeyTemp = downKey;
-                            keysTemp.Add(e);
+                            appConfig.ToDoHotkeyStr += GetKeyName(downKey);
+                            appConfig.ToDoHotkeyModifiers |= GetModifierKeys(downKey);
                         }
+                        
+                        prevKeyTemp = downKey;
+                        keysTemp.Add(e);
                     }
                 }
             }
@@ -167,8 +143,7 @@ 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 + ";
             }
@@ -211,10 +186,16 @@ namespace GeekDesk.Control.UserControls.Config
         }
 
 
-        //[MethodImpl(MethodImplOptions.Synchronized)]
-        private void HotKeyUp(object sender, KeyEventArgs e)
+        [MethodImpl(MethodImplOptions.Synchronized)]
+        private  void HotKeyUp(object sender, KeyEventArgs e)
         {
-            lock (this)
+            string tag = (sender as TextBox).Tag.ToString();
+            bool main = false;
+            if ("Main".Equals(tag))
+            {
+                main = true;
+            }
+            lock(this)
             {
                 bool allKeyUp = true;
                 //判断所有键是否都松开
@@ -232,55 +213,29 @@ namespace GeekDesk.Control.UserControls.Config
                     prevKeyTemp = Key.None;
                     hotkeyFinished = true;
 
-                    HotKeyType hkType = (HotKeyType)(sender as TextBox).Tag;
-                    if (!CheckIsEnable(hkType)) return;
-
-                    switch (hkType)
+                    if (main)
                     {
-                        case HotKeyType.Main:
-                            if (MainWindow.hotKeyId != -1)
-                            {
-                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.mainWindow).Handle, Hotkey.keymap[MainWindow.hotKeyId]);
-                                GlobalHotKey.Dispose(MainWindow.hotKeyId);
-                            }
-                            MainWindow.RegisterHotKey(false);
-                            break;
-                        case HotKeyType.ToDo:
-                            if (MainWindow.toDoHotKeyId != -1)
-                            {
-                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.toDoInfoWindow).Handle, Hotkey.keymap[MainWindow.toDoHotKeyId]);
-                                GlobalHotKey.Dispose(MainWindow.toDoHotKeyId);
-                            }
-                            MainWindow.RegisterCreateToDoHotKey(false);
-                            break;
-                        case HotKeyType.ColorPicker:
-                            if (MainWindow.colorPickerHotKeyId != -1)
-                            {
-                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.toDoInfoWindow).Handle, Hotkey.keymap[MainWindow.toDoHotKeyId]);
-                                GlobalHotKey.Dispose(MainWindow.colorPickerHotKeyId);
-                            }
-                            MainWindow.RegisterColorPickerHotKey(false);
-                            break;
+                        if (MainWindow.hotKeyId != -1)
+                        {
+                            //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.mainWindow).Handle, Hotkey.keymap[MainWindow.hotKeyId]);
+                            GlobalHotKey.Dispose(MainWindow.hotKeyId);
+                        }
+                        MainWindow.RegisterHotKey(false);
+                    } else
+                    {
+                        if (MainWindow.toDoHotKeyId != -1)
+                        {
+                            //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.toDoInfoWindow).Handle, Hotkey.keymap[MainWindow.toDoHotKeyId]);
+                            GlobalHotKey.Dispose(MainWindow.toDoHotKeyId);
+                        }
+                        MainWindow.RegisterCreateToDoHotKey(false);
                     }
 
+                    
                 }
             }
         }
 
-        private bool CheckIsEnable(HotKeyType hkType)
-        {
-            switch (hkType)
-            {
-                case HotKeyType.Main:
-                    return true == appConfig.EnableAppHotKey;
-                case HotKeyType.ToDo:
-                    return true == appConfig.EnableTodoHotKey;
-                case HotKeyType.ColorPicker:
-                    return true == appConfig.EnableColorPickerHotKey;
-            }
-            return false;
-        }
-
         /// <summary>
         /// 移动窗口
         /// </summary>
@@ -299,13 +254,21 @@ namespace GeekDesk.Control.UserControls.Config
             if (appConfig.MarginHide)
             {
                 MarginHide.StartHide();
-            }
-            else
+            } else
             {
                 MarginHide.StopHide();
             }
         }
 
+        private void Animation_Checked(object sender, RoutedEventArgs e)
+        {
+            if (MainWindow.mainWindow.Visibility == Visibility.Collapsed)
+            {
+                MainWindow.mainWindow.Visibility = Visibility.Visible;
+                // 执行一下动画 防止太过突兀
+                MainWindow.FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
+            }
+        }
 
 
         /// <summary>
@@ -315,69 +278,14 @@ namespace GeekDesk.Control.UserControls.Config
         /// <param name="e"></param>
         private void MouseMiddle_Changed(object sender, RoutedEventArgs e)
         {
-            //if (appConfig.MouseMiddleShow)
-            //{
-            //    MouseHookThread.MiddleHook();
-            //}
-            //else
-            //{
-            //    MouseHookThread.DisposeMiddle();
-            //}
-
-            MouseHookThread.Dispose();
-            MouseHookThread.Hook();
-        }
-
-        /// <summary>
-        /// 启用热键
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void EnableHotKey_Click(object sender, RoutedEventArgs e)
-        {
-            HotKeyType hkType = (HotKeyType)(sender as CheckBox).Tag;
-            switch (hkType)
+            if (appConfig.MouseMiddleShow)
             {
-                case HotKeyType.Main:
-                    if (true == appConfig.EnableAppHotKey)
-                    {
-                        MainWindow.RegisterHotKey(false);
-                    }
-                    else
-                    {
-                        if (MainWindow.hotKeyId != -1)
-                        {
-                            GlobalHotKey.Dispose(MainWindow.hotKeyId);
-                        }
-                    }
-                    break;
-                case HotKeyType.ToDo:
-                    if (true == appConfig.EnableTodoHotKey)
-                    {
-                        MainWindow.RegisterCreateToDoHotKey(false);
-                    }
-                    else
-                    {
-                        if (MainWindow.hotKeyId != -1)
-                        {
-                            GlobalHotKey.Dispose(MainWindow.toDoHotKeyId);
-                        }
-                    }
-                    break;
-                case HotKeyType.ColorPicker:
-                    if (true == appConfig.EnableColorPickerHotKey)
-                    {
-                        MainWindow.RegisterColorPickerHotKey(false);
-                    }
-                    else
-                    {
-                        if (MainWindow.hotKeyId != -1)
-                        {
-                            GlobalHotKey.Dispose(MainWindow.colorPickerHotKeyId);
-                        }
-                    }
-                    break;
+                MouseHookThread.MiddleHook();
+            } else
+            {
+                MouseHookThread.Dispose();
             }
         }
+
     }
 }

Control/UserControls/Config/OtherControl.xaml

@@ -5,7 +5,7 @@
              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" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:AppConfig}"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              mc:Ignorable="d" 
              Background="Transparent"
              d:DesignHeight="400" d:DesignWidth="500"
@@ -13,109 +13,49 @@
 
     <UserControl.Resources>
         <cvt:UpdateTypeConvert x:Key="UpdateTypeConvert"/>
-        <cvt:SortTypeConvert x:Key="SortTypeConvert"/>
     </UserControl.Resources>
     <Grid MouseDown="DragMove" Background="Transparent">
         <hc:SimplePanel Margin="20" >
             <StackPanel >
                 <TextBlock Text="程序设置" />
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
-                    <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="SelfStartUpBox" Content="开机自启动" IsChecked="{Binding SelfStartUp}" Click="SelfStartUpBox_Click"/>
+                    <CheckBox x:Name="SelfStartUpBox" Content="开机自启动" IsChecked="{Binding SelfStartUp}" Click="SelfStartUpBox_Click">
+                        <CheckBox.Background>
+                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                <GradientStop Color="#FF9EA3A6"/>
+                            </LinearGradientBrush>
+                        </CheckBox.Background>
+                    </CheckBox>
                 </hc:UniformSpacingPanel>
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,6,0,0">
-                    <CheckBox Content="性能模式"
-                              Style="{StaticResource MyCheckBoxStyle}"
-                              IsChecked="{Binding PMModel}" 
-                              hc:Poptip.HitMode="None" 
-                              hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                              hc:Poptip.Content="开启性能模式将取消图标动画效果" 
-                              hc:Poptip.Placement="Top"
-                              />
-                </hc:UniformSpacingPanel>
-                <TextBlock Text="插件"  Margin="0,20,0,0"/>
-                <hc:UniformSpacingPanel Spacing="10" Margin="20,6,0,0">
-                    <CheckBox  Content="时钟显秒" 
-                               Style="{StaticResource MyCheckBoxStyle}"
-                               Click="ShowSeconds_Click" IsChecked="{Binding SecondsWindow}" 
-                               hc:Poptip.HitMode="None"
-                               hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                               hc:Poptip.Content="仅Win11有效" 
-                               hc:Poptip.Placement="Top"
-                               />
-                    <CheckBox  Content="EveryThing搜索" 
-                               Style="{StaticResource MyCheckBoxStyle}"
-                               Click="EveryThing_Changed" IsChecked="{Binding EnableEveryThing}" 
-                               hc:Poptip.HitMode="None"
-                               hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                               hc:Poptip.Content="勾选后若弹出用户帐户控制请选择是" 
-                               hc:Poptip.Placement="Top"
-                               />
-                </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"  
-                                 Style="{StaticResource MyRadioBtnStyle}" 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" 
-                                 hc:IconElement.Geometry="{StaticResource UpSort}"
-                                 Style="{StaticResource MyRadioBtnStyle}" 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" 
-                                 hc:IconElement.Geometry="{StaticResource LowSort}"
-                                 Style="{StaticResource MyRadioBtnStyle}" 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"
-                                 hc:IconElement.Geometry="{StaticResource UpSort}"
-                                 Style="{StaticResource MyRadioBtnStyle}" 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" 
-                                 hc:IconElement.Geometry="{StaticResource LowSort}"
-                                 Style="{StaticResource MyRadioBtnStyle}" Content="名称" 
-                                 Tag="5"
-                                 PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
-                                 IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=5}"/>
-
+                    <CheckBox  Content="性能模式" IsChecked="{Binding PMModel}" 
+                           hc:Poptip.HitMode="None" 
+                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                           hc:Poptip.Content="开启性能模式将取消图标动画效果" 
+                           hc:Poptip.Placement="TopLeft">
+                        <CheckBox.Background>
+                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                <GradientStop Color="#FF9EA3A6"/>
+                            </LinearGradientBrush>
+                        </CheckBox.Background>
+                    </CheckBox>
                 </hc:UniformSpacingPanel>
                 <TextBlock Text="更新源"  Margin="0,25,0,0"/>
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
-                    <RadioButton Margin="10,0,0,0" 
-                             Style="{StaticResource MyRadioBtnStyle}" Content="Gitee"
+                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
+                             Style="{StaticResource RadioButtonIcon}" Content="Gitee"
                              hc:IconElement.Geometry="{StaticResource Gitee}"
                              Foreground="#B32225"
                              IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=1}"/>
-                    <RadioButton Margin="10,0,0,0"
+                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
                              hc:IconElement.Geometry="{StaticResource GitHub}"
-                             Style="{StaticResource MyRadioBtnStyle}" Content="GitHub" 
+                             Style="{StaticResource RadioButtonIcon}" Content="GitHub" 
                              Foreground="Black"
                              IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=2}"/>
                 </hc:UniformSpacingPanel>
-
-                <TextBlock Text="其它"  Margin="0,25,0,0"/>
-                <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
-                    <Button Content="备份数据" 
-                            hc:Poptip.Content="当数据文件损坏时, 以便能够恢复部分数据 (损坏时将有操作提示)"
-                            hc:Poptip.Placement="Top"
-                            hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                            Style="{StaticResource MyBtnStyle}" 
-                            Click="BakDataFile"/>
-                </hc:UniformSpacingPanel>
             </StackPanel>
         </hc:SimplePanel>
     </Grid>
-
+   
 
 </UserControl>

Control/UserControls/Config/OtherControl.xaml.cs

@@ -1,16 +1,20 @@
 using GeekDesk.Constant;
-using GeekDesk.MyThread;
-using GeekDesk.Plugins.EveryThing;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using ShowSeconds;
 using System;
-using System.Diagnostics;
-using System.IO;
-using System.Management;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 
 namespace GeekDesk.Control.UserControls.Config
 {
@@ -22,13 +26,6 @@ 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)
@@ -49,158 +46,5 @@ 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;
-            }
-        }
-
-        private void BakDataFile(object sender, RoutedEventArgs e)
-        {
-            CommonCode.BakAppData();
-        }
-
-        private void ShowSeconds_Click(object sender, RoutedEventArgs e)
-        {
-            if (MainWindow.appData.AppConfig.SecondsWindow == true)
-            {
-                //StartSecondsWindow();
-                SecondsWindow.ShowWindow();
-            }
-            else
-            {
-                SecondsWindow.CloseWindow();
-                //StopSecondsWindow();
-            }
-        }
-
-        public static void StopSecondsWindow()
-        {
-            if (MessageUtil.CheckWindowIsRuning("ShowSeconds_Main_" + Constants.MY_UUID))
-            {
-                MessageUtil.SendMsgByWName(
-                    "ShowSeconds_Main_" + Constants.MY_UUID,
-                    "Shutdown"
-                    );
-            }
-        }
-
-        public static void StartSecondsWindow()
-        {
-            try
-            {
-                using (var objOS = new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem"))
-                {
-                    foreach (ManagementObject objMgmt in objOS.Get())
-                    {
-                        if (objMgmt.Properties["Caption"].Value != null)
-                        {
-                            string caption = objMgmt.Properties["Caption"].Value.ToString(); ;
-                            LogUtil.WriteLog("获取的系统版本号为:" + caption);
-                            if (caption.Contains("Windows 11"))
-                            {
-                                //找到ShowSeconds插件
-                                FileInfo fi = FileUtil.GetFileByNameWithDir("ShowSeconds.exe", Constants.PLUGINS_PATH);
-                                if (fi == null)
-                                {
-                                    HandyControl.Controls.MessageBox.Show("未安装程序插件:ShowSeconds");
-                                }
-                                else
-                                {
-                                    //检查是否在运行
-                                    if (!MessageUtil.CheckWindowIsRuning("ShowSeconds_Main_" + Constants.MY_UUID))
-                                    {
-                                        using (Process p = new Process())
-                                        {
-                                            p.StartInfo.FileName = fi.FullName;
-                                            p.StartInfo.WorkingDirectory = fi.FullName.Substring(0, fi.FullName.LastIndexOf("\\"));
-                                            p.Start();
-                                        }
-                                    }
-                                }
-
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex) { }
-        }
-
-        /// <summary>
-        /// EveryThing插件开关
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void EveryThing_Changed(object sender, RoutedEventArgs e)
-        {
-            if (MainWindow.appData.AppConfig.EnableEveryThing == true)
-            {
-                EveryThingUtil.EnableEveryThing(0);
-            } else
-            {
-                EveryThingUtil.DisableEveryThing(true);
-            }
-        }
     }
 }

Control/UserControls/Config/ThemeControl.xaml

@@ -2,141 +2,59 @@
              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:viewmodel="clr-namespace:GeekDesk.ViewModel"
-             d:DataContext="{d:DesignInstance Type=viewmodel:AppConfig}"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:GeekDesk.Control.UserControls.Config"
              xmlns:hc="https://handyorg.github.io/handycontrol"
-             xmlns:cvt="clr-namespace:GeekDesk.Converts" 
              mc:Ignorable="d" 
              Background="Transparent"
              d:DesignHeight="500" d:DesignWidth="450">
 
 
-    <UserControl.Resources>
-        <cvt:BGStyleConvert x:Key="BGStyleConvert"/>
-        <cvt:StringAppendConvert x:Key="StringAppendConvert"/>
-        <cvt:Visibility2BooleanConverter x:Key="Visibility2BooleanConverter"/>
-    </UserControl.Resources>
     <Grid>
-        <Grid Background="Transparent">
+        <Grid  MouseDown="DragMove" Background="Transparent">
             <StackPanel Margin="20" >
-                <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                    <TextBlock Text="背景风格" VerticalAlignment="Center"/>
+                <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">
-                    <RadioButton Margin="10,0,0,0" 
-                         Style="{StaticResource MyRadioBtnStyle}" Click="BGStyle_Changed" Content="图 片"
-                         IsChecked="{Binding BGStyle, Mode=TwoWay, Converter={StaticResource BGStyleConvert}, ConverterParameter=1}"/>
-                    <RadioButton Margin="10,0,0,0" 
-                         Style="{StaticResource MyRadioBtnStyle}" Click="BGStyle_Changed" Content="纯 色" 
-                         IsChecked="{Binding BGStyle, Mode=TwoWay, Converter={StaticResource BGStyleConvert}, ConverterParameter=2}"/>
+                <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0" Grid.ColumnSpan="4">
+                    <TextBlock Text="图片路径:" VerticalAlignment="Center" Margin="0,5,0,0"/>
+                    <TextBlock Text="{Binding BacImgName}" Width="200" 
+                               Margin="0,5,0,0"
+                           VerticalAlignment="Center"
+                           hc:Poptip.HitMode="None" 
+                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                           hc:Poptip.Content="{Binding BacImgName}" 
+                           hc:Poptip.Placement="TopLeft"
+                           />
+                    <Button Content="修改" Click="BGButton_Click"/>
+                    <Button Content="默认" Click="DefaultButton_Click"/>
                 </hc:UniformSpacingPanel>
 
-                <UniformGrid x:Name="ImgBGConf">
-                    <hc:TransitioningContentControl TransitionMode="Fade" 
-                                                    Height="130">
-                        <StackPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="图片背景" VerticalAlignment="Center"/>
-                            </hc:UniformSpacingPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="20,15,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="图片路径:" VerticalAlignment="Center" Margin="0,5,0,0"/>
-                                <TextBlock Text="{Binding BacImgName}" Width="200" 
-                                           Margin="0,5,0,0"
-                                           VerticalAlignment="Center"
-                                           hc:Poptip.HitMode="None" 
-                                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                           hc:Poptip.Content="{Binding BacImgName}" 
-                                           hc:Poptip.Placement="TopLeft"
-                                           />
-                                <Button Content="修改" Style="{StaticResource MyBtnStyle}" Click="BGButton_Click"/>
-                                <Button Content="默认" Style="{StaticResource MyBtnStyle}" Click="DefaultButton_Click"/>
-                            </hc:UniformSpacingPanel>
-
-                            <hc:UniformSpacingPanel Spacing="10" Margin="20,10,0,0"  Grid.ColumnSpan="4">
-                                <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="IconIsAdmin" Content="毛玻璃效果" Click="BGStyle_Changed" IsChecked="{Binding BlurEffect}"/>
-                            </hc:UniformSpacingPanel>
-                        </StackPanel>
-                    </hc:TransitioningContentControl>
-
-                </UniformGrid>
-
-                <UniformGrid x:Name="GradientBGConf">
-                    <hc:TransitioningContentControl TransitionMode="Fade" 
-                                                    Height="130">
-                        <StackPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="纯色背景" VerticalAlignment="Center"/>
-                            </hc:UniformSpacingPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="色彩1:" VerticalAlignment="Center" Margin="0,5,0,0"/>
-                                <TextBlock Text="{Binding GradientBGParam.Color1, NotifyOnTargetUpdated=True}"
-                                           TargetUpdated="Color_TargetUpdated"
-                                           Width="65" 
-                                           Margin="0,5,0,0"
-                                           VerticalAlignment="Center"
-                                           />
-                                <Button Style="{StaticResource MyBtnStyle}" 
-                                        Content="设置" 
-                                        Tag="Color1" 
-                                        Click="ColorButton_Click"/>
-                            </hc:UniformSpacingPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="色彩2:" VerticalAlignment="Center" Margin="0,5,0,0"/>
-                                <TextBlock Text="{Binding GradientBGParam.Color2, NotifyOnTargetUpdated=True}" 
-                                           TargetUpdated="Color_TargetUpdated"
-                                           Width="65" 
-                                           Margin="0,5,0,0"
-                                           VerticalAlignment="Center"
-                                           />
-                                <Button Style="{StaticResource MyBtnStyle}" 
-                                        Content="设置" Tag="Color2" 
-                                        Click="ColorButton_Click" 
-                                        />
-
-                            </hc:UniformSpacingPanel>
-
-                            <Button Content="系统预设"
-                                    Style="{StaticResource MyBtnStyle}"
-                                    Margin="0,5,0,0"
-                                    hc:Poptip.HitMode="None" 
-                                    hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                    hc:Poptip.Content="{Binding GradientBGParam.Name, Converter={StaticResource StringAppendConvert}, ConverterParameter=当前设置: \{\}}" 
-                                    hc:Poptip.Placement="Top"
-                                    Click="SysBG_Click"
-                                    />
-                        </StackPanel>
-                    </hc:TransitioningContentControl>
-                </UniformGrid>
-
-
-                <hc:Divider LineStrokeDashArray="3,3" Margin="0,0,0,0" Height="20" LineStroke="Black" Grid.ColumnSpan="1"/>
-                
-                <hc:UniformSpacingPanel Spacing="10" Margin="5,-10,0,0" Grid.ColumnSpan="4">
-                    <CheckBox Style="{StaticResource MyCheckBoxStyle}"  Content="置于顶层" IsChecked="{Binding AlwaysTopmost}"/>
+                <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="5,10,0,0" Grid.ColumnSpan="4">
-                    <CheckBox Style="{StaticResource MyCheckBoxStyle}"  Content="主窗口动画" IsChecked="{Binding AppAnimation}" Click="Animation_Checked"/>
-
-                </hc:UniformSpacingPanel>
-                <hc:UniformSpacingPanel Spacing="10" Margin="5,10,0,0" Grid.ColumnSpan="4">
-                    <CheckBox Style="{StaticResource MyCheckBoxStyle}"  Content="列表展开动画" IsChecked="{Binding ItemSpradeAnimation}"/>
-
-
-                </hc:UniformSpacingPanel>
-                <hc:UniformSpacingPanel Spacing="10" Margin="5,10,0,0"  Grid.ColumnSpan="4">
-                    <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="BarIcon" Content="显示托盘图标" IsChecked="{Binding ShowBarIcon}"/>
+                <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:UniformSpacingPanel Spacing="10" Margin="5,10,0,0"  Grid.ColumnSpan="4">
-                    <CheckBox Style="{StaticResource MyCheckBoxStyle}"  Content="显示主面板Logo" IsChecked="{Binding TitleLogoVisible, Mode=TwoWay, Converter={StaticResource Visibility2BooleanConverter}}"/>
-                </hc:UniformSpacingPanel>
+                <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
 
-
-                <StackPanel Margin="0,15,0,0">
+                <StackPanel>
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
-                        <TextBlock Text="卡片不透明度" VerticalAlignment="Center"/>
+                        <TextBlock Text="托盘不透明度" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
                     <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                         <hc:PreviewSlider Value="{Binding CardOpacity}"
@@ -149,17 +67,15 @@
                         </hc:PreviewSlider>
                     </hc:UniformSpacingPanel>
 
-                   
 
                     <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                        <TextBlock Text="背景不透明度" VerticalAlignment="Center"/>
+                        <TextBlock Text="背景图片不透明度" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
                     <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                         <hc:PreviewSlider Value="{Binding BgOpacity}"
-                                          ValueChanged="BGOpacity_ValueChanged"
-                                          Maximum="100"
-                                          Width="350"
-                                          > 
+                                  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>
@@ -167,7 +83,7 @@
                     </hc:UniformSpacingPanel>
 
 
-                    <!--<hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                         <TextBlock Text="主面板不透明度" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
                     <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
@@ -180,7 +96,7 @@
                                 <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
                             </hc:PreviewSlider.PreviewContent>
                         </hc:PreviewSlider>
-                    </hc:UniformSpacingPanel>-->
+                    </hc:UniformSpacingPanel>
 
                     <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                         <TextBlock Text="主面板圆角大小" VerticalAlignment="Center"/>
@@ -216,27 +132,21 @@
                 <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}" Foreground="{Binding TextColor}" Width="100"/>
-                    <Button Style="{StaticResource MyBtnStyle}" Content="选择" Margin="0,-10,0,0" Tag="Text"  Click="ColorButton_Click"/>
+                    <TextBlock VerticalAlignment="Center" Text="{Binding TextColor}" Width="100"/>
+                    <Button Content="选择"  Click="ColorButton_Click"/>
                 </hc:UniformSpacingPanel>
             </StackPanel>
         </Grid>
-
-        <!--<StackPanel x:Name="ColorPanel" Panel.ZIndex="1" 
-                    Visibility="Collapsed"
-                    Height="500"
-                    Width="450"
-                    VerticalAlignment="Center">
+            
+        <StackPanel x:Name="ColorPanel" Visibility="Collapsed" VerticalAlignment="Center">
             <StackPanel.Background>
-                <SolidColorBrush Color="AliceBlue" Opacity="0.01"/>
-            </StackPanel.Background>-->
-
-            <!--<hc:ColorPicker Name="MyColorPicker" 
-                            Canceled="MyColorPicker_Canceled"
-                            Confirmed="MyColorPicker_Confirmed"
-                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>-->
-
-        <!--</StackPanel>-->
+                <SolidColorBrush Color="AliceBlue" Opacity="0"/>
+            </StackPanel.Background>
+            <hc:ColorPicker
+                            Name="ColorPicker" 
+                            Canceled="ColorPicker_Canceled" 
+                            SelectedColorChanged="ColorPicker_SelectedColorChanged"/>
+        </StackPanel>
     </Grid>
-
+        
 </UserControl>

Control/UserControls/Config/ThemeControl.xaml.cs

@@ -1,39 +1,35 @@
 using GeekDesk.Constant;
-using GeekDesk.Control.Other;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using Microsoft.Win32;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 
 namespace GeekDesk.Control.UserControls.Config
 {
-
     /// <summary>
     /// MotionControl.xaml 的交互逻辑
     /// </summary>
     public partial class ThemeControl : System.Windows.Controls.UserControl
     {
-        private static AppConfig appConfig = MainWindow.appData.AppConfig;
 
+        private static AppConfig appConfig = MainWindow.appData.AppConfig;
         public ThemeControl()
         {
-
             InitializeComponent();
-            if (appConfig.BGStyle != BGStyle.GradientBac)
-            {
-                GradientBGConf.Visibility = Visibility.Collapsed;
-                ImgBGConf.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                ImgBGConf.Visibility = Visibility.Collapsed;
-                GradientBGConf.Visibility = Visibility.Visible;
-            }
         }
 
         /// <summary>
@@ -43,13 +39,13 @@ namespace GeekDesk.Control.UserControls.Config
         /// <param name="e"></param>
         private void BGButton_Click(object sender, RoutedEventArgs e)
         {
-
+           
             try
             {
                 OpenFileDialog ofd = new OpenFileDialog
                 {
                     Multiselect = false, //只允许选中单个文件
-                    Filter = "图像文件(*.png, *.jpg, *.gif)|*.png;*.jpg;*.gif"
+                    Filter = "图像文件(*.png, *.jpg)|*.png;*.jpg;*.gif"
                 };
                 if (ofd.ShowDialog() == true)
                 {
@@ -57,12 +53,12 @@ namespace GeekDesk.Control.UserControls.Config
                     appConfig.BacImgName = ofd.FileName;
                 }
             }
-            catch (Exception ex)
+            catch (Exception e1)
             {
-                LogUtil.WriteErrorLog(ex, "修改背景失败,已重置为默认背景!");
                 HandyControl.Controls.Growl.WarningGlobal("修改背景失败,已重置为默认背景!");
+                LogUtil.WriteErrorLog(e1, "修改背景失败!");
             }
-            BGSettingUtil.BGSetting();
+
         }
 
 
@@ -74,21 +70,44 @@ namespace GeekDesk.Control.UserControls.Config
                 appConfig.BitmapImage = ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_BAC_IMAGE_BASE64);
                 appConfig.BacImgName = "系统默认";
             }
-            catch (Exception ex)
+            catch (Exception e1)
             {
-                LogUtil.WriteErrorLog(ex, "修改背景失败2,已重置为默认背景!");
                 HandyControl.Controls.Growl.WarningGlobal("修改背景失败,已重置为默认背景!");
+                LogUtil.WriteErrorLog(e1, "修改默认背景失败!");
             }
-            BGSettingUtil.BGSetting();
+
         }
 
 
         private void ColorButton_Click(object sender, RoutedEventArgs e)
         {
-            string tag = (sender as Button).Tag.ToString();
-            new MyColorPickerDialog(tag, "ConfigWindowDialog");
+            ColorPanel.Visibility = Visibility.Visible;
         }
 
+        private void ColorPicker_Canceled(object sender, EventArgs e)
+        {
+            ColorPanel.Visibility = Visibility.Collapsed;
+        }
+
+        private void ColorPicker_SelectedColorChanged(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
+        {
+            SolidColorBrush scb =  ColorPicker.SelectedBrush;
+            appConfig.TextColor = scb.ToString();
+            ColorPanel.Visibility = Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// 移动窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                Window.GetWindow(this).DragMove();
+            }
+        }
 
         private void PreviewSlider_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
@@ -98,7 +117,6 @@ namespace GeekDesk.Control.UserControls.Config
             };
             System.Threading.ThreadStart ts = new System.Threading.ThreadStart(cbu.CheckButtonUp);
             System.Threading.Thread t = new System.Threading.Thread(ts);
-            t.IsBackground = true;
             t.Start();
         }
 
@@ -125,48 +143,5 @@ namespace GeekDesk.Control.UserControls.Config
                 }
             }
         }
-
-
-        public void BGStyle_Changed(object sender, RoutedEventArgs e)
-        {
-            BGSettingUtil.BGSetting();
-            if (appConfig.BGStyle != BGStyle.GradientBac)
-            {
-                GradientBGConf.Visibility = Visibility.Collapsed;
-                ImgBGConf.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                ImgBGConf.Visibility = Visibility.Collapsed;
-                GradientBGConf.Visibility = Visibility.Visible;
-            }
-        }
-
-        private void BGOpacity_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            BGSettingUtil.BGSetting();
-        }
-
-        private void Color_TargetUpdated(object sender, DataTransferEventArgs e)
-        {
-            BGSettingUtil.BGSetting();
-        }
-
-        private void SysBG_Click(object sender, RoutedEventArgs e)
-        {
-            GradientBGDialog gbg = new GradientBGDialog();
-            gbg.dialog = HandyControl.Controls.Dialog.Show(gbg, "ConfigWindowDialog");
-        }
-
-
-        private void Animation_Checked(object sender, RoutedEventArgs e)
-        {
-            if (MainWindow.mainWindow.Visibility == Visibility.Collapsed)
-            {
-                appConfig.IsShow = true;
-            }
-            appConfig.IsShow = null;
-        }
-  
     }
 }

Control/UserControls/IconFont/IconPannel.xaml.cs

@@ -1,4 +1,18 @@
-using System.Windows.Controls;
+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.IconFont
 {

Control/UserControls/PannelCard/LeftCardControl.xaml

@@ -6,11 +6,9 @@
              xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
-             xmlns:cst="clr-namespace:GeekDesk.Constant"
              xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800"
-             >
+             d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
 
         <!--左侧栏样式动画-->
@@ -19,19 +17,12 @@
             <Setter Property="Margin" Value="0,0,0,1"/>
             <Setter Property="Background">
                 <Setter.Value>
-                    <SolidColorBrush Color="Black" Opacity="0.01"/>
+                    <SolidColorBrush Opacity="0"/>
                 </Setter.Value>
             </Setter>
-            <Setter Property="AllowDrop" Value="True"/>
-            <EventSetter Event="Drop" Handler="Menu_Drop"/>
-            <EventSetter Event="PreviewDragEnter" Handler="Menu_PreviewDragEnter"/>
-            <EventSetter Event="PreviewDragLeave" Handler="Menu_PreviewDragLeave"/>
-            <EventSetter Event="MouseLeave" Handler="Menu_MouseLeave"/>
             <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-            <EventSetter Event="MouseEnter" Handler="Menu_MouseEnter"/>
-            <EventSetter Event="PreviewMouseLeftButtonDown" Handler="ListBoxItem_MouseDown"/>
-            <EventSetter Event="PreviewMouseRightButtonDown" Handler="ListBoxItem_PreviewMouseRightButtonDown"/>
-            <!--<EventSetter Event="Unselected" Handler="Lbi_Unselected"/>-->
+            <EventSetter Event="MouseLeftButtonDown" Handler="MenuClick"/>
+            <EventSetter Event="MouseRightButtonDown" Handler="MenuClick"/>
             <Style.Triggers>
                 <MultiTrigger>
                     <MultiTrigger.Conditions>
@@ -52,85 +43,39 @@
                             </Storyboard>
                         </BeginStoryboard>
                     </MultiTrigger.ExitActions>
-                    <MultiTrigger.Setters>
-                        <Setter Property="Background">
-                            <Setter.Value>
-                                <SolidColorBrush Color="Black" Opacity="0.01"/>
-                            </Setter.Value>
-                        </Setter>
-                        <Setter Property="Foreground" Value="Black"/>
-                    </MultiTrigger.Setters>
                 </MultiTrigger>
-
-
-                <!--移到代码设置-->
-                <!--<Trigger Property="IsSelected" Value="False">
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="Foreground" Value="Black"/>
+                
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter Property="Background" Value="#FFECECEC"/>
                 </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>-->
-                <Trigger Property="IsMouseOver" Value="False">
-                    <Setter Property="Background" Value="#00FFFFFF"/>
+                    <Setter Property="Background" Value="#FFECECEC"/>
                     <Setter Property="Foreground" Value="Black"/>
                 </Trigger>
 
+                <MultiDataTrigger>
+                    <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEdit}" Value="True"/>
+                    </MultiDataTrigger.Conditions>
+                    <MultiDataTrigger.Setters>
+                        <Setter Property="Background" Value="Transparent"/>
+                    </MultiDataTrigger.Setters>
+                </MultiDataTrigger>
 
             </Style.Triggers>
         </Style>
-        <Style x:Key="MyPoptipStyle" TargetType="Border">
-            <Setter Property="HorizontalAlignment" Value="Center"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Background" Value="White"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-            <Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
-            <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
-            <!--<Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="hc:Poptip">
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-                            <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>-->
-        </Style>
-
         <cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
-        <cvt:StringAppendConvert x:Key="StringAppendConvert"/>
     </UserControl.Resources>
-    <Grid Background="Transparent">
-        <Popup Name="MyPoptip" FlowDirection="LeftToRight" 
-               PopupAnimation="None" Placement="Mouse" IsOpen="False"
-               AllowsTransparency="True"
-               >
-            <Grid Background="Transparent">
-                <Border Style="{StaticResource MyPoptipStyle}">
-                    <TextBlock Name="MyPoptipContent" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" Text="Test" FontSize="14"/>
-                </Border>
-            </Grid>
-        </Popup>
-
         <!--左侧栏-->
         <hc:Card x:Name="MyCard"
                  BorderThickness="1"
                  Effect="{DynamicResource EffectShadow2}" 
                  Margin="5,0,0,5"
-                 MouseDown="MyCard_MouseDown"
-                 PreviewMouseRightButtonDown="MyCard_PreviewMouseRightButtonDown"
                  >
             <hc:Card.Background>
                 <SolidColorBrush Color="#FFFFFFFF" hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
-
+                
                 </SolidColorBrush>
             </hc:Card.Background>
             <hc:Card.BorderBrush>
@@ -139,11 +84,8 @@
             <hc:Card.ContextMenu>
                 <ContextMenu Width="200">
                     <MenuItem Header="新建菜单" Click="CreateMenu"/>
-                    <MenuItem Header="新建关联菜单" Click="CreateLinkMenu"/>
-                    <MenuItem x:Name="AlterPW1" Header="修改密码" Click="AlterPassword"/>
                 </ContextMenu>
             </hc:Card.ContextMenu>
-
             <WrapPanel Orientation="Horizontal">
                 <ListBox x:Name="MenuListBox"
                          Padding="2,3,0,2"
@@ -152,17 +94,12 @@
                          BorderThickness="0" Foreground="{x:Null}"
                          SelectedIndex="{Binding AppConfig.SelectedMenuIndex}"
                          VirtualizingPanel.VirtualizationMode="Recycling"
-                         SelectionChanged="Menu_SelectionChanged"
-                         PreviewMouseWheel="Menu_MouseWheel"
-                         PreviewMouseRightButtonDown="MyCard_PreviewMouseRightButtonDown"
+                         SelectionChanged="menus_SelectionChanged"
                          >
                     <ListBox.Resources>
                         <ContextMenu x:Key="MenuDialog" Width="200">
                             <MenuItem Header="新建菜单" Click="CreateMenu"/>
-                            <MenuItem Header="新建关联菜单" Click="CreateLinkMenu"/>
                             <MenuItem Header="重命名"  Click="RenameMenu" Tag="{Binding}"/>
-                            <MenuItem Header="加密此列表"  Click="EncryptMenu" Tag="{Binding}"/>
-                            <MenuItem x:Name="AlterPW2" Header="修改密码" Click="AlterPassword"/>
                             <MenuItem Header="修改图标"  Click="EditMenuGeometry" Tag="{Binding}"/>
                             <MenuItem Header="删除" Click="DeleteMenu" Tag="{Binding}"/>
                         </ContextMenu>
@@ -185,42 +122,38 @@
 
                     <ListBox.ItemTemplate>
                         <DataTemplate>
-                            <StackPanel Tag="{Binding}">
-                                <TextBox Style="{StaticResource MyTextBoxStyle}" 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}">
-                                    <TextBox.Background>
-                                        <SolidColorBrush Color="White" Opacity="0.6" />
-                                    </TextBox.Background>
-                                </TextBox>
-                                <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"
+                            <StackPanel MouseLeftButtonDown="MenuClick" MouseRightButtonDown="MenuClick" 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">
+                                    <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"
+                                               IsVisibleChanged="MenuWhenVisibilityChanged"
+                                               Visibility="{Binding NotMenuEdit}"
+                                               />
                                 </StackPanel>
                             </StackPanel>
                         </DataTemplate>
@@ -228,5 +161,4 @@
                 </ListBox>
             </WrapPanel>
         </hc:Card>
-    </Grid>
-</UserControl>
+</UserControl>

Control/UserControls/PannelCard/LeftCardControl.xaml.cs

@@ -1,22 +1,16 @@
 using DraggAnimatedPanelExample;
-using GeekDesk.Constant;
-using GeekDesk.Control.Other;
 using GeekDesk.Control.Windows;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using Microsoft.Win32;
 using System;
 
 using System.Collections.ObjectModel;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Threading;
+
 using System.Windows;
 using System.Windows.Controls;
+
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using WindowsAPICodePack.Dialogs;
+
 
 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -27,63 +21,16 @@ namespace GeekDesk.Control.UserControls.PannelCard
     {
         private int menuSelectIndexTemp = -1;
         private AppData appData = MainWindow.appData;
-        private SolidColorBrush bac = new SolidColorBrush(Color.FromRgb(255, 255, 255));
-        
-
 
         public LeftCardControl()
         {
             InitializeComponent();
-            bac.Opacity = 0.6;
-
-            this.Loaded += (s, e) =>
-            {
-                SelectLastMenu();
-                SetMenuListBoxItemEvent();
-            };
-        }
-
-
-        private void SetMenuListBoxItemEvent()
-        {
-            int size = MenuListBox.Items.Count;
-            for (int i = 0; i < size; i++)
-            {
-                ListBoxItem lbi = (ListBoxItem)(MenuListBox.ItemContainerGenerator.ContainerFromIndex(i));
-                if (lbi != null)
-                {
-                    SetListBoxItemEvent(lbi);
-                }
-            }
-            //首次触发不了Selected事件
-            object obj = MenuListBox.ItemContainerGenerator.ContainerFromIndex(MenuListBox.SelectedIndex);
-            Lbi_Selected(obj, null);
-        }
-
-        private void SetListBoxItemEvent(ListBoxItem lbi)
-        {
-            lbi.MouseEnter += (s, me) =>
-            {
-                lbi.Background = bac;
-            };
-            lbi.Unselected += Lbi_Unselected;
-
-            lbi.MouseLeave += Lbi_MouseLeave;
-
-            lbi.Selected += Lbi_Selected;
-        }
-
-        private void SelectLastMenu()
-        {
             if (appData.AppConfig.SelectedMenuIndex >= appData.MenuList.Count || appData.AppConfig.SelectedMenuIndex == -1)
             {
-                MenuListBox.SelectedIndex = 0;
-                appData.AppConfig.SelectedMenuIndex = MenuListBox.SelectedIndex;
                 appData.AppConfig.SelectedMenuIcons = appData.MenuList[0].IconList;
             }
             else
             {
-                MenuListBox.SelectedIndex = appData.AppConfig.SelectedMenuIndex;
                 appData.AppConfig.SelectedMenuIcons = appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList;
             }
         }
@@ -113,6 +60,13 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
         }
 
+            ////菜单点击事件
+        private void MenuClick(object sender, MouseButtonEventArgs e)
+        {
+            //设置对应菜单的图标列表
+            MenuInfo mi = (MenuInfo)(((StackPanel)sender).Tag);
+            appData.AppConfig.SelectedMenuIcons = mi.IconList;
+        }
 
         /// <summary>
         /// 当修改菜单元素可见时 设置原菜单为不可见 并且不可选中
@@ -122,12 +76,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void MenuWhenVisibilityChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            StackPanel sp = sender as StackPanel;
-
-            ListBoxItem lbi = (sp.TemplatedParent as ContentPresenter).TemplatedParent as ListBoxItem;
-            if (sp.Visibility == Visibility.Collapsed)
+            TextBlock tb = sender as TextBlock;
+            if (tb.Visibility == Visibility.Collapsed)
             {
-                lbi.MouseEnter += Lbi_MouseEnter;
                 if (MenuListBox.SelectedIndex != -1)
                 {
                     menuSelectIndexTemp = MenuListBox.SelectedIndex;
@@ -138,56 +89,8 @@ namespace GeekDesk.Control.UserControls.PannelCard
                     MenuListBox.SelectedIndex = menuSelectIndexTemp;
                 }
             }
-            else
-            {
-                lbi.MouseEnter += (s, me) =>
-                {
-                    lbi.Background = bac;
-                };
-
-                lbi.MouseLeave += Lbi_MouseLeave;
-                lbi.Selected += Lbi_Selected;
-            }
         }
 
-        #region 设置菜单触发事件
-        private void Lbi_MouseEnter(object sender, MouseEventArgs e)
-        {
-            ListBoxItem lbi = sender as ListBoxItem;
-            lbi.Background = Brushes.Transparent;
-        }
-
-        private void Lbi_Unselected(object sender, RoutedEventArgs e)
-        {
-            //添加Leave效果
-            ListBoxItem lbi = sender as ListBoxItem;
-            lbi.Background = Brushes.Transparent;
-            lbi.MouseLeave += Lbi_MouseLeave;
-        }
-
-        private void Lbi_Selected(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                ListBoxItem lbi = sender as ListBoxItem;
-
-                SolidColorBrush fontColor = new SolidColorBrush(Colors.Black);
-
-                lbi.MouseLeave -= Lbi_MouseLeave;
-                lbi.Background = bac;
-                lbi.Foreground = fontColor;
-            }
-            catch { }
-
-        }
-
-        private void Lbi_MouseLeave(object sender, MouseEventArgs e)
-        {
-            ListBoxItem lbi = sender as ListBoxItem;
-            lbi.Background = Brushes.Transparent;
-        }
-        #endregion
-
         /// <summary>
         /// 新建菜单
         /// </summary>
@@ -197,87 +100,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
         {
             MenuInfo info = new MenuInfo() { MenuEdit = Visibility.Collapsed, MenuId = System.Guid.NewGuid().ToString(), MenuName = "NewMenu" };
             appData.MenuList.Add(info);
+            MenuListBox.Items.Refresh();
             MenuListBox.SelectedIndex = appData.MenuList.Count - 1;
             appData.AppConfig.SelectedMenuIndex = MenuListBox.SelectedIndex;
             appData.AppConfig.SelectedMenuIcons = info.IconList;
-            //首次触发不了Selected事件
-            object obj = MenuListBox.ItemContainerGenerator.ContainerFromIndex(MenuListBox.SelectedIndex);
-            SetListBoxItemEvent((ListBoxItem)obj);
-            Lbi_Selected(obj, null);
         }
 
-        /// <summary>
-        /// 创建实时文件菜单
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void CreateLinkMenu(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                CommonOpenFileDialog dialog = new CommonOpenFileDialog
-                {
-                    IsFolderPicker = true,
-                    Title = "选择关联文件夹"
-                };
-                if (dialog.ShowDialog() == CommonFileDialogResult.Ok)
-                {
-                    string menuId = System.Guid.NewGuid().ToString();
-                       
-                    string path = dialog.FileName;
-
-                    MenuInfo menuInfo = new MenuInfo
-                    {
-                        MenuName = Path.GetFileNameWithoutExtension(path),
-                        MenuId = menuId,
-                        MenuType = MenuType.LINK,
-                        LinkPath = path,
-                        IsEncrypt = false,
-                    };
-
-                    appData.MenuList.Add(menuInfo);
-
-                    MenuListBox.SelectedIndex = appData.MenuList.Count - 1;
-                    appData.AppConfig.SelectedMenuIndex = MenuListBox.SelectedIndex;
-                    appData.AppConfig.SelectedMenuIcons = menuInfo.IconList;
-                    //首次触发不了Selected事件
-                    object obj = MenuListBox.ItemContainerGenerator.ContainerFromIndex(MenuListBox.SelectedIndex);
-                    SetListBoxItemEvent((ListBoxItem)obj);
-                    Lbi_Selected(obj, null);
-                    HandyControl.Controls.Growl.Success("菜单关联成功, 加载列表中, 稍后重新进入此菜单可查看列表!", "MainWindowGrowl");
-                    FileWatcher.LinkMenuWatcher(menuInfo);
-
-                    new Thread(() =>
-                    {
-                        DirectoryInfo dirInfo = new DirectoryInfo(menuInfo.LinkPath);
-                        FileSystemInfo[] fileInfos = dirInfo.GetFileSystemInfos();
-
-                        ObservableCollection<IconInfo> iconList = new ObservableCollection<IconInfo>();
-                        foreach (FileSystemInfo fileInfo in fileInfos)
-                        {
-                            IconInfo iconInfo = CommonCode.GetIconInfoByPath_NoWrite(fileInfo.FullName);
-                            iconList.Add(iconInfo);
-                        }
-                        this.Dispatcher.Invoke(() =>
-                        {
-                            menuInfo.IconList = iconList;
-                            //foreach (IconInfo iconInfo in iconList)
-                            //{
-                            //    menuInfo.IconList = iconList;
-                            //}
-                        });
-                    }).Start();
-
-                }
-            }
-            catch (Exception ex)
-            {
-                LogUtil.WriteErrorLog(ex, "新建关联菜单失败!");
-                HandyControl.Controls.Growl.WarningGlobal("新建关联菜单失败!");
-            }
-        }
-
-
         /// <summary>
         /// 重命名菜单 将textbox 设置为可见
         /// </summary>
@@ -285,7 +113,6 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void RenameMenu(object sender, RoutedEventArgs e)
         {
-            RunTimeStatus.IS_MENU_EDIT = true;
             MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
             menuInfo.MenuEdit = (int)Visibility.Visible;
         }
@@ -297,39 +124,19 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void DeleteMenu(object sender, RoutedEventArgs e)
         {
-
             MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
-            if (menuInfo.IconList != null && menuInfo.IconList.Count > 0)
-            {
-                HandyControl.Controls.Growl.Ask("确认删除此菜单吗?", isConfirmed =>
-                {
-                    if (isConfirmed)
-                    {
-                        DeleteMenu(menuInfo);
-                    }
-                    return true;
-                }, "MainWindowAskGrowl");
-            } else
-            {
-                DeleteMenu(menuInfo);
-            }
-        }
-
-        private void DeleteMenu(MenuInfo menuInfo)
-        {
             if (appData.MenuList.Count == 1)
             {
                 //如果删除以后没有菜单的话 先创建一个
                 CreateMenu(null, null);
             }
             int index = appData.MenuList.IndexOf(menuInfo);
-            if (index == 0)
+            if(index == 0)
             {
                 index = 0;
-            }
-            else
+            } else
             {
-                index--;
+                index = index - 1;
             }
 
             appData.MenuList.Remove(menuInfo);
@@ -346,7 +153,6 @@ 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))
             {
@@ -355,29 +161,18 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 {
                     menuBox = ((TextBox)sender);
                 }
-                else
-                {
-                    done = false;
-                }
             }
             else if (e.GetType() == typeof(RoutedEventArgs))
             {
                 menuBox = ((TextBox)sender);
             }
 
-            if (done)
+            if (menuBox != null)
             {
-                if (menuBox != null)
-                {
-                    MenuInfo menuInfo = menuBox.Tag as MenuInfo;
-                    string text = menuBox.Text;
-                    menuInfo.MenuName = text;
-                    menuInfo.MenuEdit = Visibility.Collapsed;
-                }
-                RunTimeStatus.IS_MENU_EDIT = false;
-                //为了解决无法修改菜单的问题
-                MainWindow.mainWindow.SearchBox.Focus();
-                MenuListBox.SelectedIndex = menuSelectIndexTemp;
+                MenuInfo menuInfo = menuBox.Tag as MenuInfo;
+                string text = menuBox.Text;
+                menuInfo.MenuName = text;
+                menuInfo.MenuEdit = Visibility.Collapsed;
             }
         }
 
@@ -389,7 +184,6 @@ 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);
@@ -408,323 +202,18 @@ namespace GeekDesk.Control.UserControls.PannelCard
             IconfontWindow.Show(SvgToGeometry.GetIconfonts(), menuInfo);
         }
 
-        private void Menu_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void menus_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (RunTimeStatus.IS_MENU_EDIT) return;
-
-            if (appData.AppConfig.ItemSpradeAnimation)
-            {
-                //是否启用列表展开动画
-                MainWindow.mainWindow.RightCard.WrapUFG.Visibility = Visibility.Collapsed;
-            }
-
+            appData.AppConfig.SelectedMenuIcons = null;
             //设置对应菜单的图标列表
             if (MenuListBox.SelectedIndex == -1)
             {
-                //appData.AppConfig.SelectedMenuIcons = appData.MenuList[appData.MenuList.Count - 1].IconList;
+                appData.AppConfig.SelectedMenuIcons = appData.MenuList[appData.MenuList.Count - 1].IconList;
             }
             else
             {
-                if (appData.MenuList[MenuListBox.SelectedIndex].IsEncrypt)
-                {
-                    appData.AppConfig.SelectedMenuIcons = null;
-                    RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
-                    MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入密码";
-                    MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.INPUT;
-                    MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
-                }
-                else
-                {
-                    MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Collapsed;
-                    appData.AppConfig.SelectedMenuIcons = appData.MenuList[MenuListBox.SelectedIndex].IconList;
-                }
-            }
-            MainWindow.mainWindow.RightCard.WrapUFG.Visibility = Visibility.Visible;
-            //App.DoEvents();
-        }
-
-
-        /// <summary>
-        /// 鼠标悬停切换菜单
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Menu_MouseEnter(object sender, MouseEventArgs e)
-        {
-            if (appData.AppConfig.HoverMenu && !RunTimeStatus.IS_MENU_EDIT)
-            {
-                Thread t = 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;
-                        }
-                    });
-                });
-                t.IsBackground = true;
-                t.Start();
+                appData.AppConfig.SelectedMenuIcons = appData.MenuList[MenuListBox.SelectedIndex].IconList;
             }
         }
-
-        /// <summary>
-        /// 点击菜单后  隐藏搜索框
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ListBoxItem_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (RunTimeStatus.SEARCH_BOX_SHOW)
-            {
-                MainWindow.mainWindow.HidedSearchBox();
-            }
-
-            ListBoxItem lbi = sender as ListBoxItem;
-            MenuInfo mi = lbi.DataContext as MenuInfo;
-            int index = MenuListBox.Items.IndexOf(mi);
-            MenuListBox.SelectedIndex = index;
-        }
-
-
-        ///// <summary>
-        ///// 点击菜单后  隐藏搜索框
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void ListBoxItemPanel_MouseDown(object sender, MouseButtonEventArgs e)
-        //{
-        //    if (RunTimeStatus.SEARCH_BOX_SHOW)
-        //    {
-        //        MainWindow.mainWindow.HidedSearchBox();
-        //    }
-        //    MenuInfo mi = (sender as StackPanel).Tag as MenuInfo;
-        //    int index = MenuListBox.Items.IndexOf(mi);
-        //    MenuListBox.SelectedIndex = index;
-        //}
-
-
-        /// <summary>
-        /// 隐藏搜索框
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MyCard_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (RunTimeStatus.SEARCH_BOX_SHOW)
-            {
-                MainWindow.mainWindow.HidedSearchBox();
-            }
-        }
-
-        private void Menu_MouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            if (RunTimeStatus.IS_MENU_EDIT) return;
-
-            ScrollViewer scrollViewer = ScrollUtil.FindSimpleVisualChild<ScrollViewer>(MenuListBox);
-            if (e.Delta < 0)
-            {
-                //判断是否到了最底部
-                if (ScrollUtil.IsBootomScrollView(scrollViewer))
-                {
-                    int index = MenuListBox.SelectedIndex;
-                    if (index < MenuListBox.Items.Count - 1)
-                    {
-                        index++;
-                    }
-                    else
-                    {
-                        index = 0;
-                    }
-                    MenuListBox.SelectedIndex = index;
-                }
-            }
-            else if (e.Delta > 0)
-            {
-                if (ScrollUtil.IsTopScrollView(scrollViewer))
-                {
-                    int index = MenuListBox.SelectedIndex;
-                    if (index > 0)
-                    {
-                        index--;
-                    }
-                    else
-                    {
-                        index = MenuListBox.Items.Count - 1;
-                    }
-                    MenuListBox.SelectedIndex = index;
-                }
-            }
-
-            //滚动到选中项
-            MenuListBox.ScrollIntoView(MenuListBox.SelectedItem);
-
-        }
-
-
-        private void Menu_PreviewDragLeave(object sender, DragEventArgs e)
-        {
-            MyPoptip.IsOpen = false;
-        }
-
-        private void Menu_PreviewDragEnter(object sender, DragEventArgs e)
-        {
-            MenuInfo mi = (sender as ListBoxItem).DataContext as MenuInfo;
-            MyPoptipContent.Text = "移动至:" + mi.MenuName;
-            MyPoptip.VerticalOffset = 30;
-            MyPoptip.IsOpen = true;
-        }
-
-        private void Menu_MouseLeave(object sender, MouseEventArgs e)
-        {
-            MyPoptip.IsOpen = false;
-        }
-
-        /// <summary>
-        /// 拖动移动图标到指定菜单
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Menu_Drop(object sender, DragEventArgs e)
-        {
-            MyPoptip.IsOpen = false;
-
-            MenuInfo mi = (sender as ListBoxItem).DataContext as MenuInfo;
-            IconInfo iconInfo = (IconInfo)e.Data.GetData(typeof(IconInfo));
-            if (iconInfo != null)
-            {
-                // 将已有图标移动到该菜单
-                appData.MenuList[MenuListBox.SelectedIndex].IconList.Remove(iconInfo);
-                appData.MenuList[MenuListBox.Items.IndexOf(mi)].IconList.Add(iconInfo);
-
-            }
-            else
-            {
-                // 直接将新图标移动到该菜单
-                Array dropObject = (System.Array)e.Data.GetData(DataFormats.FileDrop);
-                if (dropObject == null) return;
-                foreach (object obj in dropObject)
-                {
-                    string path = (string)obj;
-                    iconInfo = CommonCode.GetIconInfoByPath(path);
-                    if (iconInfo == null)
-                    {
-                        LogUtil.WriteErrorLog("添加项目失败，未能获取到项目图标:" + path);
-                        break;
-
-                    }
-                    appData.MenuList[MenuListBox.Items.IndexOf(mi)].IconList.Add(iconInfo);
-                }
-                CommonCode.SortIconList();
-                CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
-            }
-        }
-
-        private void EncryptMenu(object sender, RoutedEventArgs e)
-        {
-            MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
-            if (menuInfo.IsEncrypt)
-            {
-                MainWindow.mainWindow.RightCard.PDDialog.menuInfo = menuInfo;
-                MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入密码";
-                MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.CANCEL;
-                RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
-                MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
-                //单独设置焦点
-                MainWindow.mainWindow.RightCard.PDDialog.SetFocus();
-            }
-            else
-            {
-                if (string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
-                {
-                    MainWindow.mainWindow.RightCard.PDDialog.menuInfo = menuInfo;
-                    MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "设置新密码";
-                    MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.CREATE;
-                    RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
-                    MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
-                }
-                else
-                {
-                    menuInfo.IsEncrypt = true;
-                    HandyControl.Controls.Growl.Success(menuInfo.MenuName + " 已加密!", "MainWindowGrowl");
-                }
-            }
-        }
-
-        private void AlterPassword(object sender, RoutedEventArgs e)
-        {
-            MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入旧密码";
-            MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.ALTER;
-            MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
-            //单独设置焦点
-            MainWindow.mainWindow.RightCard.PDDialog.SetFocus();
-        }
-
-        /// <summary>
-        /// 右键点击进行处理 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MyCard_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            RunTimeStatus.SHOW_RIGHT_BTN_MENU = true;
-            new Thread(() =>
-            {
-                Thread.Sleep(50);
-                RunTimeStatus.SHOW_RIGHT_BTN_MENU = false;
-            }).Start();
-
-            //在没有设置密码的情况下不弹出修改密码菜单
-            if (string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
-            {
-                AlterPW1.Visibility = Visibility.Collapsed;
-            }
-            else
-            {
-                AlterPW1.Visibility = Visibility.Visible;
-            }
-        }
-
-        private void ListBoxItem_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            ListBoxItem lbi = sender as ListBoxItem;
-            MenuInfo info = lbi.DataContext as MenuInfo;
-
-            ItemCollection ics = lbi.ContextMenu.Items;
-
-            foreach (object obj in ics)
-            {
-                MenuItem mi = (MenuItem)obj;
-                if (mi.Header.Equals("修改密码"))
-                {
-                    if (string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
-                    {
-                        mi.Visibility = Visibility.Collapsed;
-                    }
-                    else
-                    {
-                        mi.Visibility = Visibility.Visible;
-                    }
-                    break;
-                }
-                if (mi.Header.Equals("加密此列表") || mi.Header.Equals("取消加密此列表"))
-                {
-                    if (info.IsEncrypt)
-                    {
-                        mi.Header = "取消加密此列表";
-                    }
-                    else
-                    {
-                        mi.Header = "加密此列表";
-                    }
-                }
-            }
-
-        }
-
-        
     }
 }

Control/UserControls/PannelCard/RightCardControl.xaml

@@ -3,37 +3,20 @@
              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:temp="clr-namespace:GeekDesk.ViewModel.Temp"
+             xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
-              xmlns:cst="clr-namespace:GeekDesk.Constant"
              xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
-             xmlns:component="clr-namespace:GeekDesk.CustomComponent.VirtualizingWrapPanel"
-             xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
-             xmlns:ot="clr-namespace:GeekDesk.Control.Other" 
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
-             AllowDrop="True"
              >
     <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="ImageStyleNoWrite" 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_NoWrite}"/>
-        </Style>
         <Style x:Key="MyListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
             <Setter Property="FocusVisualStyle" Value="{x:Null}" />
             <Setter Property="Template">
@@ -47,262 +30,100 @@
             </Setter>
         </Style>
 
-        <Style x:Key="SearchListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
-            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border>
-                            <Border.Style>
-                                <Style TargetType="Border">
-                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                </Style>
-                            </Border.Style>
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="MyPoptipStyle" TargetType="Border">
-            <Setter Property="HorizontalAlignment" Value="Center"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Background" Value="White"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-            <Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
-            <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
-            <!--<Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="hc:Poptip">
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-                            <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>-->
-        </Style>
-
-        <Storyboard x:Key="Custom1Transition1" x:Shared="False">
-            <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-                <DoubleAnimation.EasingFunction>
-                    <ElasticEase Oscillations="1"/>
-                </DoubleAnimation.EasingFunction>
-            </DoubleAnimation>
-        </Storyboard>
-        <Storyboard x:Key="Custom2Transition2" x:Shared="False">
-            <DoubleAnimation From="10" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
-                <DoubleAnimation.EasingFunction>
-                    <ElasticEase Oscillations="1"/>
-                </DoubleAnimation.EasingFunction>
-            </DoubleAnimation>
-        </Storyboard>
-
-        <Storyboard x:Key="Custom3Transition3" x:Shared="False">
-            <DoubleAnimation From=".8" To="1" Duration="0:0:0.4">
-                <DoubleAnimation.EasingFunction>
-                    <ElasticEase Oscillations="1"/>
-                </DoubleAnimation.EasingFunction>
-            </DoubleAnimation>
-        </Storyboard>
-
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
-        <cvt:GetWidthByWWConvert x:Key="GetWidthByWWConvert"/>
-        <temp:SearchIconList x:Key="SearchIconList"/>
     </UserControl.Resources>
     <!--右侧栏-->
-    <Grid>
-        <Popup Name="MyPoptip" FlowDirection="LeftToRight" 
-               PopupAnimation="None" Placement="Mouse"
-               IsOpen="False"
-               AllowsTransparency="True"
-               >
-            <Grid Background="Transparent">
-                <Border Style="{StaticResource MyPoptipStyle}">
-                    <TextBlock Name="MyPoptipContent" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Left" Text="Test" FontSize="13"/>
-                </Border>
-            </Grid>
-        </Popup>
+    <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"/>
+                <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
+            </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}" 
+                                 BorderThickness="0"
+                                Padding="0,10,0,0"
+                                 >
+                <ListBox.Background>
+                    <SolidColorBrush Opacity="0"/>
+                </ListBox.Background>
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <DraggAnimatedPanel:DraggAnimatedPanel Background="#00FFFFFF"
+                                                               ItemsWidth="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"
+                                                               ItemsHeight="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}"
+                                                               HorizontalAlignment="Center" 
+                                                               SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
 
-        <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"
-                 PreviewMouseRightButtonDown="WrapCard_PreviewMouseRightButtonDown"
-                 hc:Dialog.Token="RightWrapCardDialog"
-                 MouseWheel="IconListBox_MouseWheel"
-                 >
-            <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"/>
-                    <MenuItem x:Name="CardLockCM" Header="锁定主面板" Click="LockAppPanel"/>
-                </ContextMenu>
-            </hc:Card.ContextMenu>
-            <hc:DialogContainer>
-                <Grid>
-                    <ot:PasswordDialog xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=Visibility, Duration=50, Delay=0}"
-                                       x:Name="PDDialog"
-                                       Visibility="Collapsed"
-                                       Panel.ZIndex="99"
-                                       IsVisibleChanged="PDDialog_IsVisibleChanged"
-                                       Margin="0,-100,0,0"/>
-                    <StackPanel Panel.ZIndex="1" Margin="0,-10,-0,0"/>
+                <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>
 
-                    <WrapPanel Orientation="Horizontal" 
-                               Margin="10"
-                            >
-                        <UniformGrid x:Name="WrapUFG" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=Visibility}">
-                            <!--<hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom3Transition3}">-->
-                            <ListBox x:Name="IconListBox" 
-                                     ItemsSource="{Binding AppConfig.SelectedMenuIcons, Mode=OneWay}" 
-                                     BorderThickness="0"
-                                     Padding="0,10,0,0"
-                                     ScrollViewer.CanContentScroll ="True"
-                                     VirtualizingPanel.VirtualizationMode="Recycling"  
-                                     VirtualizingPanel.IsVirtualizing="True" 
-                                     VirtualizingPanel.IsContainerVirtualizable="True"
-                                     VirtualizingPanel.ScrollUnit="Pixel"
-                                     >
-                                <ListBox.Template>
-                                    <ControlTemplate TargetType="ListBox">
-                                        <hc:ScrollViewer x:Name="WrapScroll"
-                                                         HorizontalScrollBarVisibility="Hidden" 
-                                                         VerticalScrollBarVisibility="Auto" 
-                                                         IsInertiaEnabled="True"
-                                                         CanContentScroll="True"
-                                                         PreviewMouseWheel="IconListBox_MouseWheel"
-                                                         >
-                                            <Border BorderBrush="{TemplateBinding BorderBrush}" 
-                                                    BorderThickness="{TemplateBinding BorderBrush}"
-                                                    
-                                                    >
-                                                <ItemsPresenter/>
-                                            </Border>
-                                        </hc:ScrollViewer>
-                                    </ControlTemplate>
-                                </ListBox.Template>
-                                <ListBox.Background>
-                                    <SolidColorBrush Color="#00FFFFFF"  />
-                                </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}}}"/>-->
+                <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}"-->
 
-                                        <component:VirtualizingWrapPanel VirtualizationMode="Recycling"  
-                                                                    IsVirtualizing="True" 
-                                                                    IsContainerVirtualizable="True"
-                                                                    VirtualizingPanel.ScrollUnit="Pixel"
-                                                Width="{Binding AppConfig.WindowWidth, Mode=OneWay, 
-                                                Converter={StaticResource GetWidthByWWConvert}, 
-                                                ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD_70}}"
-                                                />
-                                    </ItemsPanelTemplate>
-                                </ListBox.ItemsPanel>
-
-                                <ListBox.Resources>
-                                    <ContextMenu x:Key="IconDialog" Width="200">
-                                        <MenuItem Header="管理员方式运行" Click="IconAdminStart" Tag="{Binding}"/>
-                                        <MenuItem Header="打开文件所在位置" Click="ShowInExplore" Tag="{Binding}"/>
-                                        <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
-                                        <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
-                                        <MenuItem Header="资源管理器菜单" Click="SystemContextMenu" Tag="{Binding}"/>
-                                        <MenuItem Header="属性" Click="PropertyConfig" Tag="{Binding}"/>
-                                        <MenuItem Header="从列表移除" Click="RemoveIcon" Tag="{Binding}"/>
-                                    </ContextMenu>
-                                </ListBox.Resources>
-
-                                <ListBox.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"
-                                                                 Background="#00FFFFFF"
-                                                                 MouseEnter="MenuIcon_MouseEnter"
-                                                                 MouseLeave="MenuIcon_MouseLeave"
-                                                                 MouseMove="MenuIcon_MouseMove"        
-                                                                 MouseLeftButtonDown="Icon_MouseLeftButtonDown"
-                                                                 MouseLeftButtonUp="Icon_MouseLeftButtonUp"
-                                                                 >
-                                            <!--<StackPanel Background="#00FFFFFF"
-                                            MouseEnter="CursorPanel_MouseEnter"
-                                            MouseLeave="CursorPanel_MouseLeave"
-                                            Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageWidth, Mode=OneWay}">-->
-                                            <Image Style="{StaticResource ImageStyle}"  
-                                                RenderOptions.BitmapScalingMode="HighQuality"/>
-                                            <TextBlock MaxWidth="80"
-                                                    Margin="0,5,0,0"
-                                                    MaxHeight="40"
-                                                    FontSize="13"
-                                                    TextWrapping="Wrap" 
-                                                    TextTrimming="WordEllipsis"
-                                                    TextAlignment="Center" 
-                                                    VerticalAlignment="Center" 
-                                                    Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
-                                                    Text="{Binding Name}"/>
-                                            <!--</StackPanel>-->
-
-                                        </hc:SimpleStackPanel>
-                                    </DataTemplate>
-                                </ListBox.ItemTemplate>
-                            </ListBox>
-                            <!--</hc:TransitioningContentControl>-->
-                        </UniformGrid>
-                    </WrapPanel>
-
-                </Grid>
-            </hc:DialogContainer>
-        </hc:Card>
-
-
-        <hc:Card x:Name="VerticalCard"
-                 Visibility="Collapsed"
-                 BorderThickness="1" 
-                 Effect="{DynamicResource EffectShadow2}" 
-                 Margin="5,0,5,5" Grid.ColumnSpan="2"
-                 MouseLeftButtonDown="VerticalCard_MouseLeftButtonDown"
-                >
-            <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>
-            <hc:LoadingCircle x:Name="Loading_RightCard" 
-                              Width="45" Height="45" 
-                              DotBorderBrush="White"
-                              DotBorderThickness="2"
-                              Foreground="DarkGray"
-                              Opacity="0.8"
-                              DotDiameter="10"
-                              Margin="-50,-150,0,0"
-                              Visibility="Collapsed"
-                              />
-    </Grid>
+                <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"
+                                        MouseLeftButtonDown="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>
 </UserControl>

Control/UserControls/PannelCard/RightCardControl.xaml.cs

@@ -2,23 +2,20 @@
 using GeekDesk.Constant;
 using GeekDesk.Control.Other;
 using GeekDesk.Control.Windows;
-using GeekDesk.Plugins.EveryThing;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using GeekDesk.ViewModel.Temp;
 using HandyControl.Controls;
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
-using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Media.Animation;
-using System.Windows.Threading;
+using System.Windows.Media.Imaging;
 
 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -29,95 +26,39 @@ namespace GeekDesk.Control.UserControls.PannelCard
     {
         private AppData appData = MainWindow.appData;
 
-        ListBoxDragDropManager<IconInfo> dragMgr;
-
-        //private Thread dropCheckThread = null;
-
         public RightCardControl()
         {
             InitializeComponent();
-            this.Loaded += RightCardControl_Loaded;
-
-        }
-
-        private void RightCardControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            this.dragMgr = new ListBoxDragDropManager<IconInfo>(this.IconListBox);
         }
 
 
-        //#region 图标拖动
-        //DelegateCommand<int[]> _swap;
-        //public DelegateCommand<int[]> SwapCommand
-        //{
-        //    get
-        //    {
-        //        if (_swap == null)
-        //            _swap = new DelegateCommand<int[]>(
-        //                (indexes) =>
-        //                {
-        //                    DROP_ICON = true;
-        //                    if (appData.AppConfig.IconSortType != SortType.CUSTOM
-        //                    && (dropCheckThread == null || !dropCheckThread.IsAlive))
-        //                    {
-        //                        dropCheckThread = new Thread(() =>
-        //                        {
-        //                            do
-        //                            {
-        //                                DROP_ICON = false;
-        //                                Thread.Sleep(1000);
-        //                            } while (DROP_ICON);
-
-        //                            MainWindow.appData.AppConfig.IconSortType = SortType.CUSTOM;
-        //                            App.Current.Dispatcher.Invoke(() =>
-        //                            {
-        //                                if (MainWindow.mainWindow.Visibility == Visibility.Collapsed
-        //                                || MainWindow.mainWindow.Opacity != 1)
-        //                                {
-        //                                    Growl.WarningGlobal("已将图标排序规则重置为自定义!");
-        //                                }
-        //                                else
-        //                                {
-        //                                    Growl.Warning("已将图标排序规则重置为自定义!", "MainWindowGrowl");
-        //                                }
-        //                            });
-        //                        });
-        //                        dropCheckThread.Start();
-        //                    }
-        //                    int fromS = indexes[0];
-        //                    int to = indexes[1];
-        //                    ObservableCollection<IconInfo> iconList = appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList;
-        //                    var elementSource = iconList[to];
-        //                    var dragged = iconList[fromS];
-
-        //                    iconList.Remove(dragged);
-        //                    iconList.Insert(to, dragged);
-        //                }
-        //            );
-        //        return _swap;
-        //    }
-        //}
-
-        //#endregion 图标拖动
-
-
-
-
-        private void Icon_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        #region 图标拖动
+        DelegateCommand<int[]> _swap;
+        public DelegateCommand<int[]> SwapCommand
         {
-            if (appData.AppConfig.DoubleOpen)
+            get
             {
-                IconClick(sender, e);
+                if (_swap == null)
+                    _swap = new DelegateCommand<int[]>(
+                        (indexes) =>
+                        {
+                            int fromS = indexes[0];
+                            int to = indexes[1];
+                            ObservableCollection<IconInfo> iconList = appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList;
+                            var elementSource = iconList[to];
+                            var dragged = iconList[fromS];
+
+                            iconList.Remove(dragged);
+                            iconList.Insert(to, dragged);
+                        }
+                    );
+                return _swap;
             }
         }
 
-        private void Icon_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            if (!appData.AppConfig.DoubleOpen)
-            {
-                IconClick(sender, e);
-            }
-        }
+        #endregion 图标拖动
+
+
 
         /// <summary>
         /// 图标点击事件
@@ -126,33 +67,30 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void IconClick(object sender, MouseButtonEventArgs e)
         {
-            if (!RunTimeStatus.SEARCH_BOX_HIDED_300) return;
-
             if (appData.AppConfig.DoubleOpen && e.ClickCount >= 2)
             {
-                IconInfo icon = (IconInfo)((Panel)sender).Tag;
+                IconInfo icon = (IconInfo)((SimpleStackPanel)sender).Tag;
                 if (icon.AdminStartUp)
                 {
-                    ProcessUtil.StartIconApp(icon, IconStartType.ADMIN_STARTUP);
+                    StartIconApp(icon, IconStartType.ADMIN_STARTUP);
                 }
                 else
                 {
-                    ProcessUtil.StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
+                    StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
                 }
-            }
-            else if (!appData.AppConfig.DoubleOpen && e.ClickCount == 1)
+            } else if (!appData.AppConfig.DoubleOpen && e.ClickCount == 1)
             {
-                IconInfo icon = (IconInfo)((Panel)sender).Tag;
+                IconInfo icon = (IconInfo)((SimpleStackPanel)sender).Tag;
                 if (icon.AdminStartUp)
                 {
-                    ProcessUtil.StartIconApp(icon, IconStartType.ADMIN_STARTUP);
+                    StartIconApp(icon, IconStartType.ADMIN_STARTUP);
                 }
                 else
                 {
-                    ProcessUtil.StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
+                    StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
                 }
             }
-
+            
         }
 
         /// <summary>
@@ -163,7 +101,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
         private void IconAdminStart(object sender, RoutedEventArgs e)
         {
             IconInfo icon = (IconInfo)((MenuItem)sender).Tag;
-            ProcessUtil.StartIconApp(icon, IconStartType.ADMIN_STARTUP);
+            StartIconApp(icon, IconStartType.ADMIN_STARTUP);
         }
 
         /// <summary>
@@ -174,7 +112,182 @@ namespace GeekDesk.Control.UserControls.PannelCard
         private void ShowInExplore(object sender, RoutedEventArgs e)
         {
             IconInfo icon = (IconInfo)((MenuItem)sender).Tag;
-            ProcessUtil.StartIconApp(icon, IconStartType.SHOW_IN_EXPLORE);
+            StartIconApp(icon, IconStartType.SHOW_IN_EXPLORE);
+        }
+
+        private void StartIconApp(IconInfo icon, IconStartType type)
+        {
+            try
+            {
+                Process p = new Process();
+
+                string startArg = icon.StartArg;
+                
+                if (startArg!=null && Constants.SYSTEM_ICONS.ContainsKey(startArg))
+                {
+                    StartSystemApp(startArg, type);
+                } else
+                {
+                    p.StartInfo.FileName = icon.Path;
+                    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 = false;//不使用操作系统外壳程序启动进程
+                                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 (!MarginHide.IS_HIDE)
+                                {
+                                    MainWindow.HideApp();
+                                }
+                            }
+                            else
+                            {
+                                MainWindow.HideApp();
+                            }
+                        }
+                    }
+                    p.Start();
+                }
+                
+                icon.Count++;
+            }
+            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)
+                    {
+                        Process process = new Process();
+                        process.StartInfo.FileName = "cmd.exe";
+                        process.StartInfo.Verb = "runas";
+                        process.Start();
+                    } else
+                    {
+                        Process.Start("cmd");
+                    }
+                    break;
+            }
+            //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
+            if (appData.AppConfig.MarginHide)
+            {
+                if (!MarginHide.IS_HIDE)
+                {
+                    MainWindow.HideApp();
+                }
+            }
+            else
+            {
+                MainWindow.HideApp();
+            }
         }
 
         /// <summary>
@@ -191,9 +304,8 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 string path = (string)obj;
                 IconInfo iconInfo = CommonCode.GetIconInfoByPath(path);
                 MainWindow.appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList.Add(iconInfo);
+                CommonCode.SaveAppData(MainWindow.appData);
             }
-            CommonCode.SortIconList();
-            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
         }
 
         /// <summary>
@@ -230,64 +342,28 @@ namespace GeekDesk.Control.UserControls.PannelCard
             {
                 case IconType.URL:
                     IconInfoUrlDialog urlDialog = new IconInfoUrlDialog(info);
-                    urlDialog.dialog = HandyControl.Controls.Dialog.Show(urlDialog, "MainWindowDialog");
+                    urlDialog.dialog = HandyControl.Controls.Dialog.Show(urlDialog, "IconInfoDialog");
                     break;
                 default:
                     IconInfoDialog dialog = new IconInfoDialog(info);
-                    dialog.dialog = HandyControl.Controls.Dialog.Show(dialog, "MainWindowDialog");
+                    dialog.dialog = HandyControl.Controls.Dialog.Show(dialog, "IconInfoDialog");
                     break;
             }
         }
 
-        private void MenuIcon_MouseEnter(object sender, MouseEventArgs e)
+        private void StackPanel_MouseEnter(object sender, MouseEventArgs e)
         {
-            RunTimeStatus.MOUSE_ENTER_ICON = true;
-            if (!RunTimeStatus.ICONLIST_MOUSE_WHEEL)
-            {
-                ThreadPool.QueueUserWorkItem(state =>
-                {
-                    this.Dispatcher.BeginInvoke(new Action(() =>
-                    {
-                        IconInfo info = (sender as Panel).Tag as IconInfo;
-                        MyPoptipContent.Text = info.Content;
-                        MyPoptip.VerticalOffset = 30;
-                        Thread.Sleep(50);
-                        if (!RunTimeStatus.ICONLIST_MOUSE_WHEEL)
-                        {
-                            MyPoptip.IsOpen = true;
-                        }
-                    }));
-                });
-            }
-
-
 
             double width = appData.AppConfig.ImageWidth;
             double height = appData.AppConfig.ImageHeight;
             width += width * 0.15;
             height += height * 0.15;
-
-            ThreadPool.QueueUserWorkItem(state =>
-            {
-                this.Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    ImgStoryBoard(sender, (int)width, (int)height, 1, true);
-                }));
-            });
+            ImgStoryBoard(sender, (int)width, (int)height, 1, true);
         }
 
-        private void MenuIcon_MouseLeave(object sender, MouseEventArgs e)
+        private void StackPanel_MouseLeave(object sender, MouseEventArgs e)
         {
-            RunTimeStatus.MOUSE_ENTER_ICON = false;
-            MyPoptip.IsOpen = false;
-
-            ThreadPool.QueueUserWorkItem(state =>
-            {
-                this.Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    ImgStoryBoard(sender, appData.AppConfig.ImageWidth, appData.AppConfig.ImageHeight, 260);
-                }));
-            });
+            ImgStoryBoard(sender, appData.AppConfig.ImageWidth, appData.AppConfig.ImageHeight, 220);
         }
 
 
@@ -296,62 +372,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
             if (appData.AppConfig.PMModel) return;
 
-            //int count = 0;
-            //Panel sp = sender as Panel;
-            //Image img = sp.Children[0] as Image;
-
-
-            //int nowH = (int)img.Height;
-
-            //bool isSmall = nowH > height;
-
-            //if (!isSmall)
-            //{
-            //    img.Height = height;
-            //    img.Width = width;
-            //    return;
-            //}
-            //double subLen = (double)Math.Abs(nowH - height) / (double)milliseconds;
-
-            //new Thread(() =>
-            //{
-            //    this.Dispatcher.Invoke(() =>
-            //    {
-            //        while (count < milliseconds)
-            //        {
-            //            if (!isSmall)
-            //            {
-            //                img.Height += subLen;
-            //                img.Width += subLen;
-            //            } else
-            //            {
-            //                //if (img.Height > 1)
-            //                //{
-            //                //    img.Height -= 1;
-            //                //    img.Width -= 1;
-            //                //}
-            //                Application.Current.Dispatcher.Invoke(DispatcherPriority.Background,
-            //                             new Action(delegate {
-            //                                 img.Height -= subLen;
-            //                                 img.Width -= subLen;
-            //                             }));
-            //                //img.Height -= subLen;
-            //                //img.Width -= subLen;
-            //            }
-            //            count++;
-            //            Thread.Sleep(1);
-            //        }
-            //        img.Height = height;
-            //        img.Width = width;
-            //    });
-            //}).Start();
-
-
-
-
             Panel sp = sender as Panel;
 
-            DependencyObject dos = sp.Parent;
+            DependencyObject dos =  sp.Parent;
 
             Image img = sp.Children[0] as Image;
 
@@ -360,16 +383,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,
@@ -404,10 +427,8 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 {
                     ThreadStart ts = new ThreadStart(crs.Remove);
                     System.Threading.Thread t = new System.Threading.Thread(ts);
-                    t.IsBackground = true;
                     t.Start();
-                }
-                else
+                } else
                 {
                     img.BeginAnimation(WidthProperty, null);
                     img.BeginAnimation(HeightProperty, null);
@@ -415,10 +436,10 @@ namespace GeekDesk.Control.UserControls.PannelCard
             };
             img.BeginAnimation(WidthProperty, widthAnimation);
             img.BeginAnimation(HeightProperty, heightAnimation);
-            //###################################################################
+
             //myStoryboard.Completed += (s, e) =>
             //{
-            //    if (checkRmStoryboard)
+            //    if (checkRmStoryboard || true)
             //    {
             //        ThreadStart ts = new ThreadStart(crs.Remove);
             //        System.Threading.Thread t = new System.Threading.Thread(ts);
@@ -478,7 +499,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
         private void AddUrlIcon(object sender, RoutedEventArgs e)
         {
             IconInfoUrlDialog urlDialog = new IconInfoUrlDialog();
-            urlDialog.dialog = HandyControl.Controls.Dialog.Show(urlDialog, "MainWindowDialog");
+            urlDialog.dialog = HandyControl.Controls.Dialog.Show(urlDialog, "IconInfoDialog");
         }
 
         /// <summary>
@@ -490,199 +511,5 @@ namespace GeekDesk.Control.UserControls.PannelCard
         {
             SystemItemWindow.Show();
         }
-
-        public void VisibilitySearchCard(Visibility vb)
-        {
-            VerticalCard.Visibility = vb;
-            if (vb == Visibility.Visible)
-            {
-                WrapCard.Visibility = Visibility.Collapsed;
-            }
-            else
-            {
-                WrapCard.Visibility = Visibility.Visible;
-            }
-        }
-
-        /// <summary>
-        /// 搜索Card点击事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void VerticalCard_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            //隐藏搜索框
-            if (RunTimeStatus.SEARCH_BOX_SHOW)
-            {
-                MainWindow.mainWindow.HidedSearchBox();
-            }
-        }
-
-        /// <summary>
-        /// 设置光标
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void CursorPanel_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.Cursor = Cursors.Hand;
-        }
-
-        /// <summary>
-        /// 设置光标
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void CursorPanel_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.Cursor = Cursors.Arrow;
-        }
-
-        /// <summary>
-        /// 锁定/解锁主面板
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void LockAppPanel(object sender, RoutedEventArgs e)
-        {
-            RunTimeStatus.LOCK_APP_PANEL = !RunTimeStatus.LOCK_APP_PANEL;
-        }
-
-        private void WrapCard_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (RunTimeStatus.LOCK_APP_PANEL)
-            {
-                CardLockCM.Header = "解锁主面板";
-            }
-            else
-            {
-                CardLockCM.Header = "锁定主面板";
-            }
-        }
-
-        
-
-        private void PDDialog_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (PDDialog.Visibility == Visibility.Visible)
-            {
-                RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
-                PDDialog.ClearVal();
-                PDDialog.ErrorMsg.Visibility = Visibility.Collapsed;
-                PDDialog.PasswordGrid.Visibility = Visibility.Visible;
-                PDDialog.HintGrid.Visibility = Visibility.Collapsed;
-                PDDialog.count = 0;
-                PDDialog.SetFocus();
-            }
-            else
-            {
-                RunTimeStatus.SHOW_MENU_PASSWORDBOX = false;
-                PDDialog.ClearVal();
-                MainWindow.mainWindow.Focus();
-            }
-        }
-
-        /// <summary>
-        /// 菜单结果icon 列表鼠标滚轮预处理时间  
-        /// 主要使用自定义popup解决卡顿问题解决卡顿问题
-        /// 以及滚动条首尾切换菜单
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void IconListBox_MouseWheel(object sender, MouseWheelEventArgs e)
-        {
-
-            //控制在滚动时不显示popup 否则会在低GPU性能机器上造成卡顿
-            MyPoptip.IsOpen = false;
-            if (RunTimeStatus.ICONLIST_MOUSE_WHEEL)
-            {
-                RunTimeStatus.MOUSE_WHEEL_WAIT_MS = 500;
-            }
-            else
-            {
-                RunTimeStatus.ICONLIST_MOUSE_WHEEL = true;
-
-                new Thread(() =>
-                {
-                    while (RunTimeStatus.MOUSE_WHEEL_WAIT_MS > 0)
-                    {
-                        Thread.Sleep(1);
-                        RunTimeStatus.MOUSE_WHEEL_WAIT_MS -= 1;
-                    }
-                    if (RunTimeStatus.MOUSE_ENTER_ICON)
-                    {
-                        this.Dispatcher.BeginInvoke(new Action(() =>
-                        {
-                            MyPoptip.IsOpen = true;
-                        }));
-                    }
-                    RunTimeStatus.MOUSE_WHEEL_WAIT_MS = 100;
-                    RunTimeStatus.ICONLIST_MOUSE_WHEEL = false;
-                }).Start();
-            }
-
-            //修改菜单时不切换菜单
-            if (RunTimeStatus.IS_MENU_EDIT) return;
-
-
-            //切换菜单
-            System.Windows.Controls.ScrollViewer scrollViewer = sender as System.Windows.Controls.ScrollViewer;
-            if (scrollViewer == null)
-            {
-                //在card 上获取的事件
-                scrollViewer = ScrollUtil.FindSimpleVisualChild<System.Windows.Controls.ScrollViewer>(IconListBox);
-            }
-            if (e.Delta < 0)
-            {
-                int index = MainWindow.mainWindow.LeftCard.MenuListBox.SelectedIndex;
-                if (ScrollUtil.IsBootomScrollView(scrollViewer))
-                {
-                    if (index < MainWindow.mainWindow.LeftCard.MenuListBox.Items.Count - 1)
-                    {
-                        index++;
-                    }
-                    else
-                    {
-                        index = 0;
-                    }
-                    MainWindow.mainWindow.LeftCard.MenuListBox.SelectedIndex = index;
-                    scrollViewer.ScrollToVerticalOffset(0);
-                }
-            }
-            else if (e.Delta > 0)
-            {
-                if (ScrollUtil.IsTopScrollView(scrollViewer))
-                {
-                    int index = MainWindow.mainWindow.LeftCard.MenuListBox.SelectedIndex;
-                    if (index > 0)
-                    {
-                        index--;
-                    }
-                    else
-                    {
-                        index = MainWindow.mainWindow.LeftCard.MenuListBox.Items.Count - 1;
-                    }
-                    MainWindow.mainWindow.LeftCard.MenuListBox.SelectedIndex = index;
-                    scrollViewer.ScrollToVerticalOffset(0);
-                }
-            }
-
-
-        }
-
-        /// <summary>
-        /// menu结果ICON鼠标移动事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MenuIcon_MouseMove(object sender, MouseEventArgs e)
-        {
-            //防止移动后不刷新popup content
-            IconInfo info = (sender as Panel).Tag as IconInfo;
-            MyPoptipContent.Text = info.Content;
-            MyPoptip.VerticalOffset = 30;
-        }
-
-
     }
 }

Control/UserControls/SystemItem/SystemItem.xaml.cs

@@ -1,8 +1,20 @@
 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
 {
@@ -35,14 +47,13 @@ namespace GeekDesk.Control.UserControls.SystemItem
                 };
                 iconInfo.Content_NoWrite = iconInfo.Name_NoWrite
                     + "\n使用次数:" + iconInfo.Count;
-            }
-            else
+            } else
             {
                 //startupMenu or Store
                 iconInfo = CommonCode.GetIconInfoByPath(thisInfo.LnkPath_NoWrite);
             }
             menuInfo.IconList.Add(iconInfo);
-            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+            CommonCode.SaveAppData(MainWindow.appData);
         }
     }
 }

Control/UserControls/ToDo/TodoControl.xaml

@@ -8,55 +8,23 @@
              mc:Ignorable="d" 
              Background="Transparent"
              >
-
-    <UserControl.Resources>
-        <!--<cst:Count2VisibleConvert x:Key="Count2VisibleConvert"/>
-        <cst:CountGreZero2BoolConvert x:Key="CountGreZero2BoolConvert"/>
-        <Style x:Key="NoDataStyle" TargetType="TextBlock">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="False">
-                    <Setter Property="Visibility" Value="Visible"/>
-                </DataTrigger>
-                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="True">
-                    <Setter Property="Visibility" Value="Collapsed"/>
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>
-        <Style x:Key="ToDoStyle" TargetType="DataGrid">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="True">
-                    <Setter Property="Visibility" Value="Visible"/>
-                </DataTrigger>
-                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="False">
-                    <Setter Property="Visibility" Value="Collapsed"/>
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>-->
-    </UserControl.Resources>
-    <hc:SimplePanel Margin="20" Background="Transparent">
+    
+   <hc:SimplePanel Margin="20" Background="Transparent">
         <Grid Background="Transparent">
-            <TextBlock x:Name="IsNewToDo" Visibility="Collapsed" />
-            <TextBlock x:Name="NoData" 
-                       VerticalAlignment="Center" 
-                       HorizontalAlignment="Center"
-                       TextAlignment="Center"
-                       Text="暂无数据!"
-                       />
-
             <DataGrid x:Name="BacklogList" 
-                      HeadersVisibility="All"  
-                      AutoGenerateColumns="False" 
-                      ItemsSource="{Binding}"
-                      IsReadOnly="True"
-                      Initialized="DataGridMenu_Initialized"
-                      >
+                  HeadersVisibility="All"  
+                  AutoGenerateColumns="False" 
+                  ItemsSource="{Binding}"
+                  IsReadOnly="True"
+                  Initialized="DataGridMenu_Initialized"
+                  >
                 <DataGrid.ContextMenu>
                     <ContextMenu x:Name="Menu" Width="120">
                         <MenuItem Header="详情" Click="DetailMenu_Click"/>
                         <MenuItem Header="删除" Click="DeleteMenu_Click"/>
                     </ContextMenu>
                 </DataGrid.ContextMenu>
-                <!--<DataGrid.RowStyle>
+                <DataGrid.RowStyle>
                     <Style TargetType="DataGridRow" BasedOn="{StaticResource DataGridRowStyle}">
                         <EventSetter Event="MouseRightButtonDown" Handler="DataGridRow_MouseRightButtonDown" />
                         <Setter Property="Background" Value="White"/>
@@ -69,85 +37,8 @@
                             </Trigger>
                         </Style.Triggers>
                     </Style>
-                </DataGrid.RowStyle>-->
-
-
-
-                <DataGrid.RowStyle>
-                    <Style TargetType="{x:Type DataGridRow}">
-                        <Style.Setters>
-                            <Setter Property="SnapsToDevicePixels" Value="true"/>
-                            <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
-                            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="{x:Type DataGridRow}">
-                                        <Border CornerRadius="8" MouseRightButtonDown="DataGridRow_MouseRightButtonDown" Margin="0,0,0,5" BorderBrush="Black" BorderThickness="0" SnapsToDevicePixels="True">
-                                            <Border.Style>
-                                                <Style TargetType="Border">
-                                                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-                                                    <Setter Property="Background">
-                                                        <Setter.Value>
-                                                            <SolidColorBrush Color="White" Opacity="0.6"/>
-                                                        </Setter.Value>
-                                                    </Setter>
-                                                    <Style.Triggers>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Trigger.EnterActions>
-                                                                <BeginStoryboard>
-                                                                    <Storyboard  Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)">
-                                                                        <DoubleAnimation To="1" Duration="0:0:0"/>
-                                                                    </Storyboard>
-                                                                </BeginStoryboard>
-                                                            </Trigger.EnterActions>
-                                                            <Trigger.ExitActions>
-                                                                <BeginStoryboard>
-                                                                    <Storyboard  Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)">
-                                                                        <DoubleAnimation To="0.6" Duration="0:0:0.5"/>
-                                                                    </Storyboard>
-                                                                </BeginStoryboard>
-                                                            </Trigger.ExitActions>
-                                                            
-                                                        </Trigger>
-                                                        <Trigger Property="IsMouseOver" Value="False">
-                                                        </Trigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Border.Style>
-                                            <SelectiveScrollingGrid>
-                                                <SelectiveScrollingGrid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="*"/>
-                                                </SelectiveScrollingGrid.ColumnDefinitions>
-                                                <SelectiveScrollingGrid.RowDefinitions>
-                                                    <RowDefinition Height="*"/>
-                                                    <RowDefinition Height="Auto"/>
-                                                </SelectiveScrollingGrid.RowDefinitions>
-                                                <DataGridCellsPresenter Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                                <Path Name="Cross" Grid.ColumnSpan="2" Visibility="Collapsed" Margin="10,0,10,0" Data="M0,0.5 L1,0.5" Stretch="Fill" Stroke="Gray" StrokeThickness="1" Opacity="0.5" />
-                                            </SelectiveScrollingGrid>
-                                        </Border>
-                                        <ControlTemplate.Triggers>
-                                            <DataTrigger Binding="{Binding ElementName=IsNewToDo, Path=Text}" Value="N">
-                                                <Setter TargetName="Cross" Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                            <DataTrigger Binding="{Binding ElementName=IsNewToDo, Path=Text}" Value="Y">
-                                                <Setter TargetName="Cross" Property="Visibility" Value="Collapsed"/>
-                                            </DataTrigger>
-                                        </ControlTemplate.Triggers>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style.Setters>
-                        <Style.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#E5E5E2" />
-                            </Trigger>
-                        </Style.Triggers>
-                    </Style>
                 </DataGrid.RowStyle>
 
-
                 <DataGrid.CellStyle>
                     <Style TargetType="DataGridCell" BasedOn="{StaticResource DataGridCellStyle}">
                         <Setter Property="HorizontalContentAlignment" Value="Center"/>

Control/UserControls/ToDo/TodoControl.xaml.cs

@@ -1,13 +1,21 @@
-using GeekDesk.Constant;
-using GeekDesk.Control.Windows;
+using GeekDesk.Control.Windows;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 
 namespace GeekDesk.Control.UserControls.Backlog
 {
@@ -43,7 +51,7 @@ namespace GeekDesk.Control.UserControls.Backlog
                     {
                         MainWindow.appData.HiToDoList.Remove(info);
                     }
-                    CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+                    CommonCode.SaveAppData(MainWindow.appData);
                 }
                 return true;
             }, "DeleteConfirm");
@@ -72,34 +80,9 @@ namespace GeekDesk.Control.UserControls.Backlog
         /// <param name="e"></param>
         private void DataGridRow_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
-            int index;
-            ToDoInfo info = ((Border)sender).DataContext as ToDoInfo;
-            if (type == ToDoType.NEW)
-            {
-                index = MainWindow.appData.ToDoList.IndexOf(info);
-            }
-            else
-            {
-                index = MainWindow.appData.HiToDoList.IndexOf(info);
-            }
-            BacklogList.SelectedIndex = index;
+            BacklogList.SelectedIndex = ((DataGridRow)sender).GetIndex();
             Menu.IsOpen = true;
         }
 
-        /// <summary>
-        /// 选中时颜色变化
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DataGridRow_Selected(object sender, RoutedEventArgs e)
-        {
-            Color c = Color.FromRgb(91, 192, 222);
-            SolidColorBrush b = new SolidColorBrush
-            {
-                Color = c,
-                Opacity = 0.9
-            };
-            ((DataGridRow)sender).Background = b;
-        }
     }
 }

Control/Windows/ConfigWindow.xaml

@@ -4,8 +4,7 @@
            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
            xmlns:hc="https://handyorg.github.io/handycontrol"
-           xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
-           xmlns:local="clr-namespace:GeekDesk" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:AppConfig}"
+           xmlns:local="clr-namespace:GeekDesk"
            Title="Setting"
            mc:Ignorable="d"
            WindowStartupLocation="CenterScreen"
@@ -25,32 +24,30 @@
             <DropShadowEffect BlurRadius="20" Direction="-90" Color="Gray"
                               RenderingBias="Quality" ShadowDepth="2"/>
         </Grid.Effect>
-        <Grid  hc:Dialog.Token="ConfigWindowDialog">
-            <hc:DialogContainer  Margin="10">
-                <Border Style="{StaticResource BorderBG}">
-                    <Grid Background="Transparent">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="140"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
+        <Border Style="{StaticResource BorderBG}">
+            <Grid Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="140"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
 
-                        <hc:Card Grid.Row="0" Grid.Column="0" Background="Transparent" BorderThickness="0">
+                <hc:Card Grid.Row="0" Grid.Column="0" Background="Transparent" BorderThickness="0">
 
-                            <hc:SideMenu AutoSelect="True" Background="Transparent" Margin="1,7,0,3">
-                                <hc:SideMenu.ItemContainerStyle>
-                                    <Style TargetType="hc:SideMenuItem" BasedOn="{StaticResource MyMenuStyle}"/>
-                                </hc:SideMenu.ItemContainerStyle>
+                    <hc:SideMenu AutoSelect="True" Background="Transparent" Margin="1,7,0,3">
+                        <hc:SideMenu.ItemContainerStyle>
+                            <Style TargetType="hc:SideMenuItem" BasedOn="{StaticResource MyMenuStyle}"/>
+                        </hc:SideMenu.ItemContainerStyle>
 
-                                <hc:SideMenuItem Header="关于"
+                        <hc:SideMenuItem Header="关于"
                                      IsSelected="True"
                                      Selected="MemuClick"
                                      Tag="About"
                                      >
-                                    <hc:SideMenuItem.Icon>
-                                        <Button Background="Transparent" 
+                            <hc:SideMenuItem.Icon>
+                                <Button Background="Transparent" 
                                     IsEnabled="False"
                                     Opacity="0.9"
                                     BorderThickness="0"
@@ -59,13 +56,13 @@
                                     hc:IconElement.Width="18"
                                     HorizontalAlignment="Right"
                                     />
-                                    </hc:SideMenuItem.Icon>
-                                </hc:SideMenuItem>
-                                <hc:SideMenuItem Header="显示设置"
+                            </hc:SideMenuItem.Icon>
+                        </hc:SideMenuItem>
+                        <hc:SideMenuItem Header="显示设置"
                                      Tag="Theme"
                                      Selected="MemuClick">
-                                    <hc:SideMenuItem.Icon>
-                                        <Button Background="Transparent" 
+                            <hc:SideMenuItem.Icon>
+                                <Button Background="Transparent" 
                                     IsEnabled="False"
                                     Opacity="1"
                             BorderThickness="0"
@@ -74,14 +71,14 @@
                             hc:IconElement.Width="18"
                             HorizontalAlignment="Right"
                             />
-                                    </hc:SideMenuItem.Icon>
-                                </hc:SideMenuItem>
+                            </hc:SideMenuItem.Icon>
+                        </hc:SideMenuItem>
 
-                                <hc:SideMenuItem Header="动作"
+                        <hc:SideMenuItem Header="动作"
                                      Tag="Motion"
                                      Selected="MemuClick">
-                                    <hc:SideMenuItem.Icon>
-                                        <Button Background="Transparent" 
+                            <hc:SideMenuItem.Icon>
+                                <Button Background="Transparent" 
                                     IsEnabled="False"
                                     Opacity="1"
                             BorderThickness="0"
@@ -90,13 +87,13 @@
                             hc:IconElement.Width="18"
                             HorizontalAlignment="Right"
                             />
-                                    </hc:SideMenuItem.Icon>
-                                </hc:SideMenuItem>
-                                <hc:SideMenuItem Header="其它"
+                            </hc:SideMenuItem.Icon>
+                        </hc:SideMenuItem>
+                        <hc:SideMenuItem Header="其它"
                                      Tag="Other"
                                      Selected="MemuClick">
-                                    <hc:SideMenuItem.Icon>
-                                        <Button Background="Transparent" 
+                            <hc:SideMenuItem.Icon>
+                                <Button Background="Transparent" 
                                     IsEnabled="False"
                                     Opacity="1"
                             BorderThickness="0"
@@ -105,28 +102,21 @@
                             hc:IconElement.Width="18"
                             HorizontalAlignment="Right"
                             />
-                                    </hc:SideMenuItem.Icon>
-                                </hc:SideMenuItem>
-                            </hc:SideMenu>
-                        </hc:Card>
-                        <hc:ScrollViewer  Grid.Row="0" Grid.Column="1" BorderThickness="0" Margin="0,5,1,5">
-                            <UniformGrid x:Name="UFG" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeIn}, Event=Visibility, Delay=0}">
-                                <!--<hc:TransitioningContentControl TransitionMode="Left2RightWithFade">-->
-                                    <hc:Card x:Name="RightCard" BorderThickness="0"  MouseDown="DragMove">
-                                        <hc:Card.Background>
-                                            <SolidColorBrush  Opacity="0"/>
-                                        </hc:Card.Background>
-                                    </hc:Card>
-                                <!--</hc:TransitioningContentControl>-->
-                            </UniformGrid>
-                        </hc:ScrollViewer>
+                            </hc:SideMenuItem.Icon>
+                        </hc:SideMenuItem>
+                    </hc:SideMenu>
+                </hc:Card>
+                <hc:ScrollViewer  Grid.Row="0" Grid.Column="1" BorderThickness="0" Margin="0,5,1,5">
+                    <hc:Card x:Name="RightCard" Height="480" BorderThickness="0"  MouseDown="DragMove">
+                        <hc:Card.Background>
+                            <SolidColorBrush  Opacity="0"/>
+                        </hc:Card.Background>
+                    </hc:Card>
+                </hc:ScrollViewer>
 
-                        <Button Width="22" Height="22" Click="Close_Button_Click" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0" Grid.Column="1"/>
-                    </Grid>
-                </Border>
-
-            </hc:DialogContainer>
-        </Grid>
+                <Button Width="22" Height="22" Click="Close_Button_Click" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0" Grid.Column="1"/>
+            </Grid>
+        </Border>
     </Grid>
 
 </hc:Window>

Control/Windows/ConfigWindow.xaml.cs

@@ -1,11 +1,14 @@
-using GeekDesk.Control.UserControls.Config;
+
+using GeekDesk.Constant;
+using GeekDesk.Control.UserControls;
+using GeekDesk.Control.UserControls.Config;
 using GeekDesk.Interface;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
-using System.Collections.Generic;
+using HandyControl.Data;
+using System;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace GeekDesk.Control.Windows
@@ -19,14 +22,6 @@ namespace GeekDesk.Control.Windows
         private static readonly ThemeControl theme = new ThemeControl();
         private static readonly MotionControl motion = new MotionControl();
         private static readonly OtherControl other = new OtherControl();
-        private static List<UserControl> ucList = new List<UserControl>();
-        static ConfigWindow()
-        {
-            ucList.Add(about);
-            ucList.Add(theme);
-            ucList.Add(motion);
-            ucList.Add(other);
-        }
         public MainWindow mainWindow;
 
         private ConfigWindow(AppConfig appConfig, MainWindow mainWindow)
@@ -35,14 +30,12 @@ namespace GeekDesk.Control.Windows
             //BG.Source = ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_BAC_IMAGE_BASE64);
             this.DataContext = appConfig;
             RightCard.Content = about;
-            WindowUtil.SetOwner(this, mainWindow);
+            this.Topmost = true;
             this.mainWindow = mainWindow;
-            UFG.Visibility = Visibility.Collapsed;
-            UFG.Visibility = Visibility.Visible;
         }
 
-
-
+         
+        
 
         /// <summary>
         /// 点击关闭按钮
@@ -60,24 +53,16 @@ namespace GeekDesk.Control.Windows
             switch (smi.Tag.ToString())
             {
                 case "Motion":
-                    UFG.Visibility = Visibility.Collapsed;
                     RightCard.Content = motion;
-                    UFG.Visibility = Visibility.Visible;
                     break;
                 case "Theme":
-                    UFG.Visibility = Visibility.Collapsed;
                     RightCard.Content = theme;
-                    UFG.Visibility = Visibility.Visible;
                     break;
                 case "Other":
-                    UFG.Visibility = Visibility.Collapsed;
                     RightCard.Content = other;
-                    UFG.Visibility = Visibility.Visible;
                     break;
                 default:
-                    UFG.Visibility = Visibility.Collapsed;
                     RightCard.Content = about;
-                    UFG.Visibility = Visibility.Visible;
                     break;
             }
         }
@@ -110,7 +95,6 @@ namespace GeekDesk.Control.Windows
         {
             if (e.Key == Key.Escape)
             {
-                this.DataContext = null;
                 this.Close();
             }
         }

Control/Windows/GlobalColorPickerWindow.xaml

@@ -1,83 +0,0 @@
-<Window x:Class="GeekDesk.Control.Windows.GlobalColorPickerWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:GeekDesk.Control.Windows"
-        xmlns:hc="https://handyorg.github.io/handycontrol"
-        xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
-        WindowStyle="None"
-        ResizeMode="NoResize"
-        AllowsTransparency="True"
-        Background="Transparent"
-        KeyDown="OnKeyDown"
-        >
-    <Border CornerRadius="8" 
-            Background="White"
-            Height="385"
-            Width="228">
-        <Grid>
-            <TextBlock Panel.ZIndex="1000" Text="❤❤❤"
-                       x:Name="CopySuccess"
-                       Visibility="Collapsed"
-                       xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndSlideFromBottom}, Duration=400, Event=None}" 
-                       xf:Animations.PrimaryBinding="{Binding CopyAnimation}"
-                       Margin="138,300,0,0"
-                       />
-            <Button Height="32" 
-                    BorderThickness="0" Content="复 制" 
-                    Panel.ZIndex="999" 
-                    Margin="122,329,0,0" 
-                    HorizontalAlignment="Left" 
-                    Background="#BF8EF6"
-                    Click="MyColorPicker_Confirmed"
-                    VerticalAlignment="Top" Width="80"
-                    >
-                <Button.Style>
-                    <Style TargetType="Button" BasedOn="{StaticResource MyBtnStyle}">
-                    </Style>
-                </Button.Style>
-            </Button>
-            <Button Height="32"  
-                    BorderThickness="0" Content="关 闭" 
-                    Panel.ZIndex="999" Margin="26,329,0,0" 
-                    Background="#EEEEEE"
-                    Click="MyColorPicker_Canceled"
-                    HorizontalAlignment="Left" 
-                    VerticalAlignment="Top" Width="80"
-                    >
-                <Button.Style>
-                    <Style TargetType="Button" BasedOn="{StaticResource MyBtnStyle}">
-                    </Style>
-                </Button.Style>
-            </Button>
-            <StackPanel>
-                <Border MouseDown="DragMove" 
-                    VerticalAlignment="Top" 
-                    CornerRadius="8,8,0,0"
-                    Height="20" 
-                    Background="White"
-                    >
-                    <Button Width="18"  Height="18" 
-                        hc:IconElement.Geometry="{StaticResource ErrorGeometry}" 
-                        Padding="0" 
-                        Background="Transparent"
-                        Opacity="0.6"
-                        Margin="0,0,5,0"
-                        Click="Button_Click"
-                        HorizontalAlignment="Right" 
-                        MouseEnter="Button_MouseEnter"
-                        MouseLeave="Button_MouseLeave"
-                        VerticalAlignment="Center">
-
-                    </Button>
-                </Border>
-                <hc:ColorPicker HorizontalAlignment="Center" 
-                            VerticalAlignment="Bottom" 
-                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"
-                            x:Name="MyColorPicker" 
-                            ToggleButton.Checked="MyColorPicker_Checked"/>
-            </StackPanel>
-        </Grid>
-    </Border>
-</Window>

Control/Windows/GlobalColorPickerWindow.xaml.cs

@@ -1,213 +0,0 @@
-using GeekDesk.Interface;
-using GeekDesk.Util;
-using System;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Threading;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace GeekDesk.Control.Windows
-{
-    /// <summary>
-    /// GlobalColorPickerWindow.xaml 的交互逻辑
-    /// </summary>
-    public partial class GlobalColorPickerWindow : IWindowCommon
-    {
-        PixelColorPickerWindow colorPickerWindow = null;
-
-        class PrivateDataContext : INotifyPropertyChanged
-        {
-            private bool copyAnimation = false;
-
-            public bool CopyAnimation
-            {
-                set
-                {
-                    copyAnimation = value;
-                    OnPropertyChanged("CopyAnimation");
-
-                }
-                get { return copyAnimation; }
-            }
-
-            public event PropertyChangedEventHandler PropertyChanged;
-            private void OnPropertyChanged(string propertyName)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-            }
-        } 
-        public GlobalColorPickerWindow()
-        {
-            this.Topmost = true;
-            InitializeComponent();
-            this.DataContext = new PrivateDataContext();
-        }
-
-        public void OnKeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Escape)
-            {
-                this.DataContext = null;
-                this.Close();
-            }
-        }
-
-
-        /// <summary>
-        /// 取消按钮事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MyColorPicker_Canceled(object sender, RoutedEventArgs e)
-        {
-            MyColorPickerClose();
-        }
-        private void MyColorPicker_Confirmed(object sender, RoutedEventArgs e)
-        {
-            CopySuccess.Visibility = Visibility.Visible;
-            PrivateDataContext pdc = this.DataContext as PrivateDataContext;
-            pdc.CopyAnimation = true;
-            new Thread(() =>
-            {
-                Thread.Sleep(400);
-                this.Dispatcher.Invoke(() =>
-                {
-                    pdc.CopyAnimation = false;
-                    CopySuccess.Visibility = Visibility.Collapsed;
-                });
-            }).Start();
-            Color c = MyColorPicker.SelectedBrush.Color;
-            Clipboard.SetData(DataFormats.Text, string.Format("#{0:X2}{1:X2}{2:X2}", c.R, c.G, c.B));
-        }
-
-        /// <summary>
-        /// 移动窗口
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                this.DragMove();
-            }
-        }
-
-
-        private void MyColorPicker_Checked(object sender, RoutedEventArgs e)
-        {           
-            this.Hide();
-            if (colorPickerWindow == null || !colorPickerWindow.Activate())
-            {
-                colorPickerWindow = new PixelColorPickerWindow(MyColorPicker);
-            }
-            colorPickerWindow.Show();
-        }
-
-        private void MyColorPickerClose()
-        {
-            this.Close();
-        }
-
-        private static System.Windows.Window window = null;
-
-        public static void CreateNoShow()
-        {
-            if (window == null || !window.Activate())
-            {
-                window = new GlobalColorPickerWindow();
-                window.Opacity = 0;
-                App.DoEvents();
-                window.Show();
-            }
-            window.Hide();
-            new Thread(() =>
-            {
-                Thread.Sleep(200);
-                App.Current.Dispatcher.Invoke(() =>
-                {
-                    GlobalColorPickerWindow thisWindow = (GlobalColorPickerWindow)window;
-                    if (thisWindow.colorPickerWindow == null || !thisWindow.colorPickerWindow.Activate())
-                    {
-                        thisWindow.colorPickerWindow = new PixelColorPickerWindow(thisWindow.MyColorPicker);
-                    }
-                    thisWindow.colorPickerWindow.Show();
-                });
-            }).Start();
-            
-        }
-
-        public static void Show()
-        {
-            if (window == null || !window.Activate())
-            {
-                window = new GlobalColorPickerWindow();
-            }
-            window.Opacity = 1;
-            window.Show();
-            Keyboard.Focus(window);
-        }
-
-        public static void ShowOrHide()
-        {
-            if (window == null || !window.Activate())
-            {
-                window = new GlobalColorPickerWindow();
-                window.Show();
-                Keyboard.Focus(window);
-            }
-            else
-            {
-                window.Close();
-            }
-        }
-
-        private void MyColorPicker_SelectedColorChanged(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
-        {
-            Show();
-        }
-
-        private void Button_MouseEnter(object sender, MouseEventArgs e)
-        {
-            Button btn = sender as Button;
-            btn.Opacity = 1;
-        }
-
-        private void Button_MouseLeave(object sender, MouseEventArgs e)
-        {
-            Button btn = sender as Button;
-            btn.Opacity = 0.6;
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
-
-        private ICommand _hideCommand;
-        public ICommand HideCommand
-        {
-            get
-            {
-                if (_hideCommand == null)
-                {
-                    _hideCommand = new RelayCommand(
-                        p =>
-                        {
-                            return true;
-                        },
-                        p =>
-                        {
-                            //CopySuccess.Visibility = Visibility.Collapsed;
-                        });
-                }
-                return _hideCommand;
-            }
-        }
-
-    
-    }
-}

Control/Windows/IconfontWindow.xaml

@@ -51,7 +51,7 @@
             </Border.Background>-->
             <hc:DialogContainer>
                 <Grid MouseDown="DragMove">
-                    <TextBox x:Name="CheckSettingUrl" Style="{StaticResource MyTextBoxStyle}" Visibility="Collapsed" Text="{Binding IsSettingUrl}" TextChanged="CheckSettingUrl_TextChanged"/>
+                    <TextBox x:Name="CheckSettingUrl" Visibility="Collapsed" Text="{Binding IsSettingUrl}" TextChanged="CheckSettingUrl_TextChanged"/>
                     <hc:TabControl x:Name="MyTabControl" 
                                IsAnimationEnabled="True" 
                                SelectionChanged="TabControl_SelectionChanged" 
@@ -75,9 +75,9 @@
                     </hc:TabControl>
 
 
-                    <Button Style="{StaticResource MyBtnStyle}" Content="取消" Click="Close_Click" Margin="391,397.5,163,22.5" />
-                    <Button Style="{StaticResource MyBtnStyle}" Content="自定义设置" Click="CustomButton_Click" IsEnabled="False" Name="CustomButton" Margin="447,397.5,71,22.5"/>
-                    <Button Style="{StaticResource MyBtnStyle}" Content="确定" Click="Confirm_Click" Margin="534,397.5,20,22.5" />
+                    <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>

Control/Windows/IconfontWindow.xaml.cs

@@ -27,7 +27,7 @@ namespace GeekDesk.Control.Windows
         public static IconfontViewModel vm;
         private IconfontWindow(List<IconfontInfo> icons, MenuInfo menuInfo)
         {
-
+            
             InitializeComponent();
 
             systemIcons = icons;
@@ -57,7 +57,6 @@ namespace GeekDesk.Control.Windows
 
         private void Close_Click(object sender, RoutedEventArgs e)
         {
-            this.DataContext = null;
             this.Close();
         }
 
@@ -74,15 +73,13 @@ namespace GeekDesk.Control.Windows
                         LoadingEle.Visibility = Visibility.Visible;
                         CustomIcon.Visibility = Visibility.Collapsed;
                         HandyControl.Controls.Dialog.Show(new CustomIconUrlDialog(appConfig), "IconUrlDialog");
-                    }
-                    else
+                    } else
                     {
                         if (customIcons == null)
                         {
                             vm.Iconfonts = null;
                             LoadingOnlineIcon();
-                        }
-                        else
+                        } else
                         {
                             vm.Iconfonts = customIcons;
                             LoadingEle.Visibility = Visibility.Collapsed;
@@ -124,7 +121,6 @@ namespace GeekDesk.Control.Windows
                     }
                     break;
             }
-            this.DataContext = null;
             this.Close();
         }
 
@@ -138,7 +134,7 @@ namespace GeekDesk.Control.Windows
             }
             window.Show();
             Keyboard.Focus(window);
-            ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0);
+            ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0, false);
         }
 
         private void CustomButton_Click(object sender, RoutedEventArgs e)
@@ -152,8 +148,7 @@ namespace GeekDesk.Control.Windows
             if (CheckSettingUrl.Text == "true")
             {
                 LoadingOnlineIcon();
-            }
-            else
+            } else
             {
                 LoadingEle.IsRunning = true;
                 CustomIcon.Visibility = Visibility.Collapsed;
@@ -184,7 +179,6 @@ namespace GeekDesk.Control.Windows
         {
             if (e.Key == Key.Escape)
             {
-                this.DataContext = null;
                 this.Close();
             }
         }

Control/Windows/PixelColorPickerWindow.xaml

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

Control/Windows/PixelColorPickerWindow.xaml.cs

@@ -1,242 +0,0 @@
-using GeekDesk.Interface;
-using GeekDesk.Util;
-using HandyControl.Controls;
-using System;
-using System.Reflection;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using Cursors = System.Windows.Input.Cursors;
-using KeyEventArgs = System.Windows.Input.KeyEventArgs;
-using MouseEventArgs = System.Windows.Input.MouseEventArgs;
-
-namespace GeekDesk.Control.Windows
-{
-    /// <summary>
-    /// ColorPickerWindow.xaml 的交互逻辑
-    /// </summary>
-    public partial class PixelColorPickerWindow : IWindowCommon
-    {
-        private static int PIXEL_REC_LENGTH = 20;
-
-        private static readonly int MIN_LENGTH = 10;
-        private static readonly int MAX_LENGTH = 50;
-
-        private static System.Drawing.Bitmap bgBitmap;
-
-        private readonly ColorPicker colorPicker;
-
-        [System.Runtime.InteropServices.DllImport("user32.dll")]
-        private static extern bool SetProcessDPIAware();
-
-        public PixelColorPickerWindow(ColorPicker colorPicker)
-        {
-            InitializeComponent();
-            this.colorPicker = colorPicker;
-
-            try
-            {
-                SetProcessDPIAware();
-            }
-            catch (Exception e) { }
-            ColorPickerWindow_Init();
-        }
-
-        private void ColorPickerWindow_Init()
-        {
-
-            this.WindowState = WindowState.Normal;//还原窗口（非最小化和最大化）
-
-            var screens = Screen.AllScreens;
-            int allWidth = 0;
-            int allHeight = 0;
-            int x = 0;
-            int y = 0;
-
-            //获取缩放比例
-            double scale = ScreenUtil.GetScreenScalingFactor();
-
-            foreach (var screen in screens)
-            {
-                var rect = screen.Bounds;
-                allWidth += rect.Width;
-                allHeight += rect.Height;
-                x = Math.Min(x, rect.X);
-                y = Math.Min(y, rect.Y);
-            }
-            //如果主显示器是最左边和最上边，则显示主显示器的缩放比例，反之则缩放比例不添加缩放比例
-            if (Screen.PrimaryScreen.Bounds.X != x || Screen.PrimaryScreen.Bounds.Y != y)
-            {
-                scale = 1;
-            }
-
-            this.Width = allWidth;
-            this.Height = allHeight;
-
-            this.Left = x;
-            this.Top = y;
-
-            DesktopBG.Width = this.Width;
-            DesktopBG.Height = this.Height;
-            this.Topmost = true;
-
-            bgBitmap = new System.Drawing.Bitmap(
-                    (int)(Width * scale),
-                    (int)(Height * scale),
-                    System.Drawing.Imaging.PixelFormat.Format32bppArgb
-                );
-
-            using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bgBitmap))
-            {
-                g.CopyFromScreen(
-                    (int)this.Left,
-                    (int)this.Top,
-                    0,
-                    0,
-                    bgBitmap.Size
-                    );
-            }
-            BitmapSource bs = Imaging.CreateBitmapSourceFromHBitmap(
-                                         bgBitmap.GetHbitmap(),
-                                        IntPtr.Zero,
-                                        Int32Rect.Empty,
-                                        BitmapSizeOptions.FromEmptyOptions()
-                                    );
-            DesktopBG.Source = bs;
-            VisualBrush b = (VisualBrush)PixelBG.Fill;
-            b.Visual = DesktopBG;
-            Mouse.OverrideCursor = Cursors.Cross;
-            SetPixelAbout(null);
-        }
-
-
-        public void OnKeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Escape)
-            {
-                this.DataContext = null;
-                this.Close();
-            }
-        }
-
-        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            Mouse.OverrideCursor = null;
-            Point pos = e.MouseDevice.GetPosition(DesktopBG);
-            System.Drawing.Color colorD = bgBitmap.GetPixel((int)pos.X, (int)pos.Y);
-            colorPicker.SelectedBrush = new SolidColorBrush(Color.FromArgb(colorD.A, colorD.R, colorD.G, colorD.B));
-            DeleteObject(bgBitmap.GetHbitmap());
-            this.Close();
-            ClickColorPickerToggleButton(colorPicker);
-        }
-
-        public void ClickColorPickerToggleButton(ColorPicker colorPicker)
-        {
-            const BindingFlags InstanceBindFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-            Type type = colorPicker.GetType();
-            FieldInfo fi = type.GetField("_toggleButtonDropper", InstanceBindFlags);
-
-            ToggleButton tb = (ToggleButton)fi.GetValue(colorPicker);
-            if (tb != null && tb.IsChecked == true)
-            {
-                tb.IsChecked = false;
-                MethodInfo mi = type.GetMethod("ToggleButtonDropper_Click", InstanceBindFlags);
-                mi.Invoke(colorPicker, new object[] { null, null });
-            }
-        }
-
-        private void Window_PreviewMouseMove(object sender, MouseEventArgs e)
-        {
-            SetPixelAbout(e);
-        }
-
-        [System.Runtime.InteropServices.DllImport("gdi32.dll")]
-        public static extern bool DeleteObject(IntPtr onj);
-
-        private void SetPixelAbout(MouseEventArgs e)
-        {
-            VisualBrush b = (VisualBrush)PixelBG.Fill;
-
-            Point pos;
-            if (e == null)
-            {
-                pos = MouseUtil.GetMousePosition();
-            }
-            else
-            {
-                pos = e.MouseDevice.GetPosition(DesktopBG);
-            }
-            Rect viewBox = b.Viewbox;
-
-            viewBox.Width = PIXEL_REC_LENGTH;
-            viewBox.Height = PIXEL_REC_LENGTH;
-
-            viewBox.X = pos.X - PIXEL_REC_LENGTH / 2;
-            viewBox.Y = pos.Y - PIXEL_REC_LENGTH / 2;
-            b.Viewbox = viewBox;
-
-            double x = pos.X + 10;
-            double y = pos.Y + 10;
-            if (x + ColorCanvas.Width > SystemParameters.VirtualScreenWidth)
-            {
-                x = pos.X - ColorCanvas.Width - 10;
-            }
-            if (y + ColorCanvas.Height > SystemParameters.VirtualScreenHeight)
-            {
-                y = pos.Y - ColorCanvas.Height - 10;
-            }
-
-            Canvas.SetLeft(ColorCanvas, x);
-            Canvas.SetTop(ColorCanvas, y);
-
-
-            System.Drawing.Color dColor = bgBitmap.GetPixel((int)pos.X, (int)pos.Y);
-
-            PixelColor_HTML.Text = "#" + dColor.Name.ToUpper();
-            PixelColor_RGB.Text = dColor.R + "," + dColor.G + "," + dColor.B;
-            Pixel_XY.Text = pos.X + "*" + pos.Y;
-
-            SolidColorBrush scb = (SolidColorBrush)PixelColor.Fill;
-            scb.Color = Color.FromArgb(dColor.A, dColor.R, dColor.G, dColor.B);
-        }
-
-        /// <summary>
-        /// 滚轮控制缩放区域
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Window_MouseWheel(object sender, MouseWheelEventArgs e)
-        {
-
-            if (e.Delta < 0 && PIXEL_REC_LENGTH < MAX_LENGTH)
-            {
-                //缩小
-                PIXEL_REC_LENGTH += 5;
-            }
-            else if (e.Delta > 0 && PIXEL_REC_LENGTH > MIN_LENGTH)
-            {
-                //放大
-                PIXEL_REC_LENGTH -= 5;
-            }
-            SetPixelAbout(e);
-        }
-
-        /// <summary>
-        /// 右键按下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Window_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            Mouse.OverrideCursor = null;
-            GlobalColorPickerWindow.ShowOrHide();
-            //关闭
-            this.Close();
-        }
-    }
-}

Control/Windows/SystemItemWindow.xaml.cs

@@ -1,4 +1,5 @@
 using GeekDesk.Constant;
+using GeekDesk.Control.Other;
 using GeekDesk.Interface;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
@@ -7,10 +8,13 @@ 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;
@@ -25,9 +29,9 @@ namespace GeekDesk.Control.Windows
     {
         private static AppConfig appConfig = MainWindow.appData.AppConfig;
         private static SystemItemViewModel vm;
-        private List<IconInfo> systemIcons;
-        private List<IconInfo> startMenuIcons;
-        private List<IconInfo> storeIcons;
+        private static List<IconInfo> systemIcons;
+        private static List<IconInfo> startMenuIcons;
+        private static List<IconInfo> storeIcons;
 
         private SystemItemWindow()
         {
@@ -52,7 +56,6 @@ namespace GeekDesk.Control.Windows
 
         private void Close_Click(object sender, RoutedEventArgs e)
         {
-            this.DataContext = null;
             this.Close();
         }
 
@@ -81,8 +84,7 @@ namespace GeekDesk.Control.Windows
                             IsBackground = true
                         };
                         t.Start();
-                    }
-                    else
+                    } else
                     {
                         StartMenuLoading.Visibility = Visibility.Collapsed;
                         vm.IconInfos = startMenuIcons;
@@ -106,8 +108,7 @@ namespace GeekDesk.Control.Windows
                         vm.IconInfos = null;
                         systemIcons = GetSysteIconInfos();
                         vm.IconInfos = systemIcons;
-                    }
-                    else
+                    } else
                     {
                         vm.IconInfos = systemIcons;
                     }
@@ -140,7 +141,7 @@ namespace GeekDesk.Control.Windows
                 }
                 StartMenuLoading.Visibility = Visibility.Collapsed;
             }));
-
+            
         }
 
         /// <summary>
@@ -148,25 +149,13 @@ namespace GeekDesk.Control.Windows
         /// </summary>
         /// <param name="path"></param>
         /// <param name="listInfos"></param>
-        private void GetInfos(string filePath, List<IconInfo> listInfos)
+        private void GetInfos(string path, 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)
+            DirectoryInfo di = new DirectoryInfo(path);
+            FileSystemInfo[] fileInfoArr = di.GetFileSystemInfos();
+            foreach(FileSystemInfo fi in fileInfoArr)
             {
+                path = fi.FullName;
                 if (File.Exists(path))
                 {
                     string ext = Path.GetExtension(path).ToLower();
@@ -189,13 +178,6 @@ namespace GeekDesk.Control.Windows
                     GetInfos(path, listInfos);
                 }
             }
-
-            //FileSystemInfo[] fileInfoArr = di.GetFileSystemInfos();
-            //foreach(FileSystemInfo fi in fileInfoArr)
-            //{
-            //    string path = fi.FullName;
-
-            //}
         }
 
         /// <summary>
@@ -280,7 +262,7 @@ namespace GeekDesk.Control.Windows
             }
             window.Show();
             Keyboard.Focus(window);
-            ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0);
+            ShowWindowFollowMouse.Show(window, MousePosition.LEFT_CENTER, 0, 0, false);
         }
 
 
@@ -288,7 +270,6 @@ namespace GeekDesk.Control.Windows
         {
             if (e.Key == Key.Escape)
             {
-                this.DataContext = null;
                 this.Close();
             }
         }

Control/Windows/ToDoInfoWindow.xaml

@@ -12,7 +12,6 @@
            Width="510" 
            WindowStyle="None"
            Title=""
-        ResizeMode="NoResize"
            AllowsTransparency="True"
            Background="Transparent" ShowInTaskbar="False"
            Focusable="True"
@@ -31,7 +30,6 @@
             <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"/>
@@ -45,13 +43,12 @@
                             <TextBlock Text="待办任务:"  Style="{StaticResource LeftTB}"/>
                             <TextBlock Text="*" Foreground="Red" />
                         </WrapPanel>
-                        <TextBox x:Name="Title" Style="{StaticResource MyTextBoxStyle}" Width="290" Text="{Binding Title, Mode=OneWay}" FontSize="14" />
+                        <TextBox x:Name="Title" Width="290" Text="{Binding Title, Mode=OneWay}" FontSize="14" />
                     </hc:UniformSpacingPanel>
 
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
                         <TextBlock Text="待办详情:"  Style="{StaticResource LeftTB}"/>
                         <TextBox x:Name="Msg" TextWrapping="Wrap"
-                                 Style="{StaticResource MyTextBoxStyle}"
                              Margin="5,0,0,0"
                              Text="{Binding Msg, Mode=OneWay}"
                              AcceptsReturn="True"
@@ -62,46 +59,38 @@
 
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
                         <TextBlock Text="运行方式:"  Style="{StaticResource LeftTB}"/>
-                        <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked" Tag="1" 
-                         Style="{StaticResource MyRadioBtnStyle}" Content="指定时间"
+                        <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked" Tag="1" Background="{DynamicResource SecondaryRegionBrush}" 
+                         Style="{StaticResource RadioButtonIcon}" Content="指定时间"
                          IsChecked="{Binding ExecType, Mode=OneWay, Converter={StaticResource TodoTaskExecConvert}, ConverterParameter=1}"/>
-                        <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked"  Tag="2"
-                         Style="{StaticResource MyRadioBtnStyle}" Content="CRON表达式"
+                        <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked" Background="{DynamicResource SecondaryRegionBrush}"  Tag="2"
+                         Style="{StaticResource RadioButtonIcon}" Content="CRON表达式"
                          IsChecked="{Binding ExecType, Mode=OneWay, Converter={StaticResource TodoTaskExecConvert}, ConverterParameter=2}"/>
                     </hc:UniformSpacingPanel>
 
-                    <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:DateTimePicker.Background>
-                                <SolidColorBrush Color="White" Opacity="0.7"/>
-                            </hc:DateTimePicker.Background>
-                        </hc:DateTimePicker>
+                    <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>
 
-                    <hc:UniformSpacingPanel x:Name="CronPanel" Height="30" Visibility="Collapsed" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
+                    <hc:UniformSpacingPanel x:Name="CronPanel" 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" />
                         </WrapPanel>
-                        <TextBox x:Name="Cron" Style="{StaticResource MyTextBoxStyle}" Width="290" Text="{Binding Cron, Mode=OneWay}" FontSize="14" />
+                        <TextBox x:Name="Cron" Width="290" Text="{Binding Cron, Mode=OneWay}" FontSize="14" />
                     </hc:UniformSpacingPanel>
 
 
 
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
-                        <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"/>
+                        <TextBlock Text="完成时间:"  Style="{StaticResource LeftTB}"/>
+                        <TextBlock x:Name="DoneTime" Text="{Binding DoneTime, Mode=OneWay}" Width="200"/>
                     </hc:UniformSpacingPanel>
 
 
                     <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                        <Button Content="保存" Style="{StaticResource MyBtnStyle}" Margin="320,6,-208,-10"
+                        <Button Content="保存" Style="{StaticResource Btn1}" Margin="320,6,-208,-10"
                             Click="Save_Button_Click"/>
                     </hc:UniformSpacingPanel>
                 </StackPanel>

Control/Windows/ToDoInfoWindow.xaml.cs

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

Control/Windows/ToDoWindow.xaml

@@ -10,7 +10,6 @@
            Height="550" 
            Width="1000" 
            Title="Task"
-           ResizeMode="NoResize"
            WindowStyle="None"
            AllowsTransparency="True"
            Background="Transparent" ShowInTaskbar="False"
@@ -79,21 +78,17 @@
                         </hc:SideMenuItem>
                     </hc:SideMenu>
                 </hc:Card>
-                <UniformGrid x:Name="UFG" Grid.Column="1" Grid.Row="0">
-                    <hc:TransitioningContentControl TransitionMode="Left2RightWithFade">
-                        <hc:Card x:Name="RightCard" VerticalAlignment="Top" MouseDown="DragMove" Background="Transparent" BorderThickness="0"   Height="410"/>
-                    </hc:TransitioningContentControl>
-                </UniformGrid>
-                
+                <hc:Card Grid.Row="0" MouseDown="DragMove" Background="Transparent" BorderThickness="0" Grid.Column="1" x:Name="RightCard" Height="450">
+                </hc:Card>
 
 
                 <Button Width="22" Height="22" Click="Close_Button_Click" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0" Grid.Column="1"/>
                 <Button Content="新建待办"
                     Panel.ZIndex="1"
-                    Style="{StaticResource MyBtnStyle}"
+                    Style="{StaticResource Btn1}"
                     Grid.Column="1"
-                    Margin="669,400,0,0"
-                    Click="CreateBacklog_BtnClick" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                    Margin="590.01,29,10,384"
+                    Click="CreateBacklog_BtnClick"/>
             </Grid>
         </Border>
     </Grid>

Control/Windows/ToDoWindow.xaml.cs

@@ -6,9 +6,16 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reactive.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
 
 namespace GeekDesk.Control.Windows
 {
@@ -24,18 +31,7 @@ namespace GeekDesk.Control.Windows
             InitializeComponent();
             RightCard.Content = backlog;
             backlog.BacklogList.ItemsSource = appData.ToDoList;
-            backlog.type = ToDoType.NEW;
             this.Topmost = true;
-            if (backlog.BacklogList.Items.Count > 0)
-            {
-                backlog.NoData.Visibility = Visibility.Collapsed;
-                backlog.BacklogList.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                backlog.NoData.Visibility = Visibility.Visible;
-                backlog.BacklogList.Visibility = Visibility.Collapsed;
-            }
         }
 
 
@@ -68,46 +64,12 @@ namespace GeekDesk.Control.Windows
             switch (smi.Tag.ToString())
             {
                 case "History":
-                    UFG.Visibility = Visibility.Collapsed;
-                    //排序历史待办 倒序
-
-                    List<ToDoInfo> list = appData.HiToDoList.OrderByDescending(v=>v.DoneTime).ToList();
-                    appData.HiToDoList.Clear();
-                    foreach (var item in list)
-                    {
-                        appData.HiToDoList.Add(item);
-                    }
                     backlog.BacklogList.ItemsSource = appData.HiToDoList;
-                    if (backlog.BacklogList.Items.Count > 0)
-                    {
-                        backlog.NoData.Visibility = Visibility.Collapsed;
-                        backlog.BacklogList.Visibility = Visibility.Visible;
-                    }
-                    else
-                    {
-                        backlog.NoData.Visibility = Visibility.Visible;
-                        backlog.BacklogList.Visibility = Visibility.Collapsed;
-                    }
                     backlog.type = ToDoType.HISTORY;
-                    backlog.IsNewToDo.Text = "N";
-                    UFG.Visibility = Visibility.Visible;
                     break;
                 default:
-                    UFG.Visibility = Visibility.Collapsed;
                     backlog.BacklogList.ItemsSource = appData.ToDoList;
-                    if (backlog.BacklogList.Items.Count > 0)
-                    {
-                        backlog.NoData.Visibility = Visibility.Collapsed;
-                        backlog.BacklogList.Visibility = Visibility.Visible;
-                    }
-                    else
-                    {
-                        backlog.NoData.Visibility = Visibility.Visible;
-                        backlog.BacklogList.Visibility = Visibility.Collapsed;
-                    }
                     backlog.type = ToDoType.NEW;
-                    backlog.IsNewToDo.Text = "Y";
-                    UFG.Visibility = Visibility.Visible;
                     break;
             }
         }
@@ -124,7 +86,9 @@ namespace GeekDesk.Control.Windows
 
 
         private static System.Windows.Window window = null;
+#pragma warning disable CS0108 // “ToDoWindow.Show()”隐藏继承的成员“Window.Show()”。如果是有意隐藏，请使用关键字 new。
         public static void Show()
+#pragma warning restore CS0108 // “ToDoWindow.Show()”隐藏继承的成员“Window.Show()”。如果是有意隐藏，请使用关键字 new。
         {
             if (window == null || !window.Activate())
             {
@@ -134,26 +98,10 @@ namespace GeekDesk.Control.Windows
             Keyboard.Focus(window);
         }
 
-        public static void ShowOrHide()
-        {
-            if (window == null || !window.Activate())
-            {
-                window = new ToDoWindow();
-                window.Show();
-                Keyboard.Focus(window);
-            }
-            else
-            {
-                window.Close();
-            }
-        }
-
-
         public void OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Escape)
             {
-                this.DataContext = null;
                 this.Close();
             }
         }

Control/Windows/UpdateWindow.xaml

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

Control/Windows/UpdateWindow.xaml.cs

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

Converts/BGStyleConvert.cs

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

Converts/Count2VisibleConvert.cs

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

Converts/CountGreZero2BoolConvert.cs

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

Converts/DoubleToGridLength.cs

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

Converts/GetWidthByWWConvert.cs

@@ -1,54 +0,0 @@
-using GeekDesk.Constant;
-using GeekDesk.ViewModel;
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace GeekDesk.Converts
-{
-    /// <summary>
-    /// 根据主窗口width 和传入类型  获取其它宽度
-    /// </summary>
-    class GetWidthByWWConvert : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            WidthTypeEnum type = (WidthTypeEnum)parameter;
-
-            AppConfig config = MainWindow.appData.AppConfig;
-
-            if (WidthTypeEnum.LEFT_CARD == type)
-            {
-                return config.MenuCardWidth;
-            }
-            else if (WidthTypeEnum.RIGHT_CARD == type)
-            {
-                return config.WindowWidth - config.MenuCardWidth;
-            } else if (WidthTypeEnum.RIGHT_CARD_HALF == type)
-            {
-                return (config.WindowWidth - config.MenuCardWidth) * 0.618;
-            } else if (WidthTypeEnum.RIGHT_CARD_HALF_TEXT == type)
-            {
-                return (config.WindowWidth - config.MenuCardWidth) * 0.618 - config.ImageWidth - 20;
-            } else if (WidthTypeEnum.RIGHT_CARD_20 == type)
-            {
-                return (config.WindowWidth - config.MenuCardWidth) - 20;
-            }
-            else if (WidthTypeEnum.RIGHT_CARD_40 == type)
-            {
-                return (config.WindowWidth - config.MenuCardWidth) - 40;
-            }
-            else if (WidthTypeEnum.RIGHT_CARD_70 == type)
-            {
-                return (config.WindowWidth - config.MenuCardWidth) - 70;
-            }
-
-            return config.WindowWidth;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return null;
-        }
-    }
-}

Converts/HideTypeConvert.cs

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

Converts/IntToCornerRadius.cs

@@ -1,5 +1,9 @@
 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;
 
@@ -10,21 +14,12 @@ namespace GeekDesk.Converts
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             int val = int.Parse(value.ToString());
-            var param = 0;
-            if (parameter != null)
-            {
-                param = int.Parse(parameter.ToString());
-            }
-            if (val + param > 0)
-            {
-                val += param;
-            }
             return new CornerRadius(val);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return null;
+            throw new NotImplementedException();
         }
     }
 }

Converts/MenuInfoConvert.cs

@@ -1,10 +1,15 @@
-using System;
+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 class MenuInfoConvert : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
@@ -12,8 +17,7 @@ namespace GeekDesk.Converts
             if (menuIndex == -1)
             {
                 return "";
-            }
-            else
+            } else
             {
                 string type = parameter.ToString();
                 if ("1".Equals(type))

Converts/OpcityConvert.cs

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

Converts/ReverseBoolConvert.cs

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

Converts/SearchResWidth.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace GeekDesk.Converts
-{
-    class SearchResWidth : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            string param = parameter as string;
-            if ("1".Equals(param))
-            {
-                double menuLeftWidth = double.Parse(value.ToString());
-                return MainWindow.mainWindow.Width - menuLeftWidth;
-            }
-            else
-            {
-                double menuLeftWidth = double.Parse(value.ToString());
-                return (MainWindow.mainWindow.Width - menuLeftWidth) / 2;
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return null;
-        }
-    }
-}

Converts/SearchTypeConvert.cs

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

Converts/SortTypeConvert.cs

@@ -1,25 +0,0 @@
-using GeekDesk.Constant;
-using System;
-using System.Globalization;
-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());
-        }
-    }
-}

Converts/StringAppendConvert.cs

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

Converts/TodoTaskExecConvert.cs

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

Converts/UpdateTypeConvert.cs

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

Converts/Visibility2BooleanConverter.cs

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

CustomComponent/VirtualizingWrapPanel/ItemRange.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.CustomComponent.VirtualizingWrapPanel
-{
-    public struct ItemRange
-    {
-        public int StartIndex { get; }
-        public int EndIndex { get; }
-
-        public ItemRange(int startIndex, int endIndex) : this()
-        {
-            StartIndex = startIndex;
-            EndIndex = endIndex;
-        }
-
-        public bool Contains(int itemIndex)
-        {
-            return itemIndex >= StartIndex && itemIndex <= EndIndex;
-        }
-    }
-}

CustomComponent/VirtualizingWrapPanel/ScrollDirection.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.CustomComponent.VirtualizingWrapPanel
-{
-    public enum ScrollDirection
-    {
-        Vertical,
-        Horizontal
-    }
-}

CustomComponent/VirtualizingWrapPanel/SpacingMode.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekDesk.CustomComponent.VirtualizingWrapPanel
-{
-    public enum SpacingMode
-    {
-        /// <summary>
-        /// Spacing is disabled and all items will be arranged as closely as possible.
-        /// </summary>
-        None,
-        /// <summary>
-        /// The remaining space is evenly distributed between the items on a layout row, as well as the start and end of each row.
-        /// </summary>
-        Uniform,
-        /// <summary>
-        /// The remaining space is evenly distributed between the items on a layout row, excluding the start and end of each row.
-        /// </summary>
-        BetweenItemsOnly,
-        /// <summary>
-		/// The remaining space is evenly distributed between start and end of each row.
-		/// </summary>
-        StartAndEndOnly
-    }
-}

CustomComponent/VirtualizingWrapPanel/VirtualizingPanelBase.cs

@@ -1,492 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls.Primitives;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows;
-
-namespace GeekDesk.CustomComponent.VirtualizingWrapPanel
-{
-    public abstract class VirtualizingPanelBase : VirtualizingPanel, IScrollInfo
-    {
-        public static readonly DependencyProperty ScrollLineDeltaProperty = DependencyProperty.Register(nameof(ScrollLineDelta), typeof(double), typeof(VirtualizingPanelBase), new FrameworkPropertyMetadata(16.0));
-        public static readonly DependencyProperty MouseWheelDeltaProperty = DependencyProperty.Register(nameof(MouseWheelDelta), typeof(double), typeof(VirtualizingPanelBase), new FrameworkPropertyMetadata(48.0));
-        public static readonly DependencyProperty ScrollLineDeltaItemProperty = DependencyProperty.Register(nameof(ScrollLineDeltaItem), typeof(int), typeof(VirtualizingPanelBase), new FrameworkPropertyMetadata(1));
-        public static readonly DependencyProperty MouseWheelDeltaItemProperty = DependencyProperty.Register(nameof(MouseWheelDeltaItem), typeof(int), typeof(VirtualizingPanelBase), new FrameworkPropertyMetadata(3));
-        private ScrollViewer scrollOwner;
-
-        public ScrollViewer GetScrollOwner()
-        {
-            return scrollOwner;
-        }
-
-        public void SetScrollOwner(ScrollViewer value)
-        {
-            scrollOwner = value;
-        }
-
-        public bool CanVerticallyScroll { get; set; }
-        public bool CanHorizontallyScroll { get; set; }
-
-        protected override bool CanHierarchicallyScrollAndVirtualizeCore => true;
-
-        /// <summary>
-        /// Scroll line delta for pixel based scrolling. The default value is 16 dp.
-        /// </summary>
-        public double ScrollLineDelta { get => (double)GetValue(ScrollLineDeltaProperty); set => SetValue(ScrollLineDeltaProperty, value); }
-
-        /// <summary>
-        /// Mouse wheel delta for pixel based scrolling. The default value is 48 dp.
-        /// </summary>        
-        public double MouseWheelDelta { get => (double)GetValue(MouseWheelDeltaProperty); set => SetValue(MouseWheelDeltaProperty, value); }
-
-        /// <summary>
-        /// Scroll line delta for item based scrolling. The default value is 1 item.
-        /// </summary>
-        public double ScrollLineDeltaItem { get => (int)GetValue(ScrollLineDeltaItemProperty); set => SetValue(ScrollLineDeltaItemProperty, value); }
-
-        /// <summary>
-        /// Mouse wheel delta for item based scrolling. The default value is 3 items.
-        /// </summary> 
-        public int MouseWheelDeltaItem { get => (int)GetValue(MouseWheelDeltaItemProperty); set => SetValue(MouseWheelDeltaItemProperty, value); }
-
-        protected ScrollUnit ScrollUnit => GetScrollUnit(ItemsControl);
-
-        /// <summary>
-        /// The direction in which the panel scrolls when user turns the mouse wheel.
-        /// </summary>
-        protected ScrollDirection MouseWheelScrollDirection { get; set; } = ScrollDirection.Vertical;
-
-
-        protected bool IsVirtualizing => GetIsVirtualizing(ItemsControl);
-
-        protected VirtualizationMode VirtualizationMode => GetVirtualizationMode(ItemsControl);
-
-        /// <summary>
-        /// Returns true if the panel is in VirtualizationMode.Recycling, otherwise false.
-        /// </summary>
-        protected bool IsRecycling => VirtualizationMode == VirtualizationMode.Recycling;
-
-        /// <summary>
-        /// The cache length before and after the viewport. 
-        /// </summary>
-        protected VirtualizationCacheLength CacheLength { get; private set; }
-
-        /// <summary>
-        /// The Unit of the cache length. Can be Pixel, Item or Page. 
-        /// When the ItemsOwner is a group item it can only be pixel or item.
-        /// </summary>
-        protected VirtualizationCacheLengthUnit CacheLengthUnit { get; private set; }
-
-
-        /// <summary>
-        /// The ItemsControl (e.g. ListView).
-        /// </summary>
-        protected ItemsControl ItemsControl => ItemsControl.GetItemsOwner(this);
-
-        /// <summary>
-        /// The ItemsControl (e.g. ListView) or if the ItemsControl is grouping a GroupItem.
-        /// </summary>
-        protected DependencyObject ItemsOwner
-        {
-            get
-            {
-                if (ItemsOwner1 is null)
-                {
-                    /* Use reflection to access internal method because the public 
-                     * GetItemsOwner method does always return the itmes control instead 
-                     * of the real items owner for example the group item when grouping */
-                    MethodInfo getItemsOwnerInternalMethod = typeof(ItemsControl).GetMethod(
-                        "GetItemsOwnerInternal",
-                        BindingFlags.Static | BindingFlags.NonPublic,
-                        null,
-                        new Type[] { typeof(DependencyObject) },
-                        null
-                    );
-                    ItemsOwner1 = (DependencyObject)getItemsOwnerInternalMethod.Invoke(null, new object[] { this });
-                }
-                return ItemsOwner1;
-            }
-        }
-        private DependencyObject _itemsOwner;
-
-        protected ReadOnlyCollection<object> Items => ((ItemContainerGenerator)ItemContainerGenerator).Items;
-
-        protected new IRecyclingItemContainerGenerator ItemContainerGenerator
-        {
-            get
-            {
-                if (_itemContainerGenerator is null)
-                {
-                    /* Because of a bug in the framework the ItemContainerGenerator 
-                     * is null until InternalChildren accessed at least one time. */
-                    var children = InternalChildren;
-                    _itemContainerGenerator = (IRecyclingItemContainerGenerator)base.ItemContainerGenerator;
-                }
-                return _itemContainerGenerator;
-            }
-        }
-        private IRecyclingItemContainerGenerator _itemContainerGenerator;
-
-        public double ExtentWidth => Extent.Width;
-        public double ExtentHeight => Extent.Height;
-        protected Size Extent { get; private set; } = new Size(0, 0);
-
-        public double HorizontalOffset => Offset.X;
-        public double VerticalOffset => Offset.Y;
-        protected Size Viewport { get; private set; } = new Size(0, 0);
-
-        public double ViewportWidth => Viewport.Width;
-        public double ViewportHeight => Viewport.Height;
-        protected Point Offset { get; private set; } = new Point(0, 0);
-
-        /// <summary>
-        /// The range of items that a realized in viewport or cache.
-        /// </summary>
-        protected ItemRange ItemRange { get; set; }
-        public ScrollViewer ScrollOwner { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public DependencyObject ItemsOwner1 { get => _itemsOwner; set => _itemsOwner = value; }
-
-        private Visibility previousVerticalScrollBarVisibility = Visibility.Collapsed;
-        private Visibility previousHorizontalScrollBarVisibility = Visibility.Collapsed;
-
-        protected virtual void UpdateScrollInfo(Size availableSize, Size extent)
-        {
-            bool invalidateScrollInfo = false;
-
-            if (extent != Extent)
-            {
-                Extent = extent;
-                invalidateScrollInfo = true;
-
-            }
-            if (availableSize != Viewport)
-            {
-                Viewport = availableSize;
-                invalidateScrollInfo = true;
-            }
-
-            if (ViewportHeight != 0 && VerticalOffset != 0 && VerticalOffset + ViewportHeight + 1 >= ExtentHeight)
-            {
-                Offset = new Point(Offset.X, extent.Height - availableSize.Height);
-                invalidateScrollInfo = true;
-            }
-            if (ViewportWidth != 0 && HorizontalOffset != 0 && HorizontalOffset + ViewportWidth + 1 >= ExtentWidth)
-            {
-                Offset = new Point(extent.Width - availableSize.Width, Offset.Y);
-                invalidateScrollInfo = true;
-            }
-
-            if (invalidateScrollInfo)
-            {
-                GetScrollOwner()?.InvalidateScrollInfo();
-            }
-        }
-
-        public virtual Rect MakeVisible(Visual visual, Rect rectangle)
-        {
-            Point pos = visual.TransformToAncestor(this).Transform(Offset);
-
-            double scrollAmountX = 0;
-            double scrollAmountY = 0;
-
-            if (pos.X < Offset.X)
-            {
-                scrollAmountX = -(Offset.X - pos.X);
-            }
-            else if ((pos.X + rectangle.Width) > (Offset.X + Viewport.Width))
-            {
-                double notVisibleX = (pos.X + rectangle.Width) - (Offset.X + Viewport.Width);
-                double maxScrollX = pos.X - Offset.X; // keep left of the visual visible
-                scrollAmountX = Math.Min(notVisibleX, maxScrollX);
-            }
-
-            if (pos.Y < Offset.Y)
-            {
-                scrollAmountY = -(Offset.Y - pos.Y);
-            }
-            else if ((pos.Y + rectangle.Height) > (Offset.Y + Viewport.Height))
-            {
-                double notVisibleY = (pos.Y + rectangle.Height) - (Offset.Y + Viewport.Height);
-                double maxScrollY = pos.Y - Offset.Y; // keep top of the visual visible
-                scrollAmountY = Math.Min(notVisibleY, maxScrollY);
-            }
-
-            SetHorizontalOffset(Offset.X + scrollAmountX);
-            SetVerticalOffset(Offset.Y + scrollAmountY);
-
-            double visibleRectWidth = Math.Min(rectangle.Width, Viewport.Width);
-            double visibleRectHeight = Math.Min(rectangle.Height, Viewport.Height);
-
-            return new Rect(scrollAmountX, scrollAmountY, visibleRectWidth, visibleRectHeight);
-        }
-
-        protected override void OnItemsChanged(object sender, ItemsChangedEventArgs args)
-        {
-            switch (args.Action)
-            {
-                case NotifyCollectionChangedAction.Remove:
-                case NotifyCollectionChangedAction.Replace:
-                    RemoveInternalChildRange(args.Position.Index, args.ItemUICount);
-                    break;
-                case NotifyCollectionChangedAction.Move:
-                    RemoveInternalChildRange(args.OldPosition.Index, args.ItemUICount);
-                    break;
-            }
-        }
-
-        protected int GetItemIndexFromChildIndex(int childIndex)
-        {
-            var generatorPosition = GetGeneratorPositionFromChildIndex(childIndex);
-            return ItemContainerGenerator.IndexFromGeneratorPosition(generatorPosition);
-        }
-
-        protected virtual GeneratorPosition GetGeneratorPositionFromChildIndex(int childIndex)
-        {
-            return new GeneratorPosition(childIndex, 0);
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            /* Sometimes when scrolling the scrollbar gets hidden without any reason. In this case the "IsMeasureValid" 
-             * property of the ScrollOwner is false. To prevent a infinite circle the mesasure call is ignored. */
-            if (GetScrollOwner() != null)
-            {
-                bool verticalScrollBarGotHidden = GetScrollOwner().VerticalScrollBarVisibility == ScrollBarVisibility.Auto
-                    && GetScrollOwner().ComputedVerticalScrollBarVisibility != Visibility.Visible
-                    && GetScrollOwner().ComputedVerticalScrollBarVisibility != previousVerticalScrollBarVisibility;
-
-                bool horizontalScrollBarGotHidden = GetScrollOwner().HorizontalScrollBarVisibility == ScrollBarVisibility.Auto
-                   && GetScrollOwner().ComputedHorizontalScrollBarVisibility != Visibility.Visible
-                   && GetScrollOwner().ComputedHorizontalScrollBarVisibility != previousHorizontalScrollBarVisibility;
-
-                previousVerticalScrollBarVisibility = GetScrollOwner().ComputedVerticalScrollBarVisibility;
-                previousHorizontalScrollBarVisibility = GetScrollOwner().ComputedHorizontalScrollBarVisibility;
-
-                if (!GetScrollOwner().IsMeasureValid && verticalScrollBarGotHidden || horizontalScrollBarGotHidden)
-                {
-                    return availableSize;
-                }
-            }
-
-            var groupItem = ItemsOwner as IHierarchicalVirtualizationAndScrollInfo;
-
-            Size extent;
-            Size desiredSize;
-
-            if (groupItem != null)
-            {
-                /* If the ItemsOwner is a group item the availableSize is ifinity. 
-                 * Therfore the vieport size provided by the group item is used. */
-                var viewportSize = groupItem.Constraints.Viewport.Size;
-                var headerSize = groupItem.HeaderDesiredSizes.PixelSize;
-                double availableWidth = Math.Max(viewportSize.Width - 5, 0); // left margin of 5 dp
-                double availableHeight = Math.Max(viewportSize.Height - headerSize.Height, 0);
-                availableSize = new Size(availableWidth, availableHeight);
-
-                extent = CalculateExtent(availableSize);
-
-                desiredSize = new Size(extent.Width, extent.Height);
-
-                Extent = extent;
-                Offset = groupItem.Constraints.Viewport.Location;
-                Viewport = groupItem.Constraints.Viewport.Size;
-                CacheLength = groupItem.Constraints.CacheLength;
-                CacheLengthUnit = groupItem.Constraints.CacheLengthUnit; // can be Item or Pixel
-            }
-            else
-            {
-                extent = CalculateExtent(availableSize);
-                double desiredWidth = Math.Min(availableSize.Width, extent.Width);
-                double desiredHeight = Math.Min(availableSize.Height, extent.Height);
-                desiredSize = new Size(desiredWidth, desiredHeight);
-
-                UpdateScrollInfo(desiredSize, extent);
-                CacheLength = GetCacheLength(ItemsOwner);
-                CacheLengthUnit = GetCacheLengthUnit(ItemsOwner); // can be Page, Item or Pixel
-            }
-
-            ItemRange = UpdateItemRange();
-
-            RealizeItems();
-            VirtualizeItems();
-
-            return desiredSize;
-        }
-
-        /// <summary>
-        /// Realizes visible and cached items.
-        /// </summary>
-        protected virtual void RealizeItems()
-        {
-            var startPosition = ItemContainerGenerator.GeneratorPositionFromIndex(ItemRange.StartIndex);
-
-            int childIndex = startPosition.Offset == 0 ? startPosition.Index : startPosition.Index + 1;
-
-            using (ItemContainerGenerator.StartAt(startPosition, GeneratorDirection.Forward, true))
-            {
-                for (int i = ItemRange.StartIndex; i <= ItemRange.EndIndex; i++, childIndex++)
-                {
-                    UIElement child = (UIElement)ItemContainerGenerator.GenerateNext(out bool isNewlyRealized);
-                    if (isNewlyRealized || /*recycled*/!InternalChildren.Contains(child))
-                    {
-                        if (childIndex >= InternalChildren.Count)
-                        {
-                            AddInternalChild(child);
-                        }
-                        else
-                        {
-                            InsertInternalChild(childIndex, child);
-                        }
-                        ItemContainerGenerator.PrepareItemContainer(child);
-
-                        child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-                    }
-
-                    if (child is IHierarchicalVirtualizationAndScrollInfo groupItem)
-                    {
-                        groupItem.Constraints = new HierarchicalVirtualizationConstraints(
-                            new VirtualizationCacheLength(0),
-                            VirtualizationCacheLengthUnit.Item,
-                            new Rect(0, 0, ViewportWidth, ViewportHeight));
-                        child.Measure(new Size(ViewportWidth, ViewportHeight));
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Virtualizes (cleanups) no longer visible or cached items.
-        /// </summary>
-        protected virtual void VirtualizeItems()
-        {
-            for (int childIndex = InternalChildren.Count - 1; childIndex >= 0; childIndex--)
-            {
-                var generatorPosition = GetGeneratorPositionFromChildIndex(childIndex);
-
-                int itemIndex = ItemContainerGenerator.IndexFromGeneratorPosition(generatorPosition);
-
-                if (itemIndex != -1 && !ItemRange.Contains(itemIndex))
-                {
-                    if (VirtualizationMode == VirtualizationMode.Recycling)
-                    {
-                        ItemContainerGenerator.Recycle(generatorPosition, 1);
-                    }
-                    else
-                    {
-                        ItemContainerGenerator.Remove(generatorPosition, 1);
-                    }
-                    RemoveInternalChildRange(childIndex, 1);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Calculates the extent that would be needed to show all items.
-        /// </summary>
-        protected abstract Size CalculateExtent(Size availableSize);
-
-        /// <summary>
-        /// Calculates the item range that is visible in the viewport or cached.
-        /// </summary>
-        protected abstract ItemRange UpdateItemRange();
-
-        public void SetVerticalOffset(double offset)
-        {
-            if (offset < 0 || Viewport.Height >= Extent.Height)
-            {
-                offset = 0;
-            }
-            else if (offset + Viewport.Height >= Extent.Height)
-            {
-                offset = Extent.Height - Viewport.Height;
-            }
-            Offset = new Point(Offset.X, offset);
-            GetScrollOwner()?.InvalidateScrollInfo();
-            InvalidateMeasure();
-        }
-
-        public void SetHorizontalOffset(double offset)
-        {
-            if (offset < 0 || Viewport.Width >= Extent.Width)
-            {
-                offset = 0;
-            }
-            else if (offset + Viewport.Width >= Extent.Width)
-            {
-                offset = Extent.Width - Viewport.Width;
-            }
-            Offset = new Point(offset, Offset.Y);
-            GetScrollOwner()?.InvalidateScrollInfo();
-            InvalidateMeasure();
-        }
-
-        protected void ScrollVertical(double amount)
-        {
-            SetVerticalOffset(VerticalOffset + amount);
-        }
-
-        protected void ScrollHorizontal(double amount)
-        {
-            SetHorizontalOffset(HorizontalOffset + amount);
-        }
-
-        public void LineUp() => ScrollVertical(ScrollUnit == ScrollUnit.Pixel ? -ScrollLineDelta : GetLineUpScrollAmount());
-        public void LineDown() => ScrollVertical(ScrollUnit == ScrollUnit.Pixel ? ScrollLineDelta : GetLineDownScrollAmount());
-        public void LineLeft() => ScrollHorizontal(ScrollUnit == ScrollUnit.Pixel ? -ScrollLineDelta : GetLineLeftScrollAmount());
-        public void LineRight() => ScrollHorizontal(ScrollUnit == ScrollUnit.Pixel ? ScrollLineDelta : GetLineRightScrollAmount());
-
-        public void MouseWheelUp()
-        {
-            if (MouseWheelScrollDirection == ScrollDirection.Vertical)
-            {
-                ScrollVertical(ScrollUnit == ScrollUnit.Pixel ? -MouseWheelDelta : GetMouseWheelUpScrollAmount());
-            }
-            else
-            {
-                MouseWheelLeft();
-            }
-        }
-
-        public void MouseWheelDown()
-        {
-            if (MouseWheelScrollDirection == ScrollDirection.Vertical)
-            {
-                ScrollVertical(ScrollUnit == ScrollUnit.Pixel ? MouseWheelDelta : GetMouseWheelDownScrollAmount());
-            }
-            else
-            {
-                MouseWheelRight();
-            }
-        }
-
-        public void MouseWheelLeft() => ScrollHorizontal(ScrollUnit == ScrollUnit.Pixel ? -MouseWheelDelta : GetMouseWheelLeftScrollAmount());
-        public void MouseWheelRight() => ScrollHorizontal(ScrollUnit == ScrollUnit.Pixel ? MouseWheelDelta : GetMouseWheelRightScrollAmount());
-
-        public void PageUp() => ScrollVertical(ScrollUnit == ScrollUnit.Pixel ? -ViewportHeight : GetPageUpScrollAmount());
-        public void PageDown() => ScrollVertical(ScrollUnit == ScrollUnit.Pixel ? ViewportHeight : GetPageDownScrollAmount());
-        public void PageLeft() => ScrollHorizontal(ScrollUnit == ScrollUnit.Pixel ? -ViewportHeight : GetPageLeftScrollAmount());
-        public void PageRight() => ScrollHorizontal(ScrollUnit == ScrollUnit.Pixel ? ViewportHeight : GetPageRightScrollAmount());
-
-        protected abstract double GetLineUpScrollAmount();
-        protected abstract double GetLineDownScrollAmount();
-        protected abstract double GetLineLeftScrollAmount();
-        protected abstract double GetLineRightScrollAmount();
-
-        protected abstract double GetMouseWheelUpScrollAmount();
-        protected abstract double GetMouseWheelDownScrollAmount();
-        protected abstract double GetMouseWheelLeftScrollAmount();
-        protected abstract double GetMouseWheelRightScrollAmount();
-
-        protected abstract double GetPageUpScrollAmount();
-        protected abstract double GetPageDownScrollAmount();
-        protected abstract double GetPageLeftScrollAmount();
-        protected abstract double GetPageRightScrollAmount();
-    }
-}

CustomComponent/VirtualizingWrapPanel/VirtualizingWrapPanel.cs

@@ -1,474 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls.Primitives;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows;
-using GeekDesk.CustomComponent.VirtualizingWrapPanel;
-
-namespace GeekDesk.CustomComponent.VirtualizingWrapPanel
-{
-    public class VirtualizingWrapPanel : VirtualizingPanelBase
-    {
-        #region Deprecated properties
-
-        [Obsolete("Use SpacingMode")]
-        public static readonly DependencyProperty IsSpacingEnabledProperty = DependencyProperty.Register(nameof(IsSpacingEnabled), typeof(bool), typeof(VirtualizingWrapPanel), new FrameworkPropertyMetadata(true, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        [Obsolete("Use IsSpacingEnabled")]
-        public bool SpacingEnabled { get => IsSpacingEnabled; set => IsSpacingEnabled = value; }
-
-        /// <summary>
-        ///  Gets or sets a value that specifies whether the items are distributed evenly across the width (horizontal orientation) 
-        ///  or height (vertical orientation). The default value is true.
-        /// </summary>
-        [Obsolete("Use SpacingMode")]
-        public bool IsSpacingEnabled { get => (bool)GetValue(IsSpacingEnabledProperty); set => SetValue(IsSpacingEnabledProperty, value); }
-
-        [Obsolete("Use ItemSize")]
-        public Size ChildrenSize { get => ItemSize; set => ItemSize = value; }
-
-        #endregion
-
-        public static readonly DependencyProperty SpacingModeProperty = DependencyProperty.Register(nameof(SpacingMode), typeof(SpacingMode), typeof(VirtualizingWrapPanel), new FrameworkPropertyMetadata(SpacingMode.Uniform, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(nameof(Orientation), typeof(Orientation), typeof(VirtualizingWrapPanel), new FrameworkPropertyMetadata(Orientation.Vertical, FrameworkPropertyMetadataOptions.AffectsMeasure, (obj, args) => ((VirtualizingWrapPanel)obj).Orientation_Changed()));
-
-        public static readonly DependencyProperty ItemSizeProperty = DependencyProperty.Register(nameof(ItemSize), typeof(Size), typeof(VirtualizingWrapPanel), new FrameworkPropertyMetadata(Size.Empty, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public static readonly DependencyProperty StretchItemsProperty = DependencyProperty.Register(nameof(StretchItems), typeof(bool), typeof(VirtualizingWrapPanel), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.AffectsArrange));
-
-        /// <summary>
-        /// Gets or sets the spacing mode used when arranging the items. The default value is <see cref="SpacingMode.Uniform"/>.
-        /// </summary>
-        public SpacingMode SpacingMode { get => (SpacingMode)GetValue(SpacingModeProperty); set => SetValue(SpacingModeProperty, value); }
-
-        /// <summary>
-        /// Gets or sets a value that specifies the orientation in which items are arranged. The default value is <see cref="Orientation.Vertical"/>.
-        /// </summary>
-        public Orientation Orientation { get => (Orientation)GetValue(OrientationProperty); set => SetValue(OrientationProperty, value); }
-
-        /// <summary>
-        /// Gets or sets a value that specifies the size of the items. The default value is <see cref="Size.Empty"/>. 
-        /// If the value is <see cref="Size.Empty"/> the size of the items gots measured by the first realized item.
-        /// </summary>
-        public Size ItemSize { get => (Size)GetValue(ItemSizeProperty); set => SetValue(ItemSizeProperty, value); }
-
-        /// <summary>
-        /// Gets or sets a value that specifies if the items get stretched to fill up remaining space. The default value is false.
-        /// </summary>
-        /// <remarks>
-        /// The MaxWidth and MaxHeight properties of the ItemContainerStyle can be used to limit the stretching. 
-        /// In this case the use of the remaining space will be determined by the SpacingMode property. 
-        /// </remarks>
-        public bool StretchItems { get => (bool)GetValue(StretchItemsProperty); set => SetValue(StretchItemsProperty, value); }
-
-        protected Size childSize;
-
-        protected int rowCount;
-
-        protected int itemsPerRowCount;
-
-        private void Orientation_Changed()
-        {
-            MouseWheelScrollDirection = Orientation == Orientation.Vertical ? ScrollDirection.Vertical : ScrollDirection.Horizontal;
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            UpdateChildSize(availableSize);
-            return base.MeasureOverride(availableSize);
-        }
-
-        private void UpdateChildSize(Size availableSize)
-        {
-            if (ItemsOwner is IHierarchicalVirtualizationAndScrollInfo groupItem
-                && VirtualizingPanel.GetIsVirtualizingWhenGrouping(ItemsControl))
-            {
-                if (Orientation == Orientation.Vertical)
-                {
-                    availableSize.Width = groupItem.Constraints.Viewport.Size.Width;
-                    availableSize.Width = Math.Max(availableSize.Width - (Margin.Left + Margin.Right), 0);
-                }
-                else
-                {
-                    availableSize.Height = groupItem.Constraints.Viewport.Size.Height;
-                    availableSize.Height = Math.Max(availableSize.Height - (Margin.Top + Margin.Bottom), 0);
-                }
-            }
-
-            if (ItemSize != Size.Empty)
-            {
-                childSize = ItemSize;
-            }
-            else if (InternalChildren.Count != 0)
-            {
-                childSize = InternalChildren[0].DesiredSize;
-            }
-            else
-            {
-                childSize = CalculateChildSize(availableSize);
-            }
-
-            if (double.IsInfinity(GetWidth(availableSize)))
-            {
-                itemsPerRowCount = Items.Count;
-            }
-            else
-            {
-                itemsPerRowCount = Math.Max(1, (int)Math.Floor(GetWidth(availableSize) / GetWidth(childSize)));
-            }
-
-            rowCount = (int)Math.Ceiling((double)Items.Count / itemsPerRowCount);
-        }
-
-        private Size CalculateChildSize(Size availableSize)
-        {
-            if (Items.Count == 0)
-            {
-                return new Size(0, 0);
-            }
-            var startPosition = ItemContainerGenerator.GeneratorPositionFromIndex(0);
-            using (ItemContainerGenerator.StartAt(startPosition, GeneratorDirection.Forward, true))
-            {
-                var child = (UIElement)ItemContainerGenerator.GenerateNext();
-                AddInternalChild(child);
-                ItemContainerGenerator.PrepareItemContainer(child);
-                child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-                return child.DesiredSize;
-            }
-        }
-
-        protected override Size CalculateExtent(Size availableSize)
-        {
-            double extentWidth = IsSpacingEnabled && SpacingMode != SpacingMode.None && !double.IsInfinity(GetWidth(availableSize))
-                ? GetWidth(availableSize)
-                : GetWidth(childSize) * itemsPerRowCount;
-
-            if (ItemsOwner is IHierarchicalVirtualizationAndScrollInfo groupItem)
-            {
-                if (Orientation == Orientation.Vertical)
-                {
-                    extentWidth = Math.Max(extentWidth - (Margin.Left + Margin.Right), 0);
-                }
-                else
-                {
-                    extentWidth = Math.Max(extentWidth - (Margin.Top + Margin.Bottom), 0);
-                }
-            }
-
-            double extentHeight = GetHeight(childSize) * rowCount;
-            return CreateSize(extentWidth, extentHeight);
-        }
-
-        protected void CalculateSpacing(Size finalSize, out double innerSpacing, out double outerSpacing)
-        {
-            Size childSize = CalculateChildArrangeSize(finalSize);
-
-            double finalWidth = GetWidth(finalSize);
-
-            double totalItemsWidth = Math.Min(GetWidth(childSize) * itemsPerRowCount, finalWidth);
-            double unusedWidth = finalWidth - totalItemsWidth;
-
-            SpacingMode spacingMode = IsSpacingEnabled ? SpacingMode : SpacingMode.None;
-
-            switch (spacingMode)
-            {
-                case SpacingMode.Uniform:
-                    innerSpacing = outerSpacing = unusedWidth / (itemsPerRowCount + 1);
-                    break;
-
-                case SpacingMode.BetweenItemsOnly:
-                    innerSpacing = unusedWidth / Math.Max(itemsPerRowCount - 1, 1);
-                    outerSpacing = 0;
-                    break;
-
-                case SpacingMode.StartAndEndOnly:
-                    innerSpacing = 0;
-                    outerSpacing = unusedWidth / 2;
-                    break;
-
-                case SpacingMode.None:
-                default:
-                    innerSpacing = 0;
-                    outerSpacing = 0;
-                    break;
-            }
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            double offsetX = GetX(Offset);
-            double offsetY = GetY(Offset);
-
-            /* When the items owner is a group item offset is handled by the parent panel. */
-            if (ItemsOwner is IHierarchicalVirtualizationAndScrollInfo groupItem)
-            {
-                offsetY = 0;
-            }
-
-            Size childSize = CalculateChildArrangeSize(finalSize);
-
-            CalculateSpacing(finalSize, out double innerSpacing, out double outerSpacing);
-
-            for (int childIndex = 0; childIndex < InternalChildren.Count; childIndex++)
-            {
-                UIElement child = InternalChildren[childIndex];
-
-                int itemIndex = GetItemIndexFromChildIndex(childIndex);
-
-                int columnIndex = itemIndex % itemsPerRowCount;
-                int rowIndex = itemIndex / itemsPerRowCount;
-
-                double x = outerSpacing + columnIndex * (GetWidth(childSize) + innerSpacing);
-                double y = rowIndex * GetHeight(childSize);
-
-                if (GetHeight(finalSize) == 0.0)
-                {
-                    /* When the parent panel is grouping and a cached group item is not 
-                     * in the viewport it has no valid arrangement. That means that the 
-                     * height/width is 0. Therefore the items should not be visible so 
-                     * that they are not falsely displayed. */
-                    child.Arrange(new Rect(0, 0, 0, 0));
-                }
-                else
-                {
-                    child.Arrange(CreateRect(x - offsetX, y - offsetY, childSize.Width, childSize.Height));
-                }
-            }
-
-            return finalSize;
-        }
-
-        protected Size CalculateChildArrangeSize(Size finalSize)
-        {
-            if (StretchItems)
-            {
-                if (Orientation == Orientation.Vertical)
-                {
-                    double childMaxWidth = ReadItemContainerStyle(MaxWidthProperty, double.PositiveInfinity);
-                    double maxPossibleChildWith = finalSize.Width / itemsPerRowCount;
-                    double childWidth = Math.Min(maxPossibleChildWith, childMaxWidth);
-                    return new Size(childWidth, childSize.Height);
-                }
-                else
-                {
-                    double childMaxHeight = ReadItemContainerStyle(MaxHeightProperty, double.PositiveInfinity);
-                    double maxPossibleChildHeight = finalSize.Height / itemsPerRowCount;
-                    double childHeight = Math.Min(maxPossibleChildHeight, childMaxHeight);
-                    return new Size(childSize.Width, childHeight);
-                }
-            }
-            else
-            {
-                return childSize;
-            }
-        }
-
-        private T ReadItemContainerStyle<T>(DependencyProperty property, T fallbackValue) 
-        {
-            var value = ItemsControl.ItemContainerStyle?.Setters.OfType<Setter>()
-                .FirstOrDefault(setter => setter.Property == property)?.Value;
-            return (T)(value ?? fallbackValue);
-        }
-
-        protected override ItemRange UpdateItemRange()
-        {
-            if (!IsVirtualizing)
-            {
-                return new ItemRange(0, Items.Count - 1);
-            }
-
-            int startIndex;
-            int endIndex;
-
-            if (ItemsOwner is IHierarchicalVirtualizationAndScrollInfo groupItem)
-            {
-                if (!VirtualizingPanel.GetIsVirtualizingWhenGrouping(ItemsControl))
-                {
-                    return new ItemRange(0, Items.Count - 1);
-                }
-
-                var offset = new Point(Offset.X, groupItem.Constraints.Viewport.Location.Y);
-
-                int offsetRowIndex;
-                double offsetInPixel;
-
-                int rowCountInViewport;
-
-                if (ScrollUnit == ScrollUnit.Item)
-                {
-                    offsetRowIndex = GetY(offset) >= 1 ? (int)GetY(offset) - 1 : 0; // ignore header
-                    offsetInPixel = offsetRowIndex * GetHeight(childSize);
-                }
-                else
-                {
-                    offsetInPixel = Math.Min(Math.Max(GetY(offset) - GetHeight(groupItem.HeaderDesiredSizes.PixelSize), 0), GetHeight(Extent));
-                    offsetRowIndex = GetRowIndex(offsetInPixel);
-                }
-
-                double viewportHeight = Math.Min(GetHeight(Viewport), Math.Max(GetHeight(Extent) - offsetInPixel, 0));
-
-                rowCountInViewport = (int)Math.Ceiling((offsetInPixel + viewportHeight) / GetHeight(childSize)) - (int)Math.Floor(offsetInPixel / GetHeight(childSize));
-
-                startIndex = offsetRowIndex * itemsPerRowCount;
-                endIndex = Math.Min(((offsetRowIndex + rowCountInViewport) * itemsPerRowCount) - 1, Items.Count - 1);
-
-                if (CacheLengthUnit == VirtualizationCacheLengthUnit.Pixel)
-                {
-                    double cacheBeforeInPixel = Math.Min(CacheLength.CacheBeforeViewport, offsetInPixel);
-                    double cacheAfterInPixel = Math.Min(CacheLength.CacheAfterViewport, GetHeight(Extent) - viewportHeight - offsetInPixel);
-                    int rowCountInCacheBefore = (int)(cacheBeforeInPixel / GetHeight(childSize));
-                    int rowCountInCacheAfter = ((int)Math.Ceiling((offsetInPixel + viewportHeight + cacheAfterInPixel) / GetHeight(childSize))) - (int)Math.Ceiling((offsetInPixel + viewportHeight) / GetHeight(childSize));
-                    startIndex = Math.Max(startIndex - rowCountInCacheBefore * itemsPerRowCount, 0);
-                    endIndex = Math.Min(endIndex + rowCountInCacheAfter * itemsPerRowCount, Items.Count - 1);
-                }
-                else if (CacheLengthUnit == VirtualizationCacheLengthUnit.Item)
-                {
-                    startIndex = Math.Max(startIndex - (int)CacheLength.CacheBeforeViewport, 0);
-                    endIndex = Math.Min(endIndex + (int)CacheLength.CacheAfterViewport, Items.Count - 1);
-                }
-            }
-            else
-            {
-                double viewportSartPos = GetY(Offset);
-                double viewportEndPos = GetY(Offset) + GetHeight(Viewport);
-
-                if (CacheLengthUnit == VirtualizationCacheLengthUnit.Pixel)
-                {
-                    viewportSartPos = Math.Max(viewportSartPos - CacheLength.CacheBeforeViewport, 0);
-                    viewportEndPos = Math.Min(viewportEndPos + CacheLength.CacheAfterViewport, GetHeight(Extent));
-                }
-
-                int startRowIndex = GetRowIndex(viewportSartPos);
-                startIndex = startRowIndex * itemsPerRowCount;
-
-                int endRowIndex = GetRowIndex(viewportEndPos);
-                endIndex = Math.Min(endRowIndex * itemsPerRowCount + (itemsPerRowCount - 1), Items.Count - 1);
-
-                if (CacheLengthUnit == VirtualizationCacheLengthUnit.Page)
-                {
-                    int itemsPerPage = endIndex - startIndex + 1;
-                    startIndex = Math.Max(startIndex - (int)CacheLength.CacheBeforeViewport * itemsPerPage, 0);
-                    endIndex = Math.Min(endIndex + (int)CacheLength.CacheAfterViewport * itemsPerPage, Items.Count - 1);
-                }
-                else if (CacheLengthUnit == VirtualizationCacheLengthUnit.Item)
-                {
-                    startIndex = Math.Max(startIndex - (int)CacheLength.CacheBeforeViewport, 0);
-                    endIndex = Math.Min(endIndex + (int)CacheLength.CacheAfterViewport, Items.Count - 1);
-                }
-            }
-
-            return new ItemRange(startIndex, endIndex);
-        }
-
-        private int GetRowIndex(double location)
-        {
-            int calculatedRowIndex = (int)Math.Floor(location / GetHeight(childSize));
-            int maxRowIndex = (int)Math.Ceiling((double)Items.Count / (double)itemsPerRowCount);
-            return Math.Max(Math.Min(calculatedRowIndex, maxRowIndex), 0);
-        }
-
-        protected override void BringIndexIntoView(int index)
-        {
-            if (index < 0 || index >= Items.Count)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index), $"The argument {nameof(index)} must be >= 0 and < the number of items.");
-            }
-
-            if (itemsPerRowCount == 0)
-            {
-                throw new InvalidOperationException();
-            }
-
-            var offset = (index / itemsPerRowCount) * GetHeight(childSize);
-
-            if (Orientation == Orientation.Horizontal)
-            {
-                SetHorizontalOffset(offset);
-            }
-            else
-            {
-                SetVerticalOffset(offset);
-            }
-        }
-
-        protected override double GetLineUpScrollAmount()
-        {
-            return -Math.Min(childSize.Height * ScrollLineDeltaItem, Viewport.Height);
-        }
-
-        protected override double GetLineDownScrollAmount()
-        {
-            return Math.Min(childSize.Height * ScrollLineDeltaItem, Viewport.Height);
-        }
-
-        protected override double GetLineLeftScrollAmount()
-        {
-            return -Math.Min(childSize.Width * ScrollLineDeltaItem, Viewport.Width);
-        }
-
-        protected override double GetLineRightScrollAmount()
-        {
-            return Math.Min(childSize.Width * ScrollLineDeltaItem, Viewport.Width);
-        }
-
-        protected override double GetMouseWheelUpScrollAmount()
-        {
-            return -Math.Min(childSize.Height * MouseWheelDeltaItem, Viewport.Height);
-        }
-
-        protected override double GetMouseWheelDownScrollAmount()
-        {
-            return Math.Min(childSize.Height * MouseWheelDeltaItem, Viewport.Height);
-        }
-
-        protected override double GetMouseWheelLeftScrollAmount()
-        {
-            return -Math.Min(childSize.Width * MouseWheelDeltaItem, Viewport.Width);
-        }
-
-        protected override double GetMouseWheelRightScrollAmount()
-        {
-            return Math.Min(childSize.Width * MouseWheelDeltaItem, Viewport.Width);
-        }
-
-        protected override double GetPageUpScrollAmount()
-        {
-            return -Viewport.Height;
-        }
-
-        protected override double GetPageDownScrollAmount()
-        {
-            return Viewport.Height;
-        }
-
-        protected override double GetPageLeftScrollAmount()
-        {
-            return -Viewport.Width;
-        }
-
-        protected override double GetPageRightScrollAmount()
-        {
-            return Viewport.Width;
-        }
-
-        /* orientation aware helper methods */
-
-        protected double GetX(Point point) => Orientation == Orientation.Vertical ? point.X : point.Y;
-        protected double GetY(Point point) => Orientation == Orientation.Vertical ? point.Y : point.X;
-
-        protected double GetWidth(Size size) => Orientation == Orientation.Vertical ? size.Width : size.Height;
-        protected double GetHeight(Size size) => Orientation == Orientation.Vertical ? size.Height : size.Width;
-
-        protected Size CreateSize(double width, double height) => Orientation == Orientation.Vertical ? new Size(width, height) : new Size(height, width);
-        protected Rect CreateRect(double x, double y, double width, double height) => Orientation == Orientation.Vertical ? new Rect(x, y, width, height) : new Rect(y, x, width, height);
-    }
-}

DraggAnimatedPanel/DraggAnimatedPanel.cs

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

GeekDesk.csproj

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
-  <Import Project="packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
-  <Import Project="packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -18,23 +15,6 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -47,6 +27,7 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -57,8 +38,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>GeekDesk.App</StartupObject>
@@ -67,7 +46,7 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Logo.ico</ApplicationIcon>
+    <ApplicationIcon>Taskbar.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <TargetZone>LocalIntranet</TargetZone>
@@ -75,9 +54,6 @@
   <PropertyGroup>
     <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommonServiceLocator, Version=2.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>packages\CommonServiceLocator.2.0.6\lib\net45\CommonServiceLocator.dll</HintPath>
@@ -97,9 +73,6 @@
     <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>
@@ -108,7 +81,6 @@
       <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
@@ -117,7 +89,6 @@
     <Reference Include="System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>packages\System.Drawing.Common.6.0.0-preview.6.21352.12\lib\net461\System.Drawing.Common.dll</HintPath>
     </Reference>
-    <Reference Include="System.Management" />
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
@@ -125,20 +96,12 @@
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive, Version=5.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -149,15 +112,9 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="WindowsAPICodePack.Shell.CommonFileDialogs, Version=1.1.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\WindowsAPICodePack.Shell.CommonFileDialogs.1.1.5\lib\net452\WindowsAPICodePack.Shell.CommonFileDialogs.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="XamlFlair.WPF, Version=1.2.13.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\XamlFlair.WPF.1.2.13\lib\net472\XamlFlair.WPF.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -168,43 +125,21 @@
     <Compile Include="Command\DelegateCommandBase.cs" />
     <Compile Include="Constant\AppHideType.cs" />
     <Compile Include="Constant\Constants.cs" />
-    <Compile Include="Constant\HotKeyType.cs" />
     <Compile Include="Constant\IconType.cs" />
     <Compile Include="Constant\CommonEnum.cs" />
     <Compile Include="Constant\IconStartType.cs" />
-    <Compile Include="Constant\MenuType.cs" />
-    <Compile Include="Constant\PasswordType.cs" />
-    <Compile Include="Constant\RunTimeStatus.cs" />
-    <Compile Include="Constant\SearchType.cs" />
     <Compile Include="Constant\SortType.cs" />
     <Compile Include="Constant\TodoTaskExecType.cs" />
-    <Compile Include="Constant\BGStyle.cs" />
     <Compile Include="Constant\UpdateType.cs" />
-    <Compile Include="Constant\WidthTypeEnum.cs" />
-    <Compile Include="Control\Other\GlobalMsgNotification.xaml.cs">
-      <DependentUpon>GlobalMsgNotification.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Control\Other\BacklogNotificatin.xaml.cs">
       <DependentUpon>BacklogNotificatin.xaml</DependentUpon>
     </Compile>
     <Compile Include="Control\Other\CustomIconUrlDialog.xaml.cs">
       <DependentUpon>CustomIconUrlDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Control\Other\GradientBGDialog.xaml.cs">
-      <DependentUpon>GradientBGDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Control\Other\PasswordDialog.xaml.cs">
-      <DependentUpon>PasswordDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Control\Other\MyColorPickerDialog.xaml.cs">
-      <DependentUpon>MyColorPickerDialog.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Control\Other\IconInfoUrlDialog.xaml.cs">
       <DependentUpon>IconInfoUrlDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Control\Other\SearchResControl.xaml.cs">
-      <DependentUpon>SearchResControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Control\UserControls\Config\OtherControl.xaml.cs">
       <DependentUpon>OtherControl.xaml</DependentUpon>
     </Compile>
@@ -217,12 +152,6 @@
     <Compile Include="Control\UserControls\IconFont\IconPannel.xaml.cs">
       <DependentUpon>IconPannel.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Control\Windows\GlobalColorPickerWindow.xaml.cs">
-      <DependentUpon>GlobalColorPickerWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Control\Windows\PixelColorPickerWindow.xaml.cs">
-      <DependentUpon>PixelColorPickerWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Control\Windows\SystemItemWindow.xaml.cs">
       <DependentUpon>SystemItemWindow.xaml</DependentUpon>
     </Compile>
@@ -259,99 +188,47 @@
     <Compile Include="Control\Windows\UpdateWindow.xaml.cs">
       <DependentUpon>UpdateWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Converts\CountGreZero2BoolConvert.cs" />
-    <Compile Include="Converts\Count2VisibleConvert.cs" />
-    <Compile Include="Converts\GetWidthByWWConvert.cs" />
-    <Compile Include="Converts\SearchTypeConvert.cs" />
-    <Compile Include="Converts\StringAppendConvert.cs" />
     <Compile Include="Converts\DoubleToGridLength.cs" />
     <Compile Include="Converts\MenuInfoConvert.cs" />
-    <Compile Include="Converts\SearchResWidth.cs" />
-    <Compile Include="Converts\SortTypeConvert.cs" />
     <Compile Include="Converts\TodoTaskExecConvert.cs" />
     <Compile Include="Converts\IntToCornerRadius.cs" />
     <Compile Include="Converts\OpcityConvert.cs" />
-    <Compile Include="Converts\BGStyleConvert.cs" />
     <Compile Include="Converts\UpdateTypeConvert.cs" />
-    <Compile Include="Converts\ReverseBoolConvert.cs" />
-    <Compile Include="Converts\Visibility2BooleanConverter.cs" />
-    <Compile Include="CustomComponent\DraggAnimatedPanel\DraggAnimatedPanel.cs" />
-    <Compile Include="CustomComponent\DraggAnimatedPanel\DraggAnimatedPanel.Drag.cs" />
+    <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.cs" />
+    <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.Drag.cs" />
     <Compile Include="Converts\HideTypeConvert.cs" />
     <Compile Include="Interface\IWindowCommon.cs" />
-    <Compile Include="MyThread\RelativePathThread.cs" />
-    <Compile Include="Plugins\EveryThing\Constant\EveryThingConst.cs" />
-    <Compile Include="Plugins\EveryThing\EveryThing32.cs" />
-    <Compile Include="Plugins\EveryThing\EveryThing64.cs" />
-    <Compile Include="Plugins\EveryThing\EveryThingUtil.cs" />
-    <Compile Include="Plugins\ShowSeconds\Common\Constants.cs" />
-    <Compile Include="Plugins\ShowSeconds\SecondsWindow.xaml.cs">
-      <DependentUpon>SecondsWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Plugins\ShowSeconds\ViewModel\SecondsDataContext.cs" />
-    <Compile Include="Task\ShowSecondTask.cs" />
     <Compile Include="Task\ToDoTask.cs" />
-    <Compile Include="MyThread\MouseHookThread.cs" />
-    <Compile Include="MyThread\DispatcherBuild.cs" />
-    <Compile Include="MyThread\UpdateThread.cs" />
+    <Compile Include="Thread\MouseHookThread.cs" />
+    <Compile Include="Thread\DispatcherBuild.cs" />
+    <Compile Include="Thread\UpdateThread.cs" />
     <Compile Include="Util\AeroGlassHelper.cs" />
-    <Compile Include="Util\BGSettingUtil.cs" />
-    <Compile Include="Util\BlurGlassUtil.cs" />
-    <Compile Include="Util\ColorUtil.cs" />
-    <Compile Include="Util\DefaultIcons.cs" />
-    <Compile Include="Util\DragAdorner.cs" />
-    <Compile Include="Util\FileWatcher.cs" />
     <Compile Include="Util\GlobalHotKey.cs" />
     <Compile Include="Util\CommonCode.cs" />
+    <Compile Include="Util\ConsoleManager.cs" />
+    <Compile Include="Util\DragAdorner.cs" />
     <Compile Include="Util\FileIcon.cs" />
     <Compile Include="Util\FileUtil.cs" />
-    <Compile Include="ViewModel\Temp\GuideInfoList.cs" />
-    <Compile Include="Util\HideWindowUtil.cs" />
-    <Compile Include="Util\IconHelper.cs" />
-    <Compile Include="Util\IconUtil.cs" />
-    <Compile Include="Util\KeyUtil.cs" />
-    <Compile Include="Util\ListBoxDragDropManager.cs" />
     <Compile Include="Util\LogUtil.cs" />
     <Compile Include="Util\MarginHide.cs" />
     <Compile Include="Util\HttpUtil.cs" />
     <Compile Include="Util\ImageUtil.cs" />
+    <Compile Include="Util\ListViewDragDropManager.cs" />
     <Compile Include="Converts\MenuWidthConvert.cs" />
-    <Compile Include="Util\MD5Util.cs" />
-    <Compile Include="Util\MessageUtil.cs" />
-    <Compile Include="Util\MouseHook.cs" />
     <Compile Include="Util\MouseUtil.cs" />
-    <Compile Include="Util\NativeMethods.cs" />
-    <Compile Include="Util\ProcessUtil.cs" />
+    <Compile Include="Util\MouseUtilities.cs" />
     <Compile Include="Util\RegisterUtil.cs" />
-    <Compile Include="Util\RelayCommand.cs" />
-    <Compile Include="Util\ScreenUtil.cs" />
-    <Compile Include="Util\ScrollUtil.cs" />
     <Compile Include="Util\ShellContextMenu.cs" />
     <Compile Include="Util\ShowWindowFollowMouse.cs" />
     <Compile Include="Util\StringUtil.cs" />
     <Compile Include="Util\SvgToGeometry.cs" />
-    <Compile Include="Util\UserActivityHook.cs" />
-    <Compile Include="CustomComponent\VirtualizingWrapPanel\ItemRange.cs" />
-    <Compile Include="CustomComponent\VirtualizingWrapPanel\SpacingMode.cs" />
-    <Compile Include="CustomComponent\VirtualizingWrapPanel\VirtualizingPanelBase.cs" />
-    <Compile Include="CustomComponent\VirtualizingWrapPanel\VirtualizingWrapPanel.cs" />
-    <Compile Include="Util\WindowsThumbnailProvider.cs" />
-    <Compile Include="Util\WindowUtil.cs" />
-    <Compile Include="CustomComponent\VirtualizingWrapPanel\ScrollDirection.cs" />
+    <Compile Include="Util\SystemIcon.cs" />
     <Compile Include="ViewModel\AppConfig.cs" />
     <Compile Include="ViewModel\AppData.cs" />
-    <Compile Include="ViewModel\GradientBGParam.cs" />
-    <Compile Include="ViewModel\CPDataContext.cs" />
-    <Compile Include="ViewModel\Temp\GradientBGParamList.cs" />
-    <Compile Include="ViewModel\Temp\SearchIconList.cs" />
     <Compile Include="ViewModel\ToDoInfo.cs" />
     <Compile Include="ViewModel\IconfontInfo.cs" />
     <Compile Include="ViewModel\IconInfo.cs" />
     <Compile Include="ViewModel\MenuInfo.cs" />
-    <Page Include="Control\Other\GlobalMsgNotification.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Control\Other\BacklogNotificatin.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -360,26 +237,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Control\Other\GradientBGDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Control\Other\PasswordDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Control\Other\MyColorPickerDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Control\Other\IconInfoUrlDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Control\Other\SearchResControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Control\UserControls\Config\OtherControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -396,14 +257,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Control\Windows\GlobalColorPickerWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Control\Windows\PixelColorPickerWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Control\Windows\SystemItemWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -464,10 +317,6 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Plugins\ShowSeconds\SecondsWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Resource\Dictionary\Geometry.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -476,11 +325,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Resource\Dictionary\XamlFlairSettings.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -501,19 +345,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <Resource Include="Resource\Iconfont\iconfont.json" />
-    <None Include="app.manifest" />
-    <None Include="Plugins\EveryThing\32\Everything.ini">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Plugins\EveryThing\32\Everything.lng">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Plugins\EveryThing\64\Everything.ini">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Plugins\EveryThing\64\Everything.lng">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="Properties\app.manifest" />
     <None Include="Update.json" />
     <None Include="packages.config" />
@@ -554,85 +385,35 @@
       <Isolated>False</Isolated>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resource\Image\SystemIcon\Services.png" />
+    <COMReference Include="Shell32">
+      <Guid>{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
   </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>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 和 x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
+    <Resource Include="Resource\Image\SystemIcon\Notepad.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Logo.ico" />
+    <Resource Include="Resource\Image\SystemIcon\Mstsc.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Plugins\EveryThing\lib\Everything32.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Plugins\EveryThing\lib\Everything64.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <Resource Include="Resource\Image\SystemIcon\Control.png" />
   </ItemGroup>
   <ItemGroup>
-    <WCFMetadata Include="Connected Services\" />
+    <Resource Include="Resource\Image\SystemIcon\CMD.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Plugins\EveryThing\32\Everything.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Plugins\EveryThing\64\Everything.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties update_1json__JsonSchema="https://beaujs.com/schema.json" />
-    </VisualStudio>
-  </ProjectExtensions>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
-    <Error Condition="!Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
-    <Error Condition="!Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
-    <Error Condition="!Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
-  </Target>
-  <Import Project="packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
-  <Import Project="packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
-  <Import Project="packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>; Move all assemblies and related files to lib folder
-ROBOCOPY "$(TargetDir) " "$(TargetDir)lib\ " /XF Data *.exe *.config *.manifest /XD "$(TargetDir)lib" plugins logs bak /E /IS /MOVE
-ROBOCOPY "$(TargetDir) " "$(TargetDir)lib\ " *.dll /XD "$(TargetDir)lib"  /E /S /MOVE
-if %25errorlevel%25 leq 4 exit 0 else exit %25errorlevel%25</PostBuildEvent>
-  </PropertyGroup>
 </Project>

GeekDesk.sln

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

Interface/IWindowCommon.cs

@@ -1,9 +1,15 @@
-using System.Windows.Input;
+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); 
+        void OnKeyDown(object sender, KeyEventArgs e);
     }
 }

LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

LICENSE.md

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

MainWindow.xaml

@@ -3,291 +3,133 @@
         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:uc="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
-        xmlns:cn="clr-namespace:GeekDesk.Constant"
-        xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
         xmlns:local="clr-namespace:GeekDesk"
+        xmlns:uc="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
         mc:Ignorable="d"
         xmlns:cvt="clr-namespace:GeekDesk.Converts"
-        x:Name="AppWindow"
-        xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" 
-        xmlns:my="clr-namespace:GeekDesk.Util"
-        d:DataContext="{d:DesignInstance Type=viewmodel:AppData}"
-        Title="GeekDesk_Main_8400A17AEEF7C029" 
+        xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel"
+        x:Name="window"
+        xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:AppData}"
+        Title="GeekDesk" 
         MinWidth="600"
         MinHeight="400"
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
         ShowInTaskbar="False"
-        Opacity="1"
-        Deactivated="AppWindow_Deactivated"
+        Opacity="0"
+        Deactivated="Window_Deactivated"
         SizeChanged="Window_SizeChanged"
-        PreviewKeyDown="OnKeyDown"
+        KeyDown="OnKeyDown"
         Focusable="True"
-        MouseDown="MainWindow_MouseDown"
-        MouseEnter="MainWindow_MouseEnter"
-        GotFocus="Window_GotFocus"
-        Loaded="Window_Loaded"   
-        SourceInitialized="Window_SourceInitialized"
-        Topmost="{Binding AppConfig.AlwaysTopmost}"
         >
-
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0" ResizeBorderThickness="15"/>
+    </WindowChrome.WindowChrome>
     <Window.Resources>
-        <RoutedUICommand x:Key="SearchHotKeyDown" Text="SearchHotKeyDown"/>
+       
         <cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
         <cvt:IntToCornerRadius x:Key="IntToCornerRadius"/>
         <cvt:DoubleToGridLength x:Key="DoubleToGridLength"/>
-        <cvt:ReverseBoolConvert x:Key="ReverseBoolConvert"/>
     </Window.Resources>
 
-    <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="0" CornerRadius="30" ResizeBorderThickness="23"/>
-    </WindowChrome.WindowChrome>
-
-    <Window.InputBindings>
-        <KeyBinding Gesture="Ctrl+F" Key="F"  Command="{StaticResource SearchHotKeyDown}"/>
-    </Window.InputBindings>
-    <Window.CommandBindings>
-        <CommandBinding Command="{StaticResource SearchHotKeyDown}" CanExecute="SearchHotKeyDown"/>
-    </Window.CommandBindings>
-
-    <!--Opacity="{Binding AppConfig.PannelOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"-->
-    <Grid>
-        <!--遮罩层border 用于引导提示-->
-        <Border Margin="20"
-                Visibility="Collapsed"
-                MouseDown="DragMove"
-                CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=OneWay, Converter={StaticResource IntToCornerRadius}}"
-                BorderThickness="0"
-                x:Name="GrayBorder"
-                Panel.ZIndex="888"
-                >
-            <Border.Background>
-                <SolidColorBrush Color="Gray" Opacity="0.9"/>
-            </Border.Background>
-            
-            <!--<hc:Poptip.Instance>
-                <hc:Poptip  PlacementType="Top" IsOpen="False" HitMode="None">
-                    <hc:Poptip.ContentTemplate>
-                        <DataTemplate>
-                            <Border Background="White" Width="300" Height="150">
-                                <TextBlock Text="这是一个测测试"/>
-                            </Border>
-                        </DataTemplate>
-                    </hc:Poptip.ContentTemplate>
-                </hc:Poptip>
-            </hc:Poptip.Instance>-->
-        </Border>
-
-        <hc:Card x:Name="GuideCard" Width="300" Height="180" Panel.ZIndex="888" 
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Left" Visibility="Collapsed">
-            <hc:Card.Background>
-                <SolidColorBrush Color="White" Opacity="0.85"/>
-            </hc:Card.Background>
-            <!--Card 的内容部分-->
-            <Border CornerRadius="4,4,0,0" Width="300" Height="100">
-                <TextBlock TextWrapping="Wrap" 
-                           x:Name="GuideText"
-                           VerticalAlignment="Center"
-                           HorizontalAlignment="Center"
-                           LineHeight="22"
-                           FontSize="14"
-                           Text=""/>
-            </Border>
-            <!--Card 的尾部部分-->
-            <hc:Card.Footer>
-                <Grid>
-                    <StackPanel Margin="10" Width="150" Height="50" HorizontalAlignment="Left">
-                        <!--Card 的一级内容-->
-                        <WrapPanel>
-                            <TextBlock TextWrapping="Wrap"  
-                                   x:Name="GuideTitle1"
-                                   Style="{DynamicResource TextBlockLargeBold}" 
-                                   TextTrimming="CharacterEllipsis" 
-                                   Text="引导提示" 
-                                   FontSize="20"
-                                   HorizontalAlignment="Left"/>
-                            <TextBlock TextWrapping="Wrap"
-                                       x:Name="GuideNum"
-                                   Style="{DynamicResource TextBlockLargeBold}" 
-                                   TextTrimming="CharacterEllipsis" 
-                                   Text="1" 
-                                   FontSize="20"
-                                   HorizontalAlignment="Left"/>
-                        </WrapPanel>
-                        <!--Card 的二级内容-->
-                        <TextBlock TextWrapping="NoWrap" 
-                                   x:Name="GuideTitle2"
-                               Style="{DynamicResource TextBlockDefault}" 
-                               TextTrimming="CharacterEllipsis" 
-                               Text="快捷方式创建" 
-                               Margin="0,6,0,0"
-                               FontSize="14"
-                               HorizontalAlignment="Left"/>
-                    </StackPanel>
-                    <hc:UniformSpacingPanel HorizontalAlignment="Right">
-                        <Button Style="{StaticResource MyBtnStyle}" x:Name="PreviewGuideBtn" Click="PreviewGuideBtn_Click" Margin="0,0,20,0" Content="上一步"/>
-                        <Button Style="{StaticResource MyBtnStyle}" x:Name="NextGuideBtn" Click="NextGuideBtn_Click" Margin="0,0,20,0" Content="下一步"/>
-                    </hc:UniformSpacingPanel>
-                </Grid>
-            </hc:Card.Footer>
-        </hc:Card>
-
-
-        <Border Margin="20" CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  
-            BorderThickness="0"
-            Focusable="True"
-                Panel.ZIndex="1"
-            x:Name="BGBorder"
-                Background="AliceBlue"
-            hc:Dialog.Token="MainWindowDialog"
-            xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=None}"
-            xf:Animations.PrimaryBinding="{Binding AppConfig.IsShow, Mode=OneWay}"
-            xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource  FadeOut}, Event=None}"
-            xf:Animations.SecondaryBinding="{Binding AppConfig.IsShow, Mode=OneWay, Converter={StaticResource ReverseBoolConvert}}"
-            xf:Animations.SecondaryCompletionCommand="{Binding HideCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
-            xf:Animations.AllowOpacityReset="False"
-            >
-            <Border.Effect>
-                <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"
                               RenderingBias="Quality" ShadowDepth="2"/>
-            </Border.Effect>
-            <hc:DialogContainer Focusable="True">
+    </Window.Effect>
+        <Border Margin="20" CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0"
+            Background="AliceBlue" LostFocus="App_LostFocus"
+            Opacity="{Binding AppConfig.PannelOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"
+            VirtualizingPanel.VirtualizationMode="Recycling"  VirtualizingPanel.IsVirtualizing="True"  VirtualizingPanel.IsContainerVirtualizable="True"
+            hc:Dialog.Token="IconInfoDialog"
+            >
+        <hc:DialogContainer>
+
+            <Border CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0">
+                <!--背景图片-->
+                <Border.Background>
+                    <VisualBrush>
+                        <VisualBrush.Visual>
+                            <Grid ClipToBounds="True">
+                                <Image Source="{Binding AppConfig.BitmapImage}" Margin="-30" Opacity="{Binding AppConfig.BgOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
+                                    <Image.Effect>
+                                        <BlurEffect Radius="{Binding AppConfig.BlurValue}"/>
+                                    </Image.Effect>
+                                </Image>
+                            </Grid>
+                        </VisualBrush.Visual>
+                    </VisualBrush>
+                </Border.Background>
+
                 <Grid>
-
-
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="40" MouseDown="DragMove"></RowDefinition>
+                        <RowDefinition Height="40" MouseMove="DragMove"></RowDefinition>
                         <RowDefinition Height="*"></RowDefinition>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition x:Name="LeftColumn" MinWidth="80" Width="{Binding AppConfig.MenuCardWidth, Mode=TwoWay, Converter={StaticResource DoubleToGridLength}}" MaxWidth="280"></ColumnDefinition>
-                        <ColumnDefinition x:Name="RightColumn" Width="*"></ColumnDefinition>
+                        <ColumnDefinition x:Name="LeftColumn" MinWidth="80" Width="{Binding AppConfig.MenuCardWidth, Mode=TwoWay, Converter={StaticResource DoubleToGridLength}}" MaxWidth="200"></ColumnDefinition>
+                        <ColumnDefinition Width="*"></ColumnDefinition>
                     </Grid.ColumnDefinitions>
 
 
 
-
-                    <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="ShowBox" Visibility="Hidden" Panel.ZIndex="2"/>
-                    <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="HideBox" Visibility="Hidden" Panel.ZIndex="2"/>
-
-                    <StackPanel HorizontalAlignment="Right" Panel.ZIndex="99" hc:Growl.GrowlParent="False" hc:Growl.Token="MainWindowGrowl" Grid.Column="1" Grid.Row="1"/>
-                    <StackPanel HorizontalAlignment="Center" Panel.ZIndex="99" hc:Growl.GrowlParent="False" hc:Growl.Token="MainWindowAskGrowl" Grid.Column="1" Grid.Row="1"/>
-
-                    <DockPanel Grid.Row="0" Grid.Column="0" MouseDown="DragMove">
+                    <DockPanel Grid.Row="0" Grid.Column="0" MouseMove="DragMove">
                         <DockPanel.Background>
                             <SolidColorBrush Opacity="0.01"/>
                         </DockPanel.Background>
-                        <Image Visibility="{Binding AppConfig.TitleLogoVisible}" 
-                               Source="/Resource/Image/TitleLogo.png" 
-                               RenderOptions.BitmapScalingMode="HighQuality" 
-                               Margin="10,0,0,0" 
-                               Width="200" 
-                               Height="30" 
-                               Opacity="0.8"
-                               HorizontalAlignment="Left"/>
+                        <Image Source="/Resource/Image/TitleLogo.png" Margin="10,0,0,0" Width="94" Height="30" HorizontalAlignment="Left"/>
                     </DockPanel>
 
-                    <DockPanel Grid.Row="0" Grid.Column="2" MouseDown="DragMove">
+                    <DockPanel Grid.Row="0" Grid.Column="2" MouseMove="DragMove">
                         <DockPanel.Background>
                             <SolidColorBrush Opacity="0.01"/>
                         </DockPanel.Background>
-                        <hc:UniformSpacingPanel  x:Name="MainBtnPanel" Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Center">
+                        <hc:UniformSpacingPanel Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Center">
                             <Button Background="Transparent"
-                                    BorderThickness="0"
-                                    hc:IconElement.Geometry="M917.930667 512c0-57.6 36.181333-106.496 86.869333-125.952a505.429333 505.429333 0 0 0-55.210667-133.461333A134.826667 134.826667 0 0 1 771.413333 74.410667 507.733333 507.733333 0 0 0 637.952 19.2 135.168 135.168 0 0 1 512 106.069333 134.912 134.912 0 0 1 386.048 19.2 505.429333 505.429333 0 0 0 252.586667 74.410667c22.186667 49.749333 13.141333 109.824-27.562667 150.528a135.168 135.168 0 0 1-150.528 27.648 502.016 502.016 0 0 0-55.296 133.461333c50.688 19.626667 86.869333 68.437333 86.869333 125.952 0 57.6-36.181333 106.496-86.869333 125.952 12.117333 47.530667 30.72 92.330667 55.210667 133.461333a134.826667 134.826667 0 0 1 178.090666 178.176 507.733333 507.733333 0 0 0 133.546667 55.210667A135.168 135.168 0 0 1 512 917.930667c57.6 0 106.496 36.181333 125.952 86.869333a505.429333 505.429333 0 0 0 133.461333-55.210667 134.912 134.912 0 0 1 27.562667-150.528 135.168 135.168 0 0 1 150.528-27.648 502.016 502.016 0 0 0 55.296-133.461333A134.912 134.912 0 0 1 917.930667 512zM512 647.338667a135.338667 135.338667 0 1 1 0.085333-270.762667A135.338667 135.338667 0 0 1 512 647.338667z"
-                                    hc:IconElement.Height="18"
-                                    hc:IconElement.Width="18"
-                                    HorizontalAlignment="Right"
-                                    Click="ConfigButtonClick"
-                                    Initialized="SettingButton_Initialized"
-                                    PreviewMouseLeftButtonDown="AppButton_PreviewMouseLeftButtonDown"
-                                    x:Name="SettingButton"
-                                    FocusVisualStyle="{x:Null}"
-                                    >
+                                BorderThickness="0"
+                                hc:IconElement.Geometry="M917.930667 512c0-57.6 36.181333-106.496 86.869333-125.952a505.429333 505.429333 0 0 0-55.210667-133.461333A134.826667 134.826667 0 0 1 771.413333 74.410667 507.733333 507.733333 0 0 0 637.952 19.2 135.168 135.168 0 0 1 512 106.069333 134.912 134.912 0 0 1 386.048 19.2 505.429333 505.429333 0 0 0 252.586667 74.410667c22.186667 49.749333 13.141333 109.824-27.562667 150.528a135.168 135.168 0 0 1-150.528 27.648 502.016 502.016 0 0 0-55.296 133.461333c50.688 19.626667 86.869333 68.437333 86.869333 125.952 0 57.6-36.181333 106.496-86.869333 125.952 12.117333 47.530667 30.72 92.330667 55.210667 133.461333a134.826667 134.826667 0 0 1 178.090666 178.176 507.733333 507.733333 0 0 0 133.546667 55.210667A135.168 135.168 0 0 1 512 917.930667c57.6 0 106.496 36.181333 125.952 86.869333a505.429333 505.429333 0 0 0 133.461333-55.210667 134.912 134.912 0 0 1 27.562667-150.528 135.168 135.168 0 0 1 150.528-27.648 502.016 502.016 0 0 0 55.296-133.461333A134.912 134.912 0 0 1 917.930667 512zM512 647.338667a135.338667 135.338667 0 1 1 0.085333-270.762667A135.338667 135.338667 0 0 1 512 647.338667z"
+                                hc:IconElement.Height="18"
+                                hc:IconElement.Width="18"
+                                HorizontalAlignment="Right"
+                                Click="ConfigButtonClick"
+                                Initialized="SettingButton_Initialized"
+                                x:Name="SettingButton"
+                                FocusVisualStyle="{x:Null}"
+                                >
                                 <Button.ContextMenu>
                                     <ContextMenu x:Name="SettingMenus" Width="130">
                                         <MenuItem Header="设置" Click="ConfigMenuClick"/>
                                         <MenuItem Header="待办" Click="BacklogMenuClick"/>
-                                        <MenuItem Header="新手引导" Click="Guide_Click"/>
                                     </ContextMenu>
                                 </Button.ContextMenu>
                             </Button>
                             <Button Background="Transparent" 
-                                    BorderThickness="0"
-                                    hc:IconElement.Geometry="M828.770654 148.714771C641.293737-20.89959 354.184117-19.590868 168.245698 152.630946c-212.062907 196.418185-212.062907 522.329912 0 718.748098 185.93842 172.221815 473.048039 173.520546 660.524956 3.916176 219.435707-198.536117 219.435707-528.054322 0-726.580449z m-121.880976 569.643707c-11.708566 11.708566-30.680039 11.708566-42.388605 0L502.729054 556.586459c-0.659356-0.659356-1.728312-0.659356-2.397659 0L338.609327 718.318517c-11.708566 11.708566-30.680039 11.708566-42.388605 0l-0.039961-0.039961c-11.708566-11.708566-11.708566-30.680039 0-42.388605l161.732059-161.732058c0.659356-0.659356 0.659356-1.728312 0-2.397659L296.1408 350.008195c-11.708566-11.708566-11.708566-30.680039 0-42.388605l0.039961-0.039961c11.708566-11.708566 30.680039-11.708566 42.388605 0l161.772019 161.77202c0.659356 0.659356 1.728312 0.659356 2.397659 0L664.551024 307.539668c11.708566-11.708566 30.680039-11.708566 42.388605 0l0.039961 0.039961c11.708566 11.708566 11.708566 30.680039 0 42.388605L545.15762 511.770224c-0.659356 0.659356-0.659356 1.728312 0 2.397659L706.919649 675.939902c11.708566 11.708566 11.708566 30.680039 0 42.388605l-0.029971 0.029971z" 
-                                    hc:IconElement.Height="18"
-                                    hc:IconElement.Width="18"
-                                    HorizontalAlignment="Right"
-                                    Click="CloseButtonClick"
-                                    PreviewMouseLeftButtonDown="AppButton_PreviewMouseLeftButtonDown"
-                                    FocusVisualStyle="{x:Null}"
-                                    />
+                                BorderThickness="0"
+                                hc:IconElement.Geometry="M828.770654 148.714771C641.293737-20.89959 354.184117-19.590868 168.245698 152.630946c-212.062907 196.418185-212.062907 522.329912 0 718.748098 185.93842 172.221815 473.048039 173.520546 660.524956 3.916176 219.435707-198.536117 219.435707-528.054322 0-726.580449z m-121.880976 569.643707c-11.708566 11.708566-30.680039 11.708566-42.388605 0L502.729054 556.586459c-0.659356-0.659356-1.728312-0.659356-2.397659 0L338.609327 718.318517c-11.708566 11.708566-30.680039 11.708566-42.388605 0l-0.039961-0.039961c-11.708566-11.708566-11.708566-30.680039 0-42.388605l161.732059-161.732058c0.659356-0.659356 0.659356-1.728312 0-2.397659L296.1408 350.008195c-11.708566-11.708566-11.708566-30.680039 0-42.388605l0.039961-0.039961c11.708566-11.708566 30.680039-11.708566 42.388605 0l161.772019 161.77202c0.659356 0.659356 1.728312 0.659356 2.397659 0L664.551024 307.539668c11.708566-11.708566 30.680039-11.708566 42.388605 0l0.039961 0.039961c11.708566 11.708566 11.708566 30.680039 0 42.388605L545.15762 511.770224c-0.659356 0.659356-0.659356 1.728312 0 2.397659L706.919649 675.939902c11.708566 11.708566 11.708566 30.680039 0 42.388605l-0.029971 0.029971z" 
+                                hc:IconElement.Height="18"
+                                hc:IconElement.Width="18"
+                                HorizontalAlignment="Right"
+                                Click="CloseButtonClick"
+                                FocusVisualStyle="{x:Null}"
+                                />
                         </hc:UniformSpacingPanel>
+
                     </DockPanel>
 
 
-                    <uc:LeftCardControl x:Name="LeftCard" Grid.Row="1" Grid.Column="0"/>
-
+                    <uc:LeftCardControl Grid.Row="1" Grid.Column="0"/>
+                    
                     <!--分割线-->
-                    <GridSplitter Opacity="0" Grid.Row="1" Grid.Column="0" Width="5"  VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
+                    <GridSplitter Opacity="0" Grid.Row="1" Grid.Column="0" Width="1"  VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
 
-                    <Border x:Name="SearchResContainer" Panel.ZIndex="2" 
-                        Visibility="Collapsed"
-                        Grid.Row="1" Grid.Column="1" 
-                        HorizontalAlignment="Right" MaxWidth="200" 
-                        VerticalAlignment="Top"
-                        CornerRadius="8"
-                        Margin="0,20,40,0"
-                        >
-                        <Border.Style>
-                            <Style TargetType="Border" >
-                                <Setter Property="Background">
-                                    <Setter.Value>
-                                        <SolidColorBrush Color="White" Opacity="0.6"/>
-                                    </Setter.Value>
-                                </Setter>
-                                <Setter Property="MaxWidth" Value="300"/>
-                            </Style>
-                        </Border.Style>
-                        <WrapPanel Margin="8">
-                            <TextBlock Opacity="0.6" Text="g:"/>
-                            <TextBlock x:Name="GeekDeskSearchTotal" Opacity="0.6" Text="0"/>
-                            <TextBlock Opacity="0.6" Text="+"/>
-                            <TextBlock Opacity="0.6" Text="e:"/>
-                            <TextBlock x:Name="EverythingSearchCount" Opacity="0.6" Text="0"/>
-                            <TextBlock Opacity="0.6" Text=" of "/>
-                            <TextBlock x:Name="EverythingSearchTotal" Opacity="0.6" Text="0"/>
-                        </WrapPanel>
-                    </Border>
+                    <uc:RightCardControl Grid.Row="1" Grid.Column="1"/>
 
-                    <!--搜索输入框-->
-                    <TextBox Panel.ZIndex="2" Grid.Row="0" Grid.Column="1" 
-                             x:Name="SearchBox"
-                             Width="0"
-                             Margin="-100,5,0,0"
-                             Height="32"
-                             FontSize="16"
-                             BorderThickness="0"
-                             TextChanged="SearchBox_TextChanged"
-                             Style="{StaticResource MyTextBoxStyle}"
-                             >
-                        <TextBox.Background>
-                            <SolidColorBrush Color="White" Opacity="0.5" />
-                        </TextBox.Background>
-                    </TextBox>
-
-
-                    <hc:NotifyIcon Icon="/Logo.ico" Click="NotifyIcon_Click" x:Name="BarIcon"
-                            Visibility="{Binding AppConfig.ShowBarIcon, Mode=TwoWay, Converter={StaticResource Boolean2VisibilityConverter}}">
+                    <hc:NotifyIcon Icon="/Taskbar.ico"  Click="NotifyIcon_Click" x:Name="BarIcon"
+                                   Visibility="{Binding AppConfig.ShowBarIcon, Mode=TwoWay, Converter={StaticResource Boolean2VisibilityConverter}}">
                         <hc:NotifyIcon.ContextMenu>
-                            <ContextMenu Width="130" x:Name="TaskbarContextMenu">
+                            <ContextMenu Width="130">
                                 <MenuItem Header="打开面板" Click="ShowApp"/>
-                                <MenuItem Header="拾色器" Click="ColorPicker"/>
-                                <MenuItem Header="备份" Click="BakDataFile"/>
                                 <MenuItem Header="隐藏图标" Click="CloseBarIcon"/>
                                 <MenuItem Header="待办"  Click="BacklogMenuClick"/>
                                 <MenuItem Header="程序目录"  Click="OpenThisDir"/>
@@ -296,16 +138,12 @@
                                 <MenuItem Header="退出" Click="ExitApp"/>
                             </ContextMenu>
                         </hc:NotifyIcon.ContextMenu>
+
                     </hc:NotifyIcon>
-
-                    <uc:RightCardControl x:Name="RightCard" Grid.Row="1" Grid.Column="1"/>
-
-
                     <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,0"/>
                 </Grid>
-            </hc:DialogContainer>
-        </Border>
-
-    </Grid>
+            </Border>
+        </hc:DialogContainer>
+    </Border>
 
 </Window>

MainWindow.xaml.rej

@@ -1,10 +0,0 @@
-# BookerLiu
-diff a/MainWindow.xaml b/MainWindow.xaml	(rejected hunks)
-@@ -20,6 +20,7 @@
-         SizeChanged="Window_SizeChanged"
-         KeyDown="OnKeyDown"
-         Focusable="True"
-+        GotFocus="MainWindow_GotFocus"
-         MouseDown="MainWindow_MouseDown"
-         >
-     <WindowChrome.WindowChrome>

MyThread/MouseHookThread.cs

@@ -1,107 +0,0 @@
-using GeekDesk.Control.UserControls.Config;
-using GeekDesk.Control.Windows;
-using GeekDesk.Util;
-using GeekDesk.ViewModel;
-using Gma.System.MouseKeyHook;
-using System;
-using System.Drawing;
-using System.Threading;
-using System.Windows;
-using System.Windows.Threading;
-
-namespace GeekDesk.MyThread
-{
-    public class MouseHookThread
-    {
-        private static readonly AppConfig appConfig = MainWindow.appData.AppConfig;
-        public static Dispatcher dispatcher;
-        private static UserActivityHook hook;
-
-        public static void Hook()
-        {
-            //使用dispatcher来单独监听UI线程 防止程序卡顿
-            dispatcher = DispatcherBuild.Build();
-            dispatcher.Invoke(DispatcherPriority.Normal, new Action(() =>
-            {
-                hook = new UserActivityHook();
-
-                if (appConfig.MouseMiddleShow)
-                {
-                    hook.OnMouseWheelUp += OnMouseWheelUp;
-                }
-
-                hook.Start(true, false);
-            }));
-        }
-
-        private static void OnMouseLeftDown(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-        }
-
-        private static void OnMouseLeftUp(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-        }
-
-        private static void OnMouseWheelUp(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            MouseWheelShowApp(sender, e);
-        }
-
-        /// <summary>
-        /// 鼠标中键呼出
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private static void MouseWheelShowApp(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            //中键打开App
-            if (appConfig.MouseMiddleShow && MotionControl.hotkeyFinished)
-            {
-                App.Current.Dispatcher.Invoke(DispatcherPriority.Normal, new Action(() =>
-                {
-                    if (MainWindow.mainWindow.Visibility == Visibility.Collapsed || MainWindow.mainWindow.Opacity == 0)
-                    {
-                        MainWindow.ShowApp();
-                    }
-                    else
-                    {
-                        MainWindow.HideApp();
-                    }
-                }));
-            }
-        }
-
-
-        public static void Dispose()
-        {
-            try
-            {
-                if (hook != null)
-                {
-                    if (hook.MouseWheelUpEnable())
-                    {
-                        hook.OnMouseWheelUp -= OnMouseWheelUp;
-                    }
-                    if (hook.MouseLeftDownEnable())
-                    {
-                        hook.OnMouseLeftDown -= OnMouseLeftDown;
-                    }
-                    if (hook.MouseLeftUpEnable())
-                    {
-                        hook.OnMouseLeftUp -= OnMouseLeftUp;
-                    }
-                    hook.Stop();
-                    dispatcher.InvokeShutdown();
-                    hook = null;
-                    dispatcher = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogUtil.WriteErrorLog(ex, "关闭hook出错");
-            }
-        }
-
-
-    }
-}