[mapguide-commits] r6633 - in branches/maestro-4.0.x: Maestro
Maestro.Editors/MapDefinition
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed May 9 08:39:10 EDT 2012
Author: jng
Date: 2012-05-09 05:39:10 -0700 (Wed, 09 May 2012)
New Revision: 6633
Modified:
branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
branches/maestro-4.0.x/Maestro/changelog.txt
Log:
Backport #1973
Modified: branches/maestro-4.0.x/Maestro/changelog.txt
===================================================================
--- branches/maestro-4.0.x/Maestro/changelog.txt 2012-05-09 12:31:20 UTC (rev 6632)
+++ branches/maestro-4.0.x/Maestro/changelog.txt 2012-05-09 12:39:10 UTC (rev 6633)
@@ -3,6 +3,8 @@
- Uses new mg-desktop release (8 May 2012, .net 2.0, VC9)
- New command to open sources by entering its resource id
- New shortcut buttons to jump from Layer Definition to Feature/Drawing Source
+ - Fix: Groups/Layer info in Map Definition editor not updating via up/down keypress
+ - Fix: Row/Column mismatch in GetTile API (http implemenation)
- Fix: AllowOverpost and DisplayAsText properties for basic point style not exposed in editor UI
- Fix: Incorrect RuntimeMapLayer property initialization for tiled maps
- Fix: Incorrect serialization of Map Extents
Modified: branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs 2012-05-09 12:31:20 UTC (rev 6632)
+++ branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs 2012-05-09 12:39:10 UTC (rev 6633)
@@ -121,12 +121,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
//
@@ -251,12 +251,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
//
@@ -366,12 +366,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: branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-05-09 12:31:20 UTC (rev 6632)
+++ branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-05-09 12:39:10 UTC (rev 6633)
@@ -53,46 +53,81 @@
void trvLayersGroup_KeyUp(object sender, KeyEventArgs e)
{
- if (e.KeyCode == Keys.Delete)
+ if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
{
var group = GetSelectedLayerGroupItem() as GroupItem;
var layer = GetSelectedLayerGroupItem() as LayerItem;
- if (layer != null)
+ if (e.KeyCode == Keys.Delete)
{
- RemoveSelectedLayerGroupItem(layer);
+ if (layer != null)
+ {
+ RemoveSelectedLayerGroupItem(layer);
+ }
+ else if (group != null)
+ {
+ RemoveSelectedLayerGroupItem(group);
+ }
}
- else if (group != null)
+ else
{
- RemoveSelectedLayerGroupItem(group);
+ if (layer != null)
+ {
+ OnDynamicLayerItemSelected(layer);
+ }
+ else if (group != null)
+ {
+ OnDynamicGroupItemSelected(group);
+ }
}
}
}
void trvLayerDrawingOrder_KeyUp(object sender, KeyEventArgs e)
{
- if (e.KeyCode == Keys.Delete)
+ if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
{
var layer = GetSelectedDrawOrderItem() as LayerItem;
if (layer != null)
{
- RemoveSelectedDrawOrderLayerItem(layer);
+ if (e.KeyCode == Keys.Delete)
+ {
+ RemoveSelectedDrawOrderLayerItem(layer);
+ }
+ else
+ {
+ OnDrawOrderLayerItemSelected(layer);
+ }
}
}
}
void trvBaseLayers_KeyUp(object sender, KeyEventArgs e)
{
- if (e.KeyCode == Keys.Delete)
+ if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
{
var group = GetSelectedTiledLayerItem() as BaseLayerGroupItem;
var layer = GetSelectedTiledLayerItem() as BaseLayerItem;
- if (group != null)
+ if (e.KeyCode == Keys.Delete)
{
- RemoveSelectedTiledLayerItem(group);
+ if (group != null)
+ {
+ RemoveSelectedTiledLayerItem(group);
+ }
+ else if (layer != null)
+ {
+ RemoveSelectedTiledLayerItem(layer);
+ }
}
- else if (layer != null)
+ else
{
- RemoveSelectedTiledLayerItem(layer);
+ if (layer != null)
+ {
+ OnBaseLayerItemSelected(layer);
+ }
+ else if (group != null)
+ {
+ OnBaseLayerGroupItemSelected(group);
+ }
}
}
}
More information about the mapguide-commits
mailing list