[mapguide-commits] r6029 - in trunk/Tools/Maestro:
Maestro.Editors/LayerDefinition/Vector/Scales
OSGeo.MapGuide.MaestroAPI/ObjectModels
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Aug 4 07:10:46 EDT 2011
Author: jng
Date: 2011-08-04 04:10:46 -0700 (Thu, 04 Aug 2011)
New Revision: 6029
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.resx
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
Log:
#1746: Add ability to refresh available parameter overrides when symbol instance being edited is an inline symbol definition. Also fix bad parameter override object initialization
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs 2011-08-03 16:25:05 UTC (rev 6028)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs 2011-08-04 11:10:46 UTC (rev 6029)
@@ -191,6 +191,8 @@
{
var diag = new SymbolInstancesDialog(m_owner.Editor, m_comp, m_owner.SelectedClass, m_owner.GetFdoProvider(), m_owner.FeatureSourceId);
diag.ShowDialog();
+ //HACK: Assume edits made
+ Owner.RaiseResourceChanged();
return;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.Designer.cs 2011-08-03 16:25:05 UTC (rev 6028)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.Designer.cs 2011-08-04 11:10:46 UTC (rev 6029)
@@ -33,6 +33,8 @@
this.grdOverrides = new System.Windows.Forms.DataGridView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.btnAdd = new System.Windows.Forms.ToolStripDropDownButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btnEdit = new System.Windows.Forms.ToolStripButton();
this.btnDelete = new System.Windows.Forms.ToolStripButton();
this.grpSettings = new System.Windows.Forms.GroupBox();
@@ -56,6 +58,7 @@
this.grdOverrides.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
resources.ApplyResources(this.grdOverrides, "grdOverrides");
this.grdOverrides.Name = "grdOverrides";
+ this.grdOverrides.SelectionChanged += new System.EventHandler(this.grdOverrides_SelectionChanged);
//
// toolStrip1
//
@@ -68,21 +71,36 @@
//
// btnAdd
//
+ this.btnAdd.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripSeparator1,
+ this.refreshToolStripMenuItem});
this.btnAdd.Image = global::Maestro.Editors.Properties.Resources.plus_circle;
resources.ApplyResources(this.btnAdd, "btnAdd");
this.btnAdd.Name = "btnAdd";
//
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+ //
+ // refreshToolStripMenuItem
+ //
+ this.refreshToolStripMenuItem.Image = global::Maestro.Editors.Properties.Resources.arrow_circle_135;
+ this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem";
+ resources.ApplyResources(this.refreshToolStripMenuItem, "refreshToolStripMenuItem");
+ this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click);
+ //
// btnEdit
//
+ resources.ApplyResources(this.btnEdit, "btnEdit");
this.btnEdit.Image = global::Maestro.Editors.Properties.Resources.document__pencil;
- resources.ApplyResources(this.btnEdit, "btnEdit");
this.btnEdit.Name = "btnEdit";
this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click);
//
// btnDelete
//
+ resources.ApplyResources(this.btnDelete, "btnDelete");
this.btnDelete.Image = global::Maestro.Editors.Properties.Resources.cross_script;
- resources.ApplyResources(this.btnDelete, "btnDelete");
this.btnDelete.Name = "btnDelete";
this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
//
@@ -117,5 +135,7 @@
private System.Windows.Forms.ToolStripButton btnEdit;
private System.Windows.Forms.ToolStripButton btnDelete;
private System.Windows.Forms.ToolStripDropDownButton btnAdd;
+ private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs 2011-08-03 16:25:05 UTC (rev 6028)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs 2011-08-04 11:10:46 UTC (rev 6029)
@@ -80,26 +80,12 @@
if (_symRef.Reference.Type == SymbolInstanceType.Reference)
{
var sym = (ISymbolDefinitionBase)_edSvc.ResourceService.GetResource(((ISymbolInstanceReferenceLibrary)_symRef.Reference).ResourceId);
- foreach (var p in sym.GetParameters())
- {
- var param = p;
- var btn = btnAdd.DropDown.Items.Add(p.Name, null, (s, e) =>
- {
- AddParameterOverride(sym, param);
- });
- }
+ PopulateParameterList(sym);
}
else if (_symRef.Reference.Type == SymbolInstanceType.Inline)
{
var inline = (ISymbolInstanceReferenceInline)_symRef.Reference;
- foreach (var p in inline.SymbolDefinition.GetParameters())
- {
- var param = p;
- var btn = btnAdd.DropDown.Items.Add(p.Name, null, (s, e) =>
- {
- AddParameterOverride(inline.SymbolDefinition, param);
- });
- }
+ PopulateParameterList(inline.SymbolDefinition);
}
else
{
@@ -107,6 +93,21 @@
}
}
+ private void PopulateParameterList(ISymbolDefinitionBase sym)
+ {
+ foreach (var p in sym.GetParameters())
+ {
+ var param = p;
+ var btn = new ToolStripButton(p.Name, null, (s, e) =>
+ {
+ AddParameterOverride(sym, param);
+ });
+ btnAdd.DropDown.Items.Insert(0, btn);
+ }
+ btnAdd.DropDown.Items.Add(toolStripSeparator1);
+ btnAdd.DropDown.Items.Add(refreshToolStripMenuItem);
+ }
+
private void AddParameterOverride(ISymbolDefinitionBase sym, IParameter param)
{
foreach (var p in _params)
@@ -185,5 +186,15 @@
this.RaiseDirty();
}
}
+
+ private void refreshToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ PopulateAvailableParameters();
+ }
+
+ private void grdOverrides_SelectionChanged(object sender, EventArgs e)
+ {
+ btnEdit.Enabled = btnDelete.Enabled = (grdOverrides.SelectedRows.Count == 1);
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.resx 2011-08-03 16:25:05 UTC (rev 6028)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.resx 2011-08-04 11:10:46 UTC (rev 6029)
@@ -150,6 +150,15 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>3, 16</value>
</metadata>
+ <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>110, 6</value>
+ </data>
+ <data name="refreshToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>113, 22</value>
+ </data>
+ <data name="refreshToolStripMenuItem.Text" xml:space="preserve">
+ <value>Refresh</value>
+ </data>
<data name="btnAdd.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
@@ -159,6 +168,9 @@
<data name="btnAdd.Text" xml:space="preserve">
<value>Add</value>
</data>
+ <data name="btnEdit.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
<data name="btnEdit.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
@@ -168,6 +180,9 @@
<data name="btnEdit.Text" xml:space="preserve">
<value>Edit Value</value>
</data>
+ <data name="btnDelete.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
<data name="btnDelete.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
@@ -264,6 +279,18 @@
<data name=">>btnAdd.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name=">>toolStripSeparator1.Name" xml:space="preserve">
+ <value>toolStripSeparator1</value>
+ </data>
+ <data name=">>toolStripSeparator1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>refreshToolStripMenuItem.Name" xml:space="preserve">
+ <value>refreshToolStripMenuItem</value>
+ </data>
+ <data name=">>refreshToolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>btnEdit.Name" xml:space="preserve">
<value>btnEdit</value>
</data>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs 2011-08-03 16:25:05 UTC (rev 6028)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs 2011-08-04 11:10:46 UTC (rev 6029)
@@ -341,7 +341,13 @@
public IParameter CreateParameter()
{
- return new Parameter() { };
+ return new Parameter()
+ {
+ Identifier = "",
+ DefaultValue = "",
+ Description = "",
+ DisplayName = "",
+ };
}
[XmlIgnore]
More information about the mapguide-commits
mailing list