[mapguide-commits] r7168 - trunk/Tools/Maestro/Maestro.Editors/MapDefinition
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Oct 29 09:26:12 PDT 2012
Author: jng
Date: 2012-10-29 09:26:12 -0700 (Mon, 29 Oct 2012)
New Revision: 7168
Modified:
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx
Log:
#2139: Persist layer selection if moving between "layer/group" and "draw order" tabs. This is the only selection that will persist as other selections cannot be transferred as they don't exist in the other tabs.
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs 2012-10-29 16:00:25 UTC (rev 7167)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs 2012-10-29 16:26:12 UTC (rev 7168)
@@ -101,6 +101,7 @@
resources.ApplyResources(this.tabControl1, "tabControl1");
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// TAB_GROUP
//
@@ -124,12 +125,12 @@
this.trvLayersGroup.NodeControls.Add(this.NODE_GROUP_ICON);
this.trvLayersGroup.NodeControls.Add(this.NODE_GROUP_TEXT);
this.trvLayersGroup.SelectedNode = null;
- this.trvLayersGroup.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvLayersGroup_MouseDoubleClick);
+ this.trvLayersGroup.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvLayersGroup_ItemDrag);
+ this.trvLayersGroup.DragDrop += new System.Windows.Forms.DragEventHandler(this.trvLayersGroup_DragDrop);
+ this.trvLayersGroup.DragEnter += new System.Windows.Forms.DragEventHandler(this.trvLayersGroup_DragEnter);
this.trvLayersGroup.DragOver += new System.Windows.Forms.DragEventHandler(this.trvLayersGroup_DragOver);
this.trvLayersGroup.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trvLayersGroup_MouseClick);
- this.trvLayersGroup.DragDrop += new System.Windows.Forms.DragEventHandler(this.trvLayersGroup_DragDrop);
- this.trvLayersGroup.DragEnter += new System.Windows.Forms.DragEventHandler(this.trvLayersGroup_DragEnter);
- this.trvLayersGroup.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvLayersGroup_ItemDrag);
+ this.trvLayersGroup.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvLayersGroup_MouseDoubleClick);
//
// NODE_GROUP_ICON
//
@@ -254,12 +255,12 @@
this.trvLayerDrawingOrder.NodeControls.Add(this.NODE_DRAW_ICON);
this.trvLayerDrawingOrder.NodeControls.Add(this.NODE_DRAW_TEXT);
this.trvLayerDrawingOrder.SelectedNode = null;
- this.trvLayerDrawingOrder.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvLayerDrawingOrder_MouseDoubleClick);
+ this.trvLayerDrawingOrder.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvLayerDrawingOrder_ItemDrag);
+ this.trvLayerDrawingOrder.DragDrop += new System.Windows.Forms.DragEventHandler(this.trvLayerDrawingOrder_DragDrop);
+ this.trvLayerDrawingOrder.DragEnter += new System.Windows.Forms.DragEventHandler(this.trvLayerDrawingOrder_DragEnter);
this.trvLayerDrawingOrder.DragOver += new System.Windows.Forms.DragEventHandler(this.trvLayerDrawingOrder_DragOver);
this.trvLayerDrawingOrder.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trvLayerDrawingOrder_MouseClick);
- this.trvLayerDrawingOrder.DragDrop += new System.Windows.Forms.DragEventHandler(this.trvLayerDrawingOrder_DragDrop);
- this.trvLayerDrawingOrder.DragEnter += new System.Windows.Forms.DragEventHandler(this.trvLayerDrawingOrder_DragEnter);
- this.trvLayerDrawingOrder.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvLayerDrawingOrder_ItemDrag);
+ this.trvLayerDrawingOrder.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvLayerDrawingOrder_MouseDoubleClick);
//
// NODE_DRAW_ICON
//
@@ -369,12 +370,12 @@
this.trvBaseLayers.NodeControls.Add(this.nodeIcon1);
this.trvBaseLayers.NodeControls.Add(this.nodeTextBox1);
this.trvBaseLayers.SelectedNode = null;
- this.trvBaseLayers.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvBaseLayers_MouseDoubleClick);
+ this.trvBaseLayers.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvBaseLayers_ItemDrag);
+ this.trvBaseLayers.DragDrop += new System.Windows.Forms.DragEventHandler(this.trvBaseLayers_DragDrop);
+ this.trvBaseLayers.DragEnter += new System.Windows.Forms.DragEventHandler(this.trvBaseLayers_DragEnter);
this.trvBaseLayers.DragOver += new System.Windows.Forms.DragEventHandler(this.trvBaseLayers_DragOver);
this.trvBaseLayers.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trvBaseLayers_MouseClick);
- this.trvBaseLayers.DragDrop += new System.Windows.Forms.DragEventHandler(this.trvBaseLayers_DragDrop);
- this.trvBaseLayers.DragEnter += new System.Windows.Forms.DragEventHandler(this.trvBaseLayers_DragEnter);
- this.trvBaseLayers.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvBaseLayers_ItemDrag);
+ this.trvBaseLayers.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvBaseLayers_MouseDoubleClick);
//
// nodeIcon1
//
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-10-29 16:00:25 UTC (rev 7167)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-10-29 16:26:12 UTC (rev 7168)
@@ -225,6 +225,7 @@
var item = new GroupPropertiesCtrl(group.Tag);
item.GroupChanged += (s, evt) => { OnResourceChanged(); };
item.Dock = DockStyle.Fill;
+ _activeLayer = null;
propertiesPanel.Controls.Add(item);
}
@@ -236,6 +237,7 @@
var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService);
item.LayerChanged += (s, evt) => { OnResourceChanged(); };
item.Dock = DockStyle.Fill;
+ _activeLayer = layer.Tag;
propertiesPanel.Controls.Add(item);
}
@@ -258,6 +260,8 @@
}
}
+ private IMapLayer _activeLayer;
+
private void OnDrawOrderLayerItemSelected(LayerItem layer)
{
btnDLMoveLayerBottom.Enabled =
@@ -270,6 +274,7 @@
var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService);
item.LayerChanged += (s, evt) => { OnResourceChanged(); };
item.Dock = DockStyle.Fill;
+ _activeLayer = layer.Tag;
propertiesPanel.Controls.Add(item);
}
@@ -917,6 +922,7 @@
var item = new GroupPropertiesCtrl(group.Tag);
item.GroupChanged += (s, evt) => { OnResourceChanged(); };
item.Dock = DockStyle.Fill;
+ _activeLayer = null;
propertiesPanel.Controls.Add(item);
}
@@ -931,6 +937,7 @@
var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService);
item.LayerChanged += (s, evt) => { OnResourceChanged(); };
item.Dock = DockStyle.Fill;
+ _activeLayer = null;
propertiesPanel.Controls.Add(item);
}
@@ -1444,5 +1451,24 @@
"--mapagent=" + conn.GetCustomProperty("BaseUrl"),
"--mapdefinitions=" + _edSvc.ResourceID);
}
+
+ private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (_activeLayer != null)
+ {
+ switch (tabControl1.SelectedIndex)
+ {
+ case 0: //Logical
+ RestoreLayerSelection(_activeLayer);
+ break;
+ case 1: //Draw Order
+ RestoreDrawOrderSelection(_activeLayer);
+ break;
+ default:
+ _activeLayer = null;
+ break;
+ }
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx 2012-10-29 16:00:25 UTC (rev 7167)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx 2012-10-29 16:26:12 UTC (rev 7168)
@@ -612,18 +612,18 @@
<data name="btnInvokeMgCooker.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
- 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
+ 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
</value>
</data>
<data name="btnInvokeMgCooker.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
@@ -930,24 +930,24 @@
<value>toolStripSeparator8</value>
</data>
<data name=">>toolStripSeparator8.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBaseLayerGroupToRegular.Name" xml:space="preserve">
<value>btnBaseLayerGroupToRegular</value>
</data>
<data name=">>btnBaseLayerGroupToRegular.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnInvokeMgCooker.Name" xml:space="preserve">
<value>btnInvokeMgCooker</value>
</data>
<data name=">>btnInvokeMgCooker.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>MapLayersSectionCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</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