[mapguide-commits] r7923 - trunk/Tools/Maestro/Maestro.Editors/MapDefinition
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Nov 24 07:36:10 PST 2013
Author: jng
Date: 2013-11-24 07:36:10 -0800 (Sun, 24 Nov 2013)
New Revision: 7923
Modified:
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
Log:
#2325: Add button to open Layer Definition in editor from Layer Properties view
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.Designer.cs 2013-11-24 15:29:14 UTC (rev 7922)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.Designer.cs 2013-11-24 15:36:10 UTC (rev 7923)
@@ -41,11 +41,13 @@
this.txtName = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
+ this.btnGo = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
//
+ this.groupBox1.Controls.Add(this.btnGo);
this.groupBox1.Controls.Add(this.btnBrowse);
this.groupBox1.Controls.Add(this.txtResourceId);
this.groupBox1.Controls.Add(this.label3);
@@ -123,6 +125,14 @@
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
+ // btnGo
+ //
+ resources.ApplyResources(this.btnGo, "btnGo");
+ this.btnGo.Image = global::Maestro.Editors.Properties.Resources.arrow;
+ this.btnGo.Name = "btnGo";
+ this.btnGo.UseVisualStyleBackColor = true;
+ this.btnGo.Click += new System.EventHandler(this.btnGo_Click);
+ //
// LayerPropertiesCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -149,5 +159,6 @@
private System.Windows.Forms.Button btnBrowse;
private System.Windows.Forms.TextBox txtResourceId;
private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Button btnGo;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs 2013-11-24 15:29:14 UTC (rev 7922)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs 2013-11-24 15:36:10 UTC (rev 7923)
@@ -29,6 +29,7 @@
using Maestro.Editors.Generic;
using OSGeo.MapGuide.MaestroAPI.Services;
using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
namespace Maestro.Editors.MapDefinition
{
@@ -42,11 +43,14 @@
public event EventHandler LayerChanged;
private IResourceService _resSvc;
+ private IEditorService _edSvc;
- public LayerPropertiesCtrl(IMapLayer layer, IResourceService resSvc) : this()
+ public LayerPropertiesCtrl(IMapLayer layer, IResourceService resSvc, IEditorService edSvc)
+ : this()
{
layer.PropertyChanged += new PropertyChangedEventHandler(OnLayerChanged);
_resSvc = resSvc;
+ _edSvc = edSvc;
TextBoxBinder.BindText(txtResourceId, layer, "ResourceId");
TextBoxBinder.BindText(txtName, layer, "Name");
@@ -58,11 +62,12 @@
CheckBoxBinder.BindChecked(chkSelectable, layer, "Selectable");
}
- public LayerPropertiesCtrl(IBaseMapLayer layer, IResourceService resSvc)
+ public LayerPropertiesCtrl(IBaseMapLayer layer, IResourceService resSvc, IEditorService edSvc)
: this()
{
layer.PropertyChanged += new PropertyChangedEventHandler(OnLayerChanged);
_resSvc = resSvc;
+ _edSvc = edSvc;
TextBoxBinder.BindText(txtResourceId, layer, "ResourceId");
TextBoxBinder.BindText(txtName, layer, "Name");
@@ -93,5 +98,11 @@
}
}
}
+
+ private void btnGo_Click(object sender, EventArgs e)
+ {
+ if (ResourceIdentifier.Validate(txtResourceId.Text))
+ _edSvc.OpenResource(txtResourceId.Text);
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.resx 2013-11-24 15:29:14 UTC (rev 7922)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.resx 2013-11-24 15:36:10 UTC (rev 7923)
@@ -112,23 +112,50 @@
<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="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="btnGo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnGo.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnGo.Location" type="System.Drawing.Point, System.Drawing">
+ <value>371, 17</value>
+ </data>
+ <data name="btnGo.Size" type="System.Drawing.Size, System.Drawing">
+ <value>26, 23</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="btnGo.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
+ </data>
+ <data name=">>btnGo.Name" xml:space="preserve">
+ <value>btnGo</value>
+ </data>
+ <data name=">>btnGo.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnGo.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>btnGo.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="btnBrowse.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
- <value>371, 17</value>
+ <value>339, 17</value>
</data>
<data name="btnBrowse.Size" type="System.Drawing.Size, System.Drawing">
<value>26, 23</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnBrowse.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
@@ -139,13 +166,13 @@
<value>btnBrowse</value>
</data>
<data name=">>btnBrowse.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=">>btnBrowse.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>btnBrowse.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
<data name="txtResourceId.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -154,7 +181,7 @@
<value>112, 19</value>
</data>
<data name="txtResourceId.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 20</value>
+ <value>221, 20</value>
</data>
<data name="txtResourceId.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@@ -163,13 +190,13 @@
<value>txtResourceId</value>
</data>
<data name=">>txtResourceId.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtResourceId.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>txtResourceId.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -190,13 +217,13 @@
<value>label3</value>
</data>
<data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>label3.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="chkSelectable.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -217,13 +244,13 @@
<value>chkSelectable</value>
</data>
<data name=">>chkSelectable.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkSelectable.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>chkSelectable.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name="chkExpanded.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -244,13 +271,13 @@
<value>chkExpanded</value>
</data>
<data name=">>chkExpanded.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkExpanded.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>chkExpanded.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
<data name="chkLegendVisible.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -271,13 +298,13 @@
<value>chkLegendVisible</value>
</data>
<data name=">>chkLegendVisible.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkLegendVisible.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>chkLegendVisible.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>6</value>
</data>
<data name="chkVisible.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -298,13 +325,13 @@
<value>chkVisible</value>
</data>
<data name=">>chkVisible.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkVisible.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>chkVisible.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>7</value>
</data>
<data name="txtLegendLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -322,13 +349,13 @@
<value>txtLegendLabel</value>
</data>
<data name=">>txtLegendLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtLegendLabel.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>txtLegendLabel.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>8</value>
</data>
<data name="txtName.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -346,13 +373,13 @@
<value>txtName</value>
</data>
<data name=">>txtName.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtName.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>txtName.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>9</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -373,13 +400,13 @@
<value>label2</value>
</data>
<data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label2.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>label2.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>10</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -400,13 +427,13 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>10</value>
+ <value>11</value>
</data>
<data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@@ -427,7 +454,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>$this</value>
@@ -435,7 +462,7 @@
<data name=">>groupBox1.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.Size" type="System.Drawing.Size, System.Drawing">
@@ -445,6 +472,6 @@
<value>LayerPropertiesCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2013-11-24 15:29:14 UTC (rev 7922)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2013-11-24 15:36:10 UTC (rev 7923)
@@ -236,7 +236,7 @@
btnMoveLayerOrGroupDown.Enabled = true; //TODO: Disable if layer is bottom of its group
propertiesPanel.Controls.Clear();
- var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService);
+ var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService, _edSvc);
item.LayerChanged += (s, evt) => { OnResourceChanged(); };
item.Dock = DockStyle.Fill;
_activeLayer = layer.Tag;
@@ -273,7 +273,7 @@
btnDLRemoveLayer.Enabled = true;
propertiesPanel.Controls.Clear();
- var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService);
+ var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService, _edSvc);
item.LayerChanged += (s, evt) => { OnResourceChanged(); };
item.Dock = DockStyle.Fill;
_activeLayer = layer.Tag;
@@ -1022,7 +1022,7 @@
btnBaseLayerGroupToRegular.Enabled = false;
propertiesPanel.Controls.Clear();
- var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService);
+ var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService, _edSvc);
item.LayerChanged += (s, evt) => { OnResourceChanged(); };
item.Dock = DockStyle.Fill;
_activeLayer = null;
More information about the mapguide-commits
mailing list