[mapguide-commits] r5950 - in trunk/Tools/Maestro:
Maestro.Editors/LayerDefinition/Vector
Maestro.Editors/LayerDefinition/Vector/Scales
Maestro.Editors/SymbolDefinition
OSGeo.MapGuide.MaestroAPI/ObjectModels
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jun 28 08:31:01 EDT 2011
Author: jng
Date: 2011-06-28 05:31:01 -0700 (Tue, 28 Jun 2011)
New Revision: 5950
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
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/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/CommonTypes.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
Log:
#1714: Submit more further work on editor support for symbol definitions. Many symbol-related interfaces had to be changed
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -493,7 +493,7 @@
internal static void RenderNoPreview(Graphics graphics, Rectangle rect)
{
- throw new NotImplementedException();
+
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -190,6 +190,8 @@
else if (isComp)
{
var diag = new SymbolInstancesDialog(m_owner.Editor, m_comp);
+ diag.ShowDialog();
+ return;
}
if (uc != null)
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.Designer.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.Designer.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -32,11 +32,11 @@
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
- this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
- this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
- this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.btnAdd = new System.Windows.Forms.ToolStripButton();
+ this.btnEdit = new System.Windows.Forms.ToolStripButton();
+ this.btnDelete = new System.Windows.Forms.ToolStripButton();
+ this.btnRefresh = new System.Windows.Forms.ToolStripButton();
+ this.grpSettings = new System.Windows.Forms.GroupBox();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.toolStrip1.SuspendLayout();
@@ -61,47 +61,47 @@
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripButton1,
- this.toolStripButton2,
- this.toolStripButton3,
- this.toolStripButton4});
+ this.btnAdd,
+ this.btnEdit,
+ this.btnDelete,
+ this.btnRefresh});
resources.ApplyResources(this.toolStrip1, "toolStrip1");
this.toolStrip1.Name = "toolStrip1";
//
- // toolStripButton1
+ // btnAdd
//
- this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- resources.ApplyResources(this.toolStripButton1, "toolStripButton1");
- this.toolStripButton1.Name = "toolStripButton1";
+ this.btnAdd.Image = global::Maestro.Editors.Properties.Resources.plus_circle;
+ resources.ApplyResources(this.btnAdd, "btnAdd");
+ this.btnAdd.Name = "btnAdd";
//
- // toolStripButton2
+ // btnEdit
//
- this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- resources.ApplyResources(this.toolStripButton2, "toolStripButton2");
- this.toolStripButton2.Name = "toolStripButton2";
+ this.btnEdit.Image = global::Maestro.Editors.Properties.Resources.document__pencil;
+ resources.ApplyResources(this.btnEdit, "btnEdit");
+ this.btnEdit.Name = "btnEdit";
//
- // toolStripButton3
+ // btnDelete
//
- this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- resources.ApplyResources(this.toolStripButton3, "toolStripButton3");
- this.toolStripButton3.Name = "toolStripButton3";
+ this.btnDelete.Image = global::Maestro.Editors.Properties.Resources.cross_script;
+ resources.ApplyResources(this.btnDelete, "btnDelete");
+ this.btnDelete.Name = "btnDelete";
//
- // toolStripButton4
+ // btnRefresh
//
- this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- resources.ApplyResources(this.toolStripButton4, "toolStripButton4");
- this.toolStripButton4.Name = "toolStripButton4";
+ this.btnRefresh.Image = global::Maestro.Editors.Properties.Resources.arrow_circle_135;
+ resources.ApplyResources(this.btnRefresh, "btnRefresh");
+ this.btnRefresh.Name = "btnRefresh";
//
- // groupBox2
+ // grpSettings
//
- resources.ApplyResources(this.groupBox2, "groupBox2");
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.TabStop = false;
+ resources.ApplyResources(this.grpSettings, "grpSettings");
+ this.grpSettings.Name = "grpSettings";
+ this.grpSettings.TabStop = false;
//
// SymbolInstanceSettingsCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.grpSettings);
this.Controls.Add(this.groupBox1);
this.Name = "SymbolInstanceSettingsCtrl";
resources.ApplyResources(this, "$this");
@@ -119,10 +119,10 @@
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.ToolStrip toolStrip1;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.ToolStripButton toolStripButton1;
- private System.Windows.Forms.ToolStripButton toolStripButton2;
- private System.Windows.Forms.ToolStripButton toolStripButton3;
- private System.Windows.Forms.ToolStripButton toolStripButton4;
+ private System.Windows.Forms.GroupBox grpSettings;
+ private System.Windows.Forms.ToolStripButton btnAdd;
+ private System.Windows.Forms.ToolStripButton btnEdit;
+ private System.Windows.Forms.ToolStripButton btnDelete;
+ private System.Windows.Forms.ToolStripButton btnRefresh;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -33,5 +33,12 @@
{
InitializeComponent();
}
+
+ public void SetContent(Control c)
+ {
+ grpSettings.Controls.Clear();
+ c.Dock = DockStyle.Fill;
+ grpSettings.Controls.Add(c);
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.resx 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.resx 2011-06-28 12:31:01 UTC (rev 5950)
@@ -145,104 +145,47 @@
<value>0</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
+ <value>3, 16</value>
</metadata>
- <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
- ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
- HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
- rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
- TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
- oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
- 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
- xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
- LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
- KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="toolStripButton1.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <data name="btnAdd.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
- <data name="toolStripButton1.Size" type="System.Drawing.Size, System.Drawing">
- <value>23, 22</value>
+ <data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
+ <value>49, 22</value>
</data>
- <data name="toolStripButton1.Text" xml:space="preserve">
- <value>toolStripButton1</value>
+ <data name="btnAdd.Text" xml:space="preserve">
+ <value>Add</value>
</data>
- <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
- ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
- HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
- rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
- TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
- oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
- 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
- xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
- LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
- KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="toolStripButton2.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <data name="btnEdit.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
- <data name="toolStripButton2.Size" type="System.Drawing.Size, System.Drawing">
- <value>23, 22</value>
+ <data name="btnEdit.Size" type="System.Drawing.Size, System.Drawing">
+ <value>47, 22</value>
</data>
- <data name="toolStripButton2.Text" xml:space="preserve">
- <value>toolStripButton2</value>
+ <data name="btnEdit.Text" xml:space="preserve">
+ <value>Edit</value>
</data>
- <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
- ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
- HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
- rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
- TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
- oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
- 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
- xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
- LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
- KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="toolStripButton3.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <data name="btnDelete.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
- <data name="toolStripButton3.Size" type="System.Drawing.Size, System.Drawing">
- <value>23, 22</value>
+ <data name="btnDelete.Size" type="System.Drawing.Size, System.Drawing">
+ <value>60, 22</value>
</data>
- <data name="toolStripButton3.Text" xml:space="preserve">
- <value>toolStripButton3</value>
+ <data name="btnDelete.Text" xml:space="preserve">
+ <value>Delete</value>
</data>
- <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
- ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
- HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
- rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
- TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
- oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
- 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
- xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
- LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
- KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="toolStripButton4.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <data name="btnRefresh.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
- <data name="toolStripButton4.Size" type="System.Drawing.Size, System.Drawing">
- <value>23, 22</value>
+ <data name="btnRefresh.Size" type="System.Drawing.Size, System.Drawing">
+ <value>66, 22</value>
</data>
- <data name="toolStripButton4.Text" xml:space="preserve">
- <value>toolStripButton4</value>
+ <data name="btnRefresh.Text" xml:space="preserve">
+ <value>Refresh</value>
</data>
+ <data name="btnRefresh.Visible" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
<data name="toolStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 16</value>
</data>
@@ -291,28 +234,28 @@
<data name=">>groupBox1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+ <data name="grpSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 167</value>
</data>
- <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="grpSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>563, 251</value>
</data>
- <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
+ <data name="grpSettings.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
- <data name="groupBox2.Text" xml:space="preserve">
- <value>Other</value>
+ <data name="grpSettings.Text" xml:space="preserve">
+ <value>Settings</value>
</data>
- <data name=">>groupBox2.Name" xml:space="preserve">
- <value>groupBox2</value>
+ <data name=">>grpSettings.Name" xml:space="preserve">
+ <value>grpSettings</value>
</data>
- <data name=">>groupBox2.Type" xml:space="preserve">
+ <data name=">>grpSettings.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>groupBox2.Parent" xml:space="preserve">
+ <data name=">>grpSettings.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>groupBox2.ZOrder" xml:space="preserve">
+ <data name=">>grpSettings.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">
@@ -321,28 +264,28 @@
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>570, 421</value>
</data>
- <data name=">>toolStripButton1.Name" xml:space="preserve">
- <value>toolStripButton1</value>
+ <data name=">>btnAdd.Name" xml:space="preserve">
+ <value>btnAdd</value>
</data>
- <data name=">>toolStripButton1.Type" xml:space="preserve">
+ <data name=">>btnAdd.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>toolStripButton2.Name" xml:space="preserve">
- <value>toolStripButton2</value>
+ <data name=">>btnEdit.Name" xml:space="preserve">
+ <value>btnEdit</value>
</data>
- <data name=">>toolStripButton2.Type" xml:space="preserve">
+ <data name=">>btnEdit.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>toolStripButton3.Name" xml:space="preserve">
- <value>toolStripButton3</value>
+ <data name=">>btnDelete.Name" xml:space="preserve">
+ <value>btnDelete</value>
</data>
- <data name=">>toolStripButton3.Type" xml:space="preserve">
+ <data name=">>btnDelete.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>toolStripButton4.Name" xml:space="preserve">
- <value>toolStripButton4</value>
+ <data name=">>btnRefresh.Name" xml:space="preserve">
+ <value>btnRefresh</value>
</data>
- <data name=">>toolStripButton4.Type" xml:space="preserve">
+ <data name=">>btnRefresh.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.Designer.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.Designer.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -34,11 +34,11 @@
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.listView1 = new System.Windows.Forms.ListView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.btnAdd = new System.Windows.Forms.ToolStripDropDownButton();
this.referenceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.inlineSimpleSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.inlineCompoundSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.btnDelete = new System.Windows.Forms.ToolStripButton();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.groupBox1.SuspendLayout();
@@ -50,6 +50,7 @@
resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.Name = "btnClose";
this.btnClose.UseVisualStyleBackColor = true;
+ this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
// splitContainer1
//
@@ -78,46 +79,48 @@
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripDropDownButton1,
- this.toolStripButton1});
+ this.btnAdd,
+ this.btnDelete});
resources.ApplyResources(this.toolStrip1, "toolStrip1");
this.toolStrip1.Name = "toolStrip1";
//
- // toolStripDropDownButton1
+ // btnAdd
//
- this.toolStripDropDownButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.btnAdd.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.referenceToolStripMenuItem,
this.inlineSimpleSymbolToolStripMenuItem,
this.inlineCompoundSymbolToolStripMenuItem});
- this.toolStripDropDownButton1.Image = global::Maestro.Editors.Properties.Resources.plus_circle;
- resources.ApplyResources(this.toolStripDropDownButton1, "toolStripDropDownButton1");
- this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
+ this.btnAdd.Image = global::Maestro.Editors.Properties.Resources.plus_circle;
+ resources.ApplyResources(this.btnAdd, "btnAdd");
+ this.btnAdd.Name = "btnAdd";
//
// referenceToolStripMenuItem
//
this.referenceToolStripMenuItem.Image = global::Maestro.Editors.Properties.Resources.arrow;
this.referenceToolStripMenuItem.Name = "referenceToolStripMenuItem";
resources.ApplyResources(this.referenceToolStripMenuItem, "referenceToolStripMenuItem");
+ this.referenceToolStripMenuItem.Click += new System.EventHandler(this.referenceToolStripMenuItem_Click);
//
// inlineSimpleSymbolToolStripMenuItem
//
this.inlineSimpleSymbolToolStripMenuItem.Image = global::Maestro.Editors.Properties.Resources.marker;
this.inlineSimpleSymbolToolStripMenuItem.Name = "inlineSimpleSymbolToolStripMenuItem";
resources.ApplyResources(this.inlineSimpleSymbolToolStripMenuItem, "inlineSimpleSymbolToolStripMenuItem");
+ this.inlineSimpleSymbolToolStripMenuItem.Click += new System.EventHandler(this.inlineSimpleSymbolToolStripMenuItem_Click);
//
// inlineCompoundSymbolToolStripMenuItem
//
this.inlineCompoundSymbolToolStripMenuItem.Image = global::Maestro.Editors.Properties.Resources.marker;
this.inlineCompoundSymbolToolStripMenuItem.Name = "inlineCompoundSymbolToolStripMenuItem";
resources.ApplyResources(this.inlineCompoundSymbolToolStripMenuItem, "inlineCompoundSymbolToolStripMenuItem");
+ this.inlineCompoundSymbolToolStripMenuItem.Click += new System.EventHandler(this.inlineCompoundSymbolToolStripMenuItem_Click);
//
- // toolStripButton1
+ // btnDelete
//
- this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButton1.Image = global::Maestro.Editors.Properties.Resources.cross_script;
- resources.ApplyResources(this.toolStripButton1, "toolStripButton1");
- this.toolStripButton1.Name = "toolStripButton1";
+ 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);
//
// SymbolInstancesDialog
//
@@ -144,10 +147,10 @@
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.ListView listView1;
private System.Windows.Forms.ToolStrip toolStrip1;
- private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
+ private System.Windows.Forms.ToolStripDropDownButton btnAdd;
private System.Windows.Forms.ToolStripMenuItem referenceToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem inlineSimpleSymbolToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem inlineCompoundSymbolToolStripMenuItem;
- private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ToolStripButton btnDelete;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -25,6 +25,9 @@
using System.Text;
using System.Windows.Forms;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using Maestro.Editors.SymbolDefinition;
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
@@ -39,5 +42,40 @@
_edSvc = edSvc;
_comp = comp;
}
+
+ private void btnClose_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void referenceToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ splitContainer1.Panel2.Controls.Clear();
+ using (var picker = new ResourcePicker(_edSvc.ResourceService, ResourceTypes.SymbolDefinition, ResourcePickerMode.OpenResource))
+ {
+ if (picker.ShowDialog() == DialogResult.OK)
+ {
+ var symRef = _comp.CreateSymbolReference(picker.ResourceID);
+ //var ctrl = new SimpleSymbolReferenceCtrl(_edSvc.ResourceService, symRef);
+
+ //var ctrl2 = new SymbolInstanceSettingsCtrl(
+ }
+ }
+ }
+
+ private void inlineSimpleSymbolToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void inlineCompoundSymbolToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void btnDelete_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.resx 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.resx 2011-06-28 12:31:01 UTC (rev 5950)
@@ -175,7 +175,7 @@
<value>0</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
+ <value>3, 16</value>
</metadata>
<data name="referenceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>210, 22</value>
@@ -195,23 +195,23 @@
<data name="inlineCompoundSymbolToolStripMenuItem.Text" xml:space="preserve">
<value>Inline Compound Symbol</value>
</data>
- <data name="toolStripDropDownButton1.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <data name="btnAdd.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
- <data name="toolStripDropDownButton1.Size" type="System.Drawing.Size, System.Drawing">
- <value>29, 22</value>
+ <data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
+ <value>58, 22</value>
</data>
- <data name="toolStripDropDownButton1.Text" xml:space="preserve">
- <value>toolStripDropDownButton1</value>
+ <data name="btnAdd.Text" xml:space="preserve">
+ <value>Add</value>
</data>
- <data name="toolStripButton1.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <data name="btnDelete.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
- <data name="toolStripButton1.Size" type="System.Drawing.Size, System.Drawing">
- <value>23, 22</value>
+ <data name="btnDelete.Size" type="System.Drawing.Size, System.Drawing">
+ <value>60, 22</value>
</data>
- <data name="toolStripButton1.Text" xml:space="preserve">
- <value>toolStripButton1</value>
+ <data name="btnDelete.Text" xml:space="preserve">
+ <value>Delete</value>
</data>
<data name="toolStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 16</value>
@@ -321,10 +321,10 @@
<data name="$this.Text" xml:space="preserve">
<value>Symbol Instances</value>
</data>
- <data name=">>toolStripDropDownButton1.Name" xml:space="preserve">
- <value>toolStripDropDownButton1</value>
+ <data name=">>btnAdd.Name" xml:space="preserve">
+ <value>btnAdd</value>
</data>
- <data name=">>toolStripDropDownButton1.Type" xml:space="preserve">
+ <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=">>referenceToolStripMenuItem.Name" xml:space="preserve">
@@ -345,10 +345,10 @@
<data name=">>inlineCompoundSymbolToolStripMenuItem.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=">>toolStripButton1.Name" xml:space="preserve">
- <value>toolStripButton1</value>
+ <data name=">>btnDelete.Name" xml:space="preserve">
+ <value>btnDelete</value>
</data>
- <data name=">>toolStripButton1.Type" xml:space="preserve">
+ <data name=">>btnDelete.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -68,6 +68,10 @@
lineList.Owner = parent.Owner;
areaList.Owner = parent.Owner;
+ pointList.Factory = parent.Factory;
+ lineList.Factory = parent.Factory;
+ areaList.Factory = parent.Factory;
+
if (_pts == null)
_pts = parent.Factory.CreateDefaultPointStyle();
@@ -97,6 +101,7 @@
chkComposite.Checked = (_cts != null);
compList.Owner = parent.Owner;
+ compList.Factory = parent.Factory;
if (_cts == null)
_cts = parent.Factory.CreateDefaultCompositeStyle();
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -28,17 +28,18 @@
using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
using Maestro.Editors.Generic;
using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.Common;
namespace Maestro.Editors.SymbolDefinition
{
internal partial class SimpleSymbolReferenceCtrl : UserControl
{
private IResourceService _resSvc;
- private ISimpleSymbolLibraryReference _symRef;
+ private IResourceIdReference _symRef;
private bool _init = false;
- public SimpleSymbolReferenceCtrl(IResourceService resSvc, ISimpleSymbolLibraryReference symRef)
+ public SimpleSymbolReferenceCtrl(IResourceService resSvc, IResourceIdReference symRef)
{
InitializeComponent();
_resSvc = resSvc;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/CommonTypes.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/CommonTypes.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/CommonTypes.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -326,4 +326,16 @@
Sym_RepeatX,
Sym_RepeatY
}
+
+ /// <summary>
+ /// Represents a resource id reference
+ /// </summary>
+ public interface IResourceIdReference
+ {
+ /// <summary>
+ /// Gets or sets the resource id.
+ /// </summary>
+ /// <value>The resource id.</value>
+ string ResourceId { get; set; }
+ }
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -1667,6 +1667,13 @@
/// </summary>
/// <param name="inst">The inst.</param>
void RemoveSymbolInstance(ISymbolInstance inst);
+
+ /// <summary>
+ /// Creates a symbol reference.
+ /// </summary>
+ /// <param name="resourceId"></param>
+ /// <returns></returns>
+ ISymbolInstance CreateSymbolReference(string resourceId);
}
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -730,7 +730,7 @@
}
[XmlIgnore]
- string ISimpleSymbolLibraryReference.ResourceId
+ string IResourceIdReference.ResourceId
{
get
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -116,13 +116,8 @@
/// <summary>
/// Represents a symbol instance reference by a resource id
/// </summary>
- public interface ISymbolLibraryReference : ISymbolInstanceReference
+ public interface ISymbolLibraryReference : ISymbolInstanceReference, IResourceIdReference
{
- /// <summary>
- /// Gets or sets the resource id.
- /// </summary>
- /// <value>The resource id.</value>
- string ResourceId { get; set; }
}
/// <summary>
@@ -729,13 +724,8 @@
/// <summary>
/// Represents a simple symbol reference by resource id
/// </summary>
- public interface ISimpleSymbolLibraryReference : ISimpleSymbolReferenceBase
+ public interface ISimpleSymbolLibraryReference : ISimpleSymbolReferenceBase, IResourceIdReference
{
- /// <summary>
- /// Gets or sets the resource id.
- /// </summary>
- /// <value>The resource id.</value>
- string ResourceId { get; set; }
}
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs 2011-06-28 01:36:59 UTC (rev 5949)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs 2011-06-28 12:31:01 UTC (rev 5950)
@@ -1702,6 +1702,15 @@
if (sym != null)
this.SymbolInstance.Remove(sym);
}
+
+ public ISymbolInstance CreateSymbolReference(string resourceId)
+ {
+ return new SymbolInstance()
+ {
+ Item = resourceId,
+ ParameterOverrides = new ParameterOverrides()
+ };
+ }
}
partial class SymbolInstance : ISymbolInstance
More information about the mapguide-commits
mailing list