From f152aaf1f4f4c6aa58050ea6133687f52e0641db Mon Sep 17 00:00:00 2001
From: BookerLiu <booker_liu@163.com>
Date: Fri, 21 Apr 2023 18:05:06 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81,=20=20=E6=8F=90=E5=8F=96=E5=85=AC=E5=85=B1=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/Other/BacklogNotificatin.xaml         |  4 +-
 Control/Other/CustomIconUrlDialog.xaml        |  6 +-
 Control/Other/GlobalMsgNotification.xaml      |  2 +-
 Control/Other/GradientBGDialog.xaml           |  2 +-
 Control/Other/IconInfoDialog.xaml             | 15 ++--
 .../UserControls/Config/MotionControl.xaml    | 84 +++++--------------
 Control/UserControls/Config/OtherControl.xaml | 62 +++++---------
 Control/UserControls/Config/ThemeControl.xaml | 69 +++++----------
 Control/UserControls/ToDo/TodoControl.xaml    | 21 +++++
 Control/Windows/GlobalColorPickerWindow.xaml  | 14 +---
 Control/Windows/IconfontWindow.xaml           |  6 +-
 Control/Windows/ToDoWindow.xaml               |  2 +-
 Control/Windows/ToDoWindow.xaml.cs            | 13 +++
 Control/Windows/UpdateWindow.xaml             |  6 +-
 MainWindow.xaml                               |  8 +-
 MyThread/UpdateThread.cs                      | 13 +--
 Resource/Dictionary/CommonStyle.xaml          | 42 +++++++++-
 17 files changed, 170 insertions(+), 199 deletions(-)

diff --git a/Control/Other/BacklogNotificatin.xaml b/Control/Other/BacklogNotificatin.xaml
index 5b63d8d..76c46ce 100644
--- a/Control/Other/BacklogNotificatin.xaml
+++ b/Control/Other/BacklogNotificatin.xaml
@@ -44,10 +44,10 @@
                     <ComboBoxItem Content="时"/>
                 </ComboBox.Items>
             </ComboBox>
-            <Button Content="推迟提醒" Click="DelayButton_Click"/>
+            <Button Style="{StaticResource MyBtnStyle}" Content="推迟提醒" Click="DelayButton_Click"/>
         </hc:UniformSpacingPanel>
 
 
-        <Button Click="BacklogDone_Click" Content="朕已阅" Margin="10,0,10,20" Width="298" VerticalAlignment="Bottom"/>
+        <Button Style="{StaticResource MyBtnStyle}" Click="BacklogDone_Click" Content="朕已阅" Margin="10,0,10,20" Width="298" VerticalAlignment="Bottom"/>
     </Grid>
 </Border>
diff --git a/Control/Other/CustomIconUrlDialog.xaml b/Control/Other/CustomIconUrlDialog.xaml
index 512a8dc..be20eca 100644
--- a/Control/Other/CustomIconUrlDialog.xaml
+++ b/Control/Other/CustomIconUrlDialog.xaml
@@ -36,13 +36,13 @@
             <TextBlock Text="注: 需配置正确的url方可加载远程图标!" Foreground="Red" Margin="10,95,-10,-92" />
 
             <hc:UniformSpacingPanel Spacing="10" Margin="203,125,-203,-125">
-                <Button Content="取消" Command="hc:ControlCommands.Close" HorizontalAlignment="Stretch" Margin="-1,1,1,1" VerticalAlignment="Stretch" 
+                <Button Style="{StaticResource MyBtnStyle}" Content="取消" Command="hc:ControlCommands.Close" HorizontalAlignment="Stretch" Margin="-1,1,1,1" VerticalAlignment="Stretch" 
                             />
                 <Button Content="教程" Click="Teach_Click" 
-                        Style="{StaticResource Btn1}"/>
+                        Style="{StaticResource MyBtnStyle}"/>
                 <Button Content="保存" Click="Confirm_Click" 
                         Command="hc:ControlCommands.Close"
-                        Style="{StaticResource Btn1}"/>
+                        Style="{StaticResource MyBtnStyle}"/>
             </hc:UniformSpacingPanel>
         </Grid>
         <!--<Button Width="22" Height="22" Command="hc:ControlCommands.Close" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0"/>-->
diff --git a/Control/Other/GlobalMsgNotification.xaml b/Control/Other/GlobalMsgNotification.xaml
index c421ea3..73084f4 100644
--- a/Control/Other/GlobalMsgNotification.xaml
+++ b/Control/Other/GlobalMsgNotification.xaml
@@ -49,6 +49,6 @@
         </hc:Card>
         </StackPanel>
 
-        <Button Click="Close_Click" Content="朕已阅" Margin="10,0,10,20" Width="298" VerticalAlignment="Bottom"/>
+        <Button Style="{StaticResource MyBtnStyle}" Click="Close_Click" Content="朕已阅" Margin="10,0,10,20" Width="298" VerticalAlignment="Bottom"/>
     </Grid>
 </Border>
diff --git a/Control/Other/GradientBGDialog.xaml b/Control/Other/GradientBGDialog.xaml
index 8e9bb3f..3f2bd22 100644
--- a/Control/Other/GradientBGDialog.xaml
+++ b/Control/Other/GradientBGDialog.xaml
@@ -63,7 +63,7 @@
                         </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"/>
+                            <Button Content="关闭" Style="{StaticResource MyBtnStyle}" Click="Close_Click" HorizontalAlignment="Stretch" Margin="524,360,-524,10" VerticalAlignment="Stretch"/>
                         </hc:UniformSpacingPanel>
                     </Grid>
                 </Border>
diff --git a/Control/Other/IconInfoDialog.xaml b/Control/Other/IconInfoDialog.xaml
index f094620..e4165c4 100644
--- a/Control/Other/IconInfoDialog.xaml
+++ b/Control/Other/IconInfoDialog.xaml
@@ -40,24 +40,19 @@
             <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"/>
+                <Button Style="{StaticResource MyBtnStyle}" Content="修改" Click="EditImage"/>
+                <Button Style="{StaticResource MyBtnStyle}" Content="重置" Click="ReStoreImage"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="4,15,0,0">
-                <CheckBox x:Name="IconIsAdmin" Content="始终以管理员方式启动" IsChecked="{Binding AdminStartUp, Mode=OneWay}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                <CheckBox x:Name="IconIsAdmin" Style="{StaticResource MyCheckBoxStyle}"
+                          Content="始终以管理员方式启动" IsChecked="{Binding AdminStartUp, Mode=OneWay}"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="0,15,0,0">
                 <TextBlock Text="启动参数:"  Style="{StaticResource LeftTB}"/>
                 <TextBox x:Name="StartArg" Text="{Binding StartArg, Mode=OneWay}" Width="230" Height="100" TextWrapping="Wrap" FontSize="14"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Margin="0,25,0,0" Spacing="10"  Grid.ColumnSpan="4">
-                <Button Content="保存" Style="{StaticResource Btn1}" Click="SaveProperty" Margin="265,10,0,0"/>
+                <Button Content="保存" Style="{StaticResource MyBtnStyle}" Click="SaveProperty" Margin="265,10,0,0"/>
             </hc:UniformSpacingPanel>
         </StackPanel>
     </hc:SimplePanel>
diff --git a/Control/UserControls/Config/MotionControl.xaml b/Control/UserControls/Config/MotionControl.xaml
index 61c9085..fca7ecc 100644
--- a/Control/UserControls/Config/MotionControl.xaml
+++ b/Control/UserControls/Config/MotionControl.xaml
@@ -25,63 +25,36 @@
                 <TextBlock Text="面板动作设置" VerticalAlignment="Center"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0"  Grid.ColumnSpan="4">
-                <CheckBox x:Name="IconIsAdmin" Content="启动时显示主面板" IsChecked="{Binding StartedShowPanel}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                <CheckBox Style="{StaticResource MyCheckBoxStyle}" 
+                          x:Name="IconIsAdmin" 
+                          Content="启动时显示主面板" IsChecked="{Binding StartedShowPanel}"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="显示时追随鼠标位置" IsChecked="{Binding FollowMouse}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                <CheckBox Style="{StaticResource MyCheckBoxStyle}"
+                          Content="显示时追随鼠标位置" IsChecked="{Binding FollowMouse}"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="鼠标中键呼出" Click="MouseMiddle_Changed" IsChecked="{Binding MouseMiddleShow}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                <CheckBox Style="{StaticResource MyCheckBoxStyle}"
+                          Content="鼠标中键呼出"
+                          Click="MouseMiddle_Changed" IsChecked="{Binding MouseMiddleShow}"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0"  Grid.ColumnSpan="4">
-                <CheckBox  Content="双击启动" IsChecked="{Binding DoubleOpen}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                <CheckBox Style="{StaticResource MyCheckBoxStyle}" 
+                          Content="双击启动" IsChecked="{Binding DoubleOpen}"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0"  Grid.ColumnSpan="4">
-                <CheckBox  Content="悬停切换菜单" IsChecked="{Binding HoverMenu}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                <CheckBox Style="{StaticResource MyCheckBoxStyle}" 
+                          Content="悬停切换菜单" IsChecked="{Binding HoverMenu}"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <CheckBox  Content="贴边隐藏" IsChecked="{Binding MarginHide}" Click="MarginHide_Changed">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                <CheckBox Style="{StaticResource MyCheckBoxStyle}" 
+                          Content="贴边隐藏" IsChecked="{Binding MarginHide}"
+                          Click="MarginHide_Changed"/>
             </hc:UniformSpacingPanel>
 
             
@@ -134,15 +107,10 @@
                     </hc:TextBox.Background>
                 </hc:TextBox>
                 <CheckBox Content="启用" 
+                          Style="{StaticResource MyCheckBoxStyle}"
                           Click="EnableHotKey_Click" 
                           Tag="{x:Static cst:HotKeyType.Main}" 
-                          IsChecked="{Binding EnableAppHotKey}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                          IsChecked="{Binding EnableAppHotKey}"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="待办任务:" Margin="0,5,0,0"  Width="55"/>
@@ -162,15 +130,10 @@
                     </hc:TextBox.Background>
                 </hc:TextBox>
                 <CheckBox Content="启用" 
+                          Style="{StaticResource MyCheckBoxStyle}"
                           Click="EnableHotKey_Click" 
                           Tag="{x:Static cst:HotKeyType.ToDo}" 
-                          IsChecked="{Binding EnableTodoHotKey}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                          IsChecked="{Binding EnableTodoHotKey}"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
@@ -191,15 +154,10 @@
                     </hc:TextBox.Background>
                 </hc:TextBox>
                 <CheckBox Content="启用" 
+                          Style="{StaticResource MyCheckBoxStyle}"
                           Tag="{x:Static cst:HotKeyType.ColorPicker}"
                           Click="EnableHotKey_Click"
-                          IsChecked="{Binding EnableColorPickerHotKey}">
-                    <CheckBox.Background>
-                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
-                            <GradientStop Color="#FF9EA3A6"/>
-                        </LinearGradientBrush>
-                    </CheckBox.Background>
-                </CheckBox>
+                          IsChecked="{Binding EnableColorPickerHotKey}"/>
             </hc:UniformSpacingPanel>
         </StackPanel>
     </Grid>
diff --git a/Control/UserControls/Config/OtherControl.xaml b/Control/UserControls/Config/OtherControl.xaml
index fcfe104..c0e530a 100644
--- a/Control/UserControls/Config/OtherControl.xaml
+++ b/Control/UserControls/Config/OtherControl.xaml
@@ -20,54 +20,36 @@
             <StackPanel >
                 <TextBlock Text="程序设置" />
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
-                    <CheckBox x:Name="SelfStartUpBox" Content="开机自启动" IsChecked="{Binding SelfStartUp}" Click="SelfStartUpBox_Click">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
+                    <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="SelfStartUpBox" Content="开机自启动" IsChecked="{Binding SelfStartUp}" Click="SelfStartUpBox_Click"/>
                 </hc:UniformSpacingPanel>
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,6,0,0">
-                    <CheckBox Content="性能模式" IsChecked="{Binding PMModel}" 
+                    <CheckBox Content="性能模式"
+                              Style="{StaticResource MyCheckBoxStyle}"
+                              IsChecked="{Binding PMModel}" 
                               hc:Poptip.HitMode="None" 
                               hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
                               hc:Poptip.Content="开启性能模式将取消图标动画效果" 
                               hc:Poptip.Placement="Top"
-                              >
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </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="Top"
-                           >
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
-                    <CheckBox  Content="EveryThing搜索" Click="EveryThing_Changed" IsChecked="{Binding EnableEveryThing}" 
-                           hc:Poptip.HitMode="None"
-                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                           hc:Poptip.Content="勾选后若弹出用户帐户控制请选择是" 
-                           hc:Poptip.Placement="Top"
-                           >
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
+                    <CheckBox  Content="时钟显秒" 
+                               Style="{StaticResource MyCheckBoxStyle}"
+                               Click="ShowSeconds_Click" IsChecked="{Binding SecondsWindow}" 
+                               hc:Poptip.HitMode="None"
+                               hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                               hc:Poptip.Content="仅Win11有效" 
+                               hc:Poptip.Placement="Top"
+                               />
+                    <CheckBox  Content="EveryThing搜索" 
+                               Style="{StaticResource MyCheckBoxStyle}"
+                               Click="EveryThing_Changed" IsChecked="{Binding EnableEveryThing}" 
+                               hc:Poptip.HitMode="None"
+                               hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                               hc:Poptip.Content="勾选后若弹出用户帐户控制请选择是" 
+                               hc:Poptip.Placement="Top"
+                               />
                 </hc:UniformSpacingPanel>
                 <TextBlock Text="排序方式"  Margin="0,25,0,0"/>
 
@@ -128,7 +110,7 @@
                             hc:Poptip.Content="当数据文件损坏时, 以便能够恢复部分数据 (损坏时将有操作提示)"
                             hc:Poptip.Placement="Top"
                             hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                            Style="{StaticResource Btn1}" 
+                            Style="{StaticResource MyBtnStyle}" 
                             Click="BakDataFile"/>
                 </hc:UniformSpacingPanel>
             </StackPanel>
diff --git a/Control/UserControls/Config/ThemeControl.xaml b/Control/UserControls/Config/ThemeControl.xaml
index 19be6ef..256524c 100644
--- a/Control/UserControls/Config/ThemeControl.xaml
+++ b/Control/UserControls/Config/ThemeControl.xaml
@@ -49,18 +49,12 @@
                                            hc:Poptip.Content="{Binding BacImgName}" 
                                            hc:Poptip.Placement="TopLeft"
                                            />
-                                <Button Content="修改" Click="BGButton_Click"/>
-                                <Button Content="默认" Click="DefaultButton_Click"/>
+                                <Button Content="修改" Style="{StaticResource MyBtnStyle}" Click="BGButton_Click"/>
+                                <Button Content="默认" Style="{StaticResource MyBtnStyle}" Click="DefaultButton_Click"/>
                             </hc:UniformSpacingPanel>
 
                             <hc:UniformSpacingPanel Spacing="10" Margin="20,10,0,0"  Grid.ColumnSpan="4">
-                                <CheckBox 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>
+                                <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="IconIsAdmin" Content="毛玻璃效果" Click="BGStyle_Changed" IsChecked="{Binding BlurEffect}"/>
                             </hc:UniformSpacingPanel>
                         </StackPanel>
                     </hc:TransitioningContentControl>
@@ -82,7 +76,10 @@
                                            Margin="0,5,0,0"
                                            VerticalAlignment="Center"
                                            />
-                                <Button Content="设置" Tag="Color1" Click="ColorButton_Click"/>
+                                <Button Style="{StaticResource MyBtnStyle}" 
+                                        Content="设置" 
+                                        Tag="Color1" 
+                                        Click="ColorButton_Click"/>
                             </hc:UniformSpacingPanel>
                             <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0" Grid.ColumnSpan="4">
                                 <TextBlock Text="色彩2:" VerticalAlignment="Center" Margin="0,5,0,0"/>
@@ -92,10 +89,15 @@
                                            Margin="0,5,0,0"
                                            VerticalAlignment="Center"
                                            />
-                                <Button Content="设置" Tag="Color2" Click="ColorButton_Click"/>
+                                <Button Style="{StaticResource MyBtnStyle}" 
+                                        Content="设置" Tag="Color2" 
+                                        Click="ColorButton_Click" 
+                                        />
+
                             </hc:UniformSpacingPanel>
 
                             <Button Content="系统预设"
+                                    Style="{StaticResource MyBtnStyle}"
                                     Margin="0,5,0,0"
                                     hc:Poptip.HitMode="None" 
                                     hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
@@ -111,51 +113,24 @@
                 <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 AlwaysTopmost}">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
+                    <CheckBox Style="{StaticResource MyCheckBoxStyle}"  Content="置于顶层" IsChecked="{Binding AlwaysTopmost}"/>
                 </hc:UniformSpacingPanel>
 
                 <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>
+                    <CheckBox Style="{StaticResource MyCheckBoxStyle}"  Content="主窗口动画" IsChecked="{Binding AppAnimation}" Click="Animation_Checked"/>
+
                 </hc:UniformSpacingPanel>
                 <hc:UniformSpacingPanel Spacing="10" Margin="5,10,0,0" Grid.ColumnSpan="4">
-                    <CheckBox  Content="列表展开动画" IsChecked="{Binding ItemSpradeAnimation}">
-                        <CheckBox.Background>
-                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                <GradientStop Color="#FF9EA3A6"/>
-                            </LinearGradientBrush>
-                        </CheckBox.Background>
-                    </CheckBox>
+                    <CheckBox Style="{StaticResource MyCheckBoxStyle}"  Content="列表展开动画" IsChecked="{Binding ItemSpradeAnimation}"/>
+
+
                 </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>
+                    <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="BarIcon" Content="显示托盘图标" IsChecked="{Binding ShowBarIcon}"/>
                 </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>
+                    <CheckBox Style="{StaticResource MyCheckBoxStyle}"  Content="显示主面板Logo" IsChecked="{Binding TitleLogoVisible, Mode=TwoWay, Converter={StaticResource Visibility2BooleanConverter}}"/>
                 </hc:UniformSpacingPanel>
 
 
@@ -242,7 +217,7 @@
                 <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"/>
+                    <Button Style="{StaticResource MyBtnStyle}" Content="选择" Margin="0,-10,0,0" Tag="Text"  Click="ColorButton_Click"/>
                 </hc:UniformSpacingPanel>
             </StackPanel>
         </Grid>
diff --git a/Control/UserControls/ToDo/TodoControl.xaml b/Control/UserControls/ToDo/TodoControl.xaml
index 5bd02a1..b6ecf16 100644
--- a/Control/UserControls/ToDo/TodoControl.xaml
+++ b/Control/UserControls/ToDo/TodoControl.xaml
@@ -91,6 +91,27 @@
                                                             <SolidColorBrush Color="White" Opacity="0.6"/>
                                                         </Setter.Value>
                                                     </Setter>
+                                                    <Style.Triggers>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Trigger.EnterActions>
+                                                                <BeginStoryboard>
+                                                                    <Storyboard  Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)">
+                                                                        <DoubleAnimation To="1" Duration="0:0:0"/>
+                                                                    </Storyboard>
+                                                                </BeginStoryboard>
+                                                            </Trigger.EnterActions>
+                                                            <Trigger.ExitActions>
+                                                                <BeginStoryboard>
+                                                                    <Storyboard  Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)">
+                                                                        <DoubleAnimation To="0.6" Duration="0:0:0.5"/>
+                                                                    </Storyboard>
+                                                                </BeginStoryboard>
+                                                            </Trigger.ExitActions>
+                                                            
+                                                        </Trigger>
+                                                        <Trigger Property="IsMouseOver" Value="False">
+                                                        </Trigger>
+                                                    </Style.Triggers>
                                                 </Style>
                                             </Border.Style>
                                             <SelectiveScrollingGrid>
diff --git a/Control/Windows/GlobalColorPickerWindow.xaml b/Control/Windows/GlobalColorPickerWindow.xaml
index e179746..0a5c7a9 100644
--- a/Control/Windows/GlobalColorPickerWindow.xaml
+++ b/Control/Windows/GlobalColorPickerWindow.xaml
@@ -33,12 +33,7 @@
                     VerticalAlignment="Top" Width="80"
                     >
                 <Button.Style>
-                    <Style TargetType="Button" BasedOn="{StaticResource Btn1}">
-                        <Style.Triggers>
-                            <Trigger Property="IsPressed" Value="true">
-                                <Setter Property="Opacity" Value="1"/>
-                            </Trigger>
-                        </Style.Triggers>
+                    <Style TargetType="Button" BasedOn="{StaticResource MyBtnStyle}">
                     </Style>
                 </Button.Style>
             </Button>
@@ -51,12 +46,7 @@
                     VerticalAlignment="Top" Width="80"
                     >
                 <Button.Style>
-                    <Style TargetType="Button" BasedOn="{StaticResource Btn1}">
-                        <Style.Triggers>
-                            <Trigger Property="IsPressed" Value="true">
-                                <Setter Property="Opacity" Value="1"/>
-                            </Trigger>
-                        </Style.Triggers>
+                    <Style TargetType="Button" BasedOn="{StaticResource MyBtnStyle}">
                     </Style>
                 </Button.Style>
             </Button>
diff --git a/Control/Windows/IconfontWindow.xaml b/Control/Windows/IconfontWindow.xaml
index bb9803f..0d9350f 100644
--- a/Control/Windows/IconfontWindow.xaml
+++ b/Control/Windows/IconfontWindow.xaml
@@ -75,9 +75,9 @@
                     </hc:TabControl>
 
 
-                    <Button Content="取消" Click="Close_Click" Margin="391,397.5,163,22.5"/>
-                    <Button Content="自定义设置" Click="CustomButton_Click" IsEnabled="False" Name="CustomButton" Style="{StaticResource Btn1}" Margin="447,397.5,71,22.5"/>
-                    <Button Content="确定" Click="Confirm_Click" Style="{StaticResource Btn1}" Margin="534,397.5,20,22.5" />
+                    <Button Style="{StaticResource MyBtnStyle}" Content="取消" Click="Close_Click" Margin="391,397.5,163,22.5" />
+                    <Button Style="{StaticResource MyBtnStyle}" Content="自定义设置" Click="CustomButton_Click" IsEnabled="False" Name="CustomButton" Margin="447,397.5,71,22.5"/>
+                    <Button Style="{StaticResource MyBtnStyle}" Content="确定" Click="Confirm_Click" Margin="534,397.5,20,22.5" />
                 </Grid>
             </hc:DialogContainer>
         </Border>
diff --git a/Control/Windows/ToDoWindow.xaml b/Control/Windows/ToDoWindow.xaml
index 4e65bcc..6cec297 100644
--- a/Control/Windows/ToDoWindow.xaml
+++ b/Control/Windows/ToDoWindow.xaml
@@ -89,7 +89,7 @@
                 <Button Width="22" Height="22" Click="Close_Button_Click" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0" Grid.Column="1"/>
                 <Button Content="新建待办"
                     Panel.ZIndex="1"
-                    Style="{StaticResource Btn1}"
+                    Style="{StaticResource MyBtnStyle}"
                     Grid.Column="1"
                     Margin="669,400,0,0"
                     Click="CreateBacklog_BtnClick" HorizontalAlignment="Left" VerticalAlignment="Top"/>
diff --git a/Control/Windows/ToDoWindow.xaml.cs b/Control/Windows/ToDoWindow.xaml.cs
index 3744b13..02580b8 100644
--- a/Control/Windows/ToDoWindow.xaml.cs
+++ b/Control/Windows/ToDoWindow.xaml.cs
@@ -2,6 +2,11 @@
 using GeekDesk.Interface;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reactive.Linq;
 using System.Windows;
 using System.Windows.Input;
 
@@ -64,6 +69,14 @@ namespace GeekDesk.Control.Windows
             {
                 case "History":
                     UFG.Visibility = Visibility.Collapsed;
+                    //排序历史待办 倒序
+
+                    List<ToDoInfo> list = appData.HiToDoList.OrderByDescending(v=>v.DoneTime).ToList();
+                    appData.HiToDoList.Clear();
+                    foreach (var item in list)
+                    {
+                        appData.HiToDoList.Add(item);
+                    }
                     backlog.BacklogList.ItemsSource = appData.HiToDoList;
                     if (backlog.BacklogList.Items.Count > 0)
                     {
diff --git a/Control/Windows/UpdateWindow.xaml b/Control/Windows/UpdateWindow.xaml
index 0f599ce..38905f6 100644
--- a/Control/Windows/UpdateWindow.xaml
+++ b/Control/Windows/UpdateWindow.xaml
@@ -28,7 +28,7 @@
                                 <TextBlock Margin="10" x:Name="MsgTitle" TextWrapping="Wrap" FontSize="16" HorizontalAlignment="Left" Style="{DynamicResource TextBlockLargeBold}" Text="测试"/>
                                 <Button HorizontalAlignment="Right" Margin="0,0,10,0" 
                                         Content="去点个Star" Click="StarBtnClick" 
-                                        Style="{StaticResource Btn1}"
+                                        Style="{StaticResource MyBtnStyle}"
                                         hc:IconElement.Geometry="M718.565517 863.126069c-7.344552 0-15.077517-2.189241-22.987034-6.285241L512 760.337655l-183.613793 96.503173c-18.785103 9.851586-37.499586 7.521103-48.16331-5.12-5.12-6.10869-10.557793-17.125517-7.485794-35.345656l35.063173-204.411586L159.249655 467.155862c-12.747034-12.393931-17.584552-27.153655-13.241379-40.430345 4.343172-13.312 16.913655-22.386759 34.568827-24.929103l205.223725-29.837242 91.806896-185.979586c7.874207-15.995586 20.409379-25.140966 34.392276-25.140965 13.947586 0 26.482759 9.145379 34.392276 25.140965l91.771586 185.979586 205.259035 29.837242c17.619862 2.577655 30.190345 11.652414 34.498206 24.964414 4.378483 13.27669-0.529655 28.001103-13.241379 40.430344l-148.51531 144.807725 35.063172 204.411586c3.10731 18.149517-2.365793 29.272276-7.485793 35.345655a32.273655 32.273655 0 0 1-25.176276 11.369931z"
                                         />
                             </hc:SimplePanel>
@@ -55,8 +55,8 @@
                     </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="Confirm_Click" Style="{StaticResource Btn1}"/>
+                    <Button Style="{StaticResource MyBtnStyle}" Content="暂不更新" Click="Close_Click"/>
+                    <Button Style="{StaticResource MyBtnStyle}" Content="前往更新" Click="Confirm_Click"/>
                 </hc:UniformSpacingPanel>
             </StackPanel>
 
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 36a6b00..1407230 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -129,8 +129,8 @@
                                HorizontalAlignment="Left"/>
                     </StackPanel>
                     <hc:UniformSpacingPanel HorizontalAlignment="Right">
-                        <Button x:Name="PreviewGuideBtn" Click="PreviewGuideBtn_Click" Margin="0,0,20,0" Content="上一步"/>
-                        <Button x:Name="NextGuideBtn" Click="NextGuideBtn_Click" Margin="0,0,20,0" Content="下一步"/>
+                        <Button Style="{StaticResource MyBtnStyle}" x:Name="PreviewGuideBtn" Click="PreviewGuideBtn_Click" Margin="0,0,20,0" Content="上一步"/>
+                        <Button Style="{StaticResource MyBtnStyle}" x:Name="NextGuideBtn" Click="NextGuideBtn_Click" Margin="0,0,20,0" Content="下一步"/>
                     </hc:UniformSpacingPanel>
                 </Grid>
             </hc:Card.Footer>
@@ -171,8 +171,8 @@
 
 
 
-                    <CheckBox x:Name="ShowBox" Visibility="Hidden" Panel.ZIndex="2"/>
-                    <CheckBox x:Name="HideBox" Visibility="Hidden" Panel.ZIndex="2"/>
+                    <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="ShowBox" Visibility="Hidden" Panel.ZIndex="2"/>
+                    <CheckBox Style="{StaticResource MyCheckBoxStyle}" x:Name="HideBox" Visibility="Hidden" Panel.ZIndex="2"/>
 
                     <StackPanel HorizontalAlignment="Right" Panel.ZIndex="99" hc:Growl.GrowlParent="False" hc:Growl.Token="MainWindowGrowl" Grid.Column="1" Grid.Row="1"/>
                     <StackPanel HorizontalAlignment="Center" Panel.ZIndex="99" hc:Growl.GrowlParent="False" hc:Growl.Token="MainWindowAskGrowl" Grid.Column="1" Grid.Row="1"/>
diff --git a/MyThread/UpdateThread.cs b/MyThread/UpdateThread.cs
index b6b08d1..fd1dbb2 100644
--- a/MyThread/UpdateThread.cs
+++ b/MyThread/UpdateThread.cs
@@ -53,12 +53,15 @@ namespace GeekDesk.MyThread
 
                     try
                     {
-                        string statisticUrl = jo["statisticUrl"].ToString();
-                        if (!string.IsNullOrEmpty(statisticUrl))
+                        if (jo["statisticUrl"] != null)
                         {
-                            //用户统计  只通过uuid统计用户数量  不收集任何信息
-                            statisticUrl += "?uuid=" + CommonCode.GetUniqueUUID();
-                            HttpUtil.Get(statisticUrl);
+                            string statisticUrl = jo["statisticUrl"].ToString();
+                            if (!string.IsNullOrEmpty(statisticUrl))
+                            {
+                                //用户统计  只通过uuid统计用户数量  不收集任何信息
+                                statisticUrl += "?uuid=" + CommonCode.GetUniqueUUID();
+                                HttpUtil.Get(statisticUrl);
+                            }
                         }
                     } catch (Exception){}
 
diff --git a/Resource/Dictionary/CommonStyle.xaml b/Resource/Dictionary/CommonStyle.xaml
index 5a311a2..5c38195 100644
--- a/Resource/Dictionary/CommonStyle.xaml
+++ b/Resource/Dictionary/CommonStyle.xaml
@@ -19,15 +19,15 @@
         </Style.Setters>
     </Style>
 
-    <LinearGradientBrush x:Key="BtnBG" Opacity="0.97">
+    <LinearGradientBrush x:Key="BtnBG" Opacity="0.7">
         <GradientStop Color="White" Offset="0"/>
         <GradientStop Color="White" Offset="1"/>
     </LinearGradientBrush>
 
     <!--按钮样式-->
-    <Style x:Key="Btn1" TargetType="Button" BasedOn="{StaticResource ButtonInfo}">
+    <Style x:Key="MyBtnStyle" TargetType="Button" BasedOn="{StaticResource ButtonInfo}">
         <Setter Property="Background" Value="{StaticResource BtnBG}"/>
-        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="BorderBrush">
             <Setter.Value>
                 <SolidColorBrush Color="#E5E5E2"/>
@@ -36,7 +36,41 @@
         <Setter Property="Foreground" Value="Black"/>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="#E5E5E2"/>
+                <Setter Property="Background">
+                    <Setter.Value>
+                        <LinearGradientBrush Opacity="1">
+                            <GradientStop Color="White" Offset="0"/>
+                            <GradientStop Color="White" Offset="1"/>
+                        </LinearGradientBrush>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="true">
+                <Setter Property="Opacity" Value="1"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
+    <!--CheckBox样式-->
+    <Style x:Key="MyCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource CheckBoxBaseStyle}">
+        <Setter Property="Background">
+            <Setter.Value>
+                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.6">
+                    <GradientStop Color="#FF9EA3A6"/>
+                </LinearGradientBrush>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Style.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter Property="Background">
+                    <Setter.Value>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.6">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </Setter.Value>
+                </Setter>
             </Trigger>
         </Style.Triggers>
     </Style>