[mapguide-commits] r7165 - in branches/maestro-4.0.x: . Maestro Maestro.Editors/WebLayout

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-10-29 08:45:08 -0700 (Mon, 29 Oct 2012)
New Revision: 7165

Modified:
   branches/maestro-4.0.x/
   branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.Designer.cs
   branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs
   branches/maestro-4.0.x/Maestro/changelog.txt
Log:
#2160: Backport r7164 to 4.0.x


Property changes on: branches/maestro-4.0.x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Tools/Maestro:6490-6494,6923-6924,6926,6928,7026,7034,7056,7058,7060-7061,7073-7074,7125-7128
   + /trunk/Tools/Maestro:6490-6494,6923-6924,6926,6928,7026,7034,7056,7058,7060-7061,7073-7074,7125-7128,7164

Modified: branches/maestro-4.0.x/Maestro/changelog.txt
===================================================================
--- branches/maestro-4.0.x/Maestro/changelog.txt	2012-10-29 15:35:21 UTC (rev 7164)
+++ branches/maestro-4.0.x/Maestro/changelog.txt	2012-10-29 15:45:08 UTC (rev 7165)
@@ -1,6 +1,7 @@
 4.0.4
 -----
  - Improved WMS Feature Source editor
+ - Fix: Web Layout editor - Available command selection wackiness
  - Fix: XSD data type case-sensitivity when parsing FDO Data properties
  - Fix: Improve memory usage in SetResourceData (Local/LocalNative) for really large files
  - Fix: FDO class name encoding/decoding

Modified: branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.Designer.cs	2012-10-29 15:35:21 UTC (rev 7164)
+++ branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.Designer.cs	2012-10-29 15:45:08 UTC (rev 7165)
@@ -107,12 +107,15 @@
             // 
             // grdCommands
             // 
+            this.grdCommands.AllowUserToAddRows = false;
+            this.grdCommands.AllowUserToDeleteRows = false;
             resources.ApplyResources(this.grdCommands, "grdCommands");
             this.grdCommands.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.grdCommands.Name = "grdCommands";
+            this.grdCommands.ReadOnly = true;
             this.grdCommands.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdCommands_CellClick);
+            this.grdCommands.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdCommands_CellClick);
             this.grdCommands.DragLeave += new System.EventHandler(this.grdCommands_DragLeave);
-            this.grdCommands.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdCommands_CellClick);
             // 
             // groupBox1
             // 
@@ -193,9 +196,8 @@
             // WebLayoutMenusCtrl
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.HeaderText = "Menus and Toolbars";
+            resources.ApplyResources(this, "$this");
             this.Name = "WebLayoutMenusCtrl";
-            resources.ApplyResources(this, "$this");
             this.contentPanel.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.grdCommands)).EndInit();
             this.groupBox1.ResumeLayout(false);

Modified: branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs	2012-10-29 15:35:21 UTC (rev 7164)
+++ branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs	2012-10-29 15:45:08 UTC (rev 7165)
@@ -106,6 +106,10 @@
                 grdCommands.Rows[cell.RowIndex].Selected = true;
                 btnAddFromCmdSet.Enabled = true;
             }
+            else if (grdCommands.SelectedRows.Count == 1)
+            {
+                btnAddFromCmdSet.Enabled = true;
+            }
             else
             {
                 btnAddFromCmdSet.Enabled = false;