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 @@
-
+
-
+
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 @@
-
+ Style="{StaticResource MyBtnStyle}"/>
+ Style="{StaticResource MyBtnStyle}"/>
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 @@
-
+
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 @@
-
+
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 @@
-
-
+
+
-
-
-
-
-
-
-
+
-
+
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 @@
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
@@ -134,15 +107,10 @@
-
-
-
-
-
-
+ IsChecked="{Binding EnableAppHotKey}"/>
@@ -162,15 +130,10 @@
-
-
-
-
-
-
+ IsChecked="{Binding EnableTodoHotKey}"/>
@@ -191,15 +154,10 @@
-
-
-
-
-
-
+ IsChecked="{Binding EnableColorPickerHotKey}"/>
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 @@
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+ />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -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"/>
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"
/>
-
-
+
+
-
-
-
-
-
-
-
+
@@ -82,7 +76,10 @@
Margin="0,5,0,0"
VerticalAlignment="Center"
/>
-
+
@@ -92,10 +89,15 @@
Margin="0,5,0,0"
VerticalAlignment="Center"
/>
-
+
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
@@ -242,7 +217,7 @@
-
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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"
>
-
@@ -51,12 +46,7 @@
VerticalAlignment="Top" Width="80"
>
-
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 @@
-
-
-
+
+
+
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 @@
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 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 @@
@@ -55,8 +55,8 @@
-
-
+
+
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 36a6b00..1407230 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -129,8 +129,8 @@
HorizontalAlignment="Left"/>
-
-
+
+
@@ -171,8 +171,8 @@
-
-
+
+
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 @@
-
+
-
+
+
+
+