- Improved positioning of the background images for WPF UI Dialogs

- WIP: Added support for modern style folder selection dialog (triggered by #1734 discussion) - Added a more convenient option to play dialogs in demo mode during development
oleg-shilo · Feb 1, 2025 · ec24541 · ec24541
1 parent a1ba08a
commit ec24541
Show file tree

Hide file tree

Showing 12 changed files with 121 additions and 12 deletions.
diff --git a/...Samples/Wix# Samples/Managed Setup/CustomUI.WPF.Sequence/Dialogs/InstallDirDialog.xaml.cs b/...Samples/Wix# Samples/Managed Setup/CustomUI.WPF.Sequence/Dialogs/InstallDirDialog.xaml.cs
@@ -1,14 +1,15 @@
-using Caliburn.Micro;
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
 using System.Windows.Media.Imaging;
+using Caliburn.Micro;
 using WixSharp;
 using WixSharp.UI.Forms;
+
 using IO = System.IO;
 
 namespace WixSharp.UI.WPF.Sequence
@@ -74,11 +75,23 @@ public string InstallDirPath
 
         public void ChangeInstallDir()
         {
+            // `OpenFolderDialog.Select` is still under development so disabling it for now
+
+            // try
+            // {
+            //     var (isSelected, path) = OpenFolderDialog.Select(InstallDirPath);
+            //     if (isSelected)
+            //         InstallDirPath = path;
+            //     return;
+            // }
+            // catch
+            // {
             using (var dialog = new FolderBrowserDialog { SelectedPath = InstallDirPath })
             {
                 if (dialog.ShowDialog() == DialogResult.OK)
                     InstallDirPath = dialog.SelectedPath;
             }
+            // }
         }
 
         public void GoPrev()

diff --git a/Source/src/WixSharp.Samples/WixSharp.UI.xml b/Source/src/WixSharp.Samples/WixSharp.UI.xml
diff --git a/Source/src/WixSharp.Suite.sln b/Source/src/WixSharp.Suite.sln
@@ -1042,7 +1042,6 @@ Global
 		{91003067-7893-4DC3-B2F8-AB93D72467BD} = {DA107019-87B6-473D-8C9B-1C3A48CB8FD5}
 		{29DF07CE-4648-47DE-8440-3DB54D49D5D2} = {C8D0CD2D-0340-4E97-9E62-5A8334AD9E2D}
 		{1CFD0B87-E292-41B3-A914-FF8254D4A32C} = {DA107019-87B6-473D-8C9B-1C3A48CB8FD5}
-		{B8EFFF07-76BC-4E6D-9A13-4E3A0777EB0C} = {AE8877B5-88C1-4493-B70D-27DCCEA5CE39}
 		{18EF7DE3-5726-46CF-A2F1-B168D84328B4} = {1CFD0B87-E292-41B3-A914-FF8254D4A32C}
 		{C34D92EB-36E6-4405-8479-8218570D1F76} = {DA107019-87B6-473D-8C9B-1C3A48CB8FD5}
 		{EF42EF2C-57E0-41FD-96C8-AACC49DDDCCC} = {5D69978C-B7F0-4CCE-9BC5-B27AEF529A1D}

diff --git a/Source/src/WixSharp.UI.WPF/Dialogs/ExitDialog.xaml b/Source/src/WixSharp.UI.WPF/Dialogs/ExitDialog.xaml
@@ -42,7 +42,10 @@
             VerticalAlignment="Stretch"
             BorderBrush="Gray"
             BorderThickness="1">
-            <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+            <Grid
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Background="White">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="75" />
                     <RowDefinition />
@@ -55,7 +58,8 @@
                 <Image
                     x:Name="Banner"
                     Grid.RowSpan="2"
-                    Source="{Binding Banner}" />
+                    Source="{Binding Banner}"
+                    Stretch="UniformToFill" />
 
                 <TextBlock
                     x:Name="DialogTitleLabel"
@@ -64,7 +68,8 @@
                     Margin="13,25,7,0"
                     VerticalAlignment="Top"
                     FontSize="16"
-                    FontWeight="Normal">
+                    FontWeight="Normal"
+                    TextWrapping="WrapWithOverflow">
                     [ExitDialogTitle]
                 </TextBlock>
                 <TextBlock

diff --git a/Source/src/WixSharp.UI.WPF/Dialogs/InstallDirDialog.xaml.cs b/Source/src/WixSharp.UI.WPF/Dialogs/InstallDirDialog.xaml.cs
@@ -3,6 +3,7 @@
 using System.Windows.Media.Imaging;
 using WixSharp;
 using WixSharp.UI.Forms;
+using WixToolset.Dtf.WindowsInstaller;
 
 namespace WixSharp.UI.WPF
 {
@@ -98,11 +99,21 @@ public string InstallDirPath
 
         public void ChangeInstallDir()
         {
+            // `OpenFolderDialog.Select` is still under development so disabling it for now
+            // try
+            // {
+            //     var (isSelected, path) = OpenFolderDialog.Select(InstallDirPath);
+            //     if (isSelected)
+            //         InstallDirPath = path;
+            // }
+            // catch
+            // {
             using (var dialog = new FolderBrowserDialog { SelectedPath = InstallDirPath })
             {
                 if (dialog.ShowDialog() == DialogResult.OK)
                     InstallDirPath = dialog.SelectedPath;
             }
+            // }
         }
 
         public void GoPrev()

diff --git a/Source/src/WixSharp.UI.WPF/Dialogs/WelcomeDialog.xaml b/Source/src/WixSharp.UI.WPF/Dialogs/WelcomeDialog.xaml
@@ -20,7 +20,10 @@
             VerticalAlignment="Stretch"
             BorderBrush="Gray"
             BorderThickness="1">
-            <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+            <Grid
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Background="White">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="75" />
                     <RowDefinition />
@@ -33,21 +36,23 @@
                 <Image
                     x:Name="Banner"
                     Grid.RowSpan="2"
-                    Source="{Binding Banner}" />
+                    Source="{Binding Banner}"
+                    Stretch="UniformToFill" />
                 <TextBlock
                     Grid.RowSpan="1"
                     Grid.Column="1"
-                    Margin="10,25,10,10"
+                    Margin="20,25,10,10"
                     VerticalAlignment="Top"
                     FontSize="16"
-                    FontWeight="Normal">
+                    FontWeight="Normal"
+                    TextWrapping="WrapWithOverflow">
                     [WelcomeDlgTitle]
                 </TextBlock>
                 <TextBlock
                     x:Name="DialogDescription"
                     Grid.Row="2"
                     Grid.Column="1"
-                    Margin="10"
+                    Margin="20,10"
                     TextWrapping="WrapWithOverflow">
                     [WelcomeDlgDescription]
                 </TextBlock>

diff --git a/Source/src/WixSharp.UI/ManagedUI/Forms/InstallDirDialog.cs b/Source/src/WixSharp.UI/ManagedUI/Forms/InstallDirDialog.cs
@@ -83,13 +83,24 @@ void cancel_Click(object sender, EventArgs e)
 
         void change_Click(object sender, EventArgs e)
         {
+            // `OpenFolderDialog.Select` is still under development so disabling it for now
+
+            // try
+            // {
+            //     var (isSelected, path) = OpenFolderDialog.Select(installDir.Text);
+            //     if (isSelected)
+            //         installDir.Text = path;
+            // }
+            // catch
+            // {
             using (var dialog = new FolderBrowserDialog { SelectedPath = installDir.Text })
             {
                 if (dialog.ShowDialog() == DialogResult.OK)
                 {
                     installDir.Text = dialog.SelectedPath;
                 }
             }
+            // }
         }
     }
 }
diff --git a/Source/src/WixSharp.UI/ManagedUI/Forms/ShellView.cs b/Source/src/WixSharp.UI/ManagedUI/Forms/ShellView.cs
@@ -58,6 +58,11 @@ public class Dialogs
 
     class ShellView : Form, IShellView
     {
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+        }
+
         public ShellView()
         {
             InitializeComponent();

diff --git a/Source/src/WixSharp.UI/ManagedUI/UIExtensions.cs b/Source/src/WixSharp.UI/ManagedUI/UIExtensions.cs
@@ -346,5 +346,26 @@ public static string LocalizeWith(this string textToLocalize, Func<string, strin
             }
             return cleanRegex.Replace(result.ToString(), "");
         }
+
+        /// <summary>
+        /// Plays the specified dialogs in demo mode.
+        /// </summary>
+        /// <param name="dialogs">The dialogs.</param>
+        public static void Play(this ManagedDialogs dialogs)
+        {
+            UIShell.Play(dialogs);
+        }
+
+        /// <summary>
+        /// Plays the install dialogs in demo mode.
+        /// </summary>
+        /// <param name="ui">The UI.</param>
+        public static void PlayInstallDialogs(this IManagedUI ui) => UIShell.Play(ui.InstallDialogs);
+
+        /// <summary>
+        /// Plays the modify dialogs in demo mode.
+        /// </summary>
+        /// <param name="ui">The UI.</param>
+        public static void PlayModifyDialogs(this IManagedUI ui) => UIShell.Play(ui.ModifyDialogs);
     }
 }
diff --git a/Source/src/WixSharp.UI/ManagedUI/UIShell.cs b/Source/src/WixSharp.UI/ManagedUI/UIShell.cs
@@ -270,6 +270,12 @@ public int CurrentDialogIndex
                     ManagedProject.InvokeClientHandlers("UnhandledException", msiSession, e);
                     msiSession.Log("Managed Dialog unhandled Exception: " + e);
 
+                    try
+                    {
+                        // it's useful to print in console (if available) for troubleshooting
+                        Console.WriteLine("Managed Dialog unhandled Exception: " + e.InnerException?.Message ?? e.Message);
+                    }
+                    catch { }
                     this.Cancel();
                 }
             }
@@ -433,6 +439,8 @@ void DemoPlay(ManagedDialogs dialogs, string demoProperties = "")
             var resourcesMsi = BuildUiPlayerResources();
             var dummySession = Installer.OpenPackage(resourcesMsi, true);
 
+            dummySession["WixSharp_UI_INSTALLDIR"] = "INSTALLDIR";
+
             foreach (var pair in demoProperties.ToDictionary())
                 dummySession[pair.Key] = pair.Value;
 

diff --git a/Source/src/WixSharp.UI/WixSharp.UI.csproj b/Source/src/WixSharp.UI/WixSharp.UI.csproj
@@ -103,6 +103,7 @@
     </None>
     <Compile Include="ManagedUI\ISession.cs" />
     <Compile Include="ManagedUI\MsiSessionAdapter.cs" />
+    <Compile Include="ManagedUI\OpenFolderDialog.cs" />
     <Compile Include="ManagedUI\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

diff --git a/Source/src/WixSharp/CommonTasks.cs b/Source/src/WixSharp/CommonTasks.cs
@@ -1613,7 +1613,7 @@ static public XElement SetConfigAttribute(this XElement config, string elementPa
         }
 
         /// <summary>
-        /// Creates the parent XElement component for a given <see cref="WixSharp.WixEntity"/> and adds the specified XElement to it. 
+        /// Creates the parent XElement component for a given <see cref="WixSharp.WixEntity"/> and adds the specified XElement to it.
         /// </summary>
         /// <param name="entity"></param>
         /// <param name="element"></param>