[mapguide-commits] r7164 - trunk/Tools/Maestro/Maestro.Editors/WebLayout
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Oct 29 08:35:21 PDT 2012
Author: jng
Date: 2012-10-29 08:35:21 -0700 (Mon, 29 Oct 2012)
New Revision: 7164
Modified:
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.resx
Log:
#2160: Fix available command selection wackiness. Problem is due to the following:
1. We were only enabling the button when there was a selected cell and not also when there was a selected row
2. The cells were editable, which interfered with the handler that enabled/disabled the '<<' button
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.Designer.cs 2012-10-29 13:48:49 UTC (rev 7163)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.Designer.cs 2012-10-29 15:35:21 UTC (rev 7164)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs 2012-10-29 13:48:49 UTC (rev 7163)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs 2012-10-29 15:35:21 UTC (rev 7164)
@@ -116,6 +116,10 @@
grdCommands.Rows[cell.RowIndex].Selected = true;
btnAddFromCmdSet.Enabled = true;
}
+ else if (grdCommands.SelectedRows.Count == 1)
+ {
+ btnAddFromCmdSet.Enabled = true;
+ }
else
{
btnAddFromCmdSet.Enabled = false;
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.resx 2012-10-29 13:48:49 UTC (rev 7163)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.resx 2012-10-29 15:35:21 UTC (rev 7164)
@@ -112,16 +112,16 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnAddFromCmdSet.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnAddFromCmdSet.Location" type="System.Drawing.Point, System.Drawing">
<value>250, 132</value>
</data>
@@ -138,7 +138,7 @@
<value>btnAddFromCmdSet</value>
</data>
<data name=">>btnAddFromCmdSet.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnAddFromCmdSet.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -146,7 +146,7 @@
<data name=">>btnAddFromCmdSet.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
@@ -166,7 +166,7 @@
<value>grdCommands</value>
</data>
<data name=">>grdCommands.Type" xml:space="preserve">
- <value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>grdCommands.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -190,7 +190,7 @@
<value>groupBox1</value>
</data>
<data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox1.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -217,7 +217,7 @@
<value>edToolbar</value>
</data>
<data name=">>edToolbar.Type" xml:space="preserve">
- <value>Maestro.Editors.WebLayout.MenuEditorCtrl, Maestro.Editors, Version=3.0.0.5334, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.WebLayout.MenuEditorCtrl, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>edToolbar.Parent" xml:space="preserve">
<value>TAB_TOOLBAR</value>
@@ -241,7 +241,7 @@
<value>TAB_TOOLBAR</value>
</data>
<data name=">>TAB_TOOLBAR.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>TAB_TOOLBAR.Parent" xml:space="preserve">
<value>tabMenus</value>
@@ -265,7 +265,7 @@
<value>edContextMenu</value>
</data>
<data name=">>edContextMenu.Type" xml:space="preserve">
- <value>Maestro.Editors.WebLayout.MenuEditorCtrl, Maestro.Editors, Version=3.0.0.5334, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.WebLayout.MenuEditorCtrl, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>edContextMenu.Parent" xml:space="preserve">
<value>TAB_CONTEXT_MENU</value>
@@ -289,7 +289,7 @@
<value>TAB_CONTEXT_MENU</value>
</data>
<data name=">>TAB_CONTEXT_MENU.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>TAB_CONTEXT_MENU.Parent" xml:space="preserve">
<value>tabMenus</value>
@@ -313,7 +313,7 @@
<value>edTaskMenu</value>
</data>
<data name=">>edTaskMenu.Type" xml:space="preserve">
- <value>Maestro.Editors.WebLayout.MenuEditorCtrl, Maestro.Editors, Version=3.0.0.5334, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.WebLayout.MenuEditorCtrl, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>edTaskMenu.Parent" xml:space="preserve">
<value>TAB_TASK_MENU</value>
@@ -340,7 +340,7 @@
<value>TAB_TASK_MENU</value>
</data>
<data name=">>TAB_TASK_MENU.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>TAB_TASK_MENU.Parent" xml:space="preserve">
<value>tabMenus</value>
@@ -361,7 +361,7 @@
<value>tabMenus</value>
</data>
<data name=">>tabMenus.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>tabMenus.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -376,7 +376,7 @@
<value>contentPanel</value>
</data>
<data name=">>contentPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>contentPanel.Parent" xml:space="preserve">
<value>$this</value>
@@ -384,9 +384,12 @@
<data name=">>contentPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <data name="$this.HeaderText" xml:space="preserve">
+ <value>Menus and Toolbars</value>
+ </data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>682, 319</value>
</data>
@@ -442,6 +445,6 @@
<value>WebLayoutMenusCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=3.0.0.5334, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list