Mon Jun 7 03:48:34 EDT 2010

Author: jng
Date: 2010-06-07 03:48:29 -0400 (Mon, 07 Jun 2010)
New Revision: 4936

Modified:
   trunk/Tools/Maestro/Installer/UpgradeData.wxi
   trunk/Tools/Maestro/Installer/VSExpress Build.bat
   trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Localization/da-DK/Maestro/Strings/FormMain.da-DK.resx
   trunk/Tools/Maestro/Localization/es-ES/Maestro/Strings/FormMain.es-ES.resx
   trunk/Tools/Maestro/Maestro/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/LoginForm/FormLogin.cs
   trunk/Tools/Maestro/Maestro/LoginForm/HttpLoginCtrl.cs
   trunk/Tools/Maestro/Maestro/LoginForm/ILoginCtrl.cs
   trunk/Tools/Maestro/Maestro/LoginForm/LocalNativeLoginCtrl.cs
   trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs
Log:
This submission includes the following changes:
 - Prepare for 2.1 Preview Release 2
 - Remove test exception from login dialog. This was to test the nested message handling but was not removed in a previous submission. Oops.
 - Fix #1365: Evaluate button status after switching connection mode in login dialog.
 - Tweak the installer build script to use vanilla msbuild instead of WixProjBuilder.exe

Modified: trunk/Tools/Maestro/Installer/UpgradeData.wxi
===================================================================

--- trunk/Tools/Maestro/Installer/UpgradeData.wxi	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Installer/UpgradeData.wxi	2010-06-07 07:48:29 UTC (rev 4936)
@@ -3,7 +3,7 @@
   <?define UpgradeCode="A7C2ECB3-1991-47B9-A22E-8844BB95CAE2" ?>
 
   <!-- Remember to change product version on each install -->
-  <?define ProductVersion="2.1.0.4814" ?>
+  <?define ProductVersion="2.1.0.4936" ?>
 
   <?define Manufacturer="Open Source Geospatial Foundation" ?>
 

Modified: trunk/Tools/Maestro/Installer/VSExpress Build.bat
===================================================================
--- trunk/Tools/Maestro/Installer/VSExpress Build.bat	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Installer/VSExpress Build.bat	2010-06-07 07:48:29 UTC (rev 4936)
@@ -25,7 +25,7 @@
 
 "%PARAFFIN_PATH%" -dir %MAESTRO_OUTPUT% -alias "%MAESTRO_OUTPUT%" -custom MAESTROBIN -dirref INSTALLLOCATION -multiple -guids incBinFiles.wxs -ext .pdb -direXclude .svn
 
-WixProjBuilder.exe Maestro.wixproj
+msbuild.exe /p:Configuration=%TYPEBUILD% Maestro.wixproj
 
 rem Move in localization files and build zip
 %XCOPY% "%MAESTRO_LOCALIZATION%\compiled\*" "%MAESTRO_OUTPUT%"

Modified: trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.4814")]
-[assembly: AssemblyFileVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
+[assembly: AssemblyFileVersion("2.1.0.4936")]

Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/Strings/FormMain.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/Strings/FormMain.da-DK.resx	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/Strings/FormMain.da-DK.resx	2010-06-07 07:48:29 UTC (rev 4936)
@@ -291,4 +291,8 @@
   <data name="FindReplaceTooltip" xml:space="preserve">
     <value>Find any strings that match the pattern {0} and replace it with {1}</value>
   </data>
+  <data name="ConfirmMultipleOpen" xml:space="preserve">
+    <value>Are you sure you want to open {0} items?</value>
+    <comment>A confirmation message that is displayed when opening multiple items for editing</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/es-ES/Maestro/Strings/FormMain.es-ES.resx
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/Strings/FormMain.es-ES.resx	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/Strings/FormMain.es-ES.resx	2010-06-07 07:48:29 UTC (rev 4936)
@@ -291,4 +291,8 @@
   <data name="FindReplaceTooltip" xml:space="preserve">
     <value>Find any strings that match the pattern {0} and replace it with {1}</value>
   </data>
+  <data name="ConfirmMultipleOpen" xml:space="preserve">
+    <value>Are you sure you want to open {0} items?</value>
+    <comment>A confirmation message that is displayed when opening multiple items for editing</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4814")]
+[assembly: AssemblyFileVersionAttribute("2.1.0.4936")]

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4814")]
+[assembly: AssemblyFileVersionAttribute("2.1.0.4936")]

Modified: trunk/Tools/Maestro/Maestro/LoginForm/FormLogin.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/LoginForm/FormLogin.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/LoginForm/FormLogin.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -122,21 +122,30 @@
             loginPanel.Controls.Add(c);
         }
 
-        private void rdHttp_CheckedChanged(object sender, EventArgs e)
+        private void UpdateLoginControl()
         {
-            _selectedIndex = 0;
+            if (rdHttp.Checked)
+                _selectedIndex = 0;
+            else
+                _selectedIndex = 1;
+            
             SetLoginControl((Control)_controls[_selectedIndex]);
+            _controls[_selectedIndex].UpdateLoginStatus();
         }
 
+        private void rdHttp_CheckedChanged(object sender, EventArgs e)
+        {
+            UpdateLoginControl();
+        }
+
         private void rdTcpIp_CheckedChanged(object sender, EventArgs e)
         {
-            _selectedIndex = 1;
-            SetLoginControl((Control)_controls[_selectedIndex]);
+            UpdateLoginControl();
         }
 
         private void btnCancel_Click(object sender, EventArgs e)
         {
-
+            this.DialogResult = DialogResult.Cancel;
         }
 
         private void btnOK_Click(object sender, EventArgs e)
@@ -145,11 +154,6 @@
             {
                 try
 				{
-                    throw new Exception("Outer Message", 
-                        new Exception("Inner Message 1", 
-                            new Exception("Inner Message 2",
-                                new Exception("Inner Message 3"))));
-
                     PreferedSite ps = null;
 
                     if (_selectedIndex == 0) //HTTP

Modified: trunk/Tools/Maestro/Maestro/LoginForm/HttpLoginCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/LoginForm/HttpLoginCtrl.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/LoginForm/HttpLoginCtrl.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -76,7 +76,7 @@
                 cmbLanguage.SelectedIndex = selected;
 
             _loading = false;
-            UpdateButtonStatus();
+            UpdateLoginStatus();
         }
 
         public PreferedSite[] GetSites()
@@ -155,10 +155,10 @@
 
         private void txtPassword_TextChanged(object sender, EventArgs e)
         {
-            UpdateButtonStatus();
+            UpdateLoginStatus();
         }
 
-        private void UpdateButtonStatus()
+        public void UpdateLoginStatus()
         {
             if (this.Username.Trim().Length > 0 && this.Server.Trim().Length > 0)
                 EnableOk(this, EventArgs.Empty);

Modified: trunk/Tools/Maestro/Maestro/LoginForm/ILoginCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/LoginForm/ILoginCtrl.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/LoginForm/ILoginCtrl.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -28,6 +28,8 @@
         string Username { get; }
         string Password { get; }
 
+        void UpdateLoginStatus();
+
         event EventHandler EnableOk;
         event EventHandler DisabledOk;
         event EventHandler CheckSavedPassword;

Modified: trunk/Tools/Maestro/Maestro/LoginForm/LocalNativeLoginCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/LoginForm/LocalNativeLoginCtrl.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/LoginForm/LocalNativeLoginCtrl.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -66,7 +66,7 @@
 
         public event EventHandler CheckSavedPassword = delegate { };
 
-        private void txtWebConfig_TextChanged(object sender, EventArgs e)
+        public void UpdateLoginStatus()
         {
             if (this.WebConfigPath.Trim().Length > 0 && File.Exists(this.WebConfigPath))
                 EnableOk(this, EventArgs.Empty);
@@ -74,6 +74,11 @@
                 DisabledOk(this, EventArgs.Empty);
         }
 
+        private void txtWebConfig_TextChanged(object sender, EventArgs e)
+        {
+            UpdateLoginStatus();
+        }
+
         private void btnBrowse_Click(object sender, EventArgs e)
         {
             using (var dlg = new OpenFileDialog())

Modified: trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.4814")]
-[assembly: AssemblyFileVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
+[assembly: AssemblyFileVersion("2.1.0.4936")]

Modified: trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

Modified: trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -50,5 +50,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.4814")]
-[assembly: AssemblyFileVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
+[assembly: AssemblyFileVersion("2.1.0.4936")]

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4814")]
+[assembly: AssemblyFileVersionAttribute("2.1.0.4936")]

Modified: trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4814")]
+[assembly: AssemblyFileVersionAttribute("2.1.0.4936")]

Modified: trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("..\\..\\maestroapi.key")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4814")]
+[assembly: AssemblyFileVersionAttribute("2.1.0.4936")]

Modified: trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.0.4814")]
-[assembly: AssemblyFileVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
+[assembly: AssemblyFileVersion("2.1.0.4936")]

Modified: trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.0.4814")]
-[assembly: AssemblyFileVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
+[assembly: AssemblyFileVersion("2.1.0.4936")]

Modified: trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.0.4814")]
-[assembly: AssemblyFileVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
+[assembly: AssemblyFileVersion("2.1.0.4936")]

Modified: trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs	2010-06-04 21:46:25 UTC (rev 4935)
+++ trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs	2010-06-07 07:48:29 UTC (rev 4936)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.0.4814")]
-[assembly: AssemblyFileVersion("2.1.0.4814")]
+[assembly: AssemblyVersion("2.1.0.4936")]
+[assembly: AssemblyFileVersion("2.1.0.4936")]

