List:Commits« Previous MessageNext Message »
From:Mike Lischke Date:May 23 2011 3:01pm
Subject:bzr commit into wex-installer-1.0 branch (mike.lischke:479)
View as plain text  
#At file:///D:/Work/MySQL/installer/ based on revid:mike.lischke@stripped

  479 Mike Lischke	2011-05-23
      Started changes for VPAT compliance. Welcome + Remove screens are done (except for the listview, which is a matter on its own).

    modified:
      WexInstaller.Core/InstallerPanel.cs
      WexInstaller.Core/ProductManager.cs
      WexInstaller/Controls/AboutPage.Designer.cs
      WexInstaller/Controls/InstallWizardControl.Designer.cs
      WexInstaller/Controls/InstallWizardControl.cs
      WexInstaller/Controls/RemoveControl.Designer.cs
      WexInstaller/Controls/RemoveControl.cs
      WexInstaller/Controls/RemoveControl.resx
      WexInstaller/Controls/WelcomeControl.Designer.cs
      WexInstaller/Controls/WelcomeControl.cs
      WexInstaller/HiddenTabsControl.Designer.cs
      WexInstaller/HiddenTabsControl.cs
      WexInstaller/MainForm.cs
      WexInstaller/Properties/Resources.Designer.cs
      WexInstaller/Properties/Resources.resx
      WexInstaller/RemovePanels/RemoveProgress.Designer.cs
      WexInstaller/RemovePanels/RemoveProgress.cs
      WexInstaller/WexInstaller.csproj
=== modified file 'WexInstaller.Core/InstallerPanel.cs'
=== modified file 'WexInstaller.Core/InstallerPanel.cs'
--- a/WexInstaller.Core/InstallerPanel.cs	2011-04-18 08:06:38 +0000
+++ b/WexInstaller.Core/InstallerPanel.cs	2011-05-23 15:01:40 +0000
@@ -37,7 +37,7 @@
     }
 
     /// <summary>
-    /// Method to be called by each descendant.
+    /// Some post-loading setup.
     /// </summary>
     public void LoadingDone()
     {

=== modified file 'WexInstaller.Core/ProductManager.cs'
--- a/WexInstaller.Core/ProductManager.cs	2011-04-19 11:59:32 +0000
+++ b/WexInstaller.Core/ProductManager.cs	2011-05-23 15:01:40 +0000
@@ -226,23 +226,26 @@
     /// which indicates we are running from an installer package rather than standalone.
     /// </summary>
     /// <returns></returns>
-    public static bool IsNewSetup()
+    public static bool IsNewSetup
     {
-      if (ActiveCatalog != null && InstallerConfiguration.CatalogWasSpecified)
-      {
-        if (CatalogProductsInstalled)
-          return false;
-        if (CatalogProductsUpgrade)
-          return false;
-        return true;
-      }
-      else
-      {
-        if (ProductsInstalled)
-          return false;
-        if (ProductsUpgrade)
-          return false;
-        return true;
+      get
+      {
+        if (ActiveCatalog != null && InstallerConfiguration.CatalogWasSpecified)
+        {
+          if (CatalogProductsInstalled)
+            return false;
+          if (CatalogProductsUpgrade)
+            return false;
+          return true;
+        }
+        else
+        {
+          if (ProductsInstalled)
+            return false;
+          if (ProductsUpgrade)
+            return false;
+          return true;
+        }
       }
     }
 

=== modified file 'WexInstaller/Controls/AboutPage.Designer.cs'
--- a/WexInstaller/Controls/AboutPage.Designer.cs	2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/AboutPage.Designer.cs	2011-05-23 15:01:40 +0000
@@ -57,7 +57,7 @@
           this.backBtn.Location = new System.Drawing.Point(652, 523);
           this.backBtn.Name = "backBtn";
           this.backBtn.Size = new System.Drawing.Size(86, 26);
-          this.backBtn.TabIndex = 1;
+          this.backBtn.TabIndex = 0;
           this.backBtn.Text = global::WexInstaller.Properties.Resources.BackButtonDefaultText;
           this.backBtn.UseVisualStyleBackColor = false;
           this.backBtn.Click += new System.EventHandler(this.backBtn_Click);
@@ -71,7 +71,8 @@
           this.aboutText.Name = "aboutText";
           this.aboutText.ReadOnly = true;
           this.aboutText.Size = new System.Drawing.Size(692, 309);
-          this.aboutText.TabIndex = 2;
+          this.aboutText.TabIndex = 1;
+          this.aboutText.TabStop = false;
           this.aboutText.Text = "";
           // 
           // copyrightLabel3
@@ -114,7 +115,6 @@
           // 
           // AboutPage
           // 
-          this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
           this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
           this.BackColor = System.Drawing.Color.Transparent;
           this.Controls.Add(this.pictureBox2);

=== modified file 'WexInstaller/Controls/InstallWizardControl.Designer.cs'
--- a/WexInstaller/Controls/InstallWizardControl.Designer.cs	2011-04-18 09:16:30 +0000
+++ b/WexInstaller/Controls/InstallWizardControl.Designer.cs	2011-05-23 15:01:40 +0000
@@ -183,7 +183,7 @@
           this.updatePanel.Margin = new System.Windows.Forms.Padding(0);
           this.updatePanel.Name = "updatePanel";
           this.updatePanel.Size = new System.Drawing.Size(556, 461);
-          this.updatePanel.TabIndex = 1;
+          this.updatePanel.TabIndex = 0;
           // 
           // detailedUpdateTab
           // 
@@ -205,7 +205,7 @@
           this.detailedUpdatePanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
           this.detailedUpdatePanel.Name = "detailedUpdatePanel";
           this.detailedUpdatePanel.Size = new System.Drawing.Size(556, 461);
-          this.detailedUpdatePanel.TabIndex = 2;
+          this.detailedUpdatePanel.TabIndex = 0;
           // 
           // typeTab
           // 
@@ -270,7 +270,7 @@
           this.checkRequirementsPanel.Location = new System.Drawing.Point(0, 0);
           this.checkRequirementsPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
           this.checkRequirementsPanel.Name = "checkRequirementsPanel";
-          this.checkRequirementsPanel.Size = new System.Drawing.Size(192, 20);
+          this.checkRequirementsPanel.Size = new System.Drawing.Size(556, 461);
           this.checkRequirementsPanel.TabIndex = 5;
           // 
           // installProgressTab
@@ -316,7 +316,7 @@
           this.allConfigPanel.Location = new System.Drawing.Point(0, 0);
           this.allConfigPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
           this.allConfigPanel.Name = "allConfigPanel";
-          this.allConfigPanel.Size = new System.Drawing.Size(192, 2);
+          this.allConfigPanel.Size = new System.Drawing.Size(556, 461);
           this.allConfigPanel.TabIndex = 7;
           // 
           // completeTab
@@ -337,7 +337,7 @@
           this.completePanel.Font = new System.Drawing.Font("Tahoma", 8.25F);
           this.completePanel.Location = new System.Drawing.Point(0, 0);
           this.completePanel.Name = "completePanel";
-          this.completePanel.Size = new System.Drawing.Size(192, 2);
+          this.completePanel.Size = new System.Drawing.Size(556, 461);
           this.completePanel.TabIndex = 8;
           // 
           // installWizardSideBarControl1

=== modified file 'WexInstaller/Controls/InstallWizardControl.cs'
--- a/WexInstaller/Controls/InstallWizardControl.cs	2011-04-18 09:16:30 +0000
+++ b/WexInstaller/Controls/InstallWizardControl.cs	2011-05-23 15:01:40 +0000
@@ -41,7 +41,7 @@
       ShowTab(requirementsTab, false, 4);
 
       // disable setup type tab if we are updating instead of installing
-      if (!ProductManager.IsNewSetup())
+      if (!ProductManager.IsNewSetup)
       {
         ShowType(false);
         ProductManager.CurrentSetupType = "Add/Modify";

=== modified file 'WexInstaller/Controls/RemoveControl.Designer.cs'
--- a/WexInstaller/Controls/RemoveControl.Designer.cs	2011-04-18 08:06:38 +0000
+++ b/WexInstaller/Controls/RemoveControl.Designer.cs	2011-05-23 15:01:40 +0000
@@ -29,33 +29,80 @@
         private void InitializeComponent()
         {
           System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RemoveControl));
-          this.sideBarControl1 = new WexInstaller.SideBarControl();
+          this.Back = new System.Windows.Forms.Button();
+          this.Cancel = new System.Windows.Forms.Button();
+          this.Help = new System.Windows.Forms.Button();
+          this.Next = new System.Windows.Forms.Button();
           this.wizardPages = new WexInstaller.HiddenTabsControl();
           this.removeProgressTab = new System.Windows.Forms.TabPage();
           this.removeProgressPanel = new WexInstaller.RemoveProgress();
           this.removeFinalTab = new System.Windows.Forms.TabPage();
           this.removeFinalPanel = new WexInstaller.RemoveComplete();
-          this.Back = new System.Windows.Forms.Button();
-          this.Cancel = new System.Windows.Forms.Button();
-          this.Help = new System.Windows.Forms.Button();
-          this.Next = new System.Windows.Forms.Button();
+          this.sideBarControl1 = new WexInstaller.SideBarControl();
           this.wizardPages.SuspendLayout();
           this.removeProgressTab.SuspendLayout();
           this.removeFinalTab.SuspendLayout();
           this.SuspendLayout();
           // 
-          // sideBarControl1
-          // 
-          this.sideBarControl1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("sideBarControl1.BackgroundImage")));
-          this.sideBarControl1.Dock = System.Windows.Forms.DockStyle.Left;
-          this.sideBarControl1.Font = new System.Drawing.Font("Tahoma", 8.25F);
-          this.sideBarControl1.Location = new System.Drawing.Point(0, 0);
-          this.sideBarControl1.Name = "sideBarControl1";
-          this.sideBarControl1.Size = new System.Drawing.Size(220, 562);
-          this.sideBarControl1.TabIndex = 9;
+          // Back
+          // 
+          this.Back.AccessibleDescription = "Back to the previous page.";
+          this.Back.BackColor = System.Drawing.SystemColors.Control;
+          this.Back.Enabled = false;
+          this.Back.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+          this.Back.Location = new System.Drawing.Point(402, 520);
+          this.Back.Name = "Back";
+          this.Back.Size = new System.Drawing.Size(86, 26);
+          this.Back.TabIndex = 1;
+          this.Back.Text = global::WexInstaller.Properties.Resources.BackButtonDefaultText;
+          this.Back.UseVisualStyleBackColor = false;
+          this.Back.Click += new System.EventHandler(this.Back_Click);
+          // 
+          // Cancel
+          // 
+          this.Cancel.AccessibleDescription = "Cancel quit the installer.";
+          this.Cancel.BackColor = System.Drawing.SystemColors.Control;
+          this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+          this.Cancel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+          this.Cancel.Location = new System.Drawing.Point(586, 520);
+          this.Cancel.Name = "Cancel";
+          this.Cancel.Size = new System.Drawing.Size(86, 26);
+          this.Cancel.TabIndex = 3;
+          this.Cancel.Text = global::WexInstaller.Properties.Resources.CancelButtonDefaultText;
+          this.Cancel.UseVisualStyleBackColor = false;
+          this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
+          // 
+          // Help
+          // 
+          this.Help.AccessibleDescription = "Help for the current wizard.";
+          this.Help.BackColor = System.Drawing.SystemColors.Control;
+          this.Help.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+          this.Help.Location = new System.Drawing.Point(678, 520);
+          this.Help.Name = "Help";
+          this.Help.Size = new System.Drawing.Size(86, 26);
+          this.Help.TabIndex = 4;
+          this.Help.Text = "&Help";
+          this.Help.UseVisualStyleBackColor = false;
+          this.Help.Click += new System.EventHandler(this.Help_Click);
+          // 
+          // Next
+          // 
+          this.Next.AccessibleDescription = "Advance to the next page.";
+          this.Next.BackColor = System.Drawing.SystemColors.Control;
+          this.Next.Enabled = false;
+          this.Next.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+          this.Next.Location = new System.Drawing.Point(494, 520);
+          this.Next.Name = "Next";
+          this.Next.Size = new System.Drawing.Size(86, 26);
+          this.Next.TabIndex = 2;
+          this.Next.Text = global::WexInstaller.Properties.Resources.NextButtonDefaultText;
+          this.Next.UseVisualStyleBackColor = false;
+          this.Next.Click += new System.EventHandler(this.Next_Click);
           // 
           // wizardPages
           // 
+          this.wizardPages.AccessibleDescription = "Wizard to guide you through the removal process for MySQL products.";
+          this.wizardPages.AccessibleName = "RemovalWizard";
           this.wizardPages.Controls.Add(this.removeProgressTab);
           this.wizardPages.Controls.Add(this.removeFinalTab);
           this.wizardPages.Location = new System.Drawing.Point(220, 0);
@@ -64,6 +111,7 @@
           this.wizardPages.SelectedIndex = 1;
           this.wizardPages.Size = new System.Drawing.Size(564, 505);
           this.wizardPages.TabIndex = 30;
+          this.wizardPages.TabStop = false;
           this.wizardPages.SelectedIndexChanged += new System.EventHandler(this.wizardPages_SelectedIndexChanged);
           this.wizardPages.Deselected += new System.Windows.Forms.TabControlEventHandler(this.wizardPages_Deselected);
           // 
@@ -87,7 +135,8 @@
           this.removeProgressPanel.Location = new System.Drawing.Point(3, 3);
           this.removeProgressPanel.Name = "removeProgressPanel";
           this.removeProgressPanel.Size = new System.Drawing.Size(550, 473);
-          this.removeProgressPanel.TabIndex = 7;
+          this.removeProgressPanel.TabIndex = 0;
+          this.removeProgressPanel.TabStop = false;
           // 
           // removeFinalTab
           // 
@@ -110,57 +159,18 @@
           this.removeFinalPanel.Name = "removeFinalPanel";
           this.removeFinalPanel.Size = new System.Drawing.Size(550, 473);
           this.removeFinalPanel.TabIndex = 8;
-          // 
-          // Back
-          // 
-          this.Back.BackColor = System.Drawing.SystemColors.Control;
-          this.Back.Enabled = false;
-          this.Back.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-          this.Back.Location = new System.Drawing.Point(402, 520);
-          this.Back.Name = "Back";
-          this.Back.Size = new System.Drawing.Size(86, 26);
-          this.Back.TabIndex = 28;
-          this.Back.Text = global::WexInstaller.Properties.Resources.BackButtonDefaultText;
-          this.Back.UseVisualStyleBackColor = false;
-          this.Back.Click += new System.EventHandler(this.Back_Click);
-          // 
-          // Cancel
-          // 
-          this.Cancel.BackColor = System.Drawing.SystemColors.Control;
-          this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-          this.Cancel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-          this.Cancel.Location = new System.Drawing.Point(586, 520);
-          this.Cancel.Name = "Cancel";
-          this.Cancel.Size = new System.Drawing.Size(86, 26);
-          this.Cancel.TabIndex = 27;
-          this.Cancel.Text = global::WexInstaller.Properties.Resources.CancelButtonDefaultText;
-          this.Cancel.UseVisualStyleBackColor = false;
-          this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
-          // 
-          // Help
-          // 
-          this.Help.BackColor = System.Drawing.SystemColors.Control;
-          this.Help.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-          this.Help.Location = new System.Drawing.Point(678, 520);
-          this.Help.Name = "Help";
-          this.Help.Size = new System.Drawing.Size(86, 26);
-          this.Help.TabIndex = 26;
-          this.Help.Text = "&Help";
-          this.Help.UseVisualStyleBackColor = false;
-          this.Help.Click += new System.EventHandler(this.Help_Click);
-          // 
-          // Next
-          // 
-          this.Next.BackColor = System.Drawing.SystemColors.Control;
-          this.Next.Enabled = false;
-          this.Next.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-          this.Next.Location = new System.Drawing.Point(494, 520);
-          this.Next.Name = "Next";
-          this.Next.Size = new System.Drawing.Size(86, 26);
-          this.Next.TabIndex = 31;
-          this.Next.Text = global::WexInstaller.Properties.Resources.NextButtonDefaultText;
-          this.Next.UseVisualStyleBackColor = false;
-          this.Next.Click += new System.EventHandler(this.Next_Click);
+          this.removeFinalPanel.TabStop = false;
+          // 
+          // sideBarControl1
+          // 
+          this.sideBarControl1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("sideBarControl1.BackgroundImage")));
+          this.sideBarControl1.Dock = System.Windows.Forms.DockStyle.Left;
+          this.sideBarControl1.Font = new System.Drawing.Font("Tahoma", 8.25F);
+          this.sideBarControl1.Location = new System.Drawing.Point(0, 0);
+          this.sideBarControl1.Name = "sideBarControl1";
+          this.sideBarControl1.Size = new System.Drawing.Size(220, 562);
+          this.sideBarControl1.TabIndex = 9;
+          this.sideBarControl1.TabStop = false;
           // 
           // RemoveControl
           // 

=== modified file 'WexInstaller/Controls/RemoveControl.cs'
--- a/WexInstaller/Controls/RemoveControl.cs	2011-04-18 08:06:38 +0000
+++ b/WexInstaller/Controls/RemoveControl.cs	2011-05-23 15:01:40 +0000
@@ -99,5 +99,6 @@
         Utilities.ScaleControlFont(this);
       }
     }
+
   }
 }

=== modified file 'WexInstaller/Controls/RemoveControl.resx'
--- a/WexInstaller/Controls/RemoveControl.resx	2011-04-18 08:06:38 +0000
+++ b/WexInstaller/Controls/RemoveControl.resx	2011-05-23 15:01:40 +0000
@@ -121,8 +121,8 @@
   <data name="sideBarControl1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAANsAAAIyCAYAAABCV78jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9wAA
-        CvcBEOiS5wAAnydJREFUeF7t3eW/NLfRPni/331ijJmZmZmZncRxGBwmhxOHmRwzMzNTDGEG2+HYMd5O
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA
+        CvYBwq9wAwAAnydJREFUeF7t3eW/NLfRPni/331ijJmZmZmZncRxGBwmhxOHmRwzMzNTDGEG2+HYMd5O
         HIbnt7t/QO9VaqlHUpekkhpm5tznRX1mzswc8O3+zlWq7ule5uW//P8qaZ2I16p6TF4vw2uT9SheE6iX
         4vGsegSvb+r/xX15vQSvbdUv8Fgf9XP8nFb9P3hMWD/D61AndKmf4vs71kvw/ap+UlL/B98XqB/j8dL6
         Eb43UCfg8aZ+iPtO/S++/t/qeLt+gK91HYdbu47F18d+361j8LWq79V1tFdHffd/K11LlpFAywVGGKPA

=== modified file 'WexInstaller/Controls/WelcomeControl.Designer.cs'
--- a/WexInstaller/Controls/WelcomeControl.Designer.cs	2011-04-18 08:06:38 +0000
+++ b/WexInstaller/Controls/WelcomeControl.Designer.cs	2011-05-23 15:01:40 +0000
@@ -28,143 +28,131 @@
         /// </summary>
         private void InitializeComponent()
         {
-          this.installActionIcon = new System.Windows.Forms.PictureBox();
-          this.aboutActionIcon = new System.Windows.Forms.PictureBox();
-          this.resourcesActionIcon = new System.Windows.Forms.PictureBox();
-          this.installActionLink = new System.Windows.Forms.LinkLabel();
-          this.aboutActionLink = new System.Windows.Forms.LinkLabel();
-          this.resourcesActionLink = new System.Windows.Forms.LinkLabel();
-          this.installActionLabel = new System.Windows.Forms.Label();
-          this.aboutActionLabel = new System.Windows.Forms.Label();
-          this.resourcesActionLabel = new System.Windows.Forms.Label();
+          this.topActionIcon = new System.Windows.Forms.PictureBox();
+          this.middleActionIcon = new System.Windows.Forms.PictureBox();
+          this.bottomActionIcon = new System.Windows.Forms.PictureBox();
+          this.topActionLink = new System.Windows.Forms.LinkLabel();
+          this.middleActionLink = new System.Windows.Forms.LinkLabel();
+          this.bottomActionLink = new System.Windows.Forms.LinkLabel();
+          this.topDescriptionLabel = new System.Windows.Forms.Label();
+          this.middleDescriptionLabel = new System.Windows.Forms.Label();
+          this.bottomDescriptionLabel = new System.Windows.Forms.Label();
           this.label4 = new System.Windows.Forms.Label();
           this.label5 = new System.Windows.Forms.Label();
-          this.modifyActionIcon = new System.Windows.Forms.PictureBox();
-          this.modifyActionLink = new System.Windows.Forms.LinkLabel();
-          this.modifyActionLabel = new System.Windows.Forms.Label();
-          this.updateActionIcon = new System.Windows.Forms.PictureBox();
-          this.updateActionLink = new System.Windows.Forms.LinkLabel();
-          this.updateActionLabel = new System.Windows.Forms.Label();
-          this.removeActionIcon = new System.Windows.Forms.PictureBox();
-          this.removeActionLink = new System.Windows.Forms.LinkLabel();
-          this.removeActionLabel = new System.Windows.Forms.Label();
           this.copyrightLabel1 = new System.Windows.Forms.Label();
-          this.copyrightLabel3 = new System.Windows.Forms.Label();
+          this.copyrightLabel2 = new System.Windows.Forms.Label();
           this.titleImage = new System.Windows.Forms.PictureBox();
-          ((System.ComponentModel.ISupportInitialize)(this.installActionIcon)).BeginInit();
-          ((System.ComponentModel.ISupportInitialize)(this.aboutActionIcon)).BeginInit();
-          ((System.ComponentModel.ISupportInitialize)(this.resourcesActionIcon)).BeginInit();
-          ((System.ComponentModel.ISupportInitialize)(this.modifyActionIcon)).BeginInit();
-          ((System.ComponentModel.ISupportInitialize)(this.updateActionIcon)).BeginInit();
-          ((System.ComponentModel.ISupportInitialize)(this.removeActionIcon)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.topActionIcon)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.middleActionIcon)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.bottomActionIcon)).BeginInit();
           ((System.ComponentModel.ISupportInitialize)(this.titleImage)).BeginInit();
           this.SuspendLayout();
           // 
-          // installActionIcon
-          // 
-          this.installActionIcon.BackColor = System.Drawing.Color.Transparent;
-          this.installActionIcon.Image = global::WexInstaller.Properties.Resources.ActionItemInstall;
-          this.installActionIcon.Location = new System.Drawing.Point(186, 232);
-          this.installActionIcon.Name = "installActionIcon";
-          this.installActionIcon.Size = new System.Drawing.Size(49, 51);
-          this.installActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-          this.installActionIcon.TabIndex = 1;
-          this.installActionIcon.TabStop = false;
-          // 
-          // aboutActionIcon
-          // 
-          this.aboutActionIcon.BackColor = System.Drawing.Color.Transparent;
-          this.aboutActionIcon.Image = global::WexInstaller.Properties.Resources.ActionItemAbout;
-          this.aboutActionIcon.Location = new System.Drawing.Point(186, 319);
-          this.aboutActionIcon.Name = "aboutActionIcon";
-          this.aboutActionIcon.Size = new System.Drawing.Size(42, 59);
-          this.aboutActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-          this.aboutActionIcon.TabIndex = 3;
-          this.aboutActionIcon.TabStop = false;
-          // 
-          // resourcesActionIcon
-          // 
-          this.resourcesActionIcon.BackColor = System.Drawing.Color.Transparent;
-          this.resourcesActionIcon.Image = global::WexInstaller.Properties.Resources.ActionItemResources;
-          this.resourcesActionIcon.Location = new System.Drawing.Point(186, 405);
-          this.resourcesActionIcon.Name = "resourcesActionIcon";
-          this.resourcesActionIcon.Size = new System.Drawing.Size(48, 44);
-          this.resourcesActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-          this.resourcesActionIcon.TabIndex = 4;
-          this.resourcesActionIcon.TabStop = false;
-          // 
-          // installActionLink
-          // 
-          this.installActionLink.ActiveLinkColor = System.Drawing.Color.Black;
-          this.installActionLink.AutoSize = true;
-          this.installActionLink.BackColor = System.Drawing.Color.Transparent;
-          this.installActionLink.LinkColor = System.Drawing.Color.Black;
-          this.installActionLink.Location = new System.Drawing.Point(251, 232);
-          this.installActionLink.Name = "installActionLink";
-          this.installActionLink.Size = new System.Drawing.Size(131, 14);
-          this.installActionLink.TabIndex = 0;
-          this.installActionLink.TabStop = true;
-          this.installActionLink.Text = "Install MySQL Products";
-          this.installActionLink.VisitedLinkColor = System.Drawing.Color.Black;
-          this.installActionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.installActionLink_LinkClicked);
-          // 
-          // aboutActionLink
-          // 
-          this.aboutActionLink.ActiveLinkColor = System.Drawing.Color.Black;
-          this.aboutActionLink.AutoSize = true;
-          this.aboutActionLink.BackColor = System.Drawing.Color.Transparent;
-          this.aboutActionLink.LinkColor = System.Drawing.Color.Black;
-          this.aboutActionLink.Location = new System.Drawing.Point(251, 318);
-          this.aboutActionLink.Name = "aboutActionLink";
-          this.aboutActionLink.Size = new System.Drawing.Size(82, 14);
-          this.aboutActionLink.TabIndex = 1;
-          this.aboutActionLink.TabStop = true;
-          this.aboutActionLink.Text = "About MySQL";
-          this.aboutActionLink.VisitedLinkColor = System.Drawing.Color.Black;
-          this.aboutActionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.aboutActionLink_LinkClicked);
-          // 
-          // resourcesActionLink
-          // 
-          this.resourcesActionLink.ActiveLinkColor = System.Drawing.Color.Black;
-          this.resourcesActionLink.AutoSize = true;
-          this.resourcesActionLink.BackColor = System.Drawing.Color.Transparent;
-          this.resourcesActionLink.LinkColor = System.Drawing.Color.Black;
-          this.resourcesActionLink.Location = new System.Drawing.Point(251, 404);
-          this.resourcesActionLink.Name = "resourcesActionLink";
-          this.resourcesActionLink.Size = new System.Drawing.Size(62, 14);
-          this.resourcesActionLink.TabIndex = 2;
-          this.resourcesActionLink.TabStop = true;
-          this.resourcesActionLink.Text = "Resources";
-          this.resourcesActionLink.VisitedLinkColor = System.Drawing.Color.Black;
-          this.resourcesActionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.resourcesActionLink_LinkClicked);
-          // 
-          // installActionLabel
-          // 
-          this.installActionLabel.BackColor = System.Drawing.Color.Transparent;
-          this.installActionLabel.Location = new System.Drawing.Point(252, 249);
-          this.installActionLabel.Name = "installActionLabel";
-          this.installActionLabel.Size = new System.Drawing.Size(310, 30);
-          this.installActionLabel.TabIndex = 8;
-          this.installActionLabel.Text = "Guide you through the installation and configuration of your MySQL products.";
-          // 
-          // aboutActionLabel
-          // 
-          this.aboutActionLabel.BackColor = System.Drawing.Color.Transparent;
-          this.aboutActionLabel.Location = new System.Drawing.Point(251, 335);
-          this.aboutActionLabel.Name = "aboutActionLabel";
-          this.aboutActionLabel.Size = new System.Drawing.Size(310, 30);
-          this.aboutActionLabel.TabIndex = 9;
-          this.aboutActionLabel.Text = "Learn more about MySQL products and better understand how you can benefit the mos" +
+          // topActionIcon
+          // 
+          this.topActionIcon.BackColor = System.Drawing.Color.Transparent;
+          this.topActionIcon.Image = global::WexInstaller.Properties.Resources.ActionItemInstall;
+          this.topActionIcon.Location = new System.Drawing.Point(186, 232);
+          this.topActionIcon.Name = "topActionIcon";
+          this.topActionIcon.Size = new System.Drawing.Size(49, 51);
+          this.topActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+          this.topActionIcon.TabIndex = 1;
+          this.topActionIcon.TabStop = false;
+          // 
+          // middleActionIcon
+          // 
+          this.middleActionIcon.BackColor = System.Drawing.Color.Transparent;
+          this.middleActionIcon.Image = global::WexInstaller.Properties.Resources.ActionItemAbout;
+          this.middleActionIcon.Location = new System.Drawing.Point(186, 319);
+          this.middleActionIcon.Name = "middleActionIcon";
+          this.middleActionIcon.Size = new System.Drawing.Size(42, 59);
+          this.middleActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+          this.middleActionIcon.TabIndex = 3;
+          this.middleActionIcon.TabStop = false;
+          // 
+          // bottomActionIcon
+          // 
+          this.bottomActionIcon.BackColor = System.Drawing.Color.Transparent;
+          this.bottomActionIcon.Image = global::WexInstaller.Properties.Resources.ActionItemResources;
+          this.bottomActionIcon.Location = new System.Drawing.Point(186, 405);
+          this.bottomActionIcon.Name = "bottomActionIcon";
+          this.bottomActionIcon.Size = new System.Drawing.Size(48, 44);
+          this.bottomActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+          this.bottomActionIcon.TabIndex = 4;
+          this.bottomActionIcon.TabStop = false;
+          // 
+          // topActionLink
+          // 
+          this.topActionLink.ActiveLinkColor = System.Drawing.Color.Black;
+          this.topActionLink.AutoSize = true;
+          this.topActionLink.BackColor = System.Drawing.Color.Transparent;
+          this.topActionLink.LinkColor = System.Drawing.Color.Black;
+          this.topActionLink.Location = new System.Drawing.Point(251, 232);
+          this.topActionLink.Name = "topActionLink";
+          this.topActionLink.Size = new System.Drawing.Size(131, 14);
+          this.topActionLink.TabIndex = 0;
+          this.topActionLink.TabStop = true;
+          this.topActionLink.Text = "Install MySQL Products";
+          this.topActionLink.VisitedLinkColor = System.Drawing.Color.Black;
+          this.topActionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.topActionLinkClicked);
+          // 
+          // middleActionLink
+          // 
+          this.middleActionLink.ActiveLinkColor = System.Drawing.Color.Black;
+          this.middleActionLink.AutoSize = true;
+          this.middleActionLink.BackColor = System.Drawing.Color.Transparent;
+          this.middleActionLink.LinkColor = System.Drawing.Color.Black;
+          this.middleActionLink.Location = new System.Drawing.Point(251, 318);
+          this.middleActionLink.Name = "middleActionLink";
+          this.middleActionLink.Size = new System.Drawing.Size(82, 14);
+          this.middleActionLink.TabIndex = 1;
+          this.middleActionLink.TabStop = true;
+          this.middleActionLink.Text = "About MySQL";
+          this.middleActionLink.VisitedLinkColor = System.Drawing.Color.Black;
+          this.middleActionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.middleActionLinkClicked);
+          // 
+          // bottomActionLink
+          // 
+          this.bottomActionLink.ActiveLinkColor = System.Drawing.Color.Black;
+          this.bottomActionLink.AutoSize = true;
+          this.bottomActionLink.BackColor = System.Drawing.Color.Transparent;
+          this.bottomActionLink.LinkColor = System.Drawing.Color.Black;
+          this.bottomActionLink.Location = new System.Drawing.Point(251, 404);
+          this.bottomActionLink.Name = "bottomActionLink";
+          this.bottomActionLink.Size = new System.Drawing.Size(62, 14);
+          this.bottomActionLink.TabIndex = 2;
+          this.bottomActionLink.TabStop = true;
+          this.bottomActionLink.Text = "Resources";
+          this.bottomActionLink.VisitedLinkColor = System.Drawing.Color.Black;
+          this.bottomActionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.bottomActionLinkClicked);
+          // 
+          // topDescriptionLabel
+          // 
+          this.topDescriptionLabel.BackColor = System.Drawing.Color.Transparent;
+          this.topDescriptionLabel.Location = new System.Drawing.Point(252, 249);
+          this.topDescriptionLabel.Name = "topDescriptionLabel";
+          this.topDescriptionLabel.Size = new System.Drawing.Size(310, 41);
+          this.topDescriptionLabel.TabIndex = 8;
+          this.topDescriptionLabel.Text = "Guide you through the installation and configuration of your MySQL products.";
+          // 
+          // middleDescriptionLabel
+          // 
+          this.middleDescriptionLabel.BackColor = System.Drawing.Color.Transparent;
+          this.middleDescriptionLabel.Location = new System.Drawing.Point(251, 335);
+          this.middleDescriptionLabel.Name = "middleDescriptionLabel";
+          this.middleDescriptionLabel.Size = new System.Drawing.Size(310, 43);
+          this.middleDescriptionLabel.TabIndex = 9;
+          this.middleDescriptionLabel.Text = "Learn more about MySQL products and better understand how you can benefit the mos" +
               "t.";
           // 
-          // resourcesActionLabel
+          // bottomDescriptionLabel
           // 
-          this.resourcesActionLabel.BackColor = System.Drawing.Color.Transparent;
-          this.resourcesActionLabel.Location = new System.Drawing.Point(251, 421);
-          this.resourcesActionLabel.Name = "resourcesActionLabel";
-          this.resourcesActionLabel.Size = new System.Drawing.Size(310, 30);
-          this.resourcesActionLabel.TabIndex = 10;
-          this.resourcesActionLabel.Text = "Get more information on how to install MySQL and configure it to run efficiently " +
+          this.bottomDescriptionLabel.BackColor = System.Drawing.Color.Transparent;
+          this.bottomDescriptionLabel.Location = new System.Drawing.Point(251, 421);
+          this.bottomDescriptionLabel.Name = "bottomDescriptionLabel";
+          this.bottomDescriptionLabel.Size = new System.Drawing.Size(310, 45);
+          this.bottomDescriptionLabel.TabIndex = 10;
+          this.bottomDescriptionLabel.Text = "Get more information on how to install MySQL and configure it to run efficiently " +
               "on your machine.";
           // 
           // label4
@@ -189,131 +177,6 @@
           this.label5.TabIndex = 12;
           this.label5.Text = "Select one of the actions below:";
           // 
-          // modifyActionIcon
-          // 
-          this.modifyActionIcon.BackColor = System.Drawing.Color.Transparent;
-          this.modifyActionIcon.Enabled = false;
-          this.modifyActionIcon.Image = global::WexInstaller.Properties.Resources.ActionItemAddModify;
-          this.modifyActionIcon.Location = new System.Drawing.Point(186, 232);
-          this.modifyActionIcon.Name = "modifyActionIcon";
-          this.modifyActionIcon.Size = new System.Drawing.Size(46, 58);
-          this.modifyActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-          this.modifyActionIcon.TabIndex = 13;
-          this.modifyActionIcon.TabStop = false;
-          this.modifyActionIcon.Visible = false;
-          // 
-          // modifyActionLink
-          // 
-          this.modifyActionLink.ActiveLinkColor = System.Drawing.Color.Black;
-          this.modifyActionLink.AutoSize = true;
-          this.modifyActionLink.BackColor = System.Drawing.Color.Transparent;
-          this.modifyActionLink.Enabled = false;
-          this.modifyActionLink.LinkColor = System.Drawing.Color.Black;
-          this.modifyActionLink.Location = new System.Drawing.Point(251, 232);
-          this.modifyActionLink.Name = "modifyActionLink";
-          this.modifyActionLink.Size = new System.Drawing.Size(204, 14);
-          this.modifyActionLink.TabIndex = 0;
-          this.modifyActionLink.TabStop = true;
-          this.modifyActionLink.Text = "Add / Modify Products and Features";
-          this.modifyActionLink.Visible = false;
-          this.modifyActionLink.VisitedLinkColor = System.Drawing.Color.Black;
-          this.modifyActionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.modifyActionLink_LinkClicked);
-          // 
-          // modifyActionLabel
-          // 
-          this.modifyActionLabel.BackColor = System.Drawing.Color.Transparent;
-          this.modifyActionLabel.Enabled = false;
-          this.modifyActionLabel.Location = new System.Drawing.Point(252, 249);
-          this.modifyActionLabel.Name = "modifyActionLabel";
-          this.modifyActionLabel.Size = new System.Drawing.Size(310, 30);
-          this.modifyActionLabel.TabIndex = 15;
-          this.modifyActionLabel.Text = "Add additional MySQL products or make changes to the features of already installe" +
-              "d products.";
-          this.modifyActionLabel.Visible = false;
-          // 
-          // updateActionIcon
-          // 
-          this.updateActionIcon.BackColor = System.Drawing.Color.Transparent;
-          this.updateActionIcon.Enabled = false;
-          this.updateActionIcon.Image = global::WexInstaller.Properties.Resources.ActionItemCheckForUpdates;
-          this.updateActionIcon.Location = new System.Drawing.Point(186, 319);
-          this.updateActionIcon.Name = "updateActionIcon";
-          this.updateActionIcon.Size = new System.Drawing.Size(44, 63);
-          this.updateActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-          this.updateActionIcon.TabIndex = 2;
-          this.updateActionIcon.TabStop = false;
-          this.updateActionIcon.Visible = false;
-          // 
-          // updateActionLink
-          // 
-          this.updateActionLink.ActiveLinkColor = System.Drawing.Color.Black;
-          this.updateActionLink.AutoSize = true;
-          this.updateActionLink.BackColor = System.Drawing.Color.Transparent;
-          this.updateActionLink.Enabled = false;
-          this.updateActionLink.LinkColor = System.Drawing.Color.Black;
-          this.updateActionLink.Location = new System.Drawing.Point(251, 318);
-          this.updateActionLink.Name = "updateActionLink";
-          this.updateActionLink.Size = new System.Drawing.Size(108, 14);
-          this.updateActionLink.TabIndex = 1;
-          this.updateActionLink.TabStop = true;
-          this.updateActionLink.Text = "Check for Updates";
-          this.updateActionLink.Visible = false;
-          this.updateActionLink.VisitedLinkColor = System.Drawing.Color.Black;
-          this.updateActionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.updateActionLink_LinkClicked);
-          // 
-          // updateActionLabel
-          // 
-          this.updateActionLabel.BackColor = System.Drawing.Color.Transparent;
-          this.updateActionLabel.Enabled = false;
-          this.updateActionLabel.Location = new System.Drawing.Point(251, 335);
-          this.updateActionLabel.Name = "updateActionLabel";
-          this.updateActionLabel.Size = new System.Drawing.Size(310, 30);
-          this.updateActionLabel.TabIndex = 18;
-          this.updateActionLabel.Text = "Run this check to see if new maintenance release are available and to install the" +
-              "m.";
-          this.updateActionLabel.Visible = false;
-          // 
-          // removeActionIcon
-          // 
-          this.removeActionIcon.BackColor = System.Drawing.Color.Transparent;
-          this.removeActionIcon.Enabled = false;
-          this.removeActionIcon.Image = global::WexInstaller.Properties.Resources.ActionItemRemove;
-          this.removeActionIcon.Location = new System.Drawing.Point(186, 405);
-          this.removeActionIcon.Name = "removeActionIcon";
-          this.removeActionIcon.Size = new System.Drawing.Size(49, 48);
-          this.removeActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-          this.removeActionIcon.TabIndex = 19;
-          this.removeActionIcon.TabStop = false;
-          this.removeActionIcon.Visible = false;
-          // 
-          // removeActionLink
-          // 
-          this.removeActionLink.AutoSize = true;
-          this.removeActionLink.BackColor = System.Drawing.Color.Transparent;
-          this.removeActionLink.Enabled = false;
-          this.removeActionLink.LinkColor = System.Drawing.Color.Black;
-          this.removeActionLink.Location = new System.Drawing.Point(251, 404);
-          this.removeActionLink.Name = "removeActionLink";
-          this.removeActionLink.Size = new System.Drawing.Size(103, 14);
-          this.removeActionLink.TabIndex = 2;
-          this.removeActionLink.TabStop = true;
-          this.removeActionLink.Text = "Remove Products";
-          this.removeActionLink.Visible = false;
-          this.removeActionLink.VisitedLinkColor = System.Drawing.Color.Black;
-          this.removeActionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.removeActionLink_LinkClicked);
-          // 
-          // removeActionLabel
-          // 
-          this.removeActionLabel.BackColor = System.Drawing.Color.Transparent;
-          this.removeActionLabel.Enabled = false;
-          this.removeActionLabel.Location = new System.Drawing.Point(251, 421);
-          this.removeActionLabel.Name = "removeActionLabel";
-          this.removeActionLabel.Size = new System.Drawing.Size(310, 30);
-          this.removeActionLabel.TabIndex = 21;
-          this.removeActionLabel.Text = "Remove individual MySQL products from your machine. Also select this item to remo" +
-              "ve all MySQL products.";
-          this.removeActionLabel.Visible = false;
-          // 
           // copyrightLabel1
           // 
           this.copyrightLabel1.AutoSize = true;
@@ -328,19 +191,19 @@
               "registered trademark of";
           this.copyrightLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
           // 
-          // copyrightLabel3
+          // copyrightLabel2
           // 
-          this.copyrightLabel3.AutoSize = true;
-          this.copyrightLabel3.BackColor = System.Drawing.Color.Transparent;
-          this.copyrightLabel3.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-          this.copyrightLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(102)))), ((int)(((byte)(102)))));
-          this.copyrightLabel3.Location = new System.Drawing.Point(46, 531);
-          this.copyrightLabel3.Name = "copyrightLabel3";
-          this.copyrightLabel3.Size = new System.Drawing.Size(418, 11);
-          this.copyrightLabel3.TabIndex = 24;
-          this.copyrightLabel3.Text = "Oracle Corporation and/or its affiliates. Other names may be trademarks of their " +
+          this.copyrightLabel2.AutoSize = true;
+          this.copyrightLabel2.BackColor = System.Drawing.Color.Transparent;
+          this.copyrightLabel2.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+          this.copyrightLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(102)))), ((int)(((byte)(102)))));
+          this.copyrightLabel2.Location = new System.Drawing.Point(46, 531);
+          this.copyrightLabel2.Name = "copyrightLabel2";
+          this.copyrightLabel2.Size = new System.Drawing.Size(418, 11);
+          this.copyrightLabel2.TabIndex = 24;
+          this.copyrightLabel2.Text = "Oracle Corporation and/or its affiliates. Other names may be trademarks of their " +
               "respective owners.";
-          this.copyrightLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+          this.copyrightLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
           // 
           // titleImage
           // 
@@ -358,40 +221,28 @@
           this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
           this.BackgroundImage = global::WexInstaller.Properties.Resources.MySQLInstallerWelcomeBG;
           this.Controls.Add(this.titleImage);
-          this.Controls.Add(this.copyrightLabel3);
+          this.Controls.Add(this.copyrightLabel2);
           this.Controls.Add(this.copyrightLabel1);
           this.Controls.Add(this.label5);
           this.Controls.Add(this.label4);
-          this.Controls.Add(this.resourcesActionLabel);

-          this.Controls.Add(this.resourcesActionLink);
-          this.Controls.Add(this.aboutActionLink);
-          this.Controls.Add(this.installActionLink);
-          this.Controls.Add(this.modifyActionLink);
-          this.Controls.Add(this.updateActionLink);
-          this.Controls.Add(this.removeActionLabel);
-          this.Controls.Add(this.removeActionLink);
-          this.Controls.Add(this.aboutActionLabel);
-          this.Controls.Add(this.updateActionLabel);
-          this.Controls.Add(this.installActionLabel);
-          this.Controls.Add(this.modifyActionLabel);
-          this.Controls.Add(this.installActionIcon);
-          this.Controls.Add(this.modifyActionIcon);
-          this.Controls.Add(this.aboutActionIcon);
-          this.Controls.Add(this.updateActionIcon);
-          this.Controls.Add(this.resourcesActionIcon);
-          this.Controls.Add(this.removeActionIcon);
+          this.Controls.Add(this.bottomDescriptionLabel);
+          this.Controls.Add(this.bottomActionLink);
+          this.Controls.Add(this.middleActionLink);
+          this.Controls.Add(this.topActionLink);
+          this.Controls.Add(this.middleDescriptionLabel);
+          this.Controls.Add(this.topDescriptionLabel);
+          this.Controls.Add(this.topActionIcon);
+          this.Controls.Add(this.middleActionIcon);
+          this.Controls.Add(this.bottomActionIcon);
           this.DoubleBuffered = true;
           this.Font = new System.Drawing.Font("Tahoma", 8.75F);
           this.Margin = new System.Windows.Forms.Padding(0);
           this.Name = "WelcomeControl";
           this.Size = new System.Drawing.Size(784, 562);
           this.Load += new System.EventHandler(this.WelcomeControl_Load);
-          ((System.ComponentModel.ISupportInitialize)(this.installActionIcon)).EndInit();
-          ((System.ComponentModel.ISupportInitialize)(this.aboutActionIcon)).EndInit();
-          ((System.ComponentModel.ISupportInitialize)(this.resourcesActionIcon)).EndInit();
-          ((System.ComponentModel.ISupportInitialize)(this.modifyActionIcon)).EndInit();
-          ((System.ComponentModel.ISupportInitialize)(this.updateActionIcon)).EndInit();
-          ((System.ComponentModel.ISupportInitialize)(this.removeActionIcon)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.topActionIcon)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.middleActionIcon)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.bottomActionIcon)).EndInit();
           ((System.ComponentModel.ISupportInitialize)(this.titleImage)).EndInit();
           this.ResumeLayout(false);
           this.PerformLayout();
@@ -400,28 +251,19 @@
 
         #endregion
 
-        private System.Windows.Forms.PictureBox installActionIcon;
-        private System.Windows.Forms.PictureBox aboutActionIcon;
-        private System.Windows.Forms.PictureBox resourcesActionIcon;
-        private System.Windows.Forms.LinkLabel installActionLink;
-        private System.Windows.Forms.LinkLabel aboutActionLink;
-        private System.Windows.Forms.LinkLabel resourcesActionLink;
-        private System.Windows.Forms.Label installActionLabel;
-        private System.Windows.Forms.Label aboutActionLabel;
-        private System.Windows.Forms.Label resourcesActionLabel;
+        private System.Windows.Forms.PictureBox topActionIcon;
+        private System.Windows.Forms.PictureBox middleActionIcon;
+        private System.Windows.Forms.PictureBox bottomActionIcon;
+        private System.Windows.Forms.LinkLabel topActionLink;
+        private System.Windows.Forms.LinkLabel middleActionLink;
+        private System.Windows.Forms.LinkLabel bottomActionLink;
+        private System.Windows.Forms.Label topDescriptionLabel;
+        private System.Windows.Forms.Label middleDescriptionLabel;
+        private System.Windows.Forms.Label bottomDescriptionLabel;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.PictureBox modifyActionIcon;
-        private System.Windows.Forms.LinkLabel modifyActionLink;
-        private System.Windows.Forms.Label modifyActionLabel;
-        private System.Windows.Forms.PictureBox updateActionIcon;
-        private System.Windows.Forms.LinkLabel updateActionLink;
-        private System.Windows.Forms.Label updateActionLabel;
-        private System.Windows.Forms.PictureBox removeActionIcon;
-        private System.Windows.Forms.LinkLabel removeActionLink;
-        private System.Windows.Forms.Label removeActionLabel;
         private System.Windows.Forms.Label copyrightLabel1;
-        private System.Windows.Forms.Label copyrightLabel3;
+        private System.Windows.Forms.Label copyrightLabel2;
         private System.Windows.Forms.PictureBox titleImage;
 
     }

=== modified file 'WexInstaller/Controls/WelcomeControl.cs'
--- a/WexInstaller/Controls/WelcomeControl.cs	2011-04-18 08:06:38 +0000
+++ b/WexInstaller/Controls/WelcomeControl.cs	2011-05-23 15:01:40 +0000
@@ -11,103 +11,47 @@
     {
       InitializeComponent();
 
-      if (!ProductManager.IsNewSetup())
+      if (!ProductManager.IsNewSetup)
       {
         // Maintenance mode.
         titleImage.Image = Resources.Maintenance;
 
-        modifyActionIcon.Visible = true;
-        modifyActionIcon.Enabled = true;
-
-        installActionIcon.Visible = false;
-        installActionIcon.SendToBack();
-
-        modifyActionLink.Visible = true;
-        modifyActionLink.Enabled = true;
-        modifyActionLink.TabStop = true;
-
-        installActionLink.Visible = false;
-        installActionLink.TabStop = false;
-        installActionLink.SendToBack();
-
-        modifyActionLabel.Visible = true;
-        modifyActionLabel.Enabled = true;
-
-        installActionLabel.Visible = false;
-        installActionLabel.SendToBack();
-
-
-        updateActionIcon.Visible = true;
-        updateActionIcon.Enabled = true;
-
-        aboutActionIcon.Visible = false;
-        aboutActionIcon.SendToBack();
-
-        updateActionLink.Visible = true;
-        updateActionLink.Enabled = true;
-        updateActionLink.TabStop = true;
-
-        aboutActionLink.Visible = false;
-        aboutActionLink.TabStop = false;
-        aboutActionLink.SendToBack();
-
-        updateActionLabel.Visible = true;
-        updateActionLabel.Enabled = true;
-
-        aboutActionLabel.Visible = false;
-        aboutActionLabel.SendToBack();
-
-
-        removeActionIcon.Visible = true;
-        removeActionIcon.Enabled = true;
-
-        resourcesActionIcon.Visible = false;
-        resourcesActionIcon.SendToBack();
-
-        removeActionLink.Visible = true;
-        removeActionLink.Enabled = true;
-        removeActionLink.TabStop = true;
-
-        resourcesActionLink.Visible = false;
-        removeActionLink.TabStop = false;
-        resourcesActionLink.SendToBack();
-
-        removeActionLabel.Visible = true;
-        removeActionLabel.Enabled = true;
-
-        resourcesActionLabel.Visible = false;
-        resourcesActionLabel.SendToBack();
+        topActionIcon.Image = Resources.ActionItemAddModify;
+        topActionLink.Text = Resources.WelcomePageModifyLinkText;
+        topDescriptionLabel.Text = Resources.WelcomePageModifyDescriptionText;
+
+        middleActionIcon.Image = Resources.ActionItemCheckForUpdates;
+        middleActionLink.Text = Resources.WelcomePageUpdateCheckLinkText;
+        middleDescriptionLabel.Text = Resources.WelcomePageUpdateCheckDescriptionText;
+
+        bottomActionIcon.Image = Resources.ActionItemRemove;
+        bottomActionLink.Text = Resources.WelcomePageModifyLinkText;
+        bottomDescriptionLabel.Text = Resources.WelcomePageRemoveDescriptionText;
       }
     }
 
-    private void installActionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-    {
-      (ParentForm as MainForm).DoInstall();
-    }
-
-    private void aboutActionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-    {
-      (ParentForm as MainForm).ShowAbout();
-    }
-
-    private void modifyActionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-    {
-      (ParentForm as MainForm).DoModify();
-    }
-
-    private void updateActionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-    {
-      (ParentForm as MainForm).DoUpdate();
-    }
-
-    private void resourcesActionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-    {
-      (ParentForm as MainForm).ShowResources();
-    }
-
-    private void removeActionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-    {
-      (ParentForm as MainForm).RemoveAll();
+    private void topActionLinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+    {
+      if (ProductManager.IsNewSetup)
+        (ParentForm as MainForm).DoInstall();
+      else
+        (Parent as MainForm).DoModify();
+    }
+
+    private void middleActionLinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+    {
+      if (ProductManager.IsNewSetup)
+        (ParentForm as MainForm).ShowAbout();
+      else
+        (ParentForm as MainForm).DoUpdate();
+    }
+
+    private void bottomActionLinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+    {
+      if (ProductManager.IsNewSetup)
+        (ParentForm as MainForm).ShowResources();
+      else
+        (ParentForm as MainForm).RemoveAll();
     }
 
     private void WelcomeControl_Load(object sender, System.EventArgs e)

=== modified file 'WexInstaller/HiddenTabsControl.Designer.cs'
--- a/WexInstaller/HiddenTabsControl.Designer.cs	2010-03-05 23:26:32 +0000
+++ b/WexInstaller/HiddenTabsControl.Designer.cs	2011-05-23 15:01:40 +0000
@@ -28,7 +28,13 @@
         /// </summary>
         private void InitializeComponent()
         {
-            components = new System.ComponentModel.Container();
+          this.SuspendLayout();
+          // 
+          // HiddenTabsControl
+          // 
+          this.TabStop = false;
+          this.ResumeLayout(false);
+
         }
 
         #endregion

=== modified file 'WexInstaller/HiddenTabsControl.cs'
--- a/WexInstaller/HiddenTabsControl.cs	2011-02-07 21:39:59 +0000
+++ b/WexInstaller/HiddenTabsControl.cs	2011-05-23 15:01:40 +0000
@@ -1,35 +1,28 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace WexInstaller
 {
-    public partial class HiddenTabsControl : TabControl
-    {
-        public HiddenTabsControl()
-        {
-            InitializeComponent();
-        }
-
-        protected override void WndProc(ref Message m)
-        {
-            // Hide tabs by trapping the TCM_ADJUSTRECT message
-            if (m.Msg == 0x1328 && !DesignMode)
-            {
-                m.Result = (IntPtr)1;
-            }
-            else
-            {
-                base.WndProc(ref m);
-            }
-        }
-
-        protected override void OnKeyDown(KeyEventArgs ke)
-        {
-            // Completely disable arrow key functionality for the tab control.
-        }
-    }
+  public partial class HiddenTabsControl : TabControl
+  {
+    public HiddenTabsControl()
+    {
+      InitializeComponent();
+    }
+
+    protected override void WndProc(ref Message m)
+    {
+      // Hide tabs by trapping the TCM_ADJUSTRECT message
+      if (m.Msg == 0x1328 && !DesignMode)
+        m.Result = (IntPtr)1;
+      else
+        base.WndProc(ref m);
+    }
+
+    protected override void OnKeyDown(KeyEventArgs ke)
+    {
+      // Completely disable arrow key functionality for the tab control.
+      ke.Handled = true;
+    }
+  }
 }

=== modified file 'WexInstaller/MainForm.cs'
--- a/WexInstaller/MainForm.cs	2011-05-17 09:27:10 +0000
+++ b/WexInstaller/MainForm.cs	2011-05-23 15:01:40 +0000
@@ -8,14 +8,30 @@
 {
   public partial class MainForm : Form
   {
-    private UserControl last;
-    private UserControl current;
+    private UserControl last = null;
+
+    private UserControl currentPage = null;
+    private UserControl Current
+    {
+      get { return currentPage; }
+      set
+      {
+        if (currentPage != value)
+        {
+          Controls.Clear();
+          currentPage = value;
+          Controls.Add(currentPage);
+          currentPage.Dock = DockStyle.Fill;
+          currentPage.Focus();
+        }
+      }
+    }
 
     public MainForm()
     {
       InitializeComponent();
 
-      current = welcomeControl;
+      Current = welcomeControl;
       if (InstallerConfiguration.IsDefault)
       {
         // Set the form to a good default position. We have to compute that manually though
@@ -33,7 +49,7 @@
       Logger.LogTrace("MainForm.DoInstall() called.");
 
       last = welcomeControl;
-      current = installWizardControl;
+      Current = installWizardControl;
       installWizardControl.ShowWizard();
     }
 
@@ -91,7 +107,7 @@
       }
 
       last = welcomeControl;
-      current = removeWizardControl;
+      Current = removeWizardControl;
       removeWizardControl.ShowWizard();
     }
 
@@ -99,24 +115,21 @@
     {
       if (last != null)
       {
-        current = last;
+        Current = last;
         last = null;
-        current.BringToFront();
       }
     }
 
     public void ShowAbout()
     {
       last = welcomeControl;
-      current = aboutPage;
-      aboutPage.BringToFront();
+      Current = aboutPage;
     }
 
     public void ShowResources()
     {
       last = welcomeControl;
-      current = resourcesPage;
-      resourcesPage.BringToFront();
+      Current = resourcesPage;
     }
 
     /// <summary>
@@ -126,12 +139,12 @@
     /// <returns>True if we can shut down, false otherwise.</returns>
     public bool CanClose()
     {
-      bool result = (current == welcomeControl);
+      bool result = (Current == welcomeControl);
       if (!result)
-        if (current == installWizardControl)
+        if (Current == installWizardControl)
           result = installWizardControl.WorkDone;
         else
-          if (current == removeWizardControl)
+          if (Current == removeWizardControl)
             result = removeWizardControl.WorkDone;
 
       if (!result)
@@ -140,7 +153,7 @@
           Resources.ConfirmCancelAndQuit, Resources.ConfirmCancellationTitle,
           MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
         result = (answer == DialogResult.Yes);
-        if (result && current == installWizardControl)
+        if (result && Current == installWizardControl)
           result = installWizardControl.CancelActions();
       }
       return result;

=== modified file 'WexInstaller/Properties/Resources.Designer.cs'
--- a/WexInstaller/Properties/Resources.Designer.cs	2011-04-26 10:06:39 +0000
+++ b/WexInstaller/Properties/Resources.Designer.cs	2011-05-23 15:01:40 +0000
@@ -950,6 +950,87 @@
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to About MySQL.
+        /// </summary>
+        public static string WelcomePageAboutLinkText {
+            get {
+                return ResourceManager.GetString("WelcomePageAboutLinkText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Install MySQL Products.
+        /// </summary>
+        public static string WelcomePageInstallLinkText {
+            get {
+                return ResourceManager.GetString("WelcomePageInstallLinkText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add additional MySQL products or make changes to the features of already installed products..
+        /// </summary>
+        public static string WelcomePageModifyDescriptionText {
+            get {
+                return ResourceManager.GetString("WelcomePageModifyDescriptionText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add / Modify Products and Features.
+        /// </summary>
+        public static string WelcomePageModifyLinkText {
+            get {
+                return ResourceManager.GetString("WelcomePageModifyLinkText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove individual MySQL products from your machine. Also select this item to remove all MySQL products..
+        /// </summary>
+        public static string WelcomePageRemoveDescriptionText {
+            get {
+                return ResourceManager.GetString("WelcomePageRemoveDescriptionText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Get more information on how to install MySQL and configure it to run efficiently on your machine..
+        /// </summary>
+        public static string WelcomePageResourcesDescriptionText {
+            get {
+                return ResourceManager.GetString("WelcomePageResourcesDescriptionText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Resources.
+        /// </summary>
+        public static string WelcomePageResourcesLinkText {
+            get {
+                return ResourceManager.GetString("WelcomePageResourcesLinkText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Run this check to see if new maintenance release are available and to install them..
+        /// </summary>
+        public static string WelcomePageUpdateCheckDescriptionText {
+            get {
+                return ResourceManager.GetString("WelcomePageUpdateCheckDescriptionText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Check for Updates.
+        /// </summary>
+        public static string WelcomePageUpdateCheckLinkText {
+            get {
+                return ResourceManager.GetString("WelcomePageUpdateCheckLinkText", resourceCulture);
+            }
+        }
+        
         public static System.Drawing.Bitmap WelcomeRoundedButton {
             get {
                 object obj = ResourceManager.GetObject("WelcomeRoundedButton", resourceCulture);
@@ -971,6 +1052,24 @@
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Learn more about MySQL products and better understand how you can benefit the most..
+        /// </summary>
+        public static string WelcomPageAboutDescriptionText {
+            get {
+                return ResourceManager.GetString("WelcomPageAboutDescriptionText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove Products.
+        /// </summary>
+        public static string WelcomPageRemoveLinkText {
+            get {
+                return ResourceManager.GetString("WelcomPageRemoveLinkText", resourceCulture);
+            }
+        }
+        
         public static System.Drawing.Bitmap wex_product_catalog {
             get {
                 object obj = ResourceManager.GetObject("wex_product_catalog", resourceCulture);
@@ -984,5 +1083,14 @@
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Guide you through the installation and configuration of your MySQL products..
+        /// </summary>
+        public static string WlecomePageInstallDescriptionText {
+            get {
+                return ResourceManager.GetString("WlecomePageInstallDescriptionText", resourceCulture);
+            }
+        }
     }
 }

=== modified file 'WexInstaller/Properties/Resources.resx'
--- a/WexInstaller/Properties/Resources.resx	2011-04-26 10:06:39 +0000
+++ b/WexInstaller/Properties/Resources.resx	2011-05-23 15:01:40 +0000
@@ -459,8 +459,43 @@
 is already installed or is selected for installation that cannot be installed at the same time.
 Uninstall {0} in order to allow installing this product.</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="FeatureRemoveOverlay" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Remove.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="WelcomePageAboutLinkText" xml:space="preserve">
+    <value>About MySQL</value>
+  </data>
+  <data name="WelcomePageInstallLinkText" xml:space="preserve">
+    <value>Install MySQL Products</value>
+  </data>
+  <data name="WelcomePageModifyDescriptionText" xml:space="preserve">
+    <value>Add additional MySQL products or make changes to the features of already installed products.</value>
+  </data>
+  <data name="WelcomePageModifyLinkText" xml:space="preserve">
+    <value>Add / Modify Products and Features</value>
+  </data>
+  <data name="WelcomePageRemoveDescriptionText" xml:space="preserve">
+    <value>Remove individual MySQL products from your machine. Also select this item to remove all MySQL products.</value>
+  </data>
+  <data name="WelcomePageResourcesDescriptionText" xml:space="preserve">
+    <value>Get more information on how to install MySQL and configure it to run efficiently on your machine.</value>
+  </data>
+  <data name="WelcomePageResourcesLinkText" xml:space="preserve">
+    <value>Resources</value>
+  </data>
+  <data name="WelcomePageUpdateCheckDescriptionText" xml:space="preserve">
+    <value>Run this check to see if new maintenance release are available and to install them.</value>
+  </data>
+  <data name="WelcomePageUpdateCheckLinkText" xml:space="preserve">
+    <value>Check for Updates</value>
+  </data>
+  <data name="WelcomPageAboutDescriptionText" xml:space="preserve">
+    <value>Learn more about MySQL products and better understand how you can benefit the most.</value>
+  </data>
+  <data name="WelcomPageRemoveLinkText" xml:space="preserve">
+    <value>Remove Products</value>
+  </data>
+  <data name="WlecomePageInstallDescriptionText" xml:space="preserve">
+    <value>Guide you through the installation and configuration of your MySQL products.</value>
+  </data>
 </root>
\ No newline at end of file

=== modified file 'WexInstaller/RemovePanels/RemoveProgress.Designer.cs'
--- a/WexInstaller/RemovePanels/RemoveProgress.Designer.cs	2011-04-07 16:15:24 +0000
+++ b/WexInstaller/RemovePanels/RemoveProgress.Designer.cs	2011-05-23 15:01:40 +0000
@@ -33,11 +33,11 @@
           this.detailedLog = new System.Windows.Forms.TextBox();
           this.detailsPanel = new System.Windows.Forms.Panel();
           this.borderPanel = new System.Windows.Forms.Panel();
-          this.spacer = new System.Windows.Forms.Label();
           this.productList = new WexInstaller.Core.ListViewWex();
           this.blankHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
           this.productHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
           this.progressHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+          this.spacer = new System.Windows.Forms.Label();
           this.detailsPanel.SuspendLayout();
           this.borderPanel.SuspendLayout();
           this.SuspendLayout();
@@ -45,11 +45,13 @@
           // captionLabel
           // 
           this.captionLabel.Size = new System.Drawing.Size(139, 21);
+          this.captionLabel.TabIndex = 5;
           this.captionLabel.Text = "Remove Products";
           // 
           // subCaptionLabel
           // 
           this.subCaptionLabel.Size = new System.Drawing.Size(249, 14);
+          this.subCaptionLabel.TabIndex = 6;
           this.subCaptionLabel.Text = "The following products will be removed";
           // 
           // enableDetails
@@ -74,7 +76,7 @@
           this.detailedLog.Name = "detailedLog";
           this.detailedLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
           this.detailedLog.Size = new System.Drawing.Size(520, 166);
-          this.detailedLog.TabIndex = 17;
+          this.detailedLog.TabIndex = 2;
           this.detailedLog.Visible = false;
           // 
           // detailsPanel
@@ -101,16 +103,6 @@
           this.borderPanel.Size = new System.Drawing.Size(520, 179);
           this.borderPanel.TabIndex = 17;
           // 
-          // spacer
-          // 
-          this.spacer.BackColor = System.Drawing.Color.Transparent;
-          this.spacer.Dock = System.Windows.Forms.DockStyle.Bottom;
-          this.spacer.Location = new System.Drawing.Point(0, 179);
-          this.spacer.Name = "spacer";
-          this.spacer.Size = new System.Drawing.Size(520, 6);
-          this.spacer.TabIndex = 19;
-          this.spacer.Visible = false;
-          // 
           // productList
           // 
           this.productList.BorderStyle = System.Windows.Forms.BorderStyle.None;
@@ -132,10 +124,11 @@
           this.productList.ShowGroups = false;
           this.productList.ShowItemToolTips = true;
           this.productList.Size = new System.Drawing.Size(518, 177);
-          this.productList.TabIndex = 16;
+          this.productList.TabIndex = 0;
           this.productList.UseCompatibleStateImageBehavior = false;
           this.productList.View = System.Windows.Forms.View.Details;
           this.productList.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.productList_ColumnClick);
+          this.productList.ColumnWidthChanging += new System.Windows.Forms.ColumnWidthChangingEventHandler(this.productList_ColumnWidthChanging);
           this.productList.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.productList_ItemChecked);
           // 
           // blankHeader
@@ -154,6 +147,16 @@
           this.progressHeader.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
           this.progressHeader.Width = 69;
           // 
+          // spacer
+          // 
+          this.spacer.BackColor = System.Drawing.Color.Transparent;
+          this.spacer.Dock = System.Windows.Forms.DockStyle.Bottom;
+          this.spacer.Location = new System.Drawing.Point(0, 179);
+          this.spacer.Name = "spacer";
+          this.spacer.Size = new System.Drawing.Size(520, 6);
+          this.spacer.TabIndex = 19;
+          this.spacer.Visible = false;
+          // 
           // RemoveProgress
           // 
           this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;

=== modified file 'WexInstaller/RemovePanels/RemoveProgress.cs'
--- a/WexInstaller/RemovePanels/RemoveProgress.cs	2011-04-18 09:16:30 +0000
+++ b/WexInstaller/RemovePanels/RemoveProgress.cs	2011-05-23 15:01:40 +0000
@@ -25,7 +25,7 @@
       executed = false;
     }
 
-    private void ProductInstallProgressChanged(object sender, ProductMSIActionProgressEventArgs pe)
+    private void ProductRemovalProgressChanged(object sender, ProductMSIActionProgressEventArgs pe)
     {
       if (pe.ProgressPercentage == 0)
         detailedLog.AppendText(String.Format("Beginning removal of {0}.{1}", (sender as Product).Title, Environment.NewLine));
@@ -34,7 +34,7 @@
       removingItem.SubItems[2].Text = String.Format(Resources.StatusPercentage, pe.ProgressPercentage);
     }
 
-    private void ProductInstallCompleted(object sender, ProductMSIActionCompletedEventArgs pe)
+    private void ProductRemovalCompleted(object sender, ProductMSIActionCompletedEventArgs pe)
     {
       Product p = (sender as Product);
       string logText = (pe.ExitCode != 0) ? Resources.RemovalFailedText : Resources.RemovalSucceededText;
@@ -113,8 +113,8 @@
         {
           ProductManager.InstallationStarted = true;
           removingItem = item;
-          p.ProductMSIActionProgressChanged += new ProductMSIActionProgressHandler(ProductInstallProgressChanged);
-          p.ProductMSIActionCompleted += new ProductMSIActionCompleteHandler(ProductInstallCompleted);
+          p.ProductMSIActionProgressChanged += new ProductMSIActionProgressHandler(ProductRemovalProgressChanged);
+          p.ProductMSIActionCompleted += new ProductMSIActionCompleteHandler(ProductRemovalCompleted);
           p.Remove();
           break;
         }
@@ -178,6 +178,12 @@
         NextButton.Enabled = nextOk;
     }
 
+    private void productList_ColumnWidthChanging(object sender, ColumnWidthChangingEventArgs e)
+    {
+      if (e.ColumnIndex == 0)
+        e.Cancel = true;
+    }
+
     #endregion
 
   }

=== modified file 'WexInstaller/WexInstaller.csproj'
--- a/WexInstaller/WexInstaller.csproj	2011-05-17 09:27:10 +0000
+++ b/WexInstaller/WexInstaller.csproj	2011-05-23 15:01:40 +0000
@@ -255,6 +255,9 @@
       <DependentUpon>InstallWizardSideBarControl.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="HiddenTabsControl.resx">
+      <DependentUpon>HiddenTabsControl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="InstallWizard\CheckRequirements.resx">
       <DependentUpon>CheckRequirements.cs</DependentUpon>
       <SubType>Designer</SubType>

Attachment: [text/bzr-bundle] bzr/mike.lischke@oracle.com-20110523150140-aywdsfzn31xppo2c.bundle
Thread
bzr commit into wex-installer-1.0 branch (mike.lischke:479) Mike Lischke23 May