bzr commit into wex-installer-1.0 branch (mike.lischke:390)

[Mike Lischke]

#At file:///D:/Work/MySQL/installer/ based on revid:mike.lischke@stripped

  390 Mike Lischke	2011-03-28
      - InstallWizardControl: avoid page switching if the installer is currently going down.
      - InstallType: mark paths like "\Program Files\MySQL\" also as invalid, to avoid drive guessing.
      - WexInstaller: removed non-existing image files from project.

    modified:
      WexInstaller/Controls/InstallWizardControl.cs
      WexInstaller/InstallWizard/InstallType.cs
      WexInstaller/WexInstaller.csproj
=== modified file 'WexInstaller/Controls/InstallWizardControl.cs'
=== modified file 'WexInstaller/Controls/InstallWizardControl.cs'
--- a/WexInstaller/Controls/InstallWizardControl.cs	2011-03-25 17:32:28 +0000
+++ b/WexInstaller/Controls/InstallWizardControl.cs	2011-03-28 07:17:22 +0000
@@ -253,7 +253,7 @@
 
     private void wizardPages_SelectedIndexChanged(object sender, EventArgs e)
     {
-      if (wizardPages.SelectedTab != null && wizardPages.SelectedTab.Controls.Count > 0)
+      if (!IsDisposed && wizardPages.SelectedTab != null && wizardPages.SelectedTab.Controls.Count > 0)
       {
         InstallerPanel panel = wizardPages.SelectedTab.Controls[0] as InstallerPanel;
         panel.Activate();

=== modified file 'WexInstaller/InstallWizard/InstallType.cs'
--- a/WexInstaller/InstallWizard/InstallType.cs	2011-03-25 17:32:28 +0000
+++ b/WexInstaller/InstallWizard/InstallType.cs	2011-03-28 07:17:22 +0000
@@ -157,8 +157,8 @@
     }
 
     /// <summary>
-    /// Checks both paths and set nextOk accordingly. If the server panel is hidden then their content
-    /// does not matter. If any problem is found then the warning signs are set to indicate that
+    /// Checks both paths and sets nextOk accordingly. If the server panel is hidden then their contents
+    /// don't matter. If any problem is found then the warning signs are set to indicate that
     /// and the Next button is disabled.
     /// </summary>
     private void DoSanityChecks()
@@ -173,9 +173,8 @@
 
         try
         {
-
           pathExists = Directory.Exists(installPath);
-          pathIsRooted = Path.IsPathRooted(installPath);
+          pathIsRooted = Path.IsPathRooted(installPath) && (installPath[1] == ':');
 
           nextOk = pathIsRooted;
 

=== modified file 'WexInstaller/WexInstaller.csproj'
--- a/WexInstaller/WexInstaller.csproj	2011-03-25 17:32:28 +0000
+++ b/WexInstaller/WexInstaller.csproj	2011-03-28 07:17:22 +0000
@@ -355,22 +355,17 @@
     <None Include="Resources\about.rtf" />
     <None Include="Resources\license.txt" />
     <None Include="Resources\my-template.ini" />
-    <None Include="Resources\product_catalog" />
     <None Include="Resources\WizardSelection.png" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\wex_product_catalog.png" />
     <None Include="Resources\AboutBanner.png" />
-    <None Include="Resources\AddOnsCategoryIcon.png" />
-    <None Include="Resources\ConnectorCategoryIcon.png" />
-    <None Include="Resources\DocsCategoryIcon.png" />
     <None Include="Resources\Add.ico" />
     <None Include="Resources\Abort.png" />
     <None Include="Resources\dedicated_machine.png" />
     <None Include="Resources\dev_machine.png" />
     <None Include="Resources\fading_divider.png" />
     <None Include="Resources\check_mark.png" />
-    <None Include="Resources\TutorialsCategoryIcon.png" />
     <None Include="Resources\ActionWarning.png" />
     <None Include="Resources\ActionCurrent.png" />
     <None Include="Resources\ActionDone.png" />
@@ -394,7 +389,6 @@
     <Content Include="Resources\MySQLLogo.png" />
     <Content Include="Resources\OverviewSelection.png" />
     <None Include="Resources\ResourcesBanner.png" />
-    <None Include="Resources\ServerCategoryIcon.png" />
     <None Include="Resources\Remove.ico" />
     <None Include="Resources\server_machine.png" />
     <None Include="Resources\server_config_networking.png" />


Attachment: [text/bzr-bundle] bzr/[e-mail]