0.9.7.0

What's Update? * Smaller. (https://www.cnblogs.com/crwy/p/10091034.html)
kkocdko · Feb 2, 2019 · d551b38 · d551b38
1 parent b13849f
commit d551b38
Show file tree

Hide file tree

Showing 7 changed files with 368 additions and 127 deletions.
diff --git a/UniversalGUI/LoadResourceDll.cs b/UniversalGUI/LoadResourceDll.cs
diff --git a/UniversalGUI/MainWindow.xaml.cs b/UniversalGUI/MainWindow.xaml.cs
@@ -1,5 +1,4 @@
-using Microsoft.WindowsAPICodePack.Taskbar;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -273,8 +272,6 @@ public partial class MainWindow : Window
     {
         public MainWindow()
         {
-            LoadResoureDll.RegistDLL();
-
             InitializeComponent();
 
             DefaultTitle = this.Title;
@@ -376,17 +373,17 @@ private void SetProgress(double multiple = -2)
                 SetTitleSuffix(percent + "%");
                 TaskProgressBar.Value = percent;
                 TaskProgressBar.Visibility = Visibility.Visible;
-                TaskbarManager.Instance.SetProgressValue(percent, 100, this);
-                TaskbarManager.Instance.SetProgressState(TaskbarProgressBarState.Normal, this);
+                TaskbarManager.SetProgressValue(percent, 100);
+                TaskbarManager.SetProgressState(TaskbarProgressBarState.Normal);
             }
             else if (multiple == -2) // Reset
             {
                 SetTitleSuffix();
                 TaskProgressBar.Value = 0;
                 TaskProgressBar.Foreground = new SolidColorBrush(Colors.DimGray);
                 TaskProgressBar.Visibility = Visibility.Hidden;
-                TaskbarManager.Instance.SetProgressValue(0, 100, this);
-                TaskbarManager.Instance.SetProgressState(TaskbarProgressBarState.NoProgress, this);
+                TaskbarManager.SetProgressValue(0, 100);
+                TaskbarManager.SetProgressState(TaskbarProgressBarState.NoProgress);
             }
             else if (multiple == -1) // Error warning
             {
@@ -395,8 +392,8 @@ private void SetProgress(double multiple = -2)
                 TaskProgressBar.Foreground = new SolidColorBrush(Colors.Red);
                 TaskProgressBar.Value = 100;
                 TaskProgressBar.Visibility = Visibility.Visible;
-                TaskbarManager.Instance.SetProgressValue(100, 100, this);
-                TaskbarManager.Instance.SetProgressState(TaskbarProgressBarState.Error, this);
+                TaskbarManager.SetProgressValue(100, 100);
+                TaskbarManager.SetProgressState(TaskbarProgressBarState.Error);
             }
             else
             {
@@ -790,7 +787,7 @@ private void SaveIniConfig(IniManager ini)
                 {
                     ini.CreatFile();
                 }
-                catch (Exception e)
+                catch
                 {
                     string title = QueryLangDict("MessageBox_Title_Error");
                     string content = QueryLangDict("MessageBox_Content_Configfile_CanNotWrite");

diff --git a/UniversalGUI/Properties/AssemblyInfo.cs b/UniversalGUI/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.6.5")]
-[assembly: AssemblyFileVersion("0.9.6.5")]
+[assembly: AssemblyVersion("0.9.7.0")]
+[assembly: AssemblyFileVersion("0.9.7.0")]
diff --git a/UniversalGUI/Resources/Library/Microsoft.WindowsAPICodePack.Shell.dll b/UniversalGUI/Resources/Library/Microsoft.WindowsAPICodePack.Shell.dll
diff --git a/UniversalGUI/Resources/Library/Microsoft.WindowsAPICodePack.dll b/UniversalGUI/Resources/Library/Microsoft.WindowsAPICodePack.dll