Show more detailed progress messages in fallback dialog

clowd · Feb 21, 2022 · 430da60 · 430da60
1 parent 1e3ddb9
commit 430da60
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 3 deletions.
diff --git a/src/Update/ComposedWindow.cs b/src/Update/ComposedWindow.cs
@@ -55,6 +55,9 @@ public void SetProgress(ulong completed, ulong total)
         public void SetProgressIndeterminate()
             => LogThrow("Failed to set progress indeterminate.", () => _window?.SetProgressIndeterminate());
 
+        public void SetMessage(string message)
+            => LogThrow("Failed to set progress indeterminate.", () => _window?.SetMessage(message));
+
         public void Show()
             => LogThrow("Failed to show window.", () => _window?.Show());
 
@@ -69,7 +72,11 @@ public bool ShowQuestionDialog(string title, string message)
 
         private void LogThrow(string msg, Action act)
         {
-            try { act(); } catch (Exception ex) { this.Log().ErrorException(msg, ex); }
+            try {
+                act();
+            } catch (Exception ex) {
+                this.Log().ErrorException(msg, ex);
+            }
         }
 
         private T LogThrow<T>(string msg, Func<T> act, T errRet)

diff --git a/src/Update/ISplashWindow.cs b/src/Update/ISplashWindow.cs
@@ -9,6 +9,7 @@ internal interface ISplashWindow : IDisposable, IEnableLogger
         void Hide();
         void SetProgressIndeterminate();
         void SetProgress(ulong completed, ulong total);
+        void SetMessage(string message);
         void ShowErrorDialog(string title, string message);
         void ShowInfoDialog(string title, string message);
         bool ShowQuestionDialog(string title, string message);

diff --git a/src/Update/Program.cs b/src/Update/Program.cs
@@ -1,4 +1,4 @@
-using Squirrel.SimpleSplat;
+using Squirrel.SimpleSplat;
 using Squirrel.Json;
 using System;
 using System.Collections.Generic;
@@ -187,6 +187,7 @@ static async Task Setup(string setupPath, bool silentInstall, bool checkInstall)
                 // iterate through each missing dependency and download/run the installer.
                 foreach (var f in missingFrameworks) {
                     var localPath = Path.Combine(tempFolder, f.Id + ".exe");
+                    splash.SetMessage($"Downloading {f.DisplayName}...");
                     await f.DownloadToFile(localPath, e => splash.SetProgress((ulong) e, 100));
                     splash.SetProgressIndeterminate();
 
@@ -217,6 +218,7 @@ static async Task Setup(string setupPath, bool silentInstall, bool checkInstall)
                 }
             }
 
+            splash.SetMessage("Extracting package...");
             Log.Info($"Starting package install from directory " + tempFolder);
             splash.SetProgressIndeterminate();
 
@@ -237,6 +239,7 @@ static async Task Setup(string setupPath, bool silentInstall, bool checkInstall)
                 else splash.SetProgress((ulong) p, 90);
             };
 
+            splash.SetMessage(null);
             await Install(silentInstall, progressSource, tempFolder);
             splash.Dispose();
         }

diff --git a/src/Update/Windows/ComCtlProgressDialog.cs b/src/Update/Windows/ComCtlProgressDialog.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Runtime.InteropServices;
 using System.Threading;
 using Squirrel.SimpleSplat;
 using Vanara.PInvoke;
@@ -61,6 +62,24 @@ public override void SetProgressIndeterminate()
             }
         }
 
+        public override unsafe void SetMessage(string message)
+        {
+            lock (_lock) {
+                if (Handle == IntPtr.Zero) return;
+                if (String.IsNullOrWhiteSpace(message)) {
+                    var arr = stackalloc byte[2];
+                    SendMessage(_hwnd, (uint) TaskDialogMessage.TDM_SET_ELEMENT_TEXT, (IntPtr) 0, (IntPtr) arr);
+                } else {
+                    var hg = Marshal.StringToHGlobalUni(message);
+                    try {
+                        SendMessage(_hwnd, (uint) TaskDialogMessage.TDM_SET_ELEMENT_TEXT, (IntPtr) 0, hg);
+                    } finally {
+                        Marshal.FreeHGlobal(hg);
+                    }
+                }
+            }
+        }
+
         public override void Show()
         {
             lock (_lock) {

diff --git a/src/Update/Windows/User32SplashWindow.cs b/src/Update/Windows/User32SplashWindow.cs
@@ -2,7 +2,6 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using Squirrel.SimpleSplat;
@@ -109,6 +108,11 @@ public override void SetProgress(ulong completed, ulong total)
             InvalidateRect(_hwnd, null, false);
         }
 
+        public override void SetMessage(string message)
+        {
+            // TODO: where to show the message in this splash window?
+        }
+
         public override void Dispose()
         {
             if (_thread == null) return;

diff --git a/src/Update/Windows/WindowBase.cs b/src/Update/Windows/WindowBase.cs
@@ -26,6 +26,8 @@ public WindowBase(string appName)
 
         public abstract void SetProgressIndeterminate();
 
+        public abstract void SetMessage(string message);
+
         public abstract void Show();
 
         public virtual void ShowErrorDialog(string title, string message)