[mapguide-commits] r8570 - in trunk/Tools/Maestro/Maestro.Editors: MapDefinition TileSetDefinition

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-03-11 07:12:16 -0700 (Wed, 11 Mar 2015)
New Revision: 8570

Modified:
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.resx
Log:
- #2515: Enable drag/drop on the layer structure component of the Tile Set Editor
- When dragging and dropping a layer definition into the base layer part of the Map Definition editor or the layer structure part of the Tile Set Editor, focus on that layer after regenerating the tree model.

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs	2015-03-11 13:54:29 UTC (rev 8569)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs	2015-03-11 14:12:16 UTC (rev 8570)
@@ -1852,11 +1852,12 @@
                     group = _map.BaseMap.AddBaseLayerGroup(GenerateBaseGroupName(_map));
                 }
 
+                IBaseMapLayer focusLayer = null;
                 foreach (var rid in rids)
                 {
                     if (rid.ResourceId.ResourceType == ResourceTypes.LayerDefinition.ToString())
                     {
-                        group.AddLayer(GenerateBaseLayerName(rid.ResourceId.ToString(), _map.BaseMap), rid.ResourceId.ToString());
+                        focusLayer = group.AddLayer(GenerateBaseLayerName(rid.ResourceId.ToString(), _map.BaseMap), rid.ResourceId.ToString());
                         added++;
                     }
                 }
@@ -1864,6 +1865,8 @@
                 if (added > 0)
                 {
                     _tiledLayerModel.Invalidate();
+                    if (focusLayer != null)
+                        RestoreBaseLayerSelection(focusLayer);
                 }
             }
             else if (data != null && data.Length == 1)

Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.Designer.cs	2015-03-11 13:54:29 UTC (rev 8569)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.Designer.cs	2015-03-11 14:12:16 UTC (rev 8570)
@@ -79,6 +79,7 @@
             // 
             // trvBaseLayers
             // 
+            this.trvBaseLayers.AllowDrop = true;
             this.trvBaseLayers.BackColor = System.Drawing.SystemColors.Window;
             this.trvBaseLayers.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.trvBaseLayers.DefaultToolTipProvider = null;

Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs	2015-03-11 13:54:29 UTC (rev 8569)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs	2015-03-11 14:12:16 UTC (rev 8570)
@@ -241,11 +241,12 @@
                     group = _tsd.AddBaseLayerGroup(GenerateBaseGroupName(_tsd));
                 }
 
+                IBaseMapLayer focusLayer = null;
                 foreach (var rid in rids)
                 {
                     if (rid.ResourceId.ResourceType == ResourceTypes.LayerDefinition.ToString())
                     {
-                        group.AddLayer(GenerateBaseLayerName(rid.ResourceId.ToString(), _tsd), rid.ResourceId.ToString());
+                        focusLayer = group.AddLayer(GenerateBaseLayerName(rid.ResourceId.ToString(), _tsd), rid.ResourceId.ToString());
                         added++;
                     }
                 }
@@ -253,6 +254,8 @@
                 if (added > 0)
                 {
                     _tiledLayerModel.Invalidate();
+                    if (focusLayer != null)
+                        RestoreBaseLayerSelection(focusLayer);
                 }
             }
             else if (data != null && data.Length == 1)

Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.resx	2015-03-11 13:54:29 UTC (rev 8569)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.resx	2015-03-11 14:12:16 UTC (rev 8570)
@@ -124,18 +124,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>
 </root>
\ No newline at end of file