已知问题修复

App.config

@@ -2,16 +2,7 @@
 <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" />
 	</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="800" />
-	</ShowSecondsSettings>
 	<SystemIcons>
 		<add key="Calculator" value="计算器" />
 		<add key="Computer" value="此电脑" />
@@ -25,15 +16,11 @@
 		<add key="CMD" value="命令行" />
 		<add key="Services" value="服务" />
 	</SystemIcons>
-	<SystemBGs>
-		<GradientBGParam Color1="#FCCF31" Color2="#F55555" Name="诸神黄昏" />
-	</SystemBGs>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-		<probing privatePath="lib" />
       <dependentAssembly>
         <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.0.6.0" newVersion="2.0.6.0" />
@@ -54,22 +41,16 @@
         <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.12" />
+    <add key="Version" value="2.4.13" />
-      <add key="GitHubUrl" value="https://github.com/BookerLiu/GeekDesk" />
+    <add key="GitHubUrl" value="https://github.com/Demo-Liu/GeekDesk" />
-      <add key="GiteeUrl" value="https://gitee.com/BookerLiu/GeekDesk/tree/master" />
+    <add key="GiteeUrl" value="https://gitee.com/demo_liu/GeekDesk/tree/master" />
-      <add key="GitHubUpdateUrl" value="https://raw.githubusercontent.com/BookerLiu/GeekDesk/master/Update.json" />
+    <add key="GitHubUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />
-      <add key="GiteeUpdateUrl" value="https://gitee.com/BookerLiu/GeekDesk/raw/master/Update.json" />
+    <add key="GiteeUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />
-	  <!--<add key="GiteeUpdateUrl" value="file:///D:/WorkSpace/workspace-VS/GeekDesk/Update.json" />-->
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
-	  <add key="ClientSettingsProvider.ServiceUri" value="" />
+	<add key="CustomIconTeachUrl" value="https://mp.weixin.qq.com/s/LxoHAekho9HBVl4FRw_Law" />
-	  <add key="CustomIconTeachUrl" value="https://mp.weixin.qq.com/s/LxoHAekho9HBVl4FRw_Law" />
-	  <add key="ShowPublicWeChat" value="Y" />
   </appSettings>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">

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)
             {
@@ -56,18 +55,6 @@ namespace GeekDesk
             LogUtil.WriteErrorLog(e, "严重异常!");
             MessageBox.Show("GeekDesk遇到未知问题崩溃!");
         }
-        public static void DoEvents()
-        {
-            var frame = new DispatcherFrame();
-            Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Background,
-                new DispatcherOperationCallback(
-                    delegate (object f)
-                    {
-                        ((DispatcherFrame)f).Continue = false;
-                        return null;
-                    }), frame);
-            Dispatcher.PushFrame(frame);
-        }
 
 
     }

Constant/BGStyle.cs

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

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
 {
@@ -9,34 +13,21 @@ namespace GeekDesk.Constant
         public static string APP_DIR = AppDomain.CurrentDomain.BaseDirectory.Trim();
 
         // 是否为开发模式
-        public static bool DEV = false;
+        public static bool DEV = true;
 
         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>
+        public static string LOG_FILE_PATH = APP_DIR + "Log.log";
-        /// 备份文件路径
-        /// </summary>
-        public static string DATA_FILE_BAK_PATH = APP_DIR + "bak\\Data.bak";  //app备份数据文件路径
 
-        public static string PW_FILE_BAK_PATH = APP_DIR + "bak\\pw.txt";  //密码文件路径
+        public static string ERROR_FILE_PATH = APP_DIR + "Error.log";
 
-        public static string LOG_FILE_PATH = APP_DIR + "logs\\log.log"; //日志文件
+        //阴影宽度
-
+        public static readonly int SHADOW_WIDTH = 20;
-        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 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/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,62 +0,0 @@
-namespace GeekDesk.Constant
-{
-    internal class RunTimeStatus
-    {
-
-        /// <summary>
-        /// 查询框是否在工作
-        /// </summary>
-        public static bool SEARCH_BOX_SHOW = false;
-
-        /// <summary>
-        /// 贴边隐藏后  以非鼠标经过方式触发显示
-        /// </summary>
-        public static bool MARGIN_HIDE_AND_OTHER_SHOW = false;
-
-
-        /// <summary>
-        /// 是否锁定主面板 锁定后 不执行隐藏动作
-        /// </summary>
-        public static bool LOCK_APP_PANEL = false;
-
-
-        /// <summary>
-        /// 是否弹出了菜单密码框
-        /// </summary>
-        public static bool SHOW_MENU_PASSWORDBOX = false;
-
-        /// <summary>
-        /// 是否弹出了右键菜单
-        /// </summary>
-        public static bool SHOW_RIGHT_BTN_MENU = false;
-
-        /// <summary>
-        /// 是否点击了面板功能按钮
-        /// </summary>
-        public static bool APP_BTN_IS_DOWN = false;
-
-        /// <summary>
-        /// 是否正在编辑菜单
-        /// </summary>
-        public static bool IS_MENU_EDIT = false;
-
-
-        /// <summary>
-        /// 图标card 鼠标滚轮是否正在工作  
-        /// 用来控制popup的显示 否则低性能机器会造成卡顿
-        /// </summary>
-        public static bool ICONLIST_MOUSE_WHEEL = false;
-        /// <summary>
-        /// 控制多少毫秒后 关闭(ICONLIST_MOUSE_WHEEL)鼠标滚轮运行状态
-        /// </summary>
-        public static int MOUSE_WHEEL_WAIT_MS = 100;
-        /// <summary>
-        /// 与关闭popup 配合使用, 避免线程结束后不显示popup
-        /// </summary>
-        public static bool MOUSE_ENTER_ICON = false;
-        /// <summary>
-        /// 控制每次刷新搜索结果 鼠标移动后显示popup
-        /// </summary>
-        public static int MOUSE_MOVE_COUNT = 0;
-    }
-}

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/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,15 +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 //右侧托盘宽度的一半
-    }
-}

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
 {
@@ -62,7 +72,7 @@ namespace GeekDesk.Control.Other
             }
             ToDoTask.activityBacklog[info].Close(); //关闭桌面通知
             ToDoTask.activityBacklog.Remove(info);//激活任务删除
-            CommonCode.SaveAppData(appData, Constants.DATA_FILE_PATH);
+            CommonCode.SaveAppData(appData);
         }
 
 

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

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 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 Btn1}" Click="Close_Click" HorizontalAlignment="Stretch" Margin="524,360,-524,10" VerticalAlignment="Stretch"/>
-                        </hc:UniformSpacingPanel>
-                    </Grid>
-                </Border>
-
-            </hc:TransitioningContentControl>
-        </StackPanel>
-    </Grid>
-</Border>

Control/Other/GradientBGDialog.xaml.cs

@@ -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,39 +10,29 @@
     <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" Text="{Binding Name, Mode=OneWay}" Width="230" FontSize="14"/>
             </hc:UniformSpacingPanel>
-            <hc:UniformSpacingPanel Spacing="10" Margin="0,15,0,0">
+            <hc:Divider LineStrokeDashArray="3,3"  LineStroke="Black"/>
-                <TextBlock Text="相对路径:"  Style="{StaticResource LeftTB}"/>
+            <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
-                <TextBlock Text="{Binding RelativePath, Mode=OneWay}" 
-                           VerticalAlignment="Center"
-                           Margin="0,8,0,0"
-                           Width="230"
-                           FontSize="14"
-                           TextTrimming="WordEllipsis"
-                           hc:Poptip.Placement="Bottom"
-                           hc:Poptip.Content="{Binding RelativePath, Mode=OneWay, Converter={StaticResource StringAppendConvert}, ConverterParameter='\{\}\\\n(同盘符下才会建立相对路径)'}"/>
-            </hc:UniformSpacingPanel>
-            <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,15,0,0">
                 <TextBlock  Text="图标:"  Style="{StaticResource LeftTB}"/>
                 <Image x:Name="IconImg" Source="{Binding BitmapImage, Mode=OneWay}" RenderOptions.BitmapScalingMode="HighQuality" Width="60" Height="60"/>
                 <Button Content="修改" Click="EditImage"/>
                 <Button Content="重置" Click="ReStoreImage"/>
             </hc:UniformSpacingPanel>
-            <hc:UniformSpacingPanel Spacing="10" Margin="4,15,0,0">
+            <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">
@@ -52,11 +41,12 @@
                     </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" 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">
+            <hc:UniformSpacingPanel Spacing="10"  Grid.ColumnSpan="4">
                 <Button Content="保存" Style="{StaticResource Btn1}" Click="SaveProperty" Margin="265,10,0,0"/>
             </hc:UniformSpacingPanel>
         </StackPanel>

Control/Other/IconInfoDialog.xaml.cs

@@ -1,9 +1,9 @@
-using GeekDesk.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,7 +73,7 @@ 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)

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,10 +87,9 @@ 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 ex)
             {
                 HandyControl.Controls.Growl.WarningGlobal("修改图标失败,已重置为默认图标!");
                 LogUtil.WriteErrorLog(ex, "修改图标失败!");

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

Control/Other/PasswordDialog.xaml

@@ -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 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,280 +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.Visibility = Visibility.Visible;
-                        }
-                    }
-                } else if (type == PasswordType.CREATE)
-                {
-                    //创建密码
-                    if (count == 0)
-                    {
-                        count++;
-                        tempPassword = pw;
-                        Title.Text = "再次输入密码";
-                        ClearVal();
-                        SetFocus(0);
-                    } else
-                    {
-                        if (tempPassword.Equals(pw))
-                        {
-                            //两次密码设置一致  显示提示输入框
-                            Title.Text = "填写密码提示";
-                            PasswordGrid.Visibility = Visibility.Collapsed;
-                            HintGrid.Visibility = Visibility.Visible;
-                            HintBox.Focus();
-                        } else
-                        {
-                            ErrorMsg.Text = "两次密码输入不一致";
-                            ErrorMsg.Visibility = Visibility.Visible;
-                        }
-                    }
-                } else if (type == PasswordType.ALTER)
-                {
-                    //修改密码
-                    if (appData.AppConfig.MenuPassword.Equals(pw))
-                    {
-                        tempType = type;
-                        type = PasswordType.CREATE;
-                        Title.Text = "设置新密码";
-                        ClearVal();
-                        SetFocus(0);
-                    } else
-                    {
-                        //密码比对不一致
-                        ErrorMsg.Text = "密码输入错误";
-                        ErrorMsg.Visibility = Visibility.Visible;
-                        HintMsg.Text = MainWindow.appData.AppConfig.PasswordHint;
-                        HintMsg.Visibility = Visibility.Visible;
-                    }
-                }
-            } else
-            {
-                //密码未输入完全  隐藏错误信息
-                if (ErrorMsg.IsVisible)
-                {
-                    ErrorMsg.Visibility = Visibility.Hidden;
-                    HintMsg.Visibility = Visibility.Hidden;
-                    HintMsg.Visibility = Visibility.Hidden;
-                }
-            }
-        }
-
-        public void SetFocus(int time = 100)
-        {
-            new Thread(() =>
-            {
-                Thread.Sleep(time);
-                Dispatcher.Invoke(() =>
-                {
-                    if (string.IsNullOrEmpty(P1.Password))
-                    {
-                        P1.Focus();
-                        return;
-                    }
-                    if (string.IsNullOrEmpty(P2.Password))
-                    {
-                        P2.Focus();
-                        return;
-                    }
-                    if (string.IsNullOrEmpty(P3.Password))
-                    {
-                        P3.Focus();
-                        return;
-                    }
-                    P4.Focus();
-                });
-            }).Start();
-        }
-
-        public void ClearVal()
-        {
-            P1.Clear();
-            P2.Clear();
-            P3.Clear();
-            P4.Clear();
-        }
-
-        /// <summary>
-        /// 跳过设置密码提示
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void NextTB_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            appData.AppConfig.PasswordHint = "";
-            DonePassword();
-        }
-
-        private void DoneTB_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            string hint = HintBox.Text.Trim();
-            appData.AppConfig.PasswordHint = hint;
-            DonePassword();
-        }
-
-        private void DonePassword()
-        {
-            appData.AppConfig.MenuPassword = tempPassword;
-            CommonCode.SavePassword(tempPassword);
-            MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Collapsed;
-            PasswordGrid.Visibility = Visibility.Visible;
-            HintGrid.Visibility = Visibility.Collapsed;
-            if (tempType == PasswordType.ALTER)
-            {
-                HandyControl.Controls.Growl.Success("密码修改成功!", "MainWindowGrowl");
-            } else
-            {
-                menuInfo.IsEncrypt = true;
-                HandyControl.Controls.Growl.Success(menuInfo.MenuName + " 已加密!", "MainWindowGrowl");
-            }
-
-        }
-
-        private void PasswordBox_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Back)
-            {
-                if (P2.IsKeyboardFocused)
-                {
-                    if (string.IsNullOrEmpty(P2.Password))
-                    {
-                        P1.Password = "";
-                    } else
-                    {
-                        P2.Password = "";
-                    }
-                }
-
-                if (P3.IsKeyboardFocused)
-                {
-                    if (string.IsNullOrEmpty(P3.Password))
-                    {
-                        P2.Password = "";
-                    }
-                    else
-                    {
-                        P3.Password = "";
-                    }
-                }
-
-                if (P4.IsKeyboardFocused)
-                {
-                    if (string.IsNullOrEmpty(P4.Password))
-                    {
-                        P3.Password = "";
-                    }
-                    else
-                    {
-                        P4.Password = "";
-                    }
-                }
-            }
-            SetFocus(0);
-        }
-    }
-}

Control/UserControls/Config/AboutControl.xaml

@@ -4,8 +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" 
              Background="Transparent"
@@ -17,36 +15,25 @@
     <Grid MouseDown="DragMove">
         <hc:SimplePanel Margin="20,50,20,20" >
             <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top">
-                <Image Source="/Resource/Image/About.png"
+                <Image Source="/Resource/Image/About.png" Width="400" Height="100"/>
-                       Width="400"
-                       Height="100"
-                       xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndContract}, Delay=250}"
-                       />
                 <TextBlock x:Name="AppInfo"  TextAlignment="Center"  Text="Copyright ©  2021 GeekDesk V"/>
                 <hc:UniformSpacingPanel Spacing="5" HorizontalAlignment="Center" Margin="10,10,0,0" VerticalAlignment="Center">
                     <hc:Shield Subject=".net" Status=">=4.72" Margin="0,0,10,0" Color="#1182c3"/>
                     <hc:Shield Subject="IDE" Status="VS2019" Margin="0,0,10,0" Color="#1182c3"/>
 
                     <hc:Shield Subject="GitHub" Visibility="Visible" Status="Star"
-                               MouseEnter="SC_MouseEnter"
+                           Command="hc:ControlCommands.OpenLink" 
-                               MouseLeave="SC_MouseLeave"
+                           CommandParameter="https://github.com/Demo-Liu/GeekDesk"
-                               Command="hc:ControlCommands.OpenLink" 
+                           Margin="0,0,10,0" Color="#24292F"/>
-                               CommandParameter="https://github.com/BookerLiu/GeekDesk"
-                               Margin="0,0,10,0" Color="#24292F"
-                               />
-
                     <hc:Shield Subject="Gitee" Visibility="Visible" Status="Star" 
-                               MouseEnter="SC_MouseEnter"
+                           Command="hc:ControlCommands.OpenLink" 
-                               MouseLeave="SC_MouseLeave"
+                           CommandParameter="https://gitee.com/demo_liu/GeekDesk" 
-                               Command="hc:ControlCommands.OpenLink" 
+                           Margin="0,0,10,0" Color="#C71D23"/>
-                               CommandParameter="https://gitee.com/BookerLiu/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.Content>
@@ -74,17 +61,9 @@
                         </hc:Poptip.Instance>
                     </hc:Shield>
                 </hc:UniformSpacingPanel>
-                <TextBlock Margin="0,20,0,0" FontSize="13" Width="200" TextAlignment="Center" Text="这是个人开发的程序,所有人可任意修改和免费使用(商用请联系作者)" TextWrapping="Wrap"/>
+                <TextBlock Margin="0,20,0,0" FontSize="13" Width="200" TextAlignment="Center" 
+                           Text="这是个人开发的程序,所有人可任意修改和免费使用(商用请联系作者)" TextWrapping="Wrap"/>
 
-                <!--<hc:UniformSpacingPanel Spacing="10" Visibility="Visible" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,0">
-                <TextBlock Text="更新源:" TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Content="Gitee"
-                         IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=1}"/>
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
-                         Style="{StaticResource RadioButtonIcon}" Content="GitHub" 
-                         IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=2}"/>
-            </hc:UniformSpacingPanel>-->
             </StackPanel>
         </hc:SimplePanel>
     </Grid>

Control/UserControls/Config/AboutControl.xaml.cs

@@ -1,9 +1,20 @@
-using GeekDesk.Constant;
+using System;
-using GeekDesk.Util;
 using System.Configuration;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using GeekDesk.Util;
+using GeekDesk.Constant;
 
 namespace GeekDesk.Control.UserControls.Config
 {
@@ -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"
-             mc:Ignorable="d" 
              xmlns:hc="https://handyorg.github.io/handycontrol"
-             xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" 
+             mc:Ignorable="d" 
-             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" 
           >
@@ -84,7 +80,15 @@
                 </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"/>
@@ -101,93 +105,34 @@
                          IsChecked="{Binding AppHideType, Mode=TwoWay, Converter={StaticResource HideTypeConvert}, ConverterParameter=3}"/>
             </hc:UniformSpacingPanel>
 
-            <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="搜索方式" VerticalAlignment="Center"/>
-            </hc:UniformSpacingPanel>
-            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Content="快捷键"
-                         IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=0}"/>
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
-                         Style="{StaticResource RadioButtonIcon}" Content="按键即搜" 
-                         IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=1}"/>
-            </hc:UniformSpacingPanel>
-
             <hc:UniformSpacingPanel Spacing="10"  Margin="0,10,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="热键设置" VerticalAlignment="Center"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10"  Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="主面板:" VerticalAlignment="Center" Margin="0,5,0,0" Width="55"/>
+                <TextBlock Text="主面板:" VerticalAlignment="Center" Width="55"/>
                 <hc:TextBox HorizontalAlignment="Left" 
-                            Tag="{x:Static cst:HotKeyType.Main}"
+                        Tag="Main"
-                            VerticalAlignment="Top" 
+                        VerticalAlignment="Top" 
-                            IsReadOnly="True" 
+                        IsReadOnly="True" 
-                            IsReadOnlyCaretVisible="True" 
+                        IsReadOnlyCaretVisible="True" 
-                            Width="170"
+                        Width="200"
-                            Text="{Binding HotkeyStr}" 
+                        Text="{Binding HotkeyStr}" 
-                            KeyDown="HotKeyDown"
+                        KeyDown="HotKeyDown"
-                            KeyUp="HotKeyUp"
+                        KeyUp="HotKeyUp"
-                            InputMethod.IsInputMethodEnabled="False"
+                        />
-                            />
-                <CheckBox Content="启用" 
-                          Click="EnableHotKey_Click" 
-                          Tag="{x:Static cst:HotKeyType.Main}" 
-                          IsChecked="{Binding EnableAppHotKey}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="待办任务:" Margin="0,5,0,0"  Width="55"/>
+                <TextBlock Text="新建待办:"  Width="55"/>
                 <hc:TextBox HorizontalAlignment="Left" 
-                            Tag="{x:Static cst:HotKeyType.ToDo}"
+                        Tag="ToDo"
-                            VerticalAlignment="Top" 
+                        VerticalAlignment="Top" 
-                            IsReadOnly="True" 
+                        IsReadOnly="True" 
-                            IsReadOnlyCaretVisible="True" 
+                        IsReadOnlyCaretVisible="True" 
-                            Width="170"
+                        Width="200"
-                            Text="{Binding ToDoHotkeyStr}" 
+                        Text="{Binding ToDoHotkeyStr}" 
-                            KeyDown="HotKeyDown"
+                        KeyDown="HotKeyDown"
-                            KeyUp="HotKeyUp"
+                        KeyUp="HotKeyUp"
-                            InputMethod.IsInputMethodEnabled="False"
+                        />
-                            />
-                <CheckBox Content="启用" 
-                          Click="EnableHotKey_Click" 
-                          Tag="{x:Static cst:HotKeyType.ToDo}" 
-                          IsChecked="{Binding EnableTodoHotKey}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
-            </hc:UniformSpacingPanel>
-
-            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="拾色器:" Margin="0,5,0,0"  Width="55"/>
-                <hc:TextBox HorizontalAlignment="Left" 
-                            Tag="{x:Static cst:HotKeyType.ColorPicker}"
-                            VerticalAlignment="Top" 
-                            IsReadOnly="True" 
-                            IsReadOnlyCaretVisible="True" 
-                            Width="170"
-                            Text="{Binding ColorPickerHotkeyStr}" 
-                            KeyDown="HotKeyDown"
-                            KeyUp="HotKeyUp"
-                            InputMethod.IsInputMethodEnabled="False"
-                            />
-                <CheckBox Content="启用" 
-                          Tag="{x:Static cst:HotKeyType.ColorPicker}"
-                          Click="EnableHotKey_Click"
-                          IsChecked="{Binding EnableColorPickerHotKey}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
             </hc:UniformSpacingPanel>
         </StackPanel>
     </Grid>

Control/UserControls/Config/MotionControl.xaml.cs

@@ -1,13 +1,26 @@
 using GeekDesk.Constant;
+using GeekDesk.Control.Windows;
 using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
+using HandyControl.Data;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 using static GeekDesk.Util.GlobalHotKey;
 
 namespace GeekDesk.Control.UserControls.Config
@@ -35,128 +48,95 @@ 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;
+            bool main = false;
-                if (downKey == Key.System)
+            if ("Main".Equals(tag))
+            {
+                main = true;
+            }
+
+            if (prevKeyTemp == Key.None || prevKeyTemp != downKey)
+            {
+                if (hotkeyFinished)
                 {
-                    downKey = e.SystemKey;
+                    if (main)
-                }
-
-                if (!CheckIsEnable(hkType)) return;
-
-                
-                if (prevKeyTemp == Key.None || prevKeyTemp != downKey)
-                {
-                    if (hotkeyFinished)
                     {
-                        switch (hkType)
+                        appConfig.Hotkey = 0;
-                        {
+                        appConfig.HotkeyStr = "";
-                            case HotKeyType.Main:
+                        appConfig.HotkeyModifiers = 0;
-                                appConfig.Hotkey = Key.None;
-                                appConfig.HotkeyStr = "";
-                                appConfig.HotkeyModifiers = GlobalHotKey.HotkeyModifiers.None;
-                                break;
-                            case HotKeyType.ToDo:
-                                appConfig.ToDoHotkey = Key.None;
-                                appConfig.ToDoHotkeyStr = "";
-                                appConfig.ToDoHotkeyModifiers = GlobalHotKey.HotkeyModifiers.None;
-                                break;
-                            case HotKeyType.ColorPicker:
-                                appConfig.ColorPickerHotkey = Key.None;
-                                appConfig.ColorPickerHotkeyStr = "";
-                                appConfig.ColorPickerHotkeyModifiers = GlobalHotKey.HotkeyModifiers.None;
-                                break;
-                        }
-                        hotkeyFinished = false;
-                    }
-
-                    //首次按下按键
-                    if ((HotKeyType.Main == hkType && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0))
-                        || (HotKeyType.ToDo == hkType && (appConfig.ToDoHotkeyStr == null || appConfig.ToDoHotkeyStr.Length == 0))
-                        || (HotKeyType.ColorPicker == hkType && (appConfig.ColorPickerHotkeyStr == null || appConfig.ColorPickerHotkeyStr.Length == 0))
-                        )
-                    {
-                        if (CheckModifierKeys(downKey))
-                        {
-                            //辅助键
-                            switch (hkType)
-                            {
-                                case HotKeyType.Main:
-                                    appConfig.HotkeyStr = GetKeyName(downKey);
-                                    appConfig.HotkeyModifiers = GetModifierKeys(downKey);
-                                    break;
-                                case HotKeyType.ToDo:
-                                    appConfig.ToDoHotkeyStr = GetKeyName(downKey);
-                                    appConfig.ToDoHotkeyModifiers = GetModifierKeys(downKey);
-                                    break;
-                                case HotKeyType.ColorPicker:
-                                    appConfig.ColorPickerHotkeyStr = GetKeyName(downKey);
-                                    appConfig.ColorPickerHotkeyModifiers = GetModifierKeys(downKey);
-                                    break;
-                            }
-                            prevKeyTemp = downKey;
-                            keysTemp.Add(e);
-                        }
                     }
                     else
                     {
-                        //非首次按下  需要判断前一个键值是否为辅助键
+                        appConfig.ToDoHotkey = 0;
-                        if (CheckModifierKeys(prevKeyTemp)
+                        appConfig.ToDoHotkeyStr = "";
-                            && ((downKey >= Key.A && downKey <= Key.Z)
+                        appConfig.ToDoHotkeyModifiers = 0;
-                            || (downKey >= Key.F1 && downKey <= Key.F12)
+                    }
-                            || (downKey >= Key.D0 && downKey <= Key.D9)
+                    hotkeyFinished = false;
-                            || downKey == Key.Oem3
+                }
-                            ))
+                //首次按下按键
+                if ((main && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0))
+                    || (!main && (appConfig.ToDoHotkeyStr == null || appConfig.ToDoHotkeyStr.Length == 0)))
+                {
+                    if (CheckModifierKeys(downKey))
+                    {
+                        //辅助键
+                        if (main)
                         {
-                            KeyUtil.KeyProp keyProp = new KeyUtil.KeyProp();
+                            appConfig.HotkeyStr = GetKeyName(downKey);
-                            KeyUtil.KeyToChar(downKey, ref keyProp, true);
+                            appConfig.HotkeyModifiers = GetModifierKeys(downKey);
-                            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))
+                        else
                         {
-                            switch (hkType)
+                            appConfig.ToDoHotkeyStr = GetKeyName(downKey);
-                            {
+                            appConfig.ToDoHotkeyModifiers = GetModifierKeys(downKey);
-                                case HotKeyType.Main:
+                        }
-                                    appConfig.HotkeyStr += GetKeyName(downKey);
+                        prevKeyTemp = downKey;
-                                    appConfig.HotkeyModifiers |= GetModifierKeys(downKey);
+                        keysTemp.Add(e);
-                                    break;
+                    }
-                                case HotKeyType.ToDo:
+                }
-                                    appConfig.ToDoHotkeyStr += GetKeyName(downKey);
+                else
-                                    appConfig.ToDoHotkeyModifiers |= GetModifierKeys(downKey);
+                {
-                                    break;
+                    //非首次按下  需要判断前一个键值是否为辅助键
-                                case HotKeyType.ColorPicker:
+                    if (CheckModifierKeys(prevKeyTemp)
-                                    appConfig.ColorPickerHotkeyStr += GetKeyName(downKey);
+                        && ((downKey >= Key.A && downKey <= Key.Z)
-                                    appConfig.ColorPickerHotkeyModifiers |= GetModifierKeys(downKey);
+                        || (downKey >= Key.F1 && downKey <= Key.F12)
-                                    break;
+                        || (downKey >= Key.D0 && downKey <= Key.D9)))
-                            }
+                    {
+                        if (main)
+                        {
+                            appConfig.Hotkey = downKey;
+                            appConfig.HotkeyStr += downKey.ToString();
+                        }
+                        else
+                        {
+                            appConfig.ToDoHotkey = downKey;
+                            appConfig.ToDoHotkeyStr += downKey.ToString();
+                        }
+                        prevKeyTemp = downKey;
+                        keysTemp.Add(e);
+                    }
+                    else if (CheckModifierKeys(downKey))
+                    {
+                        if (main)
+                        {
+                            appConfig.HotkeyStr += GetKeyName(downKey);
+                            appConfig.HotkeyModifiers |= GetModifierKeys(downKey);
+                        }
+                        else
+                        {
+                            appConfig.ToDoHotkeyStr += GetKeyName(downKey);
+                            appConfig.ToDoHotkeyModifiers |= GetModifierKeys(downKey);
+                        }
 
-                            prevKeyTemp = downKey;
+                        prevKeyTemp = downKey;
-                            keysTemp.Add(e);
+                        keysTemp.Add(e);
-                        }
                     }
                 }
             }
@@ -211,9 +191,15 @@ namespace GeekDesk.Control.UserControls.Config
         }
 
 
-        //[MethodImpl(MethodImplOptions.Synchronized)]
+        [MethodImpl(MethodImplOptions.Synchronized)]
         private void HotKeyUp(object sender, KeyEventArgs e)
         {
+            string tag = (sender as TextBox).Tag.ToString();
+            bool main = false;
+            if ("Main".Equals(tag))
+            {
+                main = true;
+            }
             lock (this)
             {
                 bool allKeyUp = true;
@@ -232,55 +218,30 @@ namespace GeekDesk.Control.UserControls.Config
                     prevKeyTemp = Key.None;
                     hotkeyFinished = true;
 
-                    HotKeyType hkType = (HotKeyType)(sender as TextBox).Tag;
+                    if (main)
-                    if (!CheckIsEnable(hkType)) return;
-
-                    switch (hkType)
                     {
-                        case HotKeyType.Main:
+                        if (MainWindow.hotKeyId != -1)
-                            if (MainWindow.hotKeyId != -1)
+                        {
-                            {
+                            //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.mainWindow).Handle, Hotkey.keymap[MainWindow.hotKeyId]);
-                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.mainWindow).Handle, Hotkey.keymap[MainWindow.hotKeyId]);
+                            GlobalHotKey.Dispose(MainWindow.hotKeyId);
-                                GlobalHotKey.Dispose(MainWindow.hotKeyId);
+                        }
-                            }
+                        MainWindow.RegisterHotKey(false);
-                            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;
                     }
+                    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>
@@ -306,6 +267,15 @@ namespace GeekDesk.Control.UserControls.Config
             }
         }
 
+        private void Animation_Checked(object sender, RoutedEventArgs e)
+        {
+            if (MainWindow.mainWindow.Visibility == Visibility.Collapsed)
+            {
+                MainWindow.mainWindow.Visibility = Visibility.Visible;
+                // 执行一下动画 防止太过突兀
+                MainWindow.FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
+            }
+        }
 
 
         /// <summary>
@@ -315,68 +285,15 @@ namespace GeekDesk.Control.UserControls.Config
         /// <param name="e"></param>
         private void MouseMiddle_Changed(object sender, RoutedEventArgs e)
         {
-            //if (appConfig.MouseMiddleShow)
+            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)
             {
-                case HotKeyType.Main:
+                MouseHookThread.MiddleHook();
-                    if (true == appConfig.EnableAppHotKey)
+            }
-                    {
+            else
-                        MainWindow.RegisterHotKey(false);
+            {
-                    } else
+                MouseHookThread.Dispose();
-                    {
-                        if (MainWindow.hotKeyId != -1)
-                        {
-                            GlobalHotKey.Dispose(MainWindow.hotKeyId);
-                        }
-                    }
-                    break;
-                case HotKeyType.ToDo:
-                    if (true == appConfig.EnableTodoHotKey)
-                    {
-                        MainWindow.RegisterCreateToDoHotKey(false);
-                    }
-                    else
-                    {
-                        if (MainWindow.hotKeyId != -1)
-                        {
-                            GlobalHotKey.Dispose(MainWindow.toDoHotKeyId);
-                        }
-                    }
-                    break;
-                case HotKeyType.ColorPicker:
-                    if (true == appConfig.EnableColorPickerHotKey)
-                    {
-                        MainWindow.RegisterColorPickerHotKey(false);
-                    }
-                    else
-                    {
-                        if (MainWindow.hotKeyId != -1)
-                        {
-                            GlobalHotKey.Dispose(MainWindow.colorPickerHotKeyId);
-                        }
-                    }
-                    break;
             }
         }
+
     }
 }

Control/UserControls/Config/OtherControl.xaml

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

Control/UserControls/Config/OtherControl.xaml.cs

@@ -1,15 +1,20 @@
 using GeekDesk.Constant;
-using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using ShowSeconds;
 using System;
-using System.Diagnostics;
+using System.Collections.Generic;
-using System.IO;
+using System.Linq;
-using System.Management;
+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
 {
@@ -113,85 +118,5 @@ namespace GeekDesk.Control.UserControls.Config
                 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();
-            //    MouseHookThread.Dispose();
-            //    MouseHookThread.Hook();
-            //}
-            //else
-            //{
-            //    MouseHookThread.Dispose();
-            //    MouseHookThread.Hook();
-            //}
-
-            MouseHookThread.Dispose();
-            MouseHookThread.Hook();
-        }
-
-        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) { }
-        }
-
-
-
     }
 }

Control/UserControls/Config/ThemeControl.xaml

@@ -2,256 +2,157 @@
              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: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" >
+                <StackPanel Margin="20" >
-                <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                    <TextBlock Text="背景风格" VerticalAlignment="Center"/>
-                </hc:UniformSpacingPanel>
-                <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Click="BGStyle_Changed" Content="图 片"
-                         IsChecked="{Binding BGStyle, Mode=TwoWay, Converter={StaticResource BGStyleConvert}, ConverterParameter=1}"/>
-                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
-                         Style="{StaticResource RadioButtonIcon}" Click="BGStyle_Changed" Content="纯 色" 
-                         IsChecked="{Binding BGStyle, Mode=TwoWay, Converter={StaticResource BGStyleConvert}, ConverterParameter=2}"/>
-                </hc:UniformSpacingPanel>
-
-                <UniformGrid x:Name="ImgBGConf">
-                    <hc:TransitioningContentControl TransitionMode="Fade" 
-                                                    Height="130">
-                        <StackPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="图片背景" VerticalAlignment="Center"/>
-                            </hc:UniformSpacingPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="20,15,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="图片路径:" VerticalAlignment="Center" Margin="0,5,0,0"/>
-                                <TextBlock Text="{Binding BacImgName}" Width="200" 
-                                           Margin="0,5,0,0"
-                                           VerticalAlignment="Center"
-                                           hc:Poptip.HitMode="None" 
-                                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                           hc:Poptip.Content="{Binding BacImgName}" 
-                                           hc:Poptip.Placement="TopLeft"
-                                           />
-                                <Button Content="修改" Click="BGButton_Click"/>
-                                <Button Content="默认" Click="DefaultButton_Click"/>
-                            </hc:UniformSpacingPanel>
-
-                            <hc:UniformSpacingPanel Spacing="10" Margin="20,10,0,0"  Grid.ColumnSpan="4">
-                                <CheckBox x:Name="IconIsAdmin" Content="毛玻璃效果" Click="BGStyle_Changed" IsChecked="{Binding BlurEffect}">
-                                    <CheckBox.Background>
-                                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                            <GradientStop Color="#FF9EA3A6"/>
-                                        </LinearGradientBrush>
-                                    </CheckBox.Background>
-                                </CheckBox>
-                            </hc:UniformSpacingPanel>
-                        </StackPanel>
-                    </hc:TransitioningContentControl>
-
-                </UniformGrid>
-
-                <UniformGrid x:Name="GradientBGConf">
-                    <hc:TransitioningContentControl TransitionMode="Fade" 
-                                                    Height="130">
-                        <StackPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="纯色背景" VerticalAlignment="Center"/>
-                            </hc:UniformSpacingPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="色彩1:" VerticalAlignment="Center" Margin="0,5,0,0"/>
-                                <TextBlock Text="{Binding GradientBGParam.Color1, NotifyOnTargetUpdated=True}"
-                                           TargetUpdated="Color_TargetUpdated"
-                                           Width="65" 
-                                           Margin="0,5,0,0"
-                                           VerticalAlignment="Center"
-                                           />
-                                <Button Content="设置" Tag="Color1" Click="ColorButton_Click"/>
-                            </hc:UniformSpacingPanel>
-                            <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0" Grid.ColumnSpan="4">
-                                <TextBlock Text="色彩2:" VerticalAlignment="Center" Margin="0,5,0,0"/>
-                                <TextBlock Text="{Binding GradientBGParam.Color2, NotifyOnTargetUpdated=True}" 
-                                           TargetUpdated="Color_TargetUpdated"
-                                           Width="65" 
-                                           Margin="0,5,0,0"
-                                           VerticalAlignment="Center"
-                                           />
-                                <Button Content="设置" Tag="Color2" Click="ColorButton_Click"/>
-                            </hc:UniformSpacingPanel>
-
-                            <Button Content="系统预设"
-                                    Margin="0,5,0,0"
-                                    hc:Poptip.HitMode="None" 
-                                    hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                    hc:Poptip.Content="{Binding GradientBGParam.Name, Converter={StaticResource StringAppendConvert}, ConverterParameter=当前设置: \{\}}" 
-                                    hc:Poptip.Placement="Top"
-                                    Click="SysBG_Click"
-                                    />
-                        </StackPanel>
-                    </hc:TransitioningContentControl>
-                </UniformGrid>
-
-
-                <hc:Divider LineStrokeDashArray="3,3" Margin="0,0,0,0" Height="20" LineStroke="Black" Grid.ColumnSpan="1"/>
-
-                <hc:UniformSpacingPanel Spacing="10" Margin="5,-10,0,0" Grid.ColumnSpan="4">
-                    <CheckBox  Content="主窗口动画" IsChecked="{Binding AppAnimation}" Click="Animation_Checked">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
-                </hc:UniformSpacingPanel>
-                <hc:UniformSpacingPanel Spacing="10" Margin="5,10,0,0" Grid.ColumnSpan="4">
-                    <CheckBox  Content="列表展开动画" IsChecked="{Binding ItemSpradeAnimation}">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
-                </hc:UniformSpacingPanel>
-                <hc:UniformSpacingPanel Spacing="10" Margin="5,10,0,0"  Grid.ColumnSpan="4">
-                    <CheckBox x:Name="BarIcon" Content="显示托盘图标" IsChecked="{Binding ShowBarIcon}">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
-                </hc:UniformSpacingPanel>
-
-                <hc:UniformSpacingPanel Spacing="10" Margin="5,10,0,0"  Grid.ColumnSpan="4">
-                    <CheckBox  Content="显示主面板Logo" IsChecked="{Binding TitleLogoVisible, Mode=TwoWay, Converter={StaticResource Visibility2BooleanConverter}}">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
-                </hc:UniformSpacingPanel>
-
-
-                <StackPanel Margin="0,15,0,0">
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
-                        <TextBlock Text="卡片不透明度" VerticalAlignment="Center"/>
+                        <TextBlock Text="背景图片" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0" Grid.ColumnSpan="4">
-                        <hc:PreviewSlider Value="{Binding CardOpacity}"
+                        <TextBlock Text="图片路径:" VerticalAlignment="Center" Margin="0,5,0,0"/>
+                        <TextBlock Text="{Binding BacImgName}" Width="200" 
+                               Margin="0,5,0,0"
+                           VerticalAlignment="Center"
+                           hc:Poptip.HitMode="None" 
+                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                           hc:Poptip.Content="{Binding BacImgName}" 
+                           hc:Poptip.Placement="TopLeft"
+                           />
+                        <Button Content="修改" Click="BGButton_Click"/>
+                        <Button Content="默认" Click="DefaultButton_Click"/>
+                    </hc:UniformSpacingPanel>
+
+                    <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0"  Grid.ColumnSpan="4">
+                        <CheckBox x:Name="IconIsAdmin" Content="毛玻璃效果" IsChecked="{Binding BlurEffect}">
+                            <CheckBox.Background>
+                                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                    <GradientStop Color="#FF9EA3A6"/>
+                                </LinearGradientBrush>
+                            </CheckBox.Background>
+                        </CheckBox>
+                    </hc:UniformSpacingPanel>
+
+                    <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0"  Grid.ColumnSpan="4">
+                        <CheckBox x:Name="BarIcon" Content="显示托盘图标" IsChecked="{Binding ShowBarIcon}">
+                            <CheckBox.Background>
+                                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                    <GradientStop Color="#FF9EA3A6"/>
+                                </LinearGradientBrush>
+                            </CheckBox.Background>
+                        </CheckBox>
+                    </hc:UniformSpacingPanel>
+
+                    <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
+
+                    <StackPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
+                            <TextBlock Text="托盘不透明度" VerticalAlignment="Center"/>
+                        </hc:UniformSpacingPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                            <hc:PreviewSlider Value="{Binding CardOpacity}"
                                   Maximum="100"
                                   Width="350"
                                   >
-                            <hc:PreviewSlider.PreviewContent>
+                                <hc:PreviewSlider.PreviewContent>
-                                <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                            </hc:PreviewSlider.PreviewContent>
+                                </hc:PreviewSlider.PreviewContent>
-                        </hc:PreviewSlider>
+                            </hc:PreviewSlider>
-                    </hc:UniformSpacingPanel>
+                        </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"/>
-                        <TextBlock Text="背景不透明度" VerticalAlignment="Center"/>
+                        </hc:UniformSpacingPanel>
-                    </hc:UniformSpacingPanel>
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                            <hc:PreviewSlider Value="{Binding BgOpacity}"
-                        <hc:PreviewSlider Value="{Binding BgOpacity}"
+                                  Maximum="100"
-                                          ValueChanged="BGOpacity_ValueChanged"
+                                  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>
+                                </hc:PreviewSlider.PreviewContent>
-                                <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                            </hc:PreviewSlider>
-                            </hc:PreviewSlider.PreviewContent>
+                        </hc:UniformSpacingPanel>
-                        </hc:PreviewSlider>
-                    </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"/>
+                            <TextBlock Text="主面板不透明度" VerticalAlignment="Center"/>
-                    </hc:UniformSpacingPanel>
+                        </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                        <hc:PreviewSlider Value="{Binding PannelOpacity}"
+                            <hc:PreviewSlider Value="{Binding PannelOpacity}"
                                   Minimum="50"
                                   Maximum="100"
                                   Width="350"
                                   >
-                            <hc:PreviewSlider.PreviewContent>
+                                <hc:PreviewSlider.PreviewContent>
-                                <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                            </hc:PreviewSlider.PreviewContent>
+                                </hc:PreviewSlider.PreviewContent>
-                        </hc:PreviewSlider>
+                            </hc:PreviewSlider>
-                    </hc:UniformSpacingPanel>-->
+                        </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"/>
+                            <TextBlock Text="主面板圆角大小" VerticalAlignment="Center"/>
-                    </hc:UniformSpacingPanel>
+                        </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                        <hc:PreviewSlider Value="{Binding PannelCornerRadius}"
+                            <hc:PreviewSlider Value="{Binding PannelCornerRadius}"
                                   Maximum="25"
                                   Width="350"
                                   >
-                            <hc:PreviewSlider.PreviewContent>
+                                <hc:PreviewSlider.PreviewContent>
-                                <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                            </hc:PreviewSlider.PreviewContent>
+                                </hc:PreviewSlider.PreviewContent>
-                        </hc:PreviewSlider>
+                            </hc:PreviewSlider>
-                    </hc:UniformSpacingPanel>
+                        </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"/>
+                            <TextBlock Text="图标大小" VerticalAlignment="Center"/>
-                    </hc:UniformSpacingPanel>
+                        </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4"
+                        <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4"
                                             Background="#00FFFFFF"
                                             PreviewMouseLeftButtonDown="PreviewSlider_MouseLeftButtonUp"
                                             >
-                        <hc:PreviewSlider Value="{Binding ImageWidth, Mode=TwoWay}"
+                            <hc:PreviewSlider Value="{Binding ImageWidth, Mode=TwoWay}"
                                           Minimum="40"
                                           Maximum="60"
                                           Width="350"
                                           >
-                            <hc:PreviewSlider.PreviewContent>
+                                <hc:PreviewSlider.PreviewContent>
-                                <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                                    <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
-                            </hc:PreviewSlider.PreviewContent>
+                                </hc:PreviewSlider.PreviewContent>
-                        </hc:PreviewSlider>
+                            </hc:PreviewSlider>
+                        </hc:UniformSpacingPanel>
+                    </StackPanel>
+                    <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
+                    <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
+                        <TextBlock VerticalAlignment="Center" Text="图标字体颜色:" />
+                        <TextBlock VerticalAlignment="Center" Text="{Binding TextColor}" Width="100"/>
+                        <Button Content="选择" Margin="0,-10,0,0"  Click="ColorButton_Click"/>
                     </hc:UniformSpacingPanel>
                 </StackPanel>
-                <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
+            </Grid>
-                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
-                    <TextBlock VerticalAlignment="Center" Text="图标字体颜色:" />
-                    <TextBlock VerticalAlignment="Center" Text="{Binding TextColor}" Foreground="{Binding TextColor}" Width="100"/>
-                    <Button Content="选择" Margin="0,-10,0,0" Tag="Text"  Click="ColorButton_Click"/>
-                </hc:UniformSpacingPanel>
-            </StackPanel>
-        </Grid>
             
-        <!--<StackPanel x:Name="ColorPanel" Panel.ZIndex="1" 
+        <StackPanel x:Name="ColorPanel" Panel.ZIndex="1" 
                     Visibility="Collapsed"
                     Height="500"
                     Width="450"
                     VerticalAlignment="Center">
             <StackPanel.Background>
-                <SolidColorBrush Color="AliceBlue" Opacity="0.01"/>
+                <SolidColorBrush Color="AliceBlue" Opacity="0"/>
-            </StackPanel.Background>-->
+            </StackPanel.Background>
             
-            <!--<hc:ColorPicker Name="MyColorPicker" 
+            <hc:ColorPicker Name="MyColorPicker" 
+                            ToggleButton.Checked="MyColorPicker_Checked"
                             Canceled="MyColorPicker_Canceled"
                             Confirmed="MyColorPicker_Confirmed"
-                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>-->
+                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>
             
-        <!--</StackPanel>-->
+        </StackPanel>
     </Grid>
         
 </UserControl>

Control/UserControls/Config/ThemeControl.xaml.cs

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

Control/UserControls/IconFont/IconPannel.xaml.cs

@@ -1,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

@@ -3,14 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:cvt="clr-namespace:GeekDesk.Converts"
-             xmlns: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 +16,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="Unselected" Handler="ListBoxItem_Unselected"/>-->
-            <EventSetter Event="PreviewMouseRightButtonDown" Handler="ListBoxItem_PreviewMouseRightButtonDown"/>
-            <!--<EventSetter Event="Unselected" Handler="Lbi_Unselected"/>-->
             <Style.Triggers>
                 <MultiTrigger>
                     <MultiTrigger.Conditions>
@@ -53,17 +43,17 @@
                         </BeginStoryboard>
                     </MultiTrigger.ExitActions>
                     <MultiTrigger.Setters>
-                        <Setter Property="Background">
+                        <Setter Property="Background" Value="Transparent"/>
-                            <Setter.Value>
-                                <SolidColorBrush Color="Black" Opacity="0.01"/>
-                            </Setter.Value>
-                        </Setter>
                         <Setter Property="Foreground" Value="Black"/>
                     </MultiTrigger.Setters>
                 </MultiTrigger>
 
 
-                <!--移到代码设置-->
+
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="#ECECEC"/>
+                    <Setter Property="Foreground" Value="Black"/>
+                </Trigger>
                 <!--<Trigger Property="IsSelected" Value="False">
                     <Setter Property="Background" Value="Transparent"/>
                     <Setter Property="Foreground" Value="Black"/>
@@ -77,150 +67,111 @@
                     <Setter Property="Background" Value="Transparent"/>
                     <Setter Property="Foreground" Value="Black"/>
                 </Trigger>-->
-                <Trigger Property="IsMouseOver" Value="False">
+
-                    <Setter Property="Background" Value="#00FFFFFF"/>
+                <!--<MultiTrigger>
-                    <Setter Property="Foreground" Value="Black"/>
+                    <MultiTrigger.Conditions>
-                </Trigger>
+                        <Condition Property=""></Condition>
+                    </MultiTrigger.Conditions>
+                </MultiTrigger>-->
 
 
             </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" 
+    <hc:Card x:Name="MyCard"
-               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>
+        <hc:Card.Background>
-                <SolidColorBrush Color="#FFFFFFFF" hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
+            <SolidColorBrush Color="#FFFFFFFF" hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
 
-                </SolidColorBrush>
+            </SolidColorBrush>
-            </hc:Card.Background>
+        </hc:Card.Background>
-            <hc:Card.BorderBrush>
+        <hc:Card.BorderBrush>
-                <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
+            <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
-            </hc:Card.BorderBrush>
+        </hc:Card.BorderBrush>
-            <hc:Card.ContextMenu>
+        <hc:Card.ContextMenu>
-                <ContextMenu Width="200">
+            <ContextMenu Width="200">
-                    <MenuItem Header="新建菜单" Click="CreateMenu"/>
+                <MenuItem Header="新建菜单" Click="CreateMenu"/>
-                    <MenuItem x:Name="AlterPW1" Header="修改密码" Click="AlterPassword"/>
+            </ContextMenu>
-                </ContextMenu>
+        </hc:Card.ContextMenu>
-            </hc:Card.ContextMenu>
+        <WrapPanel Orientation="Horizontal">
+            <ListBox x:Name="MenuListBox"
+                     Padding="2,3,0,2"
+                     ItemsSource="{Binding MenuList}"
+                     Tag="{Binding AppConfig.MenuCardWidth}"
+                     BorderThickness="0" Foreground="{x:Null}"
+                     SelectedIndex="{Binding AppConfig.SelectedMenuIndex}"
+                     VirtualizingPanel.VirtualizationMode="Recycling"
+                     SelectionChanged="Menu_SelectionChanged"
+                     >
+                <ListBox.Resources>
+                    <ContextMenu x:Key="MenuDialog" Width="200">
+                        <MenuItem Header="新建菜单" Click="CreateMenu"/>
+                        <MenuItem Header="重命名"  Click="RenameMenu" Tag="{Binding}"/>
+                        <MenuItem Header="修改图标"  Click="EditMenuGeometry" Tag="{Binding}"/>
+                        <MenuItem Header="删除" Click="DeleteMenu" Tag="{Binding}"/>
+                    </ContextMenu>
+                </ListBox.Resources>
 
-            <WrapPanel Orientation="Horizontal">
+                <ListBox.ItemContainerStyle>
-                <ListBox x:Name="MenuListBox"
+                    <Style TargetType="ListBoxItem" BasedOn="{StaticResource MenuStyle}">
-                         Padding="2,3,0,2"
+                        <Setter Property="ContextMenu" Value="{StaticResource MenuDialog}"/>
-                         ItemsSource="{Binding MenuList}"
+                    </Style>
-                         Tag="{Binding AppConfig.MenuCardWidth}"
+                </ListBox.ItemContainerStyle>
-                         BorderThickness="0" Foreground="{x:Null}"
+                <ListBox.Background>
-                         SelectedIndex="{Binding AppConfig.SelectedMenuIndex}"
+                    <SolidColorBrush Color="AliceBlue" Opacity="0"/>
-                         VirtualizingPanel.VirtualizationMode="Recycling"
+                </ListBox.Background>
-                         SelectionChanged="Menu_SelectionChanged"
-                         PreviewMouseWheel="Menu_MouseWheel"
-                         PreviewMouseRightButtonDown="MyCard_PreviewMouseRightButtonDown"
-                         >
-                    <ListBox.Resources>
-                        <ContextMenu x:Key="MenuDialog" Width="200">
-                            <MenuItem Header="新建菜单" Click="CreateMenu"/>
-                            <MenuItem Header="重命名"  Click="RenameMenu" Tag="{Binding}"/>
-                            <MenuItem Header="加密此列表"  Click="EncryptMenu" Tag="{Binding}"/>
-                            <MenuItem x:Name="AlterPW2" Header="修改密码" Click="AlterPassword"/>
-                            <MenuItem Header="修改图标"  Click="EditMenuGeometry" Tag="{Binding}"/>
-                            <MenuItem Header="删除" Click="DeleteMenu" Tag="{Binding}"/>
-                        </ContextMenu>
-                    </ListBox.Resources>
 
-                    <ListBox.ItemContainerStyle>
+                <ListBox.ItemsPanel>
-                        <Style TargetType="ListBoxItem" BasedOn="{StaticResource MenuStyle}">
+                    <ItemsPanelTemplate>
-                            <Setter Property="ContextMenu" Value="{StaticResource MenuDialog}"/>
+                        <DraggAnimatedPanel:DraggAnimatedPanel ItemsHeight="33" ItemsWidth="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=10}"   HorizontalAlignment="Center" VerticalAlignment="Top" SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
-                        </Style>
+                    </ItemsPanelTemplate>
-                    </ListBox.ItemContainerStyle>
+                </ListBox.ItemsPanel>
-                    <ListBox.Background>
-                        <SolidColorBrush Color="AliceBlue" Opacity="0"/>
-                    </ListBox.Background>
 
-                    <ListBox.ItemsPanel>
+                <ListBox.ItemTemplate>
-                        <ItemsPanelTemplate>
+                    <DataTemplate>
-                            <DraggAnimatedPanel:DraggAnimatedPanel ItemsHeight="33" ItemsWidth="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=10}"   HorizontalAlignment="Center" VerticalAlignment="Top" SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
+                        <StackPanel Tag="{Binding}">
-                        </ItemsPanelTemplate>
+                            <TextBox Text="{Binding Path=MenuName, Mode=TwoWay}"
-                    </ListBox.ItemsPanel>
+                                    HorizontalAlignment="Left"
-
+                                    Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=35}"
-                    <ListBox.ItemTemplate>
+                                    FontSize="16"
-                        <DataTemplate>
+                                    Height="28"
-                            <StackPanel Tag="{Binding}">
+                                    VerticalAlignment="Center"
-                                <TextBox Text="{Binding Path=MenuName, Mode=TwoWay}"
+                                    TextAlignment="Left"
-                                HorizontalAlignment="Left"
+                                    LostFocus="LostFocusOrEnterDown"
-                                Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=35}"
+                                    KeyDown="LostFocusOrEnterDown"
-                                FontSize="16"
+                                    Tag="{Binding}"
-                                Height="28"
+                                    Padding="2"
-                                VerticalAlignment="Center"
-                                TextAlignment="Left"
-                                LostFocus="LostFocusOrEnterDown"
-                                KeyDown="LostFocusOrEnterDown"
-                                Tag="{Binding}"
-                                Padding="2"
-                                BorderThickness="0"
-                                IsVisibleChanged="MenuEditWhenVisibilityChanged"
-                                Visibility="{Binding MenuEdit}"/>
-                                <StackPanel Orientation="Horizontal"
-                                IsVisibleChanged="MenuWhenVisibilityChanged"
-                                Visibility="{Binding NotMenuEdit}">
-                                    <Button Background="Transparent" 
                                     BorderThickness="0"
-                                    hc:IconElement.Geometry="{Binding MenuGeometry}"
+                                    IsVisibleChanged="MenuEditWhenVisibilityChanged"
-                                    hc:IconElement.Height="18"
+                                    Visibility="{Binding MenuEdit}"/>
-                                    hc:IconElement.Width="18"
+                            <StackPanel Orientation="Horizontal"
-                                    IsEnabled="False"
+                                    IsVisibleChanged="MenuWhenVisibilityChanged"
-                                    Opacity="1"
+                                    Visibility="{Binding NotMenuEdit}">
-                                    Foreground="{Binding GeometryColor}"
+                                <Button Background="Transparent" 
-                                    />
+                                        BorderThickness="0"
-                                    <TextBlock Text="{Binding MenuName}"
+                                        hc:IconElement.Geometry="{Binding MenuGeometry}"
-                                        HorizontalAlignment="Center"
+                                        hc:IconElement.Height="18"
-                                        TextAlignment="Center"
+                                        hc:IconElement.Width="18"
-                                        VerticalAlignment="Center"
+                                        IsEnabled="False"
+                                        Opacity="1"
+                                        Foreground="{Binding GeometryColor}"
                                         />
-                                </StackPanel>
+                                <TextBlock Text="{Binding MenuName}"
+                                           HorizontalAlignment="Center"
+                                           TextAlignment="Center"
+                                           VerticalAlignment="Center"
+                                            />
                             </StackPanel>
-                        </DataTemplate>
+                        </StackPanel>
-                    </ListBox.ItemTemplate>
+                    </DataTemplate>
-                </ListBox>
+                </ListBox.ItemTemplate>
-            </WrapPanel>
+            </ListBox>
-        </hc:Card>
+        </WrapPanel>
-    </Grid>
+    </hc:Card>
 </UserControl>

Control/UserControls/PannelCard/LeftCardControl.xaml.cs

@@ -1,7 +1,6 @@
 using DraggAnimatedPanelExample;
-using GeekDesk.Constant;
-using GeekDesk.Control.Other;
 using GeekDesk.Control.Windows;
+using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using System;
@@ -10,8 +9,10 @@ using System.Collections.ObjectModel;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
+
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Threading;
 
 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -22,62 +23,19 @@ namespace GeekDesk.Control.UserControls.PannelCard
     {
         private int menuSelectIndexTemp = -1;
         private AppData appData = MainWindow.appData;
-        private SolidColorBrush bac = new SolidColorBrush(Color.FromRgb(236, 236, 236));
 
+        //是否正在修改菜单
+        private static bool IS_EDIT = false;
 
         public LeftCardControl()
         {
             InitializeComponent();
-
-
-            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;
             }
         }
@@ -107,6 +65,13 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
         }
 
+        //////菜单点击事件
+        //private void MenuClick(object sender, MouseButtonEventArgs e)
+        //{
+        //    //设置对应菜单的图标列表
+        //    MenuInfo mi = (MenuInfo)(((StackPanel)sender).Tag);
+        //    appData.AppConfig.SelectedMenuIcons = mi.IconList;
+        //}
 
         /// <summary>
         /// 当修改菜单元素可见时 设置原菜单为不可见 并且不可选中
@@ -118,10 +83,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
         {
             StackPanel sp = sender as StackPanel;
             
-            ListBoxItem lbi = (sp.TemplatedParent as ContentPresenter).TemplatedParent as ListBoxItem;
+            //ListBoxItem lbi = (sp.TemplatedParent as ContentPresenter).TemplatedParent as ListBoxItem;
             if (sp.Visibility == Visibility.Collapsed)
             {
-                lbi.MouseEnter += Lbi_MouseEnter;
+                //SolidColorBrush scb = new SolidColorBrush(Colors.Red);
+                //lbi.MouseEnter += Lbi_MouseEnter;
+
                 if (MenuListBox.SelectedIndex != -1)
                 {
                     menuSelectIndexTemp = MenuListBox.SelectedIndex;
@@ -131,55 +98,32 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 {
                     MenuListBox.SelectedIndex = menuSelectIndexTemp;
                 }
-            }
+            } else
-            else
             {
-                lbi.MouseEnter += (s, me) =>
+                //SolidColorBrush bac = new SolidColorBrush(Color.FromRgb(236, 236, 236));
-                {
+                //SolidColorBrush fontColor = new SolidColorBrush(Colors.Black);
-                    lbi.Background = bac;
-                };
 
-                lbi.MouseLeave += Lbi_MouseLeave;
+                //lbi.MouseEnter += (s, me) =>
-                lbi.Selected += Lbi_Selected;
+                //{
+                //    lbi.Background = bac;
+                //};
+
+                //lbi.MouseLeave += Lbi_MouseLeave;
+
+                //lbi.Selected += (s, me) =>
+                //{
+                //    lbi.MouseLeave -= Lbi_MouseLeave;
+                //    lbi.Background = bac;
+                //    lbi.Foreground = fontColor;
+                //};
             }
         }
 
-        #region 设置菜单触发事件
+        //private void Lbi_MouseEnter(object sender, MouseEventArgs e)
-        private void Lbi_MouseEnter(object sender, MouseEventArgs e)
+        //{
-        {
+        //    ListBoxItem lbi = sender as ListBoxItem;
-            ListBoxItem lbi = sender as ListBoxItem;
+        //    lbi.Background = Brushes.Transparent;
-            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>
         /// 新建菜单
@@ -190,15 +134,32 @@ 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);
-        }
 
+            //ItemCollection ic = MenuListBox.Items;
+            //SolidColorBrush bac = new SolidColorBrush(Color.FromRgb(236, 236, 236));
+            //SolidColorBrush fontColor = new SolidColorBrush(Colors.Black);
+            //foreach (var icItem in ic)
+            //{
+            //    ListBoxItem lbi = icItem as ListBoxItem;
+            //    lbi.MouseEnter += (s, me) =>
+            //    {
+            //        lbi.Background = bac;
+            //    };
+
+            //    lbi.MouseLeave += Lbi_MouseLeave;
+
+            //    lbi.Selected += (s, me) =>
+            //    {
+            //        lbi.MouseLeave -= Lbi_MouseLeave;
+            //        lbi.Background = bac;
+            //        lbi.Foreground = fontColor;
+            //    };
+            //}
+        }
 
         /// <summary>
         /// 重命名菜单 将textbox 设置为可见
@@ -207,9 +168,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void RenameMenu(object sender, RoutedEventArgs e)
         {
-            RunTimeStatus.IS_MENU_EDIT = true;
             MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
             menuInfo.MenuEdit = (int)Visibility.Visible;
+            IS_EDIT = true;
         }
 
         /// <summary>
@@ -226,13 +187,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 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);
@@ -257,13 +217,11 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 if (eKey.Key == Key.Enter)
                 {
                     menuBox = ((TextBox)sender);
-                }
+                } else
-                else
                 {
                     done = false;
                 }
-            }
+            } else if (e.GetType() == typeof(RoutedEventArgs))
-            else if (e.GetType() == typeof(RoutedEventArgs))
             {
                 menuBox = ((TextBox)sender);
             }
@@ -277,9 +235,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
                     menuInfo.MenuName = text;
                     menuInfo.MenuEdit = Visibility.Collapsed;
                 }
-                RunTimeStatus.IS_MENU_EDIT = false;
+                IS_EDIT = false;
-                //为了解决无法修改菜单的问题
-                MainWindow.mainWindow.SearchBox.Focus();
                 MenuListBox.SelectedIndex = menuSelectIndexTemp;
             }
         }
@@ -313,14 +269,6 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
         private void Menu_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (RunTimeStatus.IS_MENU_EDIT) return;
-
-            if (appData.AppConfig.ItemSpradeAnimation)
-            {
-                //是否启用列表展开动画
-                MainWindow.mainWindow.RightCard.WrapUFG.Visibility = Visibility.Collapsed;
-            }
-
             //设置对应菜单的图标列表
             if (MenuListBox.SelectedIndex == -1)
             {
@@ -328,23 +276,23 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
             else
             {
-                if (appData.MenuList[MenuListBox.SelectedIndex].IsEncrypt)
+                appData.AppConfig.SelectedMenuIcons = appData.MenuList[MenuListBox.SelectedIndex].IconList;
-                {
-                    appData.AppConfig.SelectedMenuIcons = null;
-                    RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
-                    MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入密码";
-                    MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
-                }
-                else
-                {
-                    MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Collapsed;
-                    appData.AppConfig.SelectedMenuIcons = appData.MenuList[MenuListBox.SelectedIndex].IconList;
-                }
             }
-            MainWindow.mainWindow.RightCard.WrapUFG.Visibility = Visibility.Visible;
-            //App.DoEvents();
         }
 
+        //private void ListBoxItem_Unselected(object sender, RoutedEventArgs e)
+        //{
+        //    //添加Leave效果
+        //    ListBoxItem lbi = sender as ListBoxItem;
+        //    //lbi.Background = Brushes.Transparent;
+        //    //lbi.MouseLeave += Lbi_MouseLeave;
+        //}
+
+        //private void Lbi_MouseLeave(object sender, MouseEventArgs e)
+        //{
+        //    ListBoxItem lbi = sender as ListBoxItem;
+        //    lbi.Background = Brushes.Transparent;
+        //}
 
         /// <summary>
         /// 鼠标悬停切换菜单
@@ -353,9 +301,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void Menu_MouseEnter(object sender, MouseEventArgs e)
         {
-            if (appData.AppConfig.HoverMenu && !RunTimeStatus.IS_MENU_EDIT)
+            if (appData.AppConfig.HoverMenu && !IS_EDIT)
             {
-                Thread t = new Thread(() =>
+                new Thread(() =>
                 {
                     Thread.Sleep(200);
                     this.Dispatcher.Invoke(() =>
@@ -367,231 +315,10 @@ namespace GeekDesk.Control.UserControls.PannelCard
                             MenuListBox.SelectedIndex = index;
                         }
                     });
-                });
+                }).Start();
-                t.IsBackground = true;
-                t.Start();
             }
         }
 
-        /// <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;
-        }
-
-        private void Menu_Drop(object sender, DragEventArgs e)
-        {
-            MyPoptip.IsOpen = false;
-
-            MenuInfo mi = (sender as ListBoxItem).DataContext as MenuInfo;
-            IconInfo iconInfo = (IconInfo)e.Data.GetData(typeof(IconInfo));
-
-            appData.MenuList[MenuListBox.SelectedIndex].IconList.Remove(iconInfo);
-            appData.MenuList[MenuListBox.Items.IndexOf(mi)].IconList.Add(iconInfo);
-        }
-
-        private void EncryptMenu(object sender, RoutedEventArgs e)
-        {
-            MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
-            if (menuInfo.IsEncrypt)
-            {
-                MainWindow.mainWindow.RightCard.PDDialog.menuInfo = menuInfo;
-                MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入密码";
-                MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.CANCEL;
-                RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
-                MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
-                //单独设置焦点
-                MainWindow.mainWindow.RightCard.PDDialog.SetFocus();
-            } else
-            {
-                if (string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
-                {
-                    MainWindow.mainWindow.RightCard.PDDialog.menuInfo = menuInfo;
-                    MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "设置新密码";
-                    MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.CREATE;
-                    RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;                    
-                    MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
-                }
-                else
-                {
-                    menuInfo.IsEncrypt = true;
-                    HandyControl.Controls.Growl.Success(menuInfo.MenuName + " 已加密!", "MainWindowGrowl");
-                }
-            }
-        }
-
-        private void AlterPassword(object sender, RoutedEventArgs e)
-        {
-            MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入旧密码";
-            MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.ALTER;
-            MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
-            //单独设置焦点
-            MainWindow.mainWindow.RightCard.PDDialog.SetFocus();
-        }
-
-        /// <summary>
-        /// 右键点击进行处理 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MyCard_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            RunTimeStatus.SHOW_RIGHT_BTN_MENU = true;
-            new Thread(() =>
-            {
-                Thread.Sleep(50);
-                RunTimeStatus.SHOW_RIGHT_BTN_MENU = false;
-            }).Start();
-
-            //在没有设置密码的情况下不弹出修改密码菜单
-            if (string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
-            {
-                AlterPW1.Visibility = Visibility.Collapsed;
-            } else
-            {
-                AlterPW1.Visibility = Visibility.Visible;
-            }
-        }
-
-        private void ListBoxItem_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            ListBoxItem lbi = sender as ListBoxItem;
-            MenuInfo info = lbi.DataContext as MenuInfo;
-
-            ItemCollection ics =  lbi.ContextMenu.Items;
-
-            foreach (object obj in ics)
-            {
-                MenuItem mi = (MenuItem)obj;
-                if (mi.Header.Equals("修改密码"))
-                {
-                    if (string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
-                    {
-                        mi.Visibility = Visibility.Collapsed;
-                    }
-                    else
-                    {
-                        mi.Visibility = Visibility.Visible;
-                    }
-                    break;
-                }
-                if (mi.Header.Equals("加密此列表") || mi.Header.Equals("取消加密此列表"))
-                {
-                    if (info.IsEncrypt)
-                    {
-                        mi.Header = "取消加密此列表";
-                    } else
-                    {
-                        mi.Header = "加密此列表";
-                    }
-                }
-            }
-
-        }
     }
 }

Control/UserControls/PannelCard/RightCardControl.xaml

@@ -6,11 +6,7 @@
              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:ot="clr-namespace:GeekDesk.Control.Other" 
-             xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:AppData}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
              >
@@ -23,6 +19,7 @@
                 </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}"/>
@@ -41,96 +38,19 @@
             </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"/>
+        <cvt:SearchResWidth x:Key="SearchResWidth"/>
         <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" 
                  x:Name="WrapCard"
                  Visibility="Visible"
                  Drop="Wrap_Drop" 
                  BorderThickness="1" 
                  Effect="{DynamicResource EffectShadow2}" 
-                 Margin="5,0,5,5" Grid.ColumnSpan="2"
+                 Margin="5,0,5,5" Grid.ColumnSpan="2">
-                 PreviewMouseRightButtonDown="WrapCard_PreviewMouseRightButtonDown"
-                 hc:Dialog.Token="RightWrapCardDialog"
-                 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>
@@ -141,258 +61,156 @@
                 <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>
-                <Grid>
+                <StackPanel Panel.ZIndex="1" Margin="0,-10,-300,0" hc:Growl.GrowlParent="True" hc:Growl.Token="MainWindowGrowl"/>
-                    <ot:PasswordDialog xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=Visibility, Duration=50, Delay=0}"
+                <WrapPanel Orientation="Horizontal" VirtualizingPanel.VirtualizationMode="Recycling"  
-                                       x:Name="PDDialog"
+                   VirtualizingPanel.IsVirtualizing="True"  
-                                       Panel.ZIndex="99"
+                   VirtualizingPanel.IsContainerVirtualizable="True"
-                                       IsVisibleChanged="PDDialog_IsVisibleChanged"
+                   >
-                                       Margin="0,-100,0,0"/>
+                    <ListBox x:Name="IconListBox" ItemsSource="{Binding AppConfig.SelectedMenuIcons, Mode=TwoWay}" 
-                    <StackPanel Panel.ZIndex="1" Margin="0,-10,-0,0"/>
+                                 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>
 
-                        <WrapPanel Orientation="Horizontal" 
+                        <ListBox.Resources>
-                            VirtualizingPanel.VirtualizationMode="Recycling"  
+                            <ContextMenu x:Key="IconDialog" Width="200">
-                            VirtualizingPanel.IsVirtualizing="True" 
+                                <MenuItem Header="管理员方式运行" Click="IconAdminStart" Tag="{Binding}"/>
-                            VirtualizingPanel.IsContainerVirtualizable="True"
+                                <MenuItem Header="打开文件所在位置" Click="ShowInExplore" Tag="{Binding}"/>
-                            >
+                                <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
-                        <UniformGrid x:Name="WrapUFG" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=Visibility}">
+                                <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
-                            <!--<hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom3Transition3}">-->
+                                <MenuItem Header="资源管理器菜单" Click="SystemContextMenu" Tag="{Binding}"/>
-                                <ListBox x:Name="IconListBox" 
+                                <MenuItem Header="属性" Click="PropertyConfig" Tag="{Binding}"/>
-                                         ItemsSource="{Binding AppConfig.SelectedMenuIcons, Mode=OneWay}" 
+                                <MenuItem Header="从列表移除" Click="RemoveIcon" Tag="{Binding}"/>
-                                         BorderThickness="0"
+                            </ContextMenu>
-                                         Padding="0,10,0,0"
+                        </ListBox.Resources>
-                                         ScrollViewer.CanContentScroll ="False"
-                                         >
-                                    <ListBox.Template>
-                                        <ControlTemplate TargetType="ListBox">
-                                        <hc:ScrollViewer x:Name="WrapScroll"
-                                                         Orientation="Vertical" 
-                                                         HorizontalScrollBarVisibility="Hidden" 
-                                                         VerticalScrollBarVisibility="Auto" 
-                                                         IsInertiaEnabled="True"
-                                                         CanContentScroll="True"
-                                                         PreviewMouseWheel="IconListBox_MouseWheel"
-                                                         >
-                                            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderBrush}">
-                                                <ItemsPresenter/>
 
-                                            </Border>
+                        <ListBox.ItemContainerStyle>
-                                        </hc:ScrollViewer>
+                            <Style TargetType="ListBoxItem" BasedOn="{StaticResource MyListBoxItemStyle}">
-                                    </ControlTemplate>
+                                <Setter Property="ContextMenu" Value="{StaticResource IconDialog}"/>
-                                    </ListBox.Template>
+                            </Style>
-                                    <ListBox.Background>
+                        </ListBox.ItemContainerStyle>
-                                        <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}}}"/>-->
 
-                                            <WrapPanel Background="#00FFFFFF"
+                        <ListBox.ItemTemplate>
-                                                Width="{Binding AppConfig.WindowWidth, Mode=OneWay, 
+                            <DataTemplate>
-                                                Converter={StaticResource GetWidthByWWConvert}, 
+                                <hc:SimpleStackPanel Tag="{Binding}"
-                                                ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD}}"
+                                                 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}"
-                                        </ItemsPanelTemplate>
+                                                 HorizontalAlignment="Center"
-                                    </ListBox.ItemsPanel>
+                                                 hc:Poptip.Content="{Binding Content}"
+                                                 hc:Poptip.Placement="BottomLeft"
+                                                 Background="#00FFFFFF"
+                                                 MouseEnter="StackPanel_MouseEnter"
+                                                 MouseLeave="StackPanel_MouseLeave"
+                                                 >
+                                    <Image Style="{StaticResource ImageStyle}"  RenderOptions.BitmapScalingMode="HighQuality"/>
+                                    <TextBlock MaxWidth="80"
+                                           Margin="0,5,0,0"
+                                           MaxHeight="40"
+                                           FontSize="13"
+                                           TextWrapping="Wrap" 
+                                           TextTrimming="WordEllipsis"
+                                           TextAlignment="Center" 
+                                           VerticalAlignment="Center" 
+                                           Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
+                                           Text="{Binding Name}"/>
+                                </hc:SimpleStackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
 
-                                    <ListBox.Resources>
+                </WrapPanel>
-                                        <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>
+            </Grid>
-                                        <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"
+        <hc:Card 
+                 x:Name="VerticalCard"
                  Visibility="Hidden"
                  BorderThickness="1" 
                  Effect="{DynamicResource EffectShadow2}" 
-                 Margin="5,0,5,5" Grid.ColumnSpan="2"
+                 Margin="5,0,5,5" Grid.ColumnSpan="2">
-                 MouseLeftButtonDown="VerticalCard_MouseLeftButtonDown"
-                >
             <hc:Card.Background>
-                <SolidColorBrush Color="AliceBlue" 
+                <SolidColorBrush Color="AliceBlue"  hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"/>
-                                 hc:GeometryEffect.GeometryEffect="20"
-                                 Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"/>
             </hc:Card.Background>
             <hc:Card.BorderBrush>
                 <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
             </hc:Card.BorderBrush>
             <Grid>
+                <StackPanel Panel.ZIndex="1" Margin="0,-10,-300,0" hc:Growl.GrowlParent="True" hc:Growl.Token="MainWindowGrowl"/>
                 <WrapPanel Orientation="Horizontal" VirtualizingPanel.VirtualizationMode="Recycling"  
                    VirtualizingPanel.IsVirtualizing="True"  
                    VirtualizingPanel.IsContainerVirtualizable="True"
                    >
-                    <UniformGrid x:Name="VerticalUFG" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeIn}, OffsetY= -10, Event=Visibility}">
+                    <ListBox ItemsSource="{Binding Source={StaticResource SearchIconList},Path=IconList}" 
-                        <!--<hc:TransitioningContentControl TransitionMode="Left2RightWithFade">-->
+                                 BorderThickness="0"
-                            <ListBox ItemsSource="{Binding Source={StaticResource SearchIconList},Path=IconList}" 
+                                Padding="0,10,0,0"
-                                     BorderThickness="0"
+                                 >
-                                     Padding="0,10,0,0"
+                        <ListBox.Background>
-                                     x:Name="SearchListBox"
+                            <SolidColorBrush Opacity="0"/>
-                                     SelectionChanged="SearchListBox_SelectionChanged"
+                        </ListBox.Background>
-                                     >
-                            <ListBox.Template>
-                                <ControlTemplate TargetType="ListBox">
-                                    <hc:ScrollViewer Orientation="Vertical" 
-                                                     HorizontalScrollBarVisibility="Hidden" 
-                                                     VerticalScrollBarVisibility="Auto" 
-                                                     IsInertiaEnabled="True"
-                                                     CanContentScroll="True"
-                                                     PreviewMouseWheel="VerticalIconList_PreviewMouseWheel"
-                                                     >
-                                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderBrush}">
-                                            <ItemsPresenter/>
-                                        </Border>
-                                    </hc:ScrollViewer>
-                                </ControlTemplate>
-                            </ListBox.Template>
 
-                            <ListBox.Background>
+                        <ListBox.Resources>
-                                    <SolidColorBrush Opacity="0"/>
+                            <ContextMenu x:Key="IconDialog" Width="200">
-                                </ListBox.Background>
+                                <MenuItem Header="管理员方式运行" Click="IconAdminStart" Tag="{Binding}"/>
+                                <MenuItem Header="打开文件所在位置" Click="ShowInExplore" Tag="{Binding}"/>
+                                <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
+                                <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
+                                <MenuItem Header="资源管理器菜单" Click="SystemContextMenu" Tag="{Binding}"/>
+                                <MenuItem Header="属性" Click="PropertyConfig" Tag="{Binding}"/>
+                            </ContextMenu>
+                        </ListBox.Resources>
 
-                                <ListBox.Resources>
+                        <ListBox.ItemContainerStyle>
-                                    <ContextMenu x:Key="IconDialog" Width="200">
+                            <Style TargetType="ListBoxItem" BasedOn="{StaticResource MyListBoxItemStyle}">
-                                        <MenuItem Header="管理员方式运行" Click="IconAdminStart" Tag="{Binding}"/>
+                                <Setter Property="ContextMenu" Value="{StaticResource IconDialog}"/>
-                                        <MenuItem Header="打开文件所在位置" Click="ShowInExplore" Tag="{Binding}"/>
+                            </Style>
-                                        <MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
+                        </ListBox.ItemContainerStyle>
-                                        <MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
-                                        <MenuItem Header="资源管理器菜单" Click="SystemContextMenu" Tag="{Binding}"/>
-                                        <MenuItem Header="属性" Click="PropertyConfig" Tag="{Binding}"/>
-                                    </ContextMenu>
-                                </ListBox.Resources>
 
-                                <ListBox.ItemContainerStyle>
+                        <ListBox.ItemTemplate>
-                                    <Style TargetType="ListBoxItem" BasedOn="{StaticResource SearchListBoxItemStyle}">
+                            <DataTemplate>
-                                        <Setter Property="ContextMenu" Value="{StaticResource IconDialog}"/>
+                                <WrapPanel Tag="{Binding}"
-                                    </Style>
+                                           Height="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageHeight, Mode=OneWay}" 
-                                </ListBox.ItemContainerStyle>
+                                           Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.MenuCardWidth, Mode=OneWay, Converter={StaticResource SearchResWidth}}" 
+                                           HorizontalAlignment="Left"
+                                           hc:Poptip.HitMode="None"
+                                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                                           hc:Poptip.Content="{Binding Content}"
+                                           hc:Poptip.Placement="BottomLeft"
+                                           Background="#00FFFFFF"
+                                           MouseLeftButtonDown="Icon_MouseLeftButtonDown"
+                                           MouseLeftButtonUp="Icon_MouseLeftButtonUp"
+                                           Margin="25,20,0,0"
+                                           >
+                                    <Image Style="{StaticResource ImageStyle}"  RenderOptions.BitmapScalingMode="HighQuality"/>
+                                    <TextBlock
+                                           Margin="10,5,0,0"
+                                           MaxHeight="40"
+                                           FontSize="13"
+                                           TextWrapping="Wrap" 
+                                           TextTrimming="WordEllipsis"
+                                           TextAlignment="Left" 
+                                           VerticalAlignment="Center" 
+                                           Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
+                                           Text="{Binding Name}"/>
+                                </WrapPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
 
-                                <ListBox.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <StackPanel Background="#00FFFFFF"
-                                           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}"
-                                                   Height="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageHeight, Mode=OneWay}" 
-                                                   Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.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 ImageStyle}"  RenderOptions.BitmapScalingMode="HighQuality"/>
-                                            <TextBlock
-                                               Margin="10,5,0,0"
-                                               MaxHeight="40"
-                                               FontSize="13"
-                                               TextWrapping="Wrap" 
-                                               TextTrimming="WordEllipsis"
-                                               TextAlignment="Left" 
-                                               VerticalAlignment="Center" 
-                                               Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
-                                               Text="{Binding Name}"/>
-                                        </WrapPanel>
-                                    </Border>
-                                    </DataTemplate>
-                                </ListBox.ItemTemplate>
-                            </ListBox>
-
-                        <!--</hc:TransitioningContentControl>-->
-                    </UniformGrid>
                 </WrapPanel>
 
             </Grid>

Control/UserControls/PannelCard/RightCardControl.xaml.cs

@@ -9,14 +9,13 @@ 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
 {
@@ -27,76 +26,68 @@ namespace GeekDesk.Control.UserControls.PannelCard
     {
         private AppData appData = MainWindow.appData;
 
-        ListBoxDragDropManager<IconInfo> dragMgr;
+        private volatile static bool DROP_ICON = false;
-
+        private Thread dropCheckThread = null;
-        //private Thread dropCheckThread = null;
 
         public RightCardControl()
         {
             InitializeComponent();
-            this.Loaded += RightCardControl_Loaded;
-            
         }
 
-        private void RightCardControl_Loaded(object sender, RoutedEventArgs e)
+
+        #region 图标拖动
+        DelegateCommand<int[]> _swap;
+        public DelegateCommand<int[]> SwapCommand
         {
-            this.dragMgr = new ListBoxDragDropManager<IconInfo>(this.IconListBox);
+            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 图标拖动
-        //#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 图标拖动
 
 
 
@@ -126,7 +117,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
         {
             if (appData.AppConfig.DoubleOpen && e.ClickCount >= 2)
             {
-                IconInfo icon = (IconInfo)((Panel)sender).Tag;
+                IconInfo icon = (IconInfo)((SimpleStackPanel)sender).Tag;
                 if (icon.AdminStartUp)
                 {
                     StartIconApp(icon, IconStartType.ADMIN_STARTUP);
@@ -138,7 +129,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
             else if (!appData.AppConfig.DoubleOpen && e.ClickCount == 1)
             {
-                IconInfo icon = (IconInfo)((Panel)sender).Tag;
+                IconInfo icon = (IconInfo)((SimpleStackPanel)sender).Tag;
                 if (icon.AdminStartUp)
                 {
                     StartIconApp(icon, IconStartType.ADMIN_STARTUP);
@@ -173,20 +164,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
             StartIconApp(icon, IconStartType.SHOW_IN_EXPLORE);
         }
 
-        private void StartIconApp(IconInfo icon, IconStartType type, bool useRelativePath = false)
+        private void StartIconApp(IconInfo icon, IconStartType type)
         {
-            
             try
             {
-                Process p = new Process();
+                using (Process p = new Process())
-                //using ()
+                {
-                //{
-                    p.StartInfo.UseShellExecute = false;
-                    p.StartInfo.RedirectStandardInput = true;
-                    p.StartInfo.RedirectStandardOutput = true;
-                    p.StartInfo.RedirectStandardError = true;
-                    p.StartInfo.CreateNoWindow = true;
-
                     string startArg = icon.StartArg;
 
                     if (startArg != null && Constants.SYSTEM_ICONS.ContainsKey(startArg))
@@ -195,46 +178,33 @@ namespace GeekDesk.Control.UserControls.PannelCard
                     }
                     else
                     {
-                        string path;
+                        p.StartInfo.FileName = icon.Path;
-                        if (useRelativePath)
-                        {
-                            string fullPath = Path.Combine(Constants.APP_DIR, icon.RelativePath);
-                            path = Path.GetFullPath(fullPath);
-                        } else
-                        {
-                            path = icon.Path;
-                        }
-                        p.StartInfo.FileName = path;
                         if (!StringUtil.IsEmpty(startArg))
                         {
                             p.StartInfo.Arguments = startArg;
                         }
                         if (icon.IconType == IconType.OTHER)
                         {
-                            if (!File.Exists(path) && !Directory.Exists(path))
+                            if (!File.Exists(icon.Path) && !Directory.Exists(icon.Path))
                             {
-                                //如果没有使用相对路径  那么使用相对路径启动一次
+                                HandyControl.Controls.Growl.WarningGlobal("程序启动失败(文件路径不存在或已删除)!");
-                                if (!useRelativePath)
+                                return;
-                                {
-                                    StartIconApp(icon, type, true);
-                                    return;
-                                } else
-                                {
-                                    HandyControl.Controls.Growl.WarningGlobal("程序启动失败(文件路径不存在或已删除)!");
-                                    return;
-                                }
                             }
-                            p.StartInfo.WorkingDirectory = path.Substring(0, path.LastIndexOf("\\"));
+                            p.StartInfo.WorkingDirectory = icon.Path.Substring(0, icon.Path.LastIndexOf("\\"));
                             switch (type)
                             {
                                 case IconStartType.ADMIN_STARTUP:
+                                    //p.StartInfo.Arguments = "1";//启动参数
                                     p.StartInfo.Verb = "runas";
-                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
+                                    //p.StartInfo.CreateNoWindow = false; //设置显示窗口
+                                    p.StartInfo.UseShellExecute = true;//不使用操作系统外壳程序启动进程
+                                    //p.StartInfo.ErrorDialog = false;
+                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
                                     {
                                         //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
                                         if (appData.AppConfig.MarginHide)
                                         {
-                                            if (!MarginHide.IsMargin())
+                                            if (!MarginHide.IS_HIDE)
                                             {
                                                 MainWindow.HideApp();
                                             }
@@ -247,12 +217,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
                                     }
                                     break;// c#好像不能case穿透
                                 case IconStartType.DEFAULT_STARTUP:
-                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
+                                    if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
                                     {
                                         //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
                                         if (appData.AppConfig.MarginHide)
                                         {
-                                            if (!MarginHide.IsMargin())
+                                            if (!MarginHide.IS_HIDE)
                                             {
                                                 MainWindow.HideApp();
                                             }
@@ -271,7 +241,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
                         }
                         else
                         {
-                            if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
+                            if (appData.AppConfig.AppHideType == AppHideType.START_EXE)
                             {
                                 //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
                                 if (appData.AppConfig.MarginHide)
@@ -288,34 +258,14 @@ namespace GeekDesk.Control.UserControls.PannelCard
                             }
                         }
                         p.Start();
-                        p.Close();
-                        p.Dispose();
-                        if (useRelativePath)
-                        {
-                            //如果使用相对路径启动成功 那么重新设置程序绝对路径
-                            icon.Path = path;
-                        }
                     }
-                //}
-                icon.Count++;
-
-                //隐藏搜索框
-                if (RunTimeStatus.SEARCH_BOX_SHOW)
-                {
-                    MainWindow.mainWindow.HidedSearchBox();
                 }
+                icon.Count++;
             }
             catch (Exception e)
             {
-                if (!useRelativePath)
+                HandyControl.Controls.Growl.WarningGlobal("程序启动失败(不支持的启动方式)!");
-                {
+                LogUtil.WriteErrorLog(e, "程序启动失败:path=" + icon.Path + ",type=" + type);
-                    StartIconApp(icon, type, true);
-                }
-                else
-                {
-                    HandyControl.Controls.Growl.WarningGlobal("程序启动失败(可能为不支持的启动方式)!");
-                    LogUtil.WriteErrorLog(e, "程序启动失败:path=" + icon.Path + ",type=" + type);
-                }
             }
         }
 
@@ -413,7 +363,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 MainWindow.appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList.Add(iconInfo);
             }
             CommonCode.SortIconList();
-            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+            CommonCode.SaveAppData(MainWindow.appData);
         }
 
         /// <summary>
@@ -450,64 +400,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;
-
+            ImgStoryBoard(sender, (int)width, (int)height, 1, true);
-            ThreadPool.QueueUserWorkItem(state =>
-            {
-                this.Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    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;
+            ImgStoryBoard(sender, appData.AppConfig.ImageWidth, appData.AppConfig.ImageHeight, 220);
-            MyPoptip.IsOpen = false;
-
-            ThreadPool.QueueUserWorkItem(state =>
-            {
-                this.Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    ImgStoryBoard(sender, appData.AppConfig.ImageWidth, appData.AppConfig.ImageHeight, 260);
-                }));
-            });
         }
 
 
@@ -516,59 +430,6 @@ 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;
@@ -624,7 +485,6 @@ 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
@@ -635,10 +495,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);
@@ -698,7 +558,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>
@@ -717,336 +577,11 @@ namespace GeekDesk.Control.UserControls.PannelCard
             if (vb == Visibility.Visible)
             {
                 WrapCard.Visibility = Visibility.Collapsed;
-            }
+            } else
-            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 = "锁定主面板";
-            }
-        }
-
-        public void SearchListBoxIndexAdd()
-        {
-            //控制移动后 鼠标即使在图标上也不显示popup
-            RunTimeStatus.MOUSE_MOVE_COUNT = 0;
-            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;
-            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)
-                {
-                    StartIconApp(icon, IconStartType.ADMIN_STARTUP);
-                }
-                else
-                {
-                    StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
-                }
-            }
-        }
-
-        private void SearchListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            SearchListBox.ScrollIntoView(SearchListBox.SelectedItem);
-        }
-
-        private void PDDialog_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (PDDialog.Visibility == Visibility.Visible)
-            {
-                RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
-                PDDialog.ClearVal();
-                PDDialog.ErrorMsg.Visibility = Visibility.Collapsed;
-                PDDialog.PasswordGrid.Visibility = Visibility.Visible;
-                PDDialog.HintGrid.Visibility = Visibility.Collapsed;
-                PDDialog.count = 0;
-                PDDialog.SetFocus();
-            }
-            else
-            {
-                RunTimeStatus.SHOW_MENU_PASSWORDBOX = false;
-                PDDialog.ClearVal();
-                MainWindow.mainWindow.Focus();
-            }
-        }
-
-        /// <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>
-        /// 搜索结果icon 列表鼠标滚轮预处理时间  
-        /// 主要使用自定义popup解决卡顿问题解决卡顿问题
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void VerticalIconList_PreviewMouseWheel(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();
-            }
-        }
-
-        /// <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;
-                        MyPoptipContent.Text = info.Content;
-                        MyPoptip.VerticalOffset = 30;
-                        Thread.Sleep(100);
-                        if (!RunTimeStatus.ICONLIST_MOUSE_WHEEL && RunTimeStatus.MOUSE_MOVE_COUNT > 1)
-                        {
-                            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;
-            MyPoptip.IsOpen = false;
-        }
-
-        /// <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;
-            MyPoptipContent.Text = info.Content;
-            MyPoptip.VerticalOffset = 30;
-
-            if (RunTimeStatus.MOUSE_MOVE_COUNT > 1 && !RunTimeStatus.ICONLIST_MOUSE_WHEEL)
-            {
-                MyPoptip.IsOpen = true;
-            }
-        }
-
-        /// <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,14 @@ namespace GeekDesk.Control.UserControls.SystemItem
                 };
                 iconInfo.Content_NoWrite = iconInfo.Name_NoWrite
                     + "\n使用次数:" + iconInfo.Count;
-            }
+            } else
-            else
             {
                 //startupMenu or Store
                 iconInfo = CommonCode.GetIconInfoByPath(thisInfo.LnkPath_NoWrite);
             }
             menuInfo.IconList.Add(iconInfo);
-            CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
+            CommonCode.SortIconList();
+            CommonCode.SaveAppData(MainWindow.appData);
         }
     }
 }

Control/UserControls/ToDo/TodoControl.xaml

@@ -9,54 +9,22 @@
              Background="Transparent"
              >
 
-    <UserControl.Resources>
-        <!--<cst:Count2VisibleConvert x:Key="Count2VisibleConvert"/>
-        <cst:CountGreZero2BoolConvert x:Key="CountGreZero2BoolConvert"/>
-        <Style x:Key="NoDataStyle" TargetType="TextBlock">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="False">
-                    <Setter Property="Visibility" Value="Visible"/>
-                </DataTrigger>
-                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="True">
-                    <Setter Property="Visibility" Value="Collapsed"/>
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>
-        <Style x:Key="ToDoStyle" TargetType="DataGrid">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="True">
-                    <Setter Property="Visibility" Value="Visible"/>
-                </DataTrigger>
-                <DataTrigger Binding="{Binding ElementName=BacklogList, Path=Items.Count, Converter={StaticResource CountGreZero2BoolConvert}}" Value="False">
-                    <Setter Property="Visibility" Value="Collapsed"/>
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>-->
-    </UserControl.Resources>
     <hc:SimplePanel Margin="20" Background="Transparent">
         <Grid Background="Transparent">
-            <TextBlock x:Name="IsNewToDo" Visibility="Collapsed" />
-            <TextBlock x:Name="NoData" 
-                       VerticalAlignment="Center" 
-                       HorizontalAlignment="Center"
-                       TextAlignment="Center"
-                       Text="暂无数据!"
-                       />
-
             <DataGrid x:Name="BacklogList" 
-                      HeadersVisibility="All"  
+                  HeadersVisibility="All"  
-                      AutoGenerateColumns="False" 
+                  AutoGenerateColumns="False" 
-                      ItemsSource="{Binding}"
+                  ItemsSource="{Binding}"
-                      IsReadOnly="True"
+                  IsReadOnly="True"
-                      Initialized="DataGridMenu_Initialized"
+                  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,59 +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" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                                            <Border.Style>
-                                                <Style TargetType="Border">
-                                                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-                                                </Style>
-                                            </Border.Style>
-                                            <SelectiveScrollingGrid>
-                                                <SelectiveScrollingGrid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="*"/>
-                                                </SelectiveScrollingGrid.ColumnDefinitions>
-                                                <SelectiveScrollingGrid.RowDefinitions>
-                                                    <RowDefinition Height="*"/>
-                                                    <RowDefinition Height="Auto"/>
-                                                </SelectiveScrollingGrid.RowDefinitions>
-                                                <DataGridCellsPresenter Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                                <Path Name="Cross" Grid.ColumnSpan="2" Visibility="Collapsed" Margin="10,0,10,0" Data="M0,0.5 L1,0.5" Stretch="Fill" Stroke="Gray" StrokeThickness="1" Opacity="0.5" />
-                                            </SelectiveScrollingGrid>
-                                        </Border>
-                                        <ControlTemplate.Triggers>
-                                            <DataTrigger Binding="{Binding ElementName=IsNewToDo, Path=Text}" Value="N">
-                                                <Setter TargetName="Cross" Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                            <DataTrigger Binding="{Binding ElementName=IsNewToDo, Path=Text}" Value="Y">
-                                                <Setter TargetName="Cross" Property="Visibility" Value="Collapsed"/>
-                                            </DataTrigger>
-                                        </ControlTemplate.Triggers>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style.Setters>
-                        <Style.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#E5E5E2" />
-                            </Trigger>
-                        </Style.Triggers>
-                    </Style>
                 </DataGrid.RowStyle>
 
-
                 <DataGrid.CellStyle>
                     <Style TargetType="DataGridCell" BasedOn="{StaticResource DataGridCellStyle}">
                         <Setter Property="HorizontalContentAlignment" Value="Center"/>

Control/UserControls/ToDo/TodoControl.xaml.cs

@@ -1,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,17 +80,7 @@ namespace GeekDesk.Control.UserControls.Backlog
         /// <param name="e"></param>
         private void DataGridRow_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
-            int index;
+            BacklogList.SelectedIndex = ((DataGridRow)sender).GetIndex();
-            ToDoInfo info = ((Border)sender).DataContext as ToDoInfo;
-            if (type == ToDoType.NEW)
-            {
-                index = MainWindow.appData.ToDoList.IndexOf(info);
-            }
-            else
-            {
-                index = MainWindow.appData.HiToDoList.IndexOf(info);
-            }
-            BacklogList.SelectedIndex = index;
             Menu.IsOpen = true;
         }
 

Control/Windows/ConfigWindow.xaml

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

Control/Windows/ConfigWindow.xaml.cs

@@ -1,10 +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
@@ -18,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)
@@ -36,8 +32,6 @@ namespace GeekDesk.Control.Windows
             RightCard.Content = about;
             this.Topmost = true;
             this.mainWindow = mainWindow;
-            UFG.Visibility = Visibility.Collapsed;
-            UFG.Visibility = Visibility.Visible;
         }
 
          
@@ -59,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;
             }
         }

Control/Windows/GlobalColorPickerWindow.xaml

@@ -1,49 +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"
-        WindowStyle="None"
-        AllowsTransparency="True"
-        Background="Transparent"
-        KeyDown="OnKeyDown"
-        >
-    <Border CornerRadius="8" 
-            Background="White"
-            Height="385"
-            Width="228">
-        <StackPanel>
-
-            <Border MouseDown="DragMove" 
-                    VerticalAlignment="Top" 
-                    CornerRadius="8,8,0,0"
-                    Height="20" 
-                    Background="White"
-                    >
-                <Button Width="18"  Height="18" 
-                        hc:IconElement.Geometry="{StaticResource ErrorGeometry}" 
-                        Padding="0" 
-                        Background="Transparent"
-                        Opacity="0.6"
-                        Margin="0,0,5,0"
-                        Click="Button_Click"
-                        HorizontalAlignment="Right" 
-                        MouseEnter="Button_MouseEnter"
-                        MouseLeave="Button_MouseLeave"
-                        VerticalAlignment="Center">
-                    
-                </Button>
-            </Border>
-
-            <hc:ColorPicker HorizontalAlignment="Center" 
-                            VerticalAlignment="Bottom" 
-                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"
-                            x:Name="MyColorPicker" 
-                            Confirmed="MyColorPicker_Confirmed"
-                            Canceled="MyColorPicker_Canceled"
-                            ToggleButton.Checked="MyColorPicker_Checked"/>
-        </StackPanel>
-    </Border>
-</Window>

Control/Windows/GlobalColorPickerWindow.xaml.cs

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

Control/Windows/IconfontWindow.xaml.cs

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

Control/Windows/PixelColorPickerWindow.xaml

@@ -1,90 +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"
-    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,221 +0,0 @@
-using GeekDesk.Interface;
-using GeekDesk.Util;
-using HandyControl.Controls;
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.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;//还原窗口（非最小化和最大化）
-
-            this.Width = SystemParameters.VirtualScreenWidth;
-            this.Height = SystemParameters.VirtualScreenHeight;
-
-            this.Left = SystemParameters.VirtualScreenLeft;
-            this.Top = SystemParameters.VirtualScreenTop;
-
-            DesktopBG.Width = this.Width;
-            DesktopBG.Height = this.Height;
-            this.Topmost = true;
-
-            //获取缩放比例
-            double scale = ScreenUtil.GetScreenScalingFactor();
-
-            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(
-                    0,
-                    0,
-                    0,
-                    0,
-                    bgBitmap.Size
-                    );
-            }
-            BitmapSource bs = Imaging.CreateBitmapSourceFromHBitmap(
-                                         bgBitmap.GetHbitmap(),
-                                        IntPtr.Zero,
-                                        Int32Rect.Empty,
-                                        BitmapSizeOptions.FromEmptyOptions()
-                                    );
-            DesktopBG.Source = bs;
-            VisualBrush b = (VisualBrush)PixelBG.Fill;
-            b.Visual = DesktopBG;
-            Mouse.OverrideCursor = Cursors.Cross;
-            SetPixelAbout(null);
-        }
-
-
-        public void OnKeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Escape)
-            {
-                this.DataContext = null;
-                this.Close();
-            }
-        }
-
-        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            Mouse.OverrideCursor = null;
-            Point pos = e.MouseDevice.GetPosition(DesktopBG);
-            System.Drawing.Color colorD = bgBitmap.GetPixel((int)pos.X, (int)pos.Y);
-            colorPicker.SelectedBrush = new SolidColorBrush(Color.FromArgb(colorD.A, colorD.R, colorD.G, colorD.B));
-            DeleteObject(bgBitmap.GetHbitmap());
-            this.Close();
-            ClickColorPickerToggleButton(colorPicker);
-        }
-
-        public void ClickColorPickerToggleButton(ColorPicker colorPicker)
-        {
-            const BindingFlags InstanceBindFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-            Type type = colorPicker.GetType();
-            FieldInfo fi = type.GetField("_toggleButtonDropper", InstanceBindFlags);
-
-            ToggleButton tb = (ToggleButton)fi.GetValue(colorPicker);
-            if (tb != null && tb.IsChecked == true)
-            {
-                tb.IsChecked = false;
-                MethodInfo mi = type.GetMethod("ToggleButtonDropper_Click", InstanceBindFlags);
-                mi.Invoke(colorPicker, new object[] { null, null });
-            }
-        }
-   
-        private void Window_PreviewMouseMove(object sender, MouseEventArgs e)
-        {
-            SetPixelAbout(e);
-        }
-
-        [System.Runtime.InteropServices.DllImport("gdi32.dll")]
-        public static extern bool DeleteObject(IntPtr onj);
-
-        private void SetPixelAbout(MouseEventArgs e)
-        {
-            VisualBrush b = (VisualBrush)PixelBG.Fill;
-
-            Point pos;
-            if (e == null)
-            {
-                pos = MouseUtil.GetMousePosition();
-            }
-            else
-            {
-                pos = e.MouseDevice.GetPosition(DesktopBG);
-            }
-            Rect viewBox = b.Viewbox;
-
-            viewBox.Width = PIXEL_REC_LENGTH;
-            viewBox.Height = PIXEL_REC_LENGTH;
-
-            viewBox.X = pos.X - PIXEL_REC_LENGTH / 2;
-            viewBox.Y = pos.Y - PIXEL_REC_LENGTH / 2;
-            b.Viewbox = viewBox;
-
-            double x = pos.X + 10;
-            double y = pos.Y + 10;
-            if (x + ColorCanvas.Width > SystemParameters.VirtualScreenWidth)
-            {
-                x = pos.X - ColorCanvas.Width - 10;
-            }
-            if (y + ColorCanvas.Height > SystemParameters.VirtualScreenHeight)
-            {
-                y = pos.Y - ColorCanvas.Height - 10;
-            }
-
-            Canvas.SetLeft(ColorCanvas, x);
-            Canvas.SetTop(ColorCanvas, y);
-
-
-            System.Drawing.Color dColor = bgBitmap.GetPixel((int)pos.X, (int)pos.Y);
-
-            PixelColor_HTML.Text = "#" + dColor.Name.ToUpper();
-            PixelColor_RGB.Text = dColor.R + "," + dColor.G + "," + dColor.B;
-            Pixel_XY.Text = pos.X + "*" + pos.Y;
-
-            SolidColorBrush scb = (SolidColorBrush)PixelColor.Fill;
-            scb.Color = Color.FromArgb(dColor.A, dColor.R, dColor.G, dColor.B);
-        }
-
-        /// <summary>
-        /// 滚轮控制缩放区域
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Window_MouseWheel(object sender, MouseWheelEventArgs e)
-        {
-
-            if (e.Delta < 0 && PIXEL_REC_LENGTH < MAX_LENGTH)
-            {
-                //缩小
-                PIXEL_REC_LENGTH += 5;
-            }
-            else if (e.Delta > 0 && PIXEL_REC_LENGTH > MIN_LENGTH)
-            {
-                //放大
-                PIXEL_REC_LENGTH -= 5;
-            }
-            SetPixelAbout(e);
-        }
-
-        /// <summary>
-        /// 右键按下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Window_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            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;
@@ -81,8 +85,7 @@ namespace GeekDesk.Control.Windows
                             IsBackground = true
                         };
                         t.Start();
-                    }
+                    } else
-                    else
                     {
                         StartMenuLoading.Visibility = Visibility.Collapsed;
                         vm.IconInfos = startMenuIcons;
@@ -106,8 +109,7 @@ namespace GeekDesk.Control.Windows
                         vm.IconInfos = null;
                         systemIcons = GetSysteIconInfos();
                         vm.IconInfos = systemIcons;
-                    }
+                    } else
-                    else
                     {
                         vm.IconInfos = systemIcons;
                     }
@@ -159,8 +161,7 @@ namespace GeekDesk.Control.Windows
             if (filePaths == null || filePaths.Length == 0)
             {
                 dirPaths.CopyTo(paths, 0);
-            }
+            } else
-            else
             {
                 dirPaths.CopyTo(paths, filePaths.Length - 1);
             }
@@ -280,7 +281,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);
         }
 
 

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;
@@ -151,8 +155,7 @@ namespace GeekDesk.Control.Windows
                 if (appData.HiToDoList.Contains(tdi))
                 {
                     appData.HiToDoList.Remove(tdi);
-                }
+                } else if (appData.ToDoList.Contains(tdi))
-                else if (appData.ToDoList.Contains(tdi))
                 {
                     appData.ToDoList.Remove(tdi);
                 }
@@ -172,13 +175,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 +202,7 @@ namespace GeekDesk.Control.Windows
             {
                 window = new ToDoInfoWindow();
                 window.Show();
-            }
+            } else
-            else
             {
                 window.Close();
             }

Control/Windows/ToDoWindow.xaml

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

Control/Windows/ToDoWindow.xaml.cs

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

Control/Windows/UpdateWindow.xaml

@@ -22,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">
+                    <Border CornerRadius="4,4,0,0" Height="260">
-                            <StackPanel>
+                        <StackPanel>
-                            <hc:SimplePanel VerticalAlignment="Center">
+                            <TextBlock Margin="10" x:Name="MsgTitle" TextWrapping="Wrap" FontSize="16" HorizontalAlignment="Left" Style="{DynamicResource TextBlockLargeBold}" Text="测试"/>
-                                <TextBlock Margin="10" x:Name="MsgTitle" TextWrapping="Wrap" FontSize="16" HorizontalAlignment="Left" Style="{DynamicResource TextBlockLargeBold}" Text="测试"/>
+                            <StackPanel x:Name="MsgPanel">
-                                <Button HorizontalAlignment="Right" Margin="0,0,10,0" 
+                                <hc:ScrollViewer x:Name="MsgBar"  HorizontalScrollBarVisibility="Visible"  IsInertiaEnabled="True" Margin="10" Width="430">
-                                        Content="去点个Star" Click="StarBtnClick" 
+                                    <TextBlock  Width="430" FontSize="15" LineHeight="22" x:Name="Msg" TextWrapping="Wrap" VerticalAlignment="Center" Text="测试"/>
-                                        Style="{StaticResource Btn1}"
-                                        hc:IconElement.Geometry="M718.565517 863.126069c-7.344552 0-15.077517-2.189241-22.987034-6.285241L512 760.337655l-183.613793 96.503173c-18.785103 9.851586-37.499586 7.521103-48.16331-5.12-5.12-6.10869-10.557793-17.125517-7.485794-35.345656l35.063173-204.411586L159.249655 467.155862c-12.747034-12.393931-17.584552-27.153655-13.241379-40.430345 4.343172-13.312 16.913655-22.386759 34.568827-24.929103l205.223725-29.837242 91.806896-185.979586c7.874207-15.995586 20.409379-25.140966 34.392276-25.140965 13.947586 0 26.482759 9.145379 34.392276 25.140965l91.771586 185.979586 205.259035 29.837242c17.619862 2.577655 30.190345 11.652414 34.498206 24.964414 4.378483 13.27669-0.529655 28.001103-13.241379 40.430344l-148.51531 144.807725 35.063172 204.411586c3.10731 18.149517-2.365793 29.272276-7.485793 35.345655a32.273655 32.273655 0 0 1-25.176276 11.369931z"
-                                        />
-                            </hc:SimplePanel>
-                                <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Margin="20,0,20,0"/>
-                                <hc:ScrollViewer BorderThickness="0" Margin="0,5,1,5" Height="225">
-                                    <StackPanel x:Name="MsgPanel">
-                                            <TextBlock  Width="430" FontSize="15" LineHeight="25" x:Name="Msg" TextWrapping="Wrap" VerticalAlignment="Center" Text="测试"/>
-                                    </StackPanel>
                                 </hc:ScrollViewer>
                             </StackPanel>
-                        </Border>
+                        </StackPanel>
+                    </Border>
                     <!--Card 的尾部部分-->
                     <hc:Card.Footer>
                         <StackPanel Margin="10" Width="520">
@@ -55,7 +47,7 @@
                     </hc:Card.Footer>
                 </hc:Card>
                 <hc:UniformSpacingPanel Spacing="100" HorizontalAlignment="Center" Margin="0,10,0,0">
-                    <Button Content="暂不更新" Click="Close_Click" Style="{StaticResource Btn1}"/>
+                    <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
 {
@@ -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}")
+            Process.Start(packageUrl);
-            {
-                UseShellExecute = false,
-                CreateNoWindow = true
-            });
             this.Close();
         }
 
@@ -99,7 +104,6 @@ namespace GeekDesk.Control.Windows
                 window = new UpdateWindow(jo);
             }
             window.Show();
-            window.Activate();
             Keyboard.Focus(window);
         }
 
@@ -111,59 +115,5 @@ namespace GeekDesk.Control.Windows
                 this.Close();
             }
         }
-
-        private void StarBtnClick(object sender, RoutedEventArgs e)
-        {
-
-            string githubUrl = ConfigurationManager.AppSettings["GitHubUrl"];
-            string giteeUrl = ConfigurationManager.AppSettings["GiteeUrl"];
-
-            if(!ReqGitUrl(githubUrl))
-            {
-                if (!ReqGitUrl(giteeUrl))
-                {
-                    OpenLinkUrl(githubUrl);
-                } else
-                {
-                    OpenLinkUrl(giteeUrl);
-                }
-            } else
-            {
-                OpenLinkUrl(githubUrl);
-            }
-        }
-
-
-        private bool ReqGitUrl(String url)
-        {
-            HttpWebResponse myResponse = null;
-            try
-            {
-                ServicePointManager.Expect100Continue = true;
-                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
-                //创建Web访问对  象
-                WebRequest myRequest = WebRequest.Create(url);
-
-                myRequest.ContentType = "text/plain; charset=utf-8";
-                //通过Web访问对象获取响应内容
-                myResponse = (HttpWebResponse)myRequest.GetResponse();
-            }
-            catch 
-            {
-                return false;
-            }
-
-            return myResponse != null && myResponse.StatusCode == HttpStatusCode.OK;
-        }
-
-        private void OpenLinkUrl(String url)
-        {
-            Process.Start(new ProcessStartInfo("cmd", $"/c start {url}")
-            {
-                UseShellExecute = false,
-                CreateNoWindow = true
-            });
-        }
-
     }
 }

Converts/BGStyleConvert.cs

@@ -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,40 +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) / 2;
-            }
-
-            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/SearchResWidth.cs

@@ -1,22 +1,25 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
 namespace GeekDesk.Converts
 {
-    internal class ReverseBoolConvert : IValueConverter
+    class SearchResWidth : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value == null) return null;
+            double menuLeftWidth = double.Parse(value.ToString());
-            bool val = (bool)value;
+            return MainWindow.mainWindow.Width - menuLeftWidth;
-            return !val;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            throw new NotImplementedException();
+            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,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 SortTypeConvert : IValueConverter
+   public class SortTypeConvert : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {

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 ((Visibility)value == Visibility.Visible)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if ((bool)value)
-            {
-                return Visibility.Visible;
-            }
-            else
-            {
-                return Visibility.Collapsed;
-            }
-        }
-    }
-}

DraggAnimatedPanel/DraggAnimatedPanel.cs

@@ -21,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>
@@ -49,20 +29,17 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\GeekDesk\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>
+    <StartupObject>GeekDesk.App</StartupObject>
-    </StartupObject>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>false</SignManifests>
@@ -76,9 +53,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>
@@ -89,6 +63,9 @@
     <Reference Include="HandyControl, Version=3.3.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
       <HintPath>packages\HandyControl.3.3.0\lib\net472\HandyControl.dll</HintPath>
     </Reference>
+    <Reference Include="KeyMouseHook, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\KeyMouseHook.1.0.6\lib\net40\KeyMouseHook.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
@@ -114,7 +91,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>
@@ -122,19 +98,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.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" />
@@ -148,9 +117,6 @@
     <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">
@@ -161,36 +127,18 @@
     <Compile Include="Command\DelegateCommandBase.cs" />
     <Compile Include="Constant\AppHideType.cs" />
     <Compile Include="Constant\Constants.cs" />
-    <Compile Include="Constant\HotKeyType.cs" />
     <Compile Include="Constant\IconType.cs" />
     <Compile Include="Constant\CommonEnum.cs" />
     <Compile Include="Constant\IconStartType.cs" />
-    <Compile Include="Constant\PasswordType.cs" />
-    <Compile Include="Constant\RunTimeStatus.cs" />
-    <Compile Include="Constant\SearchType.cs" />
     <Compile Include="Constant\SortType.cs" />
     <Compile Include="Constant\TodoTaskExecType.cs" />
-    <Compile Include="Constant\BGStyle.cs" />
     <Compile Include="Constant\UpdateType.cs" />
-    <Compile Include="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>
@@ -206,12 +154,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>
@@ -248,78 +190,49 @@
     <Compile Include="Control\Windows\UpdateWindow.xaml.cs">
       <DependentUpon>UpdateWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Converts\CountGreZero2BoolConvert.cs" />
+    <Compile Include="Converts\SearchResWidth.cs" />
-    <Compile Include="Converts\Count2VisibleConvert.cs" />
-    <Compile Include="Converts\SearchTypeConvert.cs" />
-    <Compile Include="Converts\StringAppendConvert.cs" />
     <Compile Include="Converts\DoubleToGridLength.cs" />
-    <Compile Include="Converts\MenuInfoConvert.cs" />
-    <Compile Include="Converts\GetWidthByWWConvert.cs" />
     <Compile Include="Converts\SortTypeConvert.cs" />
+    <Compile Include="Converts\MenuInfoConvert.cs" />
     <Compile Include="Converts\TodoTaskExecConvert.cs" />
     <Compile Include="Converts\IntToCornerRadius.cs" />
     <Compile Include="Converts\OpcityConvert.cs" />
-    <Compile Include="Converts\BGStyleConvert.cs" />
     <Compile Include="Converts\UpdateTypeConvert.cs" />
-    <Compile Include="Converts\ReverseBoolConvert.cs" />
-    <Compile Include="Converts\Visibility2BooleanConverter.cs" />
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.cs" />
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.Drag.cs" />
     <Compile Include="Converts\HideTypeConvert.cs" />
     <Compile Include="Interface\IWindowCommon.cs" />
-    <Compile Include="MyThread\RelativePathThread.cs" />
-    <Compile Include="Plugins\ShowSeconds\ViewModel\SecondsDataContext.cs" />
-    <Compile Include="Plugins\ShowSeconds\SecondsWindow.xaml.cs">
-      <DependentUpon>SecondsWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Task\ToDoTask.cs" />
     <Compile Include="MyThread\MouseHookThread.cs" />
     <Compile Include="MyThread\DispatcherBuild.cs" />
     <Compile Include="MyThread\UpdateThread.cs" />
     <Compile Include="Util\AeroGlassHelper.cs" />
-    <Compile Include="Util\BGSettingUtil.cs" />
-    <Compile Include="Util\BlurGlassUtil.cs" />
-    <Compile Include="Util\ColorUtil.cs" />
-    <Compile Include="Util\DragAdorner.cs" />
     <Compile Include="Util\GlobalHotKey.cs" />
     <Compile Include="Util\CommonCode.cs" />
+    <Compile Include="Util\ConsoleManager.cs" />
+    <Compile Include="Util\DragAdorner.cs" />
     <Compile Include="Util\FileIcon.cs" />
     <Compile Include="Util\FileUtil.cs" />
-    <Compile Include="Util\HideWindowUtil.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\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="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>
@@ -328,18 +241,6 @@
       <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>
@@ -360,14 +261,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>
@@ -428,10 +321,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>
@@ -440,11 +329,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">
@@ -465,7 +349,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <Resource Include="Resource\Iconfont\iconfont.json" />
-    <None Include="app.manifest" />
     <None Include="Properties\app.manifest" />
     <None Include="Update.json" />
     <None Include="packages.config" />
@@ -522,46 +405,6 @@
     <Resource Include="Resource\Image\SystemIcon\RecycleBin.png" />
     <Resource Include="Resource\Image\SystemIcon\Registry.png" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 和 x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties update_1json__JsonSchema="https://beaujs.com/schema.json" />
-    </VisualStudio>
-  </ProjectExtensions>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
-    <Error Condition="!Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
-    <Error Condition="!Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
-    <Error Condition="!Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
-  </Target>
-  <Import Project="packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
-  <Import Project="packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
-  <Import Project="packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>; Move all assemblies and related files to lib folder
-ROBOCOPY "$(TargetDir) " "$(TargetDir)lib\ " /XF Data *.exe *.config *.manifest /XD lib logs bak /E /IS /MOVE
-if %25errorlevel%25 leq 4 exit 0 else exit %25errorlevel%25</PostBuildEvent>
-  </PropertyGroup>
 </Project>

GeekDesk.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17 
+# Blend for Visual Studio Version 16
-VisualStudioVersion = 17.1.32319.34
+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,4 +1,10 @@
-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
 {

MainWindow.xaml

@@ -4,71 +4,72 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:uc="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
-        xmlns:cn="clr-namespace:GeekDesk.Constant"
-        xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
-        xmlns:local="clr-namespace:GeekDesk"
         mc:Ignorable="d"
         xmlns:cvt="clr-namespace:GeekDesk.Converts"
-        x:Name="AppWindow"
+        x:Name="window"
-        xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" 
+        xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:AppData}"
-        d:DataContext="{d:DesignInstance Type=viewmodel:AppData}"
+        Title="GeekDesk" 
-        Title="GeekDesk_Main_8400A17AEEF7C029" 
         MinWidth="600"
         MinHeight="400"
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
         ShowInTaskbar="False"
-        Opacity="1"
+        Opacity="0"
-        Deactivated="AppWindow_Deactivated"
+        Deactivated="App_LostFocus"
         SizeChanged="Window_SizeChanged"
-        PreviewKeyDown="OnKeyDown"
+        KeyDown="OnKeyDown"
         Focusable="True"
         MouseDown="MainWindow_MouseDown"
-        MouseEnter="MainWindow_MouseEnter"
-        GotFocus="Window_GotFocus"
-        Loaded="Window_Loaded"          
         >
-    
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0" ResizeBorderThickness="15"/>
+    </WindowChrome.WindowChrome>
     <Window.Resources>
-        <RoutedUICommand x:Key="SearchHotKeyDown" Text="SearchHotKeyDown"/>
+        <RoutedUICommand x:Key="SearchItem" Text="SearchItem"/>
 
         <cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
         <cvt:IntToCornerRadius x:Key="IntToCornerRadius"/>
         <cvt:DoubleToGridLength x:Key="DoubleToGridLength"/>
-        <cvt:ReverseBoolConvert x:Key="ReverseBoolConvert"/>
     </Window.Resources>
-    
-    <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="0" CornerRadius="30" ResizeBorderThickness="15"/>
-    </WindowChrome.WindowChrome>
-    
     <Window.InputBindings>
-        <KeyBinding Gesture="Ctrl+F" Key="F"  Command="{StaticResource SearchHotKeyDown}"/>
+        <KeyBinding Gesture="Ctrl+F" Key="F"  Command="{StaticResource SearchItem}"/>
     </Window.InputBindings>
     <Window.CommandBindings>
-        <CommandBinding Command="{StaticResource SearchHotKeyDown}" CanExecute="SearchHotKeyDown"/>
+        <CommandBinding Command="{StaticResource SearchItem}" CanExecute="SearchItem"/>
     </Window.CommandBindings>
 
-    <!--Opacity="{Binding AppConfig.PannelOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"-->
+    <Window.Effect>
-    <Border Margin="20" CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  
+        <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"
-            BorderThickness="0"
-            Focusable="True"
-            x:Name="BGBorder"
-            hc:Dialog.Token="MainWindowDialog"
-            xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndGrowHorizontally}, Event=None}"
-            xf:Animations.PrimaryBinding="{Binding AppConfig.IsShow, Mode=OneWay}"
-            xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource  FadeOut}, Event=None}"
-            xf:Animations.SecondaryBinding="{Binding AppConfig.IsShow, Mode=OneWay, Converter={StaticResource ReverseBoolConvert}}"
-            xf:Animations.SecondaryCompletionCommand="{Binding HideCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
-            xf:Animations.AllowOpacityReset="False"
-            >
-        <Border.Effect>
-            <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"
                               RenderingBias="Quality" ShadowDepth="2"/>
-        </Border.Effect>
+    </Window.Effect>
-            <hc:DialogContainer Focusable="True">
+    <Border Margin="20" CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0"
+            Background="AliceBlue"
+            Opacity="{Binding AppConfig.PannelOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"
+            VirtualizingPanel.VirtualizationMode="Recycling"  VirtualizingPanel.IsVirtualizing="True"  VirtualizingPanel.IsContainerVirtualizable="True"
+            hc:Dialog.Token="IconInfoDialog"
+            Focusable="True"
+            >
+        <hc:DialogContainer Focusable="True">
+
+            <Border CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0">
+                <!--背景图片-->
+                <Border.Background>
+                    <VisualBrush>
+                        <VisualBrush.Visual>
+                            <Grid ClipToBounds="True">
+                                <Image Source="{Binding AppConfig.BitmapImage}" Margin="-30" Opacity="{Binding AppConfig.BgOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
+                                    <Image.Effect>
+                                        <BlurEffect Radius="{Binding AppConfig.BlurValue}"/>
+                                    </Image.Effect>
+                                </Image>
+                            </Grid>
+                        </VisualBrush.Visual>
+                    </VisualBrush>
+                </Border.Background>
+
+
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="40" MouseMove="DragMove"></RowDefinition>
@@ -79,16 +80,15 @@
                         <ColumnDefinition x:Name="RightColumn" Width="*"></ColumnDefinition>
                     </Grid.ColumnDefinitions>
 
-                    <CheckBox x:Name="ShowBox" Visibility="Hidden" Panel.ZIndex="2"/>
+                    <!--获取焦点用-->
-                    <CheckBox x:Name="HideBox" Visibility="Hidden" Panel.ZIndex="2"/>
+                    <TextBox x:Name="EmptyTextBox" Width="0"/>
 
-                    <StackPanel HorizontalAlignment="Right" Panel.ZIndex="99" hc:Growl.GrowlParent="False" hc:Growl.Token="MainWindowGrowl" Grid.Column="1" Grid.Row="1"/>
 
                     <DockPanel Grid.Row="0" Grid.Column="0" MouseMove="DragMove">
                         <DockPanel.Background>
                             <SolidColorBrush Opacity="0.01"/>
                         </DockPanel.Background>
-                        <Image Visibility="{Binding AppConfig.TitleLogoVisible}" Source="/Resource/Image/TitleLogo.png" Margin="10,0,0,0" Width="94" Height="30" 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" MouseMove="DragMove">
@@ -97,39 +97,38 @@
                         </DockPanel.Background>
                         <hc:UniformSpacingPanel Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Center">
                             <Button Background="Transparent"
-                                    BorderThickness="0"
+                                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.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.Height="18"
-                                    hc:IconElement.Width="18"
+                                hc:IconElement.Width="18"
-                                    HorizontalAlignment="Right"
+                                HorizontalAlignment="Right"
-                                    Click="ConfigButtonClick"
+                                Click="ConfigButtonClick"
-                                    Initialized="SettingButton_Initialized"
+                                Initialized="SettingButton_Initialized"
-                                    PreviewMouseLeftButtonDown="AppButton_PreviewMouseLeftButtonDown"
+                                x:Name="SettingButton"
-                                    x:Name="SettingButton"
+                                FocusVisualStyle="{x:Null}"
-                                    FocusVisualStyle="{x:Null}"
+                                >
-                                    >
+                                <Button.ContextMenu>
-                                    <Button.ContextMenu>
+                                    <ContextMenu x:Name="SettingMenus" Width="130">
-                                        <ContextMenu x:Name="SettingMenus" Width="130">
+                                        <MenuItem Header="设置" Click="ConfigMenuClick"/>
-                                            <MenuItem Header="设置" Click="ConfigMenuClick"/>
+                                        <MenuItem Header="待办" Click="BacklogMenuClick"/>
-                                            <MenuItem Header="待办" Click="BacklogMenuClick"/>
+                                    </ContextMenu>
-                                        </ContextMenu>
+                                </Button.ContextMenu>
-                                    </Button.ContextMenu>
                             </Button>
                             <Button Background="Transparent" 
-                                    BorderThickness="0"
+                                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.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.Height="18"
-                                    hc:IconElement.Width="18"
+                                hc:IconElement.Width="18"
-                                    HorizontalAlignment="Right"
+                                HorizontalAlignment="Right"
-                                    Click="CloseButtonClick"
+                                Click="CloseButtonClick"
-                                    PreviewMouseLeftButtonDown="AppButton_PreviewMouseLeftButtonDown"
+                                FocusVisualStyle="{x:Null}"
-                                    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="1"  VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
@@ -137,22 +136,24 @@
                     <!--搜索输入框-->
                     <TextBox Panel.ZIndex="2" Grid.Row="0" Grid.Column="1" 
                              x:Name="SearchBox"
-                             Width="0"
+                             Visibility="Collapsed"
+                             LostFocus="SearchBox_LostFocus"
                              Margin="-100,5,0,0"
                              Height="32"
                              FontSize="16"
+                             Width="400"
                              BorderThickness="0"
                              TextChanged="SearchBox_TextChanged"
                              />
   
 
-                    <hc:NotifyIcon Icon="/Taskbar.ico" Click="NotifyIcon_Click" x:Name="BarIcon"
+                    <uc:RightCardControl x:Name="RightCard" Grid.Row="1" Grid.Column="1"/>
-                            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"/>
@@ -161,13 +162,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>
+        </hc:DialogContainer>
     </Border>
 
 </Window>

MainWindow.xaml.cs

@@ -1,27 +1,22 @@
 using GeekDesk.Constant;
 using GeekDesk.Control.UserControls.Config;
-using GeekDesk.Control.UserControls.PannelCard;
 using GeekDesk.Control.Windows;
 using GeekDesk.Interface;
-using GeekDesk.MyThread;
 using GeekDesk.Task;
+using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using GeekDesk.ViewModel.Temp;
+
-using Microsoft.Win32;
-using NPinyin;
-using ShowSeconds;
 using System;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interop;
 using System.Windows.Media.Animation;
-using System.Windows.Threading;
 using static GeekDesk.Util.ShowWindowFollowMouse;
+using System.Collections.ObjectModel;
+using NPinyin;
+using GeekDesk.ViewModel.Temp;
 
 namespace GeekDesk
 {
@@ -36,56 +31,35 @@ namespace GeekDesk
         public static ToDoInfoWindow toDoInfoWindow;
         public static int hotKeyId = -1;
         public static int toDoHotKeyId = -1;
-        public static int colorPickerHotKeyId = -1;
         public static MainWindow mainWindow;
         public MainWindow()
         {
-            //加载数据
             LoadData();
             InitializeComponent();
-
-            //用于其他类访问
             mainWindow = this;
-
-            //置于顶层
             this.Topmost = true;
-
+            this.Loaded += Window_Loaded;
-            //执行待办提醒
+            this.SizeChanged += MainWindow_Resize;
             ToDoTask.BackLogCheck();
 
+
             ////实例化隐藏 Hide类，进行时间timer设置
             MarginHide.ReadyHide(this);
             if (appData.AppConfig.MarginHide)
             {
                 MarginHide.StartHide();
             }
-
-        }
-
-       
-
-
-        /// <summary>
-        /// 搜索快捷键按下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SearchHotKeyDown(object sender, CanExecuteRoutedEventArgs e)
-        {
-            if (appData.AppConfig.SearchType == SearchType.HOT_KEY)
-            {
-                ShowSearchBox();
-            }
         }
 
         /// <summary>
         /// 显示搜索框
         /// </summary>
-        private void ShowSearchBox()
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SearchItem(object sender, CanExecuteRoutedEventArgs e)
         {
-            RunTimeStatus.SEARCH_BOX_SHOW = true;
             RightCard.VisibilitySearchCard(Visibility.Visible);
-            SearchBox.Width = 400;
+            SearchBox.Visibility = Visibility.Visible;
             SearchBox.Focus();
         }
         /// <summary>
@@ -95,25 +69,7 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
         {
-             if (!RunTimeStatus.SEARCH_BOX_SHOW 
-                && appData.AppConfig.SearchType != SearchType.KEY_DOWN
-                )
-            {
-                SearchBox.TextChanged -= SearchBox_TextChanged;
-                SearchBox.Clear();
-                SearchBox.TextChanged += SearchBox_TextChanged;
-                return;
-            }
-
-            if (!RunTimeStatus.SEARCH_BOX_SHOW) ShowSearchBox();
-
-            //刷新搜索后 鼠标移动次数置为0
-            RunTimeStatus.MOUSE_MOVE_COUNT = 0;
-            //隐藏popup
-            RightCard.MyPoptip.IsOpen = false;
-
             string inputText = SearchBox.Text.ToLower();
-            RightCard.VerticalUFG.Visibility = Visibility.Collapsed;
             if (!string.IsNullOrEmpty(inputText))
             {
                 SearchIconList.IconList.Clear();
@@ -124,38 +80,27 @@ namespace GeekDesk
                     foreach (IconInfo icon in iconList)
                     {
                         string pyName = Pinyin.GetInitials(icon.Name).ToLower();
-                        if (icon.Name.Contains(inputText) || pyName.Contains(inputText))
+                        if (icon.Name.Contains(inputText) || pyName.Contains(inputText)) {
-                        {
                             SearchIconList.IconList.Add(icon);
                         }
                     }
                 }
-            }
+            } else
-            else
             {
                 SearchIconList.IconList.Clear();
             }
-            if (RightCard.SearchListBox.Items.Count > 0)
-            {
-                RightCard.SearchListBox.SelectedIndex = 0;
-            }
-            RightCard.VerticalUFG.Visibility = Visibility.Visible;
         }
-
         /// <summary>
         /// 隐藏搜索框
         /// </summary>
-        public void HidedSearchBox()
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SearchBox_LostFocus(object sender, RoutedEventArgs e)
         {
-            RunTimeStatus.SEARCH_BOX_SHOW = false;
-            SearchBox.TextChanged -= SearchBox_TextChanged;
-            SearchBox.Clear();
-            SearchBox.TextChanged += SearchBox_TextChanged;
-            SearchBox.Width = 0;
             SearchIconList.IconList.Clear();
             RightCard.VisibilitySearchCard(Visibility.Collapsed);
-            Keyboard.Focus(SearchBox);
+            SearchBox.Visibility = Visibility.Collapsed;
-            App.DoEvents();
+            SearchBox.Text = "";
         }
 
 
@@ -164,6 +109,7 @@ namespace GeekDesk
         /// </summary>
         private void LoadData()
         {
+            GC.KeepAlive(appData); // 持活
             this.DataContext = appData;
             if (appData.MenuList.Count == 0)
             {
@@ -181,34 +127,28 @@ namespace GeekDesk
         /// <param name="e"></param>
         void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            SecondsWindow.ShowWindow();
-
-            BGSettingUtil.BGSetting();
             if (!appData.AppConfig.StartedShowPanel)
             {
-                this.Visibility = Visibility.Collapsed;
+                if (appData.AppConfig.AppAnimation)
+                {
+                    this.Opacity = 0;
+                }
+                else
+                {
+                    this.Visibility = Visibility.Collapsed;
+                }
             }
             else
             {
                 ShowApp();
             }
+
             //给任务栏图标一个名字
             BarIcon.Text = Constants.MY_NAME;
 
             //注册热键
-            if (true == appData.AppConfig.EnableAppHotKey)
+            RegisterHotKey(true);
-            {
+            RegisterCreateToDoHotKey(true);
-                RegisterHotKey(true);
-            }
-            if (true == appData.AppConfig.EnableTodoHotKey)
-            {
-                RegisterCreateToDoHotKey(true);
-            }
-
-            if (true == appData.AppConfig.EnableColorPickerHotKey)
-            {
-                RegisterColorPickerHotKey(true);
-            }
 
             //注册自启动
             if (!appData.AppConfig.SelfStartUped && !Constants.DEV)
@@ -216,23 +156,14 @@ namespace GeekDesk
                 RegisterUtil.SetSelfStarting(appData.AppConfig.SelfStartUp, Constants.MY_NAME);
             }
 
-            //注册鼠标监听事件
+            //注册鼠标中键监听事件
-            if (appData.AppConfig.MouseMiddleShow || appData.AppConfig.SecondsWindow==true)
+            if (appData.AppConfig.MouseMiddleShow)
             {
-                MouseHookThread.Hook();
+                MouseHookThread.MiddleHook();
             }
 
-
             //更新线程开启  检测更新
             UpdateThread.Update();
-
-            //建立相对路径
-            RelativePathThread.MakeRelativePath();
-
-            //毛玻璃  暂时未解决阴影问题
-            //BlurGlassUtil.EnableBlur(this);
-
-            MessageUtil.ChangeWindowMessageFilter(MessageUtil.WM_COPYDATA, 1);
         }
 
         /// <summary>
@@ -242,8 +173,9 @@ namespace GeekDesk
         {
             try
             {
-                if (appData.AppConfig.HotkeyModifiers != GlobalHotKey.HotkeyModifiers.None)
+                if (appData.AppConfig.HotkeyModifiers != 0)
                 {
+
                     hotKeyId = GlobalHotKey.RegisterHotKey(appData.AppConfig.HotkeyModifiers, appData.AppConfig.Hotkey, () =>
                     {
                         if (MotionControl.hotkeyFinished)
@@ -258,12 +190,10 @@ namespace GeekDesk
                             }
                         }
                     });
-                    if (!first)
+                }
-                    {
+                if (!first)
-                        HandyControl.Controls.Growl.Success("GeekDesk快捷键注册成功(" + appData.AppConfig.HotkeyStr + ")!", "HotKeyGrowl");
-                    }
-                } else
                 {
+                    HandyControl.Controls.Growl.Success("GeekDesk快捷键注册成功(" + appData.AppConfig.HotkeyStr + ")!", "HotKeyGrowl");
                 }
             }
             catch (Exception)
@@ -290,22 +220,21 @@ namespace GeekDesk
             try
             {
 
-                if (appData.AppConfig.HotkeyModifiers != GlobalHotKey.HotkeyModifiers.None)
+                if (appData.AppConfig.ToDoHotkeyModifiers != 0)
                 {
                     //加载完毕注册热键
                     toDoHotKeyId = GlobalHotKey.RegisterHotKey(appData.AppConfig.ToDoHotkeyModifiers, appData.AppConfig.ToDoHotkey, () =>
                     {
                         if (MotionControl.hotkeyFinished)
                         {
-                            ToDoWindow.ShowOrHide();
+                            ToDoInfoWindow.ShowOrHide();
                         }
                     });
-                    if (!first)
-                    {
-                        HandyControl.Controls.Growl.Success("新建待办任务快捷键注册成功(" + appData.AppConfig.ToDoHotkeyStr + ")!", "HotKeyGrowl");
-                    }
                 }
-                
+                if (!first)
+                {
+                    HandyControl.Controls.Growl.Success("新建待办任务快捷键注册成功(" + appData.AppConfig.ToDoHotkeyStr + ")!", "HotKeyGrowl");
+                }
             }
             catch (Exception)
             {
@@ -320,45 +249,24 @@ namespace GeekDesk
             }
         }
 
+
         /// <summary>
-        /// 注册新建待办的热键
+        /// 重置窗体大小 写入缓存
         /// </summary>
-        public static void RegisterColorPickerHotKey(bool first)
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void MainWindow_Resize(object sender, System.EventArgs e)
         {
-            try
+            if (this.DataContext != null)
             {
-                if (appData.AppConfig.HotkeyModifiers != GlobalHotKey.HotkeyModifiers.None)
+                AppData appData = this.DataContext as AppData;
-                {
+                appData.AppConfig.WindowWidth = this.Width;
-                    //加载完毕注册热键
+                appData.AppConfig.WindowHeight = this.Height;
-                    colorPickerHotKeyId = GlobalHotKey.RegisterHotKey(appData.AppConfig.ColorPickerHotkeyModifiers, appData.AppConfig.ColorPickerHotkey, () =>
-                    {
-                        if (MotionControl.hotkeyFinished)
-                        {
-                            GlobalColorPickerWindow.CreateNoShow();
-                        }
-                    });
-                    if (!first)
-                    {
-                        HandyControl.Controls.Growl.Success("拾色器快捷键注册成功(" + appData.AppConfig.ColorPickerHotkeyStr + ")!", "HotKeyGrowl");
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                if (first)
-                {
-                    HandyControl.Controls.Growl.WarningGlobal("拾色器快捷键已被其它程序占用(" + appData.AppConfig.ColorPickerHotkeyStr + ")!");
-                }
-                else
-                {
-                    HandyControl.Controls.Growl.Warning("拾色器快捷键已被其它程序占用(" + appData.AppConfig.ColorPickerHotkeyStr + ")!", "HotKeyGrowl");
-                }
             }
         }
 
 
 
-
         /// <summary>
         /// 程序窗体拖动
         /// </summary>
@@ -401,7 +309,14 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void CloseButtonClick(object sender, RoutedEventArgs e)
         {
-            HideApp();
+            if (appData.AppConfig.AppAnimation)
+            {
+                FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);
+            }
+            else
+            {
+                this.Visibility = Visibility.Collapsed;
+            }
         }
 
 
@@ -423,7 +338,7 @@ namespace GeekDesk
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        public void ShowApp(object sender, RoutedEventArgs e)
+        private void ShowApp(object sender, RoutedEventArgs e)
         {
             ShowApp();
         }
@@ -434,84 +349,21 @@ namespace GeekDesk
             //{
             //    return;
             //}
+            //修改贴边隐藏状态为未隐藏
+            mainWindow.Activate();
 
-            if (MarginHide.ON_HIDE)
+            MarginHide.IS_HIDE = false;
-            {
-                //修改贴边隐藏状态为未隐藏
-                MarginHide.IS_HIDE = false;
-                if (!CommonCode.MouseInWindow(mainWindow))
-                {
-                    RunTimeStatus.MARGIN_HIDE_AND_OTHER_SHOW = true;
-                    MarginHide.WaitHide(3000);
-                }
-            }
-
             if (appData.AppConfig.FollowMouse)
             {
-                ShowWindowFollowMouse.Show(mainWindow, MousePosition.CENTER, 0, 0);
+                ShowWindowFollowMouse.Show(mainWindow, MousePosition.CENTER, 0, 0, false);
-            }
-
-            MainWindow.mainWindow.Activate();
-            mainWindow.Show();
-            //mainWindow.Visibility = Visibility.Visible;
-            if (appData.AppConfig.AppAnimation)
-            {
-                appData.AppConfig.IsShow = true;
-            }
-            else
-            {
-                appData.AppConfig.IsShow = null;
-                //防止永远不显示界面
-                if (mainWindow.Opacity < 1)
-                {
-                    mainWindow.Opacity = 1;
-                }
-            }
-
-
-            //FadeStoryBoard(1, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Visible);
-
-            Keyboard.Focus(mainWindow);
-            if (RunTimeStatus.SHOW_MENU_PASSWORDBOX)
-            {
-                mainWindow.RightCard.PDDialog.SetFocus();
-            } else
-            {
-                Keyboard.Focus(mainWindow.SearchBox);
             }
+            FadeStoryBoard(1, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Visible);
+            mainWindow.Focus();           
         }
 
         public static void HideApp()
         {
-            if (appData.AppConfig.AppAnimation)
+            FadeStoryBoard(0, (int)CommonEnum.WINDOW_ANIMATION_TIME, Visibility.Collapsed);            
-            {
-                appData.AppConfig.IsShow = false;
-            }
-            else
-            {
-                appData.AppConfig.IsShow = null;
-                HideAppVis();
-            }
-            
-        }
-
-        private static void HideAppVis()
-        {
-            //关闭锁定
-            RunTimeStatus.LOCK_APP_PANEL = false;
-            if (RunTimeStatus.SEARCH_BOX_SHOW)
-            {
-                mainWindow.HidedSearchBox();
-            }
-            mainWindow.Visibility = Visibility.Collapsed;
-            //if (!MarginHide.IS_HIDE)
-            //{
-               
-            //}
-            //else
-            //{
-            //    ShowApp();
-            //}
         }
 
         /// <summary>
@@ -643,11 +495,10 @@ namespace GeekDesk
             SettingButton.ContextMenu = null;
         }
 
-
+        private void App_LostFocus(object sender, EventArgs e)
-        private void AppWindowLostFocus()
         {
             if (appData.AppConfig.AppHideType == AppHideType.LOST_FOCUS
-                && this.Opacity == 1 && !RunTimeStatus.LOCK_APP_PANEL)
+                && this.Opacity == 1)
             {
                 //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
                 if (!appData.AppConfig.MarginHide || (appData.AppConfig.MarginHide && !MarginHide.IS_HIDE))
@@ -657,7 +508,6 @@ namespace GeekDesk
             }
         }
 
-
         private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this.DataContext != null)
@@ -677,7 +527,7 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void ExitApp(object sender, RoutedEventArgs e)
         {
-            if (appData.AppConfig.MouseMiddleShow || appData.AppConfig.SecondsWindow==true)
+            if (appData.AppConfig.MouseMiddleShow)
             {
                 MouseHookThread.Dispose();
             }
@@ -690,7 +540,7 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void ReStartApp(object sender, RoutedEventArgs e)
         {
-            if (appData.AppConfig.MouseMiddleShow || appData.AppConfig.SecondsWindow == true)
+            if (appData.AppConfig.MouseMiddleShow)
             {
                 MouseHookThread.Dispose();
             }
@@ -716,34 +566,12 @@ namespace GeekDesk
 
         public void OnKeyDown(object sender, KeyEventArgs e)
         {
-            //char c = (char)e.Key;
-
             if (e.Key == Key.Escape)
             {
                 HideApp();
             }
-
-            if (RunTimeStatus.SEARCH_BOX_SHOW && (e.Key == Key.Up 
-                || e.Key == Key.Down 
-                || e.Key == Key.Tab
-                || e.Key == Key.Enter
-                ))
-            {
-                if (e.Key == Key.Down || e.Key == Key.Tab)
-                {
-                    RightCard.SearchListBoxIndexAdd();
-                } else if (e.Key == Key.Up)
-                {
-                    RightCard.SearchListBoxIndexSub();
-                } else if (e.Key == Key.Enter)
-                {
-                    RightCard.StartupSelectionItem();
-                }
-            } 
         }
 
-
-
         /// <summary>
         /// 为了让修改菜单的textBox失去焦点
         /// </summary>
@@ -751,132 +579,8 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void MainWindow_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            SearchBox.Focus();
+            EmptyTextBox.Focus();
         }
 
-        /// <summary>
-        /// 鼠标进入后 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MainWindow_MouseEnter(object sender, MouseEventArgs e)
-        {
-            //防止延迟贴边隐藏
-            RunTimeStatus.MARGIN_HIDE_AND_OTHER_SHOW = false;
-        }
-
-        /// <summary>
-        /// 打开屏幕拾色器
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ColorPicker(object sender, RoutedEventArgs e)
-        {
-            TaskbarContextMenu.IsOpen = false;
-            GlobalColorPickerWindow.CreateNoShow();
-        }
-
-        private void Window_GotFocus(object sender, RoutedEventArgs e)
-        {
-            // 如果没有在修改菜单 并且不是右键点击了面板
-            if (!RunTimeStatus.IS_MENU_EDIT
-                && !RunTimeStatus.SHOW_RIGHT_BTN_MENU
-                && !RunTimeStatus.APP_BTN_IS_DOWN)
-            {
-                if (RunTimeStatus.SHOW_MENU_PASSWORDBOX)
-                {
-                    //必须在其它文本框没有工作的时候才给密码框焦点
-                    RightCard.PDDialog.SetFocus();
-                }
-                else
-                {
-                    //必须在其它文本框没有工作的时候才给搜索框焦点
-                    Keyboard.Focus(SearchBox);
-                }
-                
-            }
-            
-        }
-
-        private void AppWindow_Deactivated(object sender, EventArgs e)
-        {
-            AppWindowLostFocus();
-        }
-
-        /// <summary>
-        /// 备份数据文件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        [Obsolete]
-        private void BakDataFile(object sender, RoutedEventArgs e)
-        {
-            Thread t = new Thread(() =>
-            {
-                CommonCode.BakAppData();
-            });
-            t.ApartmentState = ApartmentState.STA;
-            t.Start();
-        }
-
-        private void AppButton_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            //点击了面板
-            RunTimeStatus.APP_BTN_IS_DOWN = true;
-            new Thread(() =>
-            {
-                Thread.Sleep(50);
-                RunTimeStatus.APP_BTN_IS_DOWN = false;
-            }).Start();
-        }
-
-
-        private ICommand _hideCommand;
-        public ICommand HideCommand
-        {
-            get
-            {
-                if (_hideCommand == null)
-                {
-                    _hideCommand = new RelayCommand(
-                        p =>
-                        {
-                            return true;
-                        },
-                        p =>
-                        {
-                            HideAppVis();
-                        });
-                }
-                return _hideCommand;
-            }
-        }
-
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            base.OnSourceInitialized(e);
-            HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;
-            if (hwndSource != null)
-            {
-                IntPtr handle = hwndSource.Handle;
-                hwndSource.AddHook(new HwndSourceHook(WndProc));
-            }
-        }
-
-        IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            if (msg == MessageUtil.WM_COPYDATA)
-            {
-                MessageUtil.CopyDataStruct cds = (MessageUtil.CopyDataStruct)System.Runtime.InteropServices.Marshal.PtrToStructure(lParam, typeof(MessageUtil.CopyDataStruct));
-                if ("ShowApp".Equals(cds.msg))
-                {
-                    ShowApp();
-                }
-            }
-            return hwnd;
-        }
-
-
-
     }
 }

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

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

MyThread/MouseHookThread.cs

@@ -1,12 +1,12 @@
 using GeekDesk.Control.UserControls.Config;
-using GeekDesk.Control.Windows;
-using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using Gma.System.MouseKeyHook;
-using ShowSeconds;
 using System;
-using System.Drawing;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
 
@@ -14,46 +14,27 @@ namespace GeekDesk.MyThread
 {
     public class MouseHookThread
     {
-        private static readonly AppConfig appConfig = MainWindow.appData.AppConfig;
+        private static AppConfig appConfig = MainWindow.appData.AppConfig;
-        public static Dispatcher dispatcher;
+        private static IKeyboardMouseEvents m_GlobalHook = Hook.GlobalEvents();
-        private static UserActivityHook hook;
+        private static Dispatcher dispatcher;
 
-        public static void Hook()
+
+
+        public static void MiddleHook()
         {
-            //使用dispatcher来单独监听UI线程 防止程序卡顿
+            //使用dispatcher来单独监听UI线程  防止程序卡顿
             dispatcher = DispatcherBuild.Build();
-            dispatcher.Invoke(DispatcherPriority.Normal, new Action(() =>
+            dispatcher.Invoke((Action)(() =>
             {
-                hook = new UserActivityHook();
+                m_GlobalHook.MouseDownExt += M_GlobalHook_MouseDownExt;
-
-                if (appConfig.MouseMiddleShow)
-                {
-                    hook.OnMouseWheelUp += OnMouseWheelUp;
-                }
-
-                if (appConfig.SecondsWindow == true)
-                {
-                    hook.OnMouseLeftDown += OnMouseLeftDown;
-                    hook.OnMouseLeftUp += OnMouseLeftUp;
-                }
-
-                hook.Start(true, false);
             }));
         }
 
-        private static void OnMouseLeftDown(object sender, System.Windows.Forms.MouseEventArgs e)
+        public static void Dispose()
         {
-            SecondsWindow.SecondsBakColorFun(sender, e);
+            m_GlobalHook.MouseDownExt -= M_GlobalHook_MouseDownExt;
-        }
+            m_GlobalHook.Dispose();
-
+            dispatcher.InvokeShutdown();
-        private static void OnMouseLeftUp(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            SecondsWindow.SecondsHookSetFuc(sender, e);
-        }
-
-        private static void OnMouseWheelUp(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            MouseWheelShowApp(sender, e);
         }
 
         /// <summary>
@@ -61,55 +42,26 @@ namespace GeekDesk.MyThread
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private static void MouseWheelShowApp(object sender, System.Windows.Forms.MouseEventArgs e)
+        private static void M_GlobalHook_MouseDownExt(object sender, System.Windows.Forms.MouseEventArgs e)
         {
-            //中键打开App
+            if (appConfig.MouseMiddleShow && e.Button == System.Windows.Forms.MouseButtons.Middle)
-            if (appConfig.MouseMiddleShow && MotionControl.hotkeyFinished)
             {
-                App.Current.Dispatcher.Invoke(DispatcherPriority.Normal, new Action(() =>
+                if (MotionControl.hotkeyFinished)
                 {
-                    if (MainWindow.mainWindow.Visibility == Visibility.Collapsed || MainWindow.mainWindow.Opacity == 0)
+                    MainWindow.mainWindow.Dispatcher.Invoke((Action)(() =>
                     {
-                        MainWindow.ShowApp();
+                        if (MainWindow.mainWindow.Visibility == Visibility.Collapsed || MainWindow.mainWindow.Opacity == 0)
-                    }
+                        {
-                    else
+                            MainWindow.ShowApp();
-                    {
+                        }
-                        MainWindow.HideApp();
+                        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出错");
-            }
         }
 
-
     }
 }

MyThread/RelativePathThread.cs

@@ -1,46 +0,0 @@
-using GeekDesk.Constant;
-using GeekDesk.Util;
-using GeekDesk.ViewModel;
-using System;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Threading;
-
-namespace GeekDesk.MyThread
-{
-    public class RelativePathThread
-    {
-        public static void MakeRelativePath()
-        {
-            new Thread(() =>
-            {
-                try
-                {
-                    ObservableCollection<MenuInfo> menuList = MainWindow.appData.MenuList;
-
-                    string myExePath = Constants.APP_DIR + "GeekDesk.exe";
-                    foreach (MenuInfo mi in menuList)
-                    {
-                        ObservableCollection<IconInfo> iconList = mi.IconList;
-                        foreach (IconInfo icon in iconList)
-                        {
-                            if (icon == null) continue;
-                            string relativePath = FileUtil.MakeRelativePath(myExePath, icon.Path);
-                            if (File.Exists(icon.Path)
-                                && !string.IsNullOrEmpty(relativePath)
-                                && !relativePath.Equals(icon.Path))
-                            {
-                                icon.RelativePath_NoWrite = relativePath;
-                            }
-                        }
-                    }
-                    CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_PATH);
-                    CommonCode.SaveAppData(MainWindow.appData, Constants.DATA_FILE_BAK_PATH);
-                } catch (Exception ex)
-                {
-                    LogUtil.WriteErrorLog(ex, "init相对路径出错!");
-                }
-            }).Start();
-        }
-    }
-}

MyThread/UpdateThread.cs

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

Plugins/ShowSeconds/SecondsWindow.xaml

@@ -1,34 +0,0 @@
-<Window x:Class="ShowSeconds.SecondsWindow"
-        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:hc="https://handyorg.github.io/handycontrol"
-        xmlns:xf="clr-namespace:XamlFlair;assembly=XamlFlair.WPF"
-        Height="90" 
-        Width="160" 
-        WindowStyle="None"
-        Title="ShowSeconds_Main_8400A17AEEF7C029"
-        AllowsTransparency="True"
-        Background="Transparent" 
-        ShowInTaskbar="False"
-        Focusable="True"
-        Loaded="Window_Loaded"
-        ShowActivated="False"
-        >
-
-    <Grid Margin="20">
-        <Grid.Effect>
-            <DropShadowEffect BlurRadius="20" Direction="-90" Color="Gray"
-                              RenderingBias="Quality" ShadowDepth="2"/>
-        </Grid.Effect>
-        <Border x:Name="BGBorder" CornerRadius="8" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeInAndSlideFromRight}, Event=Visibility, Delay=0}">
-            <TextBlock x:Name="SecondsText" HorizontalAlignment="Center"
-                       VerticalAlignment="Center"
-                       FontSize="25"
-                       FontWeight="Bold"
-                       Foreground="White"
-                       Text="{Binding Seconds}"/>
-        </Border>
-    </Grid>
-</Window>

Plugins/ShowSeconds/SecondsWindow.xaml.cs

@@ -1,367 +0,0 @@
-using GeekDesk;
-using GeekDesk.MyThread;
-using GeekDesk.Util;
-using ShowSeconds.ViewModel;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Timers;
-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.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;
-
-namespace ShowSeconds
-{
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class SecondsWindow : Window
-    {
-
-        private static Color beforeColor;
-        private static Color topBeforeColor;
-
-        //dark theam
-        private readonly static System.Windows.Media.SolidColorBrush darkBG
-            = new System.Windows.Media.SolidColorBrush
-            {
-                Color = System.Windows.Media.Color.FromRgb(46, 50, 54),
-                Opacity = 0.8
-            };
-        private readonly static System.Windows.Media.SolidColorBrush darkFont
-            = new System.Windows.Media.SolidColorBrush
-            {
-                Color = System.Windows.Media.Color.FromRgb(255, 255, 255)
-            };
-
-        //light theam
-        private readonly static System.Windows.Media.SolidColorBrush lightBG
-            = new System.Windows.Media.SolidColorBrush
-            {
-                Color = System.Windows.Media.Color.FromRgb(236, 244, 251),
-                Opacity = 1
-            };
-        private readonly static System.Windows.Media.SolidColorBrush lightFont
-            = new System.Windows.Media.SolidColorBrush
-            {
-                Color = System.Windows.Media.Color.FromRgb(65, 63, 61),
-            };
-
-        private static bool expandClock = true; //是否展开时钟
-        private static System.Windows.Forms.Timer timer;
-        private static double lProportion = 0.82;
-        private static double tProportion = 0.03;
-        private static int sleepTime = 800;
-        public SecondsWindow()
-        {
-            SecondsDataContext dc = new SecondsDataContext
-            {
-                Seconds = (DateTime.Now.Hour).ToString() + ":" +
-                        FormatMS(DateTime.Now.Minute) + ":" +
-                        FormatMS(DateTime.Now.Second)
-            };
-
-            try
-            {
-                Hashtable settings = (Hashtable)ConfigurationManager.GetSection("ShowSecondsSettings");
-
-                lProportion = Convert.ToDouble(settings["LProportion"]);
-                tProportion = Convert.ToDouble(settings["TProportion"]);
-                sleepTime = Convert.ToInt32(settings["DelayTime"]);
-            }
-            catch (Exception ex)
-            {
-                lProportion = 0.82;
-                tProportion = 0.03;
-                sleepTime = 800;
-            }
-
-            InitializeComponent();
-            this.DataContext = dc;
-            this.Topmost = true;
-            BGBorder.Visibility = Visibility.Collapsed;
-        }
-
-        private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            timer = new System.Windows.Forms.Timer();
-            timer.Interval = 1000;
-            timer.Tick += Timer_Tick;         
-            HideWindowUtil.HideAltTab(this);
-        }
-
-        public static void SecondsHookSetFuc(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            ThreadPool.QueueUserWorkItem(state =>
-            {
-                window.Dispatcher.Invoke(() =>
-                {
-                    if (ScreenUtil.IsPrimaryFullScreen()) return;
-
-                    App.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Render, new Action(() =>
-                    {
-                        int x = e.X;
-                        int y = e.Y;
-
-                        //获取实际坐标  windows可能会有缩放
-                        IntPtr hdc = GetDC(IntPtr.Zero);
-                        double scale = ScreenUtil.GetScreenScalingFactor();
-
-                        x = (int)(x / scale);
-                        y = (int)(y / scale);
-
-                        double w = 1920;
-                        double h = 1080;
-                        double width = SystemParameters.PrimaryScreenWidth;
-                        double height = SystemParameters.PrimaryScreenHeight;
-
-                        if (x > 1843 / w * width
-                            && x < 1907 / w * width
-                            && y > 1037 / h * height
-                            && y < 1074 / h * height)
-                        {
-                            Color c;
-                            int count = sleepTime;
-                            do
-                            {
-                                c = GetBottomBeforeColor();
-                                if (c.A != beforeColor.A
-                                || c.R != beforeColor.R
-                                || c.G != beforeColor.G
-                                || c.B != beforeColor.B)
-                                {
-                                    break;
-                                }
-                                Thread.Sleep(50);
-                                count -= 50;
-                            } while (count > 0);
-                           
-                            if (c.A != beforeColor.A
-                                || c.R != beforeColor.R
-                                || c.G != beforeColor.G
-                                || c.B != beforeColor.B)
-                            {
-                                //判断是否展开时钟
-                                Color ct = GetTopBeforeColor();
-                                if (ct.A != topBeforeColor.A
-                                || ct.R != topBeforeColor.R
-                                || ct.G != topBeforeColor.G
-                                || ct.B != topBeforeColor.B)
-                                {
-                                    expandClock = true;
-                                }
-                                else
-                                {
-                                    expandClock = false;
-                                }
-
-                                if (!window.BGBorder.IsVisible)
-                                {
-                                    Color theamColor = GetColor(1919, 1079);
-                                    if (CalculateLight(theamColor) > 255 / 2)
-                                    {
-                                        //light
-                                        window.BGBorder.Background = lightBG;
-                                        window.SecondsText.Foreground = lightFont;
-                                    }
-                                    else
-                                    {
-                                        // dark
-                                        window.BGBorder.Background = darkBG;
-                                        window.SecondsText.Foreground = darkFont;
-                                    }
-
-                                    SecondsDataContext dc = window.DataContext as SecondsDataContext;
-                                    dc.Seconds = (DateTime.Now.Hour).ToString() + ":" +
-                                        FormatMS(DateTime.Now.Minute) + ":" +
-                                        FormatMS(DateTime.Now.Second);
-
-                                    int sx = (int)(width * lProportion);
-                                    int sMarginBottom = (int)(height * tProportion);
-                                    window.Left = sx - window.Width;
-                                    window.Top = SystemParameters.WorkArea.Height - window.Height;
-                                    window.BGBorder.Visibility = Visibility.Visible;
-                                    timer.Start();
-                                }
-                                else
-                                {
-                                    window.BGBorder.Visibility = Visibility.Collapsed;
-                                    timer.Stop();
-                                }
-                            }
-                        }
-                        else if ((expandClock && (x < 1574 / w * width
-                                    || x > 1906 / w * width
-                                    || y < 598 / h * height
-                                    || y > 1020 / h * height)
-                                    )
-                                    || !expandClock && (x < 1574 / w * width
-                                    || x > 1906 / w * width
-                                    || y < 950 / h * height
-                                    || y > 1020 / h * height)
-                                    )
-                        {
-                            window.BGBorder.Visibility = Visibility.Collapsed;
-                            timer.Stop();
-                        }
-                    }));
-                });
-            });
-           
-        }
-
-        public static void SecondsBakColorFun(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            ThreadPool.QueueUserWorkItem(state =>
-            {
-                window.Dispatcher.Invoke(() =>
-                {
-                    beforeColor = GetBottomBeforeColor();
-                    topBeforeColor = GetTopBeforeColor();
-                });
-
-            });
-        }
-
-
-        private void Timer_Tick(object sender, EventArgs e)
-        {
-            string str = (DateTime.Now.Hour).ToString() + ":" +
-                        FormatMS(DateTime.Now.Minute) + ":" +
-                        FormatMS(DateTime.Now.Second);
-            SecondsDataContext dc = this.DataContext as SecondsDataContext;
-            dc.Seconds = str;
-
-            this.DataContext = null;
-            this.DataContext = dc;
-        }
-
-        private static string FormatMS(int ms)
-        {
-            if (ms < 10)
-            {
-                return "0" + ms;
-            }
-            else
-            {
-                return ms.ToString();
-            }
-        }
-
-        private static Color GetBottomBeforeColor()
-        {
-            return GetColor(1760, 985);
-        }
-
-        private static Color GetTopBeforeColor()
-        {
-            return GetColor(1751, 693);
-        }
-
-        private static Color GetColor(int w2, int h2)
-        {
-            double w = 1920;
-            double h = 1080;
-            double width = SystemParameters.PrimaryScreenWidth;
-            double height = SystemParameters.PrimaryScreenHeight;
-            double scale = ScreenUtil.GetScreenScalingFactor();
-
-            System.Drawing.Point p = new System.Drawing.Point((int)(w2 / w * width * scale), (int)(h2 / h * height * scale));
-            return ScreenUtil.GetColorAt(p);
-        }
-
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            base.OnSourceInitialized(e);
-            HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;
-            if (hwndSource != null)
-            {
-                IntPtr handle = hwndSource.Handle;
-                hwndSource.AddHook(new HwndSourceHook(WndProc));
-            }
-        }
-
-        IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            if (msg == MessageUtil.WM_COPYDATA)
-            {
-                MessageUtil.CopyDataStruct cds = (MessageUtil.CopyDataStruct)System.Runtime.InteropServices.Marshal.PtrToStructure(lParam, typeof(MessageUtil.CopyDataStruct));
-                
-                if ("Shutdown".Equals(cds.msg))
-                {
-                    Application.Current.Shutdown();
-                }
-            }
-            return hwnd;
-        }
-
-
-        private static int CalculateLight(Color color)
-        {
-            int[] colorArr = new int[] {color.R, color.G, color.B};
-
-            int max = 0;
-            int min = 255;
-            foreach (int i in colorArr)
-            {
-                max = Math.Max(max, i);
-                min = Math.Min(min, i);
-            }
-            int avg = (max + min) / 2;
-            return avg;
-        }
-
-        private static SecondsWindow window = null;
-        public static void ShowWindow()
-        {
-            if (window == null || !window.Activate())
-            {
-                window = new SecondsWindow();
-            }
-            window.Show();
-            Keyboard.Focus(window);
-        }
-
-
-        //#######################################################
-     
-
-        
-
-
-        /// <summary>
-        /// 该函数检索一指定窗口的客户区域或整个屏幕的显示设备上下文环境的句柄，
-        /// 以后可以在GDI函数中使用该句柄来在设备上下文环境中绘图。
-        /// </summary>
-        /// <param name="hWnd">设备上下文环境被检索的窗口的句柄，如果该值为NULL，GetDC则检索整个屏幕的设备上下文环境。</param>
-        /// <returns>如果成功，返回指定窗口客户区的设备上下文环境；如果失败，返回值为Null。</returns>
-        [DllImport("user32")]
-        public static extern IntPtr GetDC(IntPtr hWnd);
-        /// <summary>
-        /// 该函数释放设备上下文环境（DC）供其他应用程序使用。函数的效果与设备上下文环境类型有关。
-        /// 它只释放公用的和设备上下文环境，对于类或私有的则无效。
-        /// </summary>
-        /// <param name="hWnd">指向要释放的设备上下文环境所在的窗口的句柄。</param>
-        /// <param name="hDC">指向要释放的设备上下文环境的句柄。</param>
-        /// <returns>如果释放成功，则返回值为1；如果没有释放成功，则返回值为0。</returns>
-        [DllImport("user32")]
-        public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
-        [DllImport("user32")]
-        public static extern bool GetCursorPos(out System.Drawing.Point pt);
-
-    }
-}

Plugins/ShowSeconds/ViewModel/SecondsDataContext.cs

@@ -1,25 +0,0 @@
-using System.ComponentModel;
-
-
-namespace ShowSeconds.ViewModel
-{
-    public class SecondsDataContext : INotifyPropertyChanged
-    {
-        private string seconds;
-        public string Seconds
-        {
-            set
-            {
-                seconds = value;
-                OnPropertyChanged("Seconds");
-            }
-            get { return seconds; }
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-        private void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-    }
-}

Properties/AssemblyInfo.cs

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

README.md

@@ -1,77 +1,46 @@
 # GeekDesk 极客桌面
 小巧、**美观**的桌面快速启动管理工具  
   
-———— 大风, 雨夜...  
+谈一谈做GeekDesk的原因:  
-「你来了」  
-「我来了」  
   
-「你究竟想干什么!」  
+目前的市场上也有一部分桌面图标管理工具, 但是**界面好点的收费**, **免费的界面差**  
-「我想做一款软件, 这个软件要Cool」  
+**windows11**都来了, 难道还要用界面停留在**win7时代**的软件吗  
   
-「什么软件?」  
+所以就萌生了做这款软件的想法,  **免费 / 美观 / 高度定制化** 是从GeekDesk诞生开始就有的需求和方向, 未来也会向着这些方向发展  
-「从最常用的桌面开始吧」  
+目前GeekDesk只有一个人在开发, 大家如果有好的建议也可以提Issue  
-  
-「哼!现在的软件多入牛毛, 会差你一个吗」  
-「我不知道, 但是我想做」  
-  
-「你以为凭你一个人的力量能在这大海里掀起什么波浪吗」  
-「但只要我想就够了, 这是我的梦想!」  
-  
-「梦想? 可笑, 这世界哪有什么梦想. 不过是一日三餐, 车子和房!」  
-「我想...就够了...」  
-  
-「...」  
- ———— 雨停, 狂风仍在呼啸...  
-  
-<img src="https://s4.ax1x.com/2021/12/15/TSrwfU.png" a border="0" width="800px"/>
-
-
-**免费 / 美观 / 高度定制化** 是从GeekDesk诞生开始就有的需求和方向, 未来也会向着这些方向发展  
-
-目前GeekDesk只有一个人在开发所以想法有限, 大家如果有好的建议也可以提Issue  
   
 另外如果你喜欢 GeekDesk的话, 或许可以为作者购买防脱洗发水  
-当然, 点个**Star**也是对作者的激励哦~ 😊😊😊
-
-
-### GitHub
-[https://github.com/BookerLiu/GeekDesk](https://github.com/BookerLiu/GeekDesk)  
-### 码云
-[https://gitee.com/BookerLiu/GeekDesk](https://gitee.com/BookerLiu/GeekDesk)
-
  <img src="https://z3.ax1x.com/2021/07/20/WYdfmR.jpg" alt="WYdfmR.jpg" border="0" width="400px"/>
-
-## 全局热键 一键呼出 鼠标跟随
-- 自定义热键 设置并使用自己习惯的快捷键
-- 一键呼出 使用鼠标中键呼出
-- 鼠标跟随 自动追随鼠标位置
-<img src="https://s4.ax1x.com/2021/12/15/TSlg8f.gif" alt="WJt4hQ.gif" border="0" width="800px"/>
-
-## 自定义壁纸
-- 随意选择自己喜欢的壁纸  
-<img src="https://s4.ax1x.com/2021/12/15/TSNx4H.gif" alt="WJt4hQ.gif" border="0" width="800px"/>
-
-
-## 毛玻璃等界面效果
-- 背景图片毛玻璃效果
-- 界面透明度
-- 界面圆角  
-<img src="https://s4.ax1x.com/2021/12/15/TSabTO.gif" alt="WGOYSU.gif" border="0" width="800px"/>
-
-## 自定义菜单图标
-- 80多个系统图标可供选择
-- 另支持在线导入阿里巴巴icon图标  
-- ~~篇幅原因,公众号内回复 **自定义图标** 可以查看教程~~  现在软件内已经贴上教程链接啦  也欢迎大家关注我的公众号:blush:
-<img src="https://s4.ax1x.com/2021/12/15/TSd1NF.gif" border="0" width="800px"/>
-
-## 定时提醒 永不忘记
-- 快捷键快速新建待办事项
-<img src="https://s4.ax1x.com/2021/12/15/TSDCvj.gif" alt="WJU6df.gif" border="0" width="800px"/>
-
 ## 开发框架
 - wpf
 - .net 4.7.2
 - [HandyControl](https://github.com/HandyOrg/HandyControl)
 
-## Stargazers over time
+## 全局热键 鼠标跟随 快速启动 随时随地
-[![Stargazers over time](https://starchart.cc/Demo-Liu/GeekDesk.svg)](https://starchart.cc/Demo-Liu/GeekDesk)
+- 支持自定义热键
+- 支持鼠标跟随  
+<img src="https://z3.ax1x.com/2021/07/19/WJt4hQ.gif" alt="WJt4hQ.gif" border="0" width="800px"/>
+
+## 自定义壁纸
+- 随意选择自己喜欢的壁纸  
+
+[![WJlcIs.md.jpg](https://z3.ax1x.com/2021/07/19/WJlcIs.md.jpg)](https://imgtu.com/i/WJlcIs)
+
+## 毛玻璃等界面效果
+- 背景图片毛玻璃效果
+- 界面透明度
+- 界面圆角  
+<img src="https://z3.ax1x.com/2021/07/19/WGOYSU.gif" alt="WGOYSU.gif" border="0" width="800px"/>
+
+## 自定义菜单图标
+- 80多个系统图标可供选择
+- 另支持在线导入阿里巴巴icon图标  
+- 篇幅原因,公众号内回复 **自定义图标** 可以查看教程
+<img src="https://z3.ax1x.com/2021/07/19/WJ3fDU.png" alt="WJ3fDU.png" border="0" width="450px"/>
+
+## 定时提醒 永不忘记
+<img src="https://z3.ax1x.com/2021/07/19/WJU6df.gif" alt="WJU6df.gif" border="0" width="800px"/>
+
+## LICENSE
+- 这是个人开发的程序,任何人可任意修改和免费使用(未做较大功能性改动不允许修改赞赏码,重新修改发布需注明出处)
+- 商用需联系作者

Resource/Dictionary/XamlFlairSettings.xaml

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

Task/ToDoTask.cs

@@ -1,11 +1,16 @@
-using GeekDesk.Control.Other;
+using GeekDesk.Control;
+using GeekDesk.Control.Other;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using HandyControl.Data;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Timers;
 
 namespace GeekDesk.Task
@@ -46,7 +51,7 @@ namespace GeekDesk.Task
                         }
                     }
                 }
-                //ClearMemory();
+                ClearMemory();
             }));
         }
 

Update.json

@@ -1,9 +1,9 @@
 {
 	"title": "GeekDesk版本更新",
-	"subTitle": "V2.5.12",
+	"subTitle": "V2.4.12",
 	"msgTitle": "本次更新内容如下",
-	"msg": "['求Star,求Star', '集成Win11显秒插件', '崩溃问题修复', '现在在右侧栏(快捷图标区域)也可以鼠标滚轮切换菜单了', '缩放屏幕截图问题修复(感谢@1062406901提的PR)', '其它已知问题修复']",
+	"msg": "['各位兄弟去给我点个免费Star呗','这是个修复版本,主要修复上个版本的bug','修复图标无法拖动','修复界面遮挡任务栏']",
-	"githubUrl": "https://github.com/BookerLiu/GeekDesk/releases",
+	"githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases",
-	"giteeUrl": "https://gitee.com/BookerLiu/GeekDesk/releases",
+	"giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases",
-	"version": "2.5.12"
+	"version": "2.4.12"
 }

Util/BGSettingUtil.cs

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

Util/BlurGlassUtil.cs

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

Util/ColorUtil.cs

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

Util/CommonCode.cs

@@ -1,9 +1,5 @@
 using GeekDesk.Constant;
-using GeekDesk.Control.Other;
 using GeekDesk.ViewModel;
-using HandyControl.Data;
-using Microsoft.Win32;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -12,7 +8,6 @@ using System.Runtime.InteropServices;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Windows;
 using System.Windows.Media.Imaging;
-using static GeekDesk.Control.Other.GlobalMsgNotification;
 
 /// <summary>
 /// 提取一些代码
@@ -33,117 +28,54 @@ namespace GeekDesk.Util
             {
                 using (FileStream fs = File.Create(Constants.DATA_FILE_PATH)) { }
                 appData = new AppData();
-                SaveAppData(appData, Constants.DATA_FILE_PATH);
+                SaveAppData(appData);
+
             }
             else
             {
-                try
+                using (FileStream fs = new FileStream(Constants.DATA_FILE_PATH, FileMode.Open))
                 {
-                    using (FileStream fs = new FileStream(Constants.DATA_FILE_PATH, FileMode.Open))
+                    BinaryFormatter bf = new BinaryFormatter();
-                    {
+                    appData = bf.Deserialize(fs) as AppData;
-                        BinaryFormatter bf = new BinaryFormatter();
-                        appData = bf.Deserialize(fs) as AppData;
-                    }
-                } 
-                catch
-                {
-                    if (File.Exists(Constants.DATA_FILE_BAK_PATH))
-                    {
-                        try
-                        {
-                            using (FileStream fs = new FileStream(Constants.DATA_FILE_BAK_PATH, FileMode.Open))
-                            {
-                                BinaryFormatter bf = new BinaryFormatter();
-                                appData = bf.Deserialize(fs) as AppData;
-                            }
-
-                            DialogMsg msg = new DialogMsg();
-                            msg.msg = "不幸的是, GeekDesk当前的数据文件已经损坏, " +
-                                "现在已经启用系统自动备份的数据\n\n" +
-                                "如果你有较新的备份, " +
-                                "请退出GeekDesk, " +
-                                "将备份文件重命名为:Data, " +
-                                "然后将Data覆盖到GeekDesk的根目录即可\n\n" +
-                                "系统上次备份时间: \n" + appData.AppConfig.SysBakTime +
-                                "\n\n如果当前数据就是你想要的数据, 那么请不用管它";
-                            GlobalMsgNotification gm = new GlobalMsgNotification(msg);
-                            HandyControl.Controls.Notification ntf = HandyControl.Controls.Notification.Show(gm, ShowAnimation.Fade, true);
-                            gm.ntf = ntf;
-                        } catch 
-                        {
-                            MessageBox.Show("不幸的是, GeekDesk当前的数据文件已经损坏\n如果你有备份, 请将备份文件重命名为:Data 然后将Data覆盖到GeekDesk的根目录即可!");
-                            Application.Current.Shutdown();
-                            return null;
-                        }
-                        
-                    } else
-                    {
-                        MessageBox.Show("不幸的是, GeekDesk当前的数据文件已经损坏\n如果你有备份, 请将备份文件重命名为:Data 然后将Data覆盖到GeekDesk的根目录即可!");
-                        Application.Current.Shutdown();
-                        return null;
-                    }
-                    
                 }
             }
             return appData;
         }
 
-        private readonly static object _MyLock = new object();
         /// <summary>
         /// 保存app 数据
         /// </summary>
         /// <param name="appData"></param>
-        public static void SaveAppData(AppData appData, string filePath)
+        public static void SaveAppData(AppData appData)
         {
-            lock (_MyLock)
+            using (FileStream fs = new FileStream(Constants.DATA_FILE_PATH, FileMode.Create))
             {
-                if (filePath.Equals(Constants.DATA_FILE_BAK_PATH))
+                BinaryFormatter bf = new BinaryFormatter();
-                {
+                bf.Serialize(fs, appData);
-                    appData.AppConfig.SysBakTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                }
-                if (!Directory.Exists(filePath.Substring(0, filePath.LastIndexOf("\\"))))
-                {
-                    Directory.CreateDirectory(filePath.Substring(0, filePath.LastIndexOf("\\")));
-                }
-                using (FileStream fs = new FileStream(filePath, FileMode.Create))
-                {
-                    BinaryFormatter bf = new BinaryFormatter();
-                    bf.Serialize(fs, appData);
-                }
             }
         }
 
 
-        public static void SavePassword(string password)
+
+        /// <summary>
+        /// 判断当前屏幕(鼠标最后活动屏幕)是否有全屏化应用
+        /// </summary>
+        /// <returns></returns>
+        public static bool IsPrimaryFullScreen()
         {
-            using (StreamWriter sw = new StreamWriter(Constants.PW_FILE_BAK_PATH))
+            RECT rect = new RECT();
+            GetWindowRect(new HandleRef(null, GetForegroundWindow()), ref rect);
+
+            int windowHeight = rect.bottom - rect.top;
+            int screenHeight = (int)SystemParameters.PrimaryScreenHeight;
+
+            if (windowHeight >= screenHeight)
             {
-                sw.Write(password);
+                return true;
             }
+            return false;
         }
 
-
-        public static void BakAppData()
-        {
-
-            SaveFileDialog sfd = new SaveFileDialog
-            {
-                Title = "备份文件",
-                Filter = "bak文件(*.bak)|*.bak",
-                FileName = "Data-GD-" + DateTime.Now.ToString("yyMMdd") + ".bak",
-            };
-            if (sfd.ShowDialog() == true)
-            {
-                using (FileStream fs = new FileStream(sfd.FileName, FileMode.Create))
-                {
-                    BinaryFormatter bf = new BinaryFormatter();
-                    bf.Serialize(fs, MainWindow.appData);
-                }
-            }
-        }
-
-        
-
         /// <summary>
         /// 根据路径获取文件图标等信息
         /// </summary>
@@ -160,7 +92,7 @@ namespace GeekDesk.Util
             //    ext = System.IO.Path.GetExtension(path).ToLower();
             //}
 
-            string iconPath;
+            string iconPath = null;
             //if (".lnk".Equals(ext))
             //{
 
@@ -179,21 +111,16 @@ namespace GeekDesk.Util
             BitmapImage bi = ImageUtil.GetBitmapIconByPath(iconPath);
             IconInfo iconInfo = new IconInfo
             {
-                Path_NoWrite = path,
+                Path = path,
-                LnkPath_NoWrite = tempPath,
+                LnkPath = tempPath,
-                BitmapImage_NoWrite = bi,
+                BitmapImage = bi,
-                StartArg_NoWrite = FileUtil.GetArgByLnk(tempPath)
+                StartArg = FileUtil.GetArgByLnk(tempPath)
             };
-            iconInfo.DefaultImage_NoWrite = iconInfo.ImageByteArr;
+            iconInfo.DefaultImage = iconInfo.ImageByteArr;
-            iconInfo.Name_NoWrite = System.IO.Path.GetFileNameWithoutExtension(tempPath);
+            iconInfo.Name = System.IO.Path.GetFileNameWithoutExtension(tempPath);
             if (StringUtil.IsEmpty(iconInfo.Name))
             {
-                iconInfo.Name_NoWrite = path;
+                iconInfo.Name = path;
-            }
-            string relativePath = FileUtil.MakeRelativePath(Constants.APP_DIR + "GeekDesk.exe", iconInfo.Path);
-            if (!string.IsNullOrEmpty(relativePath) && !relativePath.Equals(iconInfo.Path))
-            {
-                iconInfo.RelativePath_NoWrite = relativePath;
             }
             return iconInfo;
         }
@@ -244,6 +171,20 @@ namespace GeekDesk.Util
         }
 
 
+        [StructLayout(LayoutKind.Sequential)]
+        private struct RECT
+        {
+            public int left;
+            public int top;
+            public int right;
+            public int bottom;
+        }
+
+        [DllImport("user32.dll")]
+        private static extern bool GetWindowRect(HandleRef hWnd, [In, Out] ref RECT rect);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetForegroundWindow();
 
 
 
@@ -281,34 +222,5 @@ namespace GeekDesk.Util
             }
         }
 
-
-
-        /// <summary>
-        /// 判断鼠标是否在窗口内
-        /// </summary>
-        /// <param name="window"></param>
-        /// <returns></returns>
-        public static bool MouseInWindow(Window window)
-        {
-            double windowHeight = window.Height;
-            double windowWidth = window.Width;
-
-            double windowTop = window.Top;
-            double windowLeft = window.Left;
-
-            //获取鼠标位置
-            System.Windows.Point p = MouseUtil.GetMousePosition();
-            double mouseX = p.X;
-            double mouseY = p.Y;
-
-            //鼠标不在窗口上
-            if (mouseX < windowLeft || mouseX > windowLeft + windowWidth
-                || mouseY < windowTop || mouseY > windowTop + windowHeight)
-            {
-                return false;
-            }
-            return true;
-        }
-
     }
 }

Util/ConsoleManager.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace GeekDesk.Util
+{
+    [SuppressUnmanagedCodeSecurity]
+    public static class ConsoleManager
+    {
+        private const string Kernel32_DllName = "kernel32.dll";
+
+        [DllImport(Kernel32_DllName)]
+        private static extern bool AllocConsole();
+
+        [DllImport(Kernel32_DllName)]
+        private static extern bool FreeConsole();
+
+        [DllImport(Kernel32_DllName)]
+        private static extern IntPtr GetConsoleWindow();
+
+        [DllImport(Kernel32_DllName)]
+        private static extern int GetConsoleOutputCP();
+
+        public static bool HasConsole
+        {
+            get { return GetConsoleWindow() != IntPtr.Zero; }
+        }
+
+        /// <summary>
+        /// Creates a new console instance if the process is not attached to a console already.
+        /// </summary>
+        public static void Show()
+        {
+            //#if DEBUG
+            if (!HasConsole)
+            {
+                AllocConsole();
+                InvalidateOutAndError();
+            }
+            //#endif
+        }
+
+        /// <summary>
+        /// If the process has a console attached to it, it will be detached and no longer visible. Writing to the System.Console is still possible, but no output will be shown.
+        /// </summary>
+        public static void Hide()
+        {
+            //#if DEBUG
+            if (HasConsole)
+            {
+                SetOutAndErrorNull();
+                FreeConsole();
+            }
+            //#endif
+        }
+
+        public static void Toggle()
+        {
+            if (HasConsole)
+            {
+                Hide();
+            }
+            else
+            {
+                Show();
+            }
+        }
+
+        static void InvalidateOutAndError()
+        {
+            Type type = typeof(System.Console);
+
+            System.Reflection.FieldInfo _out = type.GetField("_out",
+                System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);
+
+            System.Reflection.FieldInfo _error = type.GetField("_error",
+                System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);
+
+            System.Reflection.MethodInfo _InitializeStdOutError = type.GetMethod("InitializeStdOutError",
+                System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);
+
+            Debug.Assert(_out != null);
+            Debug.Assert(_error != null);
+
+            Debug.Assert(_InitializeStdOutError != null);
+
+            _out.SetValue(null, null);
+            _error.SetValue(null, null);
+
+            _InitializeStdOutError.Invoke(null, new object[] { true });
+        }
+
+        static void SetOutAndErrorNull()
+        {
+            Console.SetOut(TextWriter.Null);
+            Console.SetError(TextWriter.Null);
+        }
+    }
+}

Util/DragAdorner.cs

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

Util/FileIcon.cs

@@ -1,5 +1,5 @@
-using System;
+using IWshRuntimeLibrary;
-using System.Collections;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -11,42 +11,27 @@ namespace GeekDesk.Util
 {
     public class FileIcon
     {
-        static List<string> blurExtsList;
+
-        static List<int[]> pixelList;
+        private static List<string> GetBlurExts()
-        static FileIcon() {
+        {
-            blurExtsList = new List<string>
+            List<string> list = new List<string>();
-            {
+            list.Add(".exe");
-                ".exe",
+            list.Add(".cer");
-                ".cer",
+            list.Add(".lnk");
-                ".lnk",
+            return list;
-                ".chm"
-            };
-            pixelList = new List<int[]>
-            {
-                new int[]{ 256 / 4, 256 / 4 },
-                new int[]{ 256 / 2, 256 / 4 },
-                new int[]{ 256 / 4 * 3, 256 / 4 },
-                new int[]{ 256 / 4, 256 / 2 },
-                new int[]{ 256 / 4, 256 / 4 * 3 },
-                new int[]{ 256 / 4 * 3, 256 / 2 },
-                new int[]{ 256 / 4 * 3, 256 / 4 * 3 },
-                new int[]{ 256 / 2, 256 / 4 * 3 },
-            };
         }
 
-      
+          [DllImport("User32.dll")]
-
+         public static extern int PrivateExtractIcons(
-        [DllImport("User32.dll")]
+             string lpszFile, //文件名可以是exe,dll,ico,cur,ani,bmp
-        public static extern int PrivateExtractIcons(
+             int nIconIndex,  //从第几个图标开始获取
-           string lpszFile, //文件名可以是exe,dll,ico,cur,ani,bmp
+             int cxIcon,      //获取图标的尺寸x
-           int nIconIndex,  //从第几个图标开始获取
+             int cyIcon,      //获取图标的尺寸y
-           int cxIcon,      //获取图标的尺寸x
+             IntPtr[] phicon, //获取到的图标指针数组
-           int cyIcon,      //获取图标的尺寸y
+             int[] piconid,   //图标对应的资源编号
-           IntPtr[] phicon, //获取到的图标指针数组
+             int nIcons,      //指定获取的图标数量，仅当文件类型为.exe 和 .dll时候可用
-           int[] piconid,   //图标对应的资源编号
+             int flags        //标志，默认0就可以，具体可以看LoadImage函数
-           int nIcons,      //指定获取的图标数量，仅当文件类型为.exe 和 .dll时候可用
+         );
-           int flags        //标志，默认0就可以，具体可以看LoadImage函数
-       );
 
 
         public static BitmapImage GetBitmapImage(string filePath)
@@ -69,7 +54,7 @@ namespace GeekDesk.Util
                 ip = hIcons[0];
                 ico = Icon.FromHandle(ip);
             }
-            else if (blurExtsList.Contains(ext))
+            else if (GetBlurExts().Contains(ext))
             {
                 ico = Icon.ExtractAssociatedIcon(filePath);
             }
@@ -77,14 +62,8 @@ namespace GeekDesk.Util
             {
                 ip = GetJumboIcon(GetIconIndex(filePath));
                 ico = Icon.FromHandle(ip);
-                if (CheckIsSmallIco(ico.ToBitmap()))
-                {
-                    ico = Icon.ExtractAssociatedIcon(filePath);
-                }
             }
 
-            
-
             Bitmap bmp = ico.ToBitmap();
             MemoryStream strm = new MemoryStream();
 
@@ -95,7 +74,6 @@ namespace GeekDesk.Util
             myEncoderParameters.Param[0] = myEncoderParameter;
 
             bmp.Save(strm, myImageCodecInfo, myEncoderParameters);
-
             BitmapImage bmpImage = new BitmapImage();
             bmpImage.BeginInit();
             strm.Seek(0, SeekOrigin.Begin);
@@ -105,7 +83,6 @@ namespace GeekDesk.Util
             {
                 Shell32.DestroyIcon(ip);
             }
-            DeleteObject(bmp.GetHbitmap());
             return bmpImage.Clone();
         }
 
@@ -122,30 +99,6 @@ namespace GeekDesk.Util
             return null;
         }
 
-        private static bool CheckIsSmallIco(Bitmap bm)
-        {
-            Color color;
-            int count = 0;
-            foreach (int[] arr in pixelList)
-            {
-                color = bm.GetPixel(arr[0], arr[1]);
-                if (color.A == 0)
-                {
-                    count++;
-                }
-            }
-            DeleteObject(bm.GetHbitmap());
-            if (count >= 6)
-            {
-                return true;
-            }
-            return false;
-        }
-
-
-        [System.Runtime.InteropServices.DllImport("gdi32.dll")]
-        public static extern bool DeleteObject(IntPtr onj);
-
 
 
         public static int GetIconIndex(string pszFile)

Util/FileUtil.cs

@@ -1,9 +1,11 @@
 using IWshRuntimeLibrary;
 using System;
-using System.IO;
+using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace GeekDesk.Util
 {
@@ -157,47 +159,5 @@ namespace GeekDesk.Util
             }
         }
 
-        public static string MakeRelativePath(string fromPath, string toPath)
-        {
-            string relativePath = null;
-            try
-            {
-                if (string.IsNullOrEmpty(toPath) || string.IsNullOrEmpty(fromPath)) return null;
-                Uri file = new Uri(@toPath);
-                // Must end in a slash to indicate folder
-                Uri folder = new Uri(@fromPath);
-                relativePath =
-                Uri.UnescapeDataString(
-                    folder.MakeRelativeUri(file)
-                        .ToString()
-                        .Replace('/', Path.DirectorySeparatorChar)
-                    );
-            } catch (Exception ex)
-            {
-                LogUtil.WriteErrorLog(ex, "建立相对路径出错:fromPath:" + fromPath + ",toPath:" + toPath);
-            }
-            return relativePath;
-        }
-
-
-        public static FileInfo GetFileByNameWithDir(string name, string dir)
-        {
-            DirectoryInfo d = new DirectoryInfo(dir);
-            FileInfo[] files = d.GetFiles();//文件
-            foreach (FileInfo fi in files)
-            {
-                if (fi.Name.Equals(name))
-                {
-                    return fi;
-                }
-            }
-            DirectoryInfo[] directs = d.GetDirectories();
-            foreach (DirectoryInfo direct in directs)
-            {
-                return GetFileByNameWithDir(name, direct.FullName);
-            }
-            return null;
-        }
-
     }
 }

Util/GlobalHotKey.cs

@@ -10,7 +10,6 @@ namespace GeekDesk.Util
     {
         public enum HotkeyModifiers
         {
-            None = 0,
             MOD_ALT = 0x1,
             MOD_CONTROL = 0x2,
             MOD_SHIFT = 0x4,
@@ -54,8 +53,7 @@ namespace GeekDesk.Util
                 UnregisterHotKey(handleTemp[id].Handle, id);
                 GlobalHotKey.handleTemp[id].Dispose();
                 GlobalHotKey.handleTemp.Remove(id);
-            }
+            } catch
-            catch
             {
                 //nothing
             }
@@ -96,4 +94,4 @@ namespace GeekDesk.Util
 
 
     }
-}
+    }