Release v1.4.8.0

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/ExitDialog.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Windows.Forms;
+
 using WixSharp;
 using WixSharp.UI.Forms;
 
@@ -23,30 +25,44 @@ public ExitDialog()
         void ExitDialog_Load(object sender, System.EventArgs e)
         {
             image.Image = MsiRuntime.Session.GetEmbeddedBitmap("WixUI_Bmp_Dialog");
-            if (Shell.UserInterrupted || Shell.ErrorDetected)
+            if (Shell.UserInterrupted)
             {
+                title.Text = "[UserExitTitle]";
                 description.Text = "[UserExitDescription1]";
                 this.Localize();
             }
+            else if (Shell.ErrorDetected)
+            {
+                title.Text = "[FatalErrorTitle]";
+                description.Text = "[FatalErrorDescription1]";
+                this.Localize();
+            }
 
             ResetLayout();
+
+            // show error message if required
+            // if (Shell.Errors.Any())
+            // {
+            //     string lastError = Shell.Errors.LastOrDefault();
+            //     MessageBox.Show(lastError);
+            // }
         }
 
         void ResetLayout()
         {
-            // The form controls are properly anchored and will be correctly resized on parent form 
-            // resizing. However the initial sizing by WinForm runtime doesn't do a good job with DPI 
-            // other than 96. Thus manual resizing is the only reliable option apart from going WPF.  
+            // The form controls are properly anchored and will be correctly resized on parent form
+            // resizing. However the initial sizing by WinForm runtime doesn't do a good job with DPI
+            // other than 96. Thus manual resizing is the only reliable option apart from going WPF.
 
-            var bHeight = (int) (next.Height * 2.3);
+            var bHeight = (int)(next.Height * 2.3);
 
             var upShift = bHeight - bottomPanel.Height;
             bottomPanel.Top -= upShift;
             bottomPanel.Height = bHeight;
 
             imgPanel.Height = this.ClientRectangle.Height - bottomPanel.Height;
-            float ratio = (float) image.Image.Width / (float) image.Image.Height;
-            image.Width = (int) (image.Height * ratio);
+            float ratio = (float)image.Image.Width / (float)image.Image.Height;
+            image.Width = (int)(image.Height * ratio);
 
             textPanel.Left = image.Right + 5;
             textPanel.Width = (bottomPanel.Width - image.Width) - 10;
@@ -72,4 +88,4 @@ void viewLog_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
             catch { }
         }
     }
-}
+}

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/FeaturesDialog.cs

@@ -30,6 +30,8 @@ public partial class FeaturesDialog : ManagedForm, IManagedDialog
         public FeaturesDialog()
         {
             InitializeComponent();
+            label1.MakeTransparentOn(banner);
+            label2.MakeTransparentOn(banner);
         }
 
         void FeaturesDialog_Load(object sender, System.EventArgs e)
@@ -57,7 +59,7 @@ void FeaturesDialog_Load(object sender, System.EventArgs e)
 
             banner.Image = MsiRuntime.Session.GetEmbeddedBitmap("WixUI_Bmp_Banner");
             BuildFeaturesHierarchy();
-            
+
             ResetLayout();
         }
 
@@ -99,7 +101,9 @@ void BuildFeaturesHierarchy()
             features = names.Select(name => new FeatureItem(MsiRuntime.Session, name)).ToArray();
 
             //build the hierarchy tree
-            var rootItems = features.Where(x => x.ParentName.IsEmpty()).ToArray();
+            var rootItems = features.Where(x => x.ParentName.IsEmpty())
+                                    .OrderBy(x => x.RawDisplay)
+                                    .ToArray();
 
             var itemsToProcess = new Queue<FeatureItem>(rootItems); //features to find the children for
 
@@ -137,7 +141,6 @@ void BuildFeaturesHierarchy()
 
                 if (item.Display == FeatureDisplay.expand)
                     view.Expand();
-
             }
 
             //add views to the treeView control