mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-25 05:40:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

[GUI] Display progress in the taskbar button

Browse Source
This commit is contained in:
VaDiM 2023-06-05 01:33:48 +03:00
parent 2f8f57c1a6
commit 547659e151
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AssetStudioGUI/AssetStudioGUI.csproj
View File

@ -65,6 +65,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft-WindowsAPICodePack-Core-6.0" Version="1.1.5" />
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell-6.0" Version="1.1.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup> </ItemGroup>

16
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@ -19,6 +19,7 @@ using System.Timers;
using System.Windows.Forms; using System.Windows.Forms;
using static AssetStudioGUI.Studio; using static AssetStudioGUI.Studio;
using Font = AssetStudio.Font; using Font = AssetStudio.Font;
using Microsoft.WindowsAPICodePack.Taskbar;
#if NET472 #if NET472
using Vector3 = OpenTK.Vector3; using Vector3 = OpenTK.Vector3;
using Vector4 = OpenTK.Vector4; using Vector4 = OpenTK.Vector4;
@ -106,6 +107,8 @@ namespace AssetStudioGUI
private GUILogger logger; private GUILogger logger;
private TaskbarManager taskbar = TaskbarManager.Instance;
[DllImport("gdi32.dll")] [DllImport("gdi32.dll")]
private static extern IntPtr AddFontMemResourceEx(IntPtr pbFont, uint cbFont, IntPtr pdv, [In] ref uint pcFonts); private static extern IntPtr AddFontMemResourceEx(IntPtr pbFont, uint cbFont, IntPtr pdv, [In] ref uint pcFonts);
@ -607,7 +610,7 @@ namespace AssetStudioGUI
{ {
listSearch.Text = ""; listSearch.Text = "";
listSearch.ForeColor = SystemColors.WindowText; listSearch.ForeColor = SystemColors.WindowText;
BeginInvoke(new Action(() => enableFiltering = true)); BeginInvoke(new Action(() => { enableFiltering = true; }));
} }
} }
@ -1303,6 +1306,16 @@ namespace AssetStudioGUI
{ {
progressBar1.Value = value; progressBar1.Value = value;
} }
BeginInvoke(new Action(() =>
{
var max = progressBar1.Maximum;
taskbar.SetProgressValue(value, max);
if (value == max)
taskbar.SetProgressState(TaskbarProgressBarState.NoProgress);
else
taskbar.SetProgressState(TaskbarProgressBarState.Normal);
}));
} }
private void StatusStripUpdate(string statusText) private void StatusStripUpdate(string statusText)
@ -1354,6 +1367,7 @@ namespace AssetStudioGUI
filterTypeToolStripMenuItem.DropDownItems.RemoveAt(1); filterTypeToolStripMenuItem.DropDownItems.RemoveAt(1);
} }
taskbar.SetProgressState(TaskbarProgressBarState.NoProgress);
FMODreset(); FMODreset();
} }