List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:February 8 2011 9:54pm
Subject:bzr commit into wex-installer-1.0 branch (reggie.burnett:319)
View as plain text  
#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:reggie.burnett@stripped

  319 Reggie Burnett	2011-02-08
      fixed dropping back on config overview

    modified:
      StandardPlugins/Server/ServerConfigPanel2.cs
      StandardPlugins/StandardPlugins.csproj
      WexInstaller/Controls/InstallWizardControl.cs
      installer-vs2010.sln
=== modified file 'StandardPlugins/Server/ServerConfigPanel2.cs'
=== modified file 'StandardPlugins/Server/ServerConfigPanel2.cs'
--- a/StandardPlugins/Server/ServerConfigPanel2.cs	2011-02-08 18:41:30 +0000
+++ b/StandardPlugins/Server/ServerConfigPanel2.cs	2011-02-08 21:54:02 +0000
@@ -31,12 +31,6 @@
 
         private ServerConfigurationController Controller { get; set; }
 
-        public override bool Next()
-        {
-            (ParentControl as InstallWizardControl).ShowConfigOverviewPage();
-            return false;
-        }
-
         private void portNumber_TextChanged(object sender, EventArgs e)
         {
             int port = 0;

=== modified file 'StandardPlugins/StandardPlugins.csproj'
--- a/StandardPlugins/StandardPlugins.csproj	2011-02-08 21:28:42 +0000
+++ b/StandardPlugins/StandardPlugins.csproj	2011-02-08 21:54:02 +0000
@@ -60,12 +60,14 @@
     <Compile Include="Server\ServerConfigPanel1.Designer.cs">
       <DependentUpon>ServerConfigPanel1.cs</DependentUpon>
     </Compile>
-    <Compile Include="Server\ServerConfigPanel2.cs" />
+    <Compile Include="Server\ServerConfigPanel2.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Server\ServerConfigPanel2.Designer.cs">
       <DependentUpon>ServerConfigPanel2.cs</DependentUpon>
     </Compile>
     <Compile Include="Server\ServerConfigPanel5.cs">
-      <SubType>Code</SubType>
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Server\ServerConfigPanel5.Designer.cs">
       <DependentUpon>ServerConfigPanel5.cs</DependentUpon>

=== modified file 'WexInstaller/Controls/InstallWizardControl.cs'
--- a/WexInstaller/Controls/InstallWizardControl.cs	2011-02-07 21:39:59 +0000
+++ b/WexInstaller/Controls/InstallWizardControl.cs	2011-02-08 21:54:02 +0000
@@ -99,7 +99,7 @@
             wizardPages.Refresh();
         }
 
-        public void ShowConfigOverviewPage()
+        private void ShowConfigOverviewPage()
         {
             wizardPages.SelectTab(allConfigTab);
             RemoveConfigPages("Config");
@@ -220,7 +220,10 @@
         {
             if (CurrentPanel.Next())
             {
-                UpdateWizardPage(1);
+                if (wizardPages.SelectedIndex == (wizardPages.TabCount - 2) && wizardPages.SelectedTab.Text == "Config")
+                    ShowConfigOverviewPage();
+                else
+                    UpdateWizardPage(1);
             }
         }
 

=== modified file 'installer-vs2010.sln'
--- a/installer-vs2010.sln	2011-02-08 21:28:42 +0000
+++ b/installer-vs2010.sln	2011-02-08 21:54:02 +0000
@@ -63,7 +63,6 @@
 		{27F00801-BEAE-417F-9CF5-5686923F7538}.Release|x86.ActiveCfg = Release|x86
 		{27F00801-BEAE-417F-9CF5-5686923F7538}.Release|x86.Build.0 = Release|x86
 		{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Any CPU.Build.0 = Debug|x86
 		{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Win32.ActiveCfg = Debug|x86
@@ -89,7 +88,6 @@
 		{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|x86.ActiveCfg = Release|x86
 		{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|x86.Build.0 = Release|x86
 		{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Any CPU.Build.0 = Debug|x86
 		{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Win32.ActiveCfg = Debug|x86


Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110208215402-4wlfog5f48ja8rbk.bundle
Thread
bzr commit into wex-installer-1.0 branch (reggie.burnett:319) Reggie Burnett8 Feb