taskbar progress

setsumi · Apr 30, 2023 · 22e3a3b · 22e3a3b
1 parent 4b400cb
commit 22e3a3b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 37 deletions.
diff --git a/src/syosetuDownloader/App.xaml.cs b/src/syosetuDownloader/App.xaml.cs
@@ -1,34 +1,34 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Windows;
-using CommandLine;
-using HtmlAgilityPack;
-using System.Security.Permissions;
-
-namespace syosetuDownloader
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-
-        [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.ControlAppDomain)]
-        protected override void OnStartup(StartupEventArgs e)
-        {
-            AppDomain currentDomain = AppDomain.CurrentDomain;
-            currentDomain.UnhandledException += new UnhandledExceptionEventHandler(MyHandler);
-
-            base.OnStartup(e);
-        }
-
-        static void MyHandler(object sender, UnhandledExceptionEventArgs args)
-        {
-            Exception e = (Exception)args.ExceptionObject;
-            MessageBox.Show(e.Message, "ERROR", MessageBoxButton.OK, MessageBoxImage.Error);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+using CommandLine;
+using HtmlAgilityPack;
+using System.Security.Permissions;
+
+namespace syosetuDownloader
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+
+        [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.ControlAppDomain)]
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            AppDomain currentDomain = AppDomain.CurrentDomain;
+            currentDomain.UnhandledException += new UnhandledExceptionEventHandler(MyHandler);
+
+            base.OnStartup(e);
+        }
+
+        static void MyHandler(object sender, UnhandledExceptionEventArgs args)
+        {
+            Exception e = (Exception)args.ExceptionObject;
+            MessageBox.Show(e.Message, "ERROR", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+    }
+}
diff --git a/src/syosetuDownloader/MainWindow.xaml.cs b/src/syosetuDownloader/MainWindow.xaml.cs
@@ -39,7 +39,7 @@ public partial class MainWindow : Window
         Shell32.Shell _shell;
         string _exe_dir;
         string _dl_dir;
-        readonly string _version = "2.4.0 plus 13";
+        readonly string _version = "2.4.0 plus 14";
 
         public Util.GridViewTool.SortInfo sortInfo = new Util.GridViewTool.SortInfo();
 

diff --git a/src/syosetuDownloaderCore/Syousetsu.cs b/src/syosetuDownloaderCore/Syousetsu.cs
@@ -9,14 +9,16 @@
 using HtmlAgilityPack;
 using System.Net;
 using System.IO;
-using System.Windows.Media;
 
 namespace Syousetsu
 {
     public class Methods
     {
         public static CancellationTokenSource AddDownloadJob(Syousetsu.Constants details, ProgressBar pb, Label lb)
         {
+            var taskbar = Microsoft.WindowsAPICodePack.Taskbar.TaskbarManager.Instance;
+            taskbar.SetProgressState(Microsoft.WindowsAPICodePack.Taskbar.TaskbarProgressBarState.Normal);
+
             int max = Convert.ToInt32(pb.Maximum);
 
             int i = 0;
@@ -58,7 +60,7 @@ public static CancellationTokenSource AddDownloadJob(Syousetsu.Constants details
                     details.LastDownloaded = ctr;
                     History.SaveNovel(details);
 
-                    pb.Dispatcher.Invoke((Action)(() => { pb.Value = ctr; }));
+                    pb.Dispatcher.Invoke((Action)(() => { pb.Value = ctr; taskbar.SetProgressValue(ctr, max); }));
                     if (upTo != -1 && ctr > upTo)//stop loop if the specifed range is reached
                     {
                         break;
@@ -73,6 +75,7 @@ public static CancellationTokenSource AddDownloadJob(Syousetsu.Constants details
                 }
                 pb.Dispatcher.Invoke((Action)(() =>
                 {
+                    taskbar.SetProgressState(Microsoft.WindowsAPICodePack.Taskbar.TaskbarProgressBarState.NoProgress);
                     //pb.Value = max;
                     pb.ToolTip = null;
                     pb.Tag = 1;

diff --git a/src/syosetuDownloaderCore/syosetuDownloaderCore.csproj b/src/syosetuDownloaderCore/syosetuDownloaderCore.csproj
@@ -41,6 +41,9 @@
       <HintPath>..\packages\HtmlAgilityPack.1.11.29\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell">
+      <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />