[mapguide-commits] r6523 - in trunk/Tools/Maestro:
Maestro.AddIn.ExtendedObjectModels
Maestro.AddIn.ExtendedObjectModels/Editor
Maestro.Editors/SymbolDefinition/GraphicsEditors
OSGeo.MapGuide.MaestroAPI/ObjectModels
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Feb 18 10:24:50 EST 2012
Author: jng
Date: 2012-02-18 07:24:50 -0800 (Sat, 18 Feb 2012)
New Revision: 6523
Modified:
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Manifest.addin
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.resx
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.resx
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.resx
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs
Log:
#1911: Symbol Definition editor improvements
- Reduce screen real estate by using a tabbed interface for Text and Image graphic dialogs
- Add missing Image graphic options (SizeX, SizeY, SizeScalable, Angle, PositionX, PositionY)
- Add missing Text graphic options introduced with the 1.1.0 schema
- Add support for Path scaling options introduced with the 2.4.0 schema
- Allow 1.1.0 and 2.4.0 symbol definitions to be opened with the specialized editor
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs 2012-02-18 15:24:50 UTC (rev 6523)
@@ -230,4 +230,34 @@
return new LoadProcedureEditor();
}
}
+
+ internal class SymbolDefinition110EditorFactory : IEditorFactory
+ {
+ public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
+
+ public SymbolDefinition110EditorFactory()
+ {
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolDefinition, "1.1.0");
+ }
+
+ public IEditorViewContent Create()
+ {
+ return new SymbolDefinitionEditor();
+ }
+ }
+
+ internal class SymbolDefinition240EditorFactory : IEditorFactory
+ {
+ public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
+
+ public SymbolDefinition240EditorFactory()
+ {
+ this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolDefinition, "2.4.0");
+ }
+
+ public IEditorViewContent Create()
+ {
+ return new SymbolDefinitionEditor();
+ }
+ }
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Manifest.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Manifest.addin 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Manifest.addin 2012-02-18 15:24:50 UTC (rev 6523)
@@ -26,6 +26,8 @@
<Class id="LayerDefinitionEditor240" class="Maestro.AddIn.ExtendedObjectModels.Editor.LayerDefinition240EditorFactory" />
<Class id="MapDefinition230" class="Maestro.AddIn.ExtendedObjectModels.Editor.MapDefinition230EditorFactory" />
<Class id="MapDefinition240" class="Maestro.AddIn.ExtendedObjectModels.Editor.MapDefinition240EditorFactory" />
+ <Class id="SymbolDefinition110" class="Maestro.AddIn.ExtendedObjectModels.Editor.SymbolDefinition110EditorFactory" />
+ <Class id="SymbolDefinition240" class="Maestro.AddIn.ExtendedObjectModels.Editor.SymbolDefinition240EditorFactory" />
<Class id="WatermarkDefinition230" class="Maestro.AddIn.ExtendedObjectModels.Editor.WatermarkDefinition230EditorFactory" />
<Class id="WatermarkDefinition240" class="Maestro.AddIn.ExtendedObjectModels.Editor.WatermarkDefinition240EditorFactory" />
</Path>
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.Designer.cs 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.Designer.cs 2012-02-18 15:24:50 UTC (rev 6523)
@@ -42,7 +42,21 @@
this.picPreview = new System.Windows.Forms.PictureBox();
this.btnBrowse = new System.Windows.Forms.Button();
this.btnResData = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.symSizeX = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.symPositionX = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.symPositionY = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.symSizeY = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.symAngle = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.label7 = new System.Windows.Forms.Label();
+ this.symSizeScalable = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.label8 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.picPreview)).BeginInit();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// rdResourceRef
@@ -131,11 +145,96 @@
this.btnResData.UseVisualStyleBackColor = true;
this.btnResData.Click += new System.EventHandler(this.btnResData_Click);
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.symAngle);
+ this.groupBox1.Controls.Add(this.label7);
+ this.groupBox1.Controls.Add(this.symSizeScalable);
+ this.groupBox1.Controls.Add(this.label8);
+ this.groupBox1.Controls.Add(this.symPositionY);
+ this.groupBox1.Controls.Add(this.label5);
+ this.groupBox1.Controls.Add(this.label6);
+ this.groupBox1.Controls.Add(this.symSizeY);
+ this.groupBox1.Controls.Add(this.symPositionX);
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.label3);
+ this.groupBox1.Controls.Add(this.symSizeX);
+ resources.ApplyResources(this.groupBox1, "groupBox1");
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.TabStop = false;
+ //
+ // symSizeX
+ //
+ resources.ApplyResources(this.symSizeX, "symSizeX");
+ this.symSizeX.Name = "symSizeX";
+ this.symSizeX.SupportedEnhancedDataTypes = null;
+ //
+ // label3
+ //
+ resources.ApplyResources(this.label3, "label3");
+ this.label3.Name = "label3";
+ //
+ // label4
+ //
+ resources.ApplyResources(this.label4, "label4");
+ this.label4.Name = "label4";
+ //
+ // symPositionX
+ //
+ resources.ApplyResources(this.symPositionX, "symPositionX");
+ this.symPositionX.Name = "symPositionX";
+ this.symPositionX.SupportedEnhancedDataTypes = null;
+ //
+ // symPositionY
+ //
+ resources.ApplyResources(this.symPositionY, "symPositionY");
+ this.symPositionY.Name = "symPositionY";
+ this.symPositionY.SupportedEnhancedDataTypes = null;
+ //
+ // label5
+ //
+ resources.ApplyResources(this.label5, "label5");
+ this.label5.Name = "label5";
+ //
+ // label6
+ //
+ resources.ApplyResources(this.label6, "label6");
+ this.label6.Name = "label6";
+ //
+ // symSizeY
+ //
+ resources.ApplyResources(this.symSizeY, "symSizeY");
+ this.symSizeY.Name = "symSizeY";
+ this.symSizeY.SupportedEnhancedDataTypes = null;
+ //
+ // symAngle
+ //
+ resources.ApplyResources(this.symAngle, "symAngle");
+ this.symAngle.Name = "symAngle";
+ this.symAngle.SupportedEnhancedDataTypes = null;
+ //
+ // label7
+ //
+ resources.ApplyResources(this.label7, "label7");
+ this.label7.Name = "label7";
+ //
+ // symSizeScalable
+ //
+ resources.ApplyResources(this.symSizeScalable, "symSizeScalable");
+ this.symSizeScalable.Name = "symSizeScalable";
+ this.symSizeScalable.SupportedEnhancedDataTypes = null;
+ //
+ // label8
+ //
+ resources.ApplyResources(this.label8, "label8");
+ this.label8.Name = "label8";
+ //
// ImageDialog
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
resources.ApplyResources(this, "$this");
this.ControlBox = false;
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btnResData);
this.Controls.Add(this.picPreview);
this.Controls.Add(this.lnkLoadImage);
@@ -151,6 +250,8 @@
this.Controls.Add(this.rdResourceRef);
this.Name = "ImageDialog";
((System.ComponentModel.ISupportInitialize)(this.picPreview)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -171,5 +272,18 @@
private System.Windows.Forms.PictureBox picPreview;
private System.Windows.Forms.Button btnBrowse;
private System.Windows.Forms.Button btnResData;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private SymbolField symSizeX;
+ private SymbolField symAngle;
+ private System.Windows.Forms.Label label7;
+ private SymbolField symSizeScalable;
+ private System.Windows.Forms.Label label8;
+ private SymbolField symPositionY;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Label label6;
+ private SymbolField symSizeY;
+ private SymbolField symPositionX;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs 2012-02-18 15:24:50 UTC (rev 6523)
@@ -87,6 +87,24 @@
}
}
+ protected override void OnLoad(EventArgs e)
+ {
+ try
+ {
+ _init = true;
+ symAngle.Bind(_image, "Angle");
+ symPositionX.Bind(_image, "PositionX");
+ symPositionY.Bind(_image, "PositionY");
+ symSizeScalable.Bind(_image, "SizeScalable");
+ symSizeX.Bind(_image, "SizeX");
+ symSizeY.Bind(_image, "SizeY");
+ }
+ finally
+ {
+ _init = false;
+ }
+ }
+
private void imageType_CheckedChanged(object sender, EventArgs e)
{
if (_init)
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.resx 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.resx 2012-02-18 15:24:50 UTC (rev 6523)
@@ -112,16 +112,16 @@
<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="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="rdResourceRef.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="rdResourceRef.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 13</value>
</data>
@@ -138,13 +138,13 @@
<value>rdResourceRef</value>
</data>
<data name=">>rdResourceRef.Type" xml:space="preserve">
- <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>rdResourceRef.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>rdResourceRef.ZOrder" xml:space="preserve">
- <value>12</value>
+ <value>13</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -165,13 +165,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>$this</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>11</value>
+ <value>12</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -192,13 +192,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>$this</value>
</data>
<data name=">>label2.ZOrder" xml:space="preserve">
- <value>10</value>
+ <value>11</value>
</data>
<data name="txtResourceId.Location" type="System.Drawing.Point, System.Drawing">
<value>153, 42</value>
@@ -213,13 +213,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>$this</value>
</data>
<data name=">>txtResourceId.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>10</value>
</data>
<data name="txtResData.Location" type="System.Drawing.Point, System.Drawing">
<value>153, 70</value>
@@ -234,13 +234,13 @@
<value>txtResData</value>
</data>
<data name=">>txtResData.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=">>txtResData.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>txtResData.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>9</value>
</data>
<data name="rdInline.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -261,13 +261,13 @@
<value>rdInline</value>
</data>
<data name=">>rdInline.Type" xml:space="preserve">
- <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>rdInline.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>rdInline.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>7</value>
</data>
<data name="txtImageBase64.Location" type="System.Drawing.Point, System.Drawing">
<value>30, 140</value>
@@ -275,12 +275,12 @@
<data name="txtImageBase64.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <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="txtImageBase64.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
<value>Vertical</value>
</data>
<data name="txtImageBase64.Size" type="System.Drawing.Size, System.Drawing">
- <value>246, 208</value>
+ <value>246, 178</value>
</data>
<data name="txtImageBase64.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
@@ -289,16 +289,16 @@
<value>txtImageBase64</value>
</data>
<data name=">>txtImageBase64.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=">>txtImageBase64.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>txtImageBase64.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>6</value>
</data>
<data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
- <value>453, 364</value>
+ <value>453, 441</value>
</data>
<data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -313,13 +313,13 @@
<value>btnClose</value>
</data>
<data name=">>btnClose.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=">>btnClose.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>btnClose.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
<data name="lnkPreview.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -340,13 +340,13 @@
<value>lnkPreview</value>
</data>
<data name=">>lnkPreview.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lnkPreview.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>lnkPreview.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name="lnkLoadImage.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -367,19 +367,19 @@
<value>lnkLoadImage</value>
</data>
<data name=">>lnkLoadImage.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lnkLoadImage.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>lnkLoadImage.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="picPreview.Location" type="System.Drawing.Point, System.Drawing">
<value>282, 140</value>
</data>
<data name="picPreview.Size" type="System.Drawing.Size, System.Drawing">
- <value>246, 208</value>
+ <value>246, 178</value>
</data>
<data name="picPreview.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@@ -388,13 +388,13 @@
<value>picPreview</value>
</data>
<data name=">>picPreview.Type" xml:space="preserve">
- <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>picPreview.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>picPreview.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
<value>500, 40</value>
@@ -412,13 +412,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>$this</value>
</data>
<data name=">>btnBrowse.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>8</value>
</data>
<data name="btnResData.Location" type="System.Drawing.Point, System.Drawing">
<value>500, 68</value>
@@ -436,19 +436,343 @@
<value>btnResData</value>
</data>
<data name=">>btnResData.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=">>btnResData.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>btnResData.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="symAngle.Location" type="System.Drawing.Point, System.Drawing">
+ <value>289, 72</value>
+ </data>
+ <data name="symAngle.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symAngle.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
+ </data>
+ <data name=">>symAngle.Name" xml:space="preserve">
+ <value>symAngle</value>
+ </data>
+ <data name=">>symAngle.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symAngle.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>symAngle.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">
+ <data name="label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
+ </data>
+ <data name="label7.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
+ <value>227, 75</value>
+ </data>
+ <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+ <value>34, 13</value>
+ </data>
+ <data name="label7.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name="label7.Text" xml:space="preserve">
+ <value>Angle</value>
+ </data>
+ <data name=">>label7.Name" xml:space="preserve">
+ <value>label7</value>
+ </data>
+ <data name=">>label7.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label7.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label7.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="symSizeScalable.Location" type="System.Drawing.Point, System.Drawing">
+ <value>99, 72</value>
+ </data>
+ <data name="symSizeScalable.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symSizeScalable.TabIndex" type="System.Int32, mscorlib">
+ <value>9</value>
+ </data>
+ <data name=">>symSizeScalable.Name" xml:space="preserve">
+ <value>symSizeScalable</value>
+ </data>
+ <data name=">>symSizeScalable.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symSizeScalable.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>symSizeScalable.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="label8.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
+ <value>14, 75</value>
+ </data>
+ <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
+ <value>71, 13</value>
+ </data>
+ <data name="label8.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
+ </data>
+ <data name="label8.Text" xml:space="preserve">
+ <value>Size Scalable</value>
+ </data>
+ <data name=">>label8.Name" xml:space="preserve">
+ <value>label8</value>
+ </data>
+ <data name=">>label8.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label8.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label8.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="symPositionY.Location" type="System.Drawing.Point, System.Drawing">
+ <value>289, 45</value>
+ </data>
+ <data name="symPositionY.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symPositionY.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name=">>symPositionY.Name" xml:space="preserve">
+ <value>symPositionY</value>
+ </data>
+ <data name=">>symPositionY.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symPositionY.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>symPositionY.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="label5.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label5.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
+ <value>227, 48</value>
+ </data>
+ <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+ <value>54, 13</value>
+ </data>
+ <data name="label5.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name="label5.Text" xml:space="preserve">
+ <value>Position Y</value>
+ </data>
+ <data name=">>label5.Name" xml:space="preserve">
+ <value>label5</value>
+ </data>
+ <data name=">>label5.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label5.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label5.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+ <value>227, 22</value>
+ </data>
+ <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+ <value>37, 13</value>
+ </data>
+ <data name="label6.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="label6.Text" xml:space="preserve">
+ <value>Size Y</value>
+ </data>
+ <data name=">>label6.Name" xml:space="preserve">
+ <value>label6</value>
+ </data>
+ <data name=">>label6.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label6.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label6.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="symSizeY.Location" type="System.Drawing.Point, System.Drawing">
+ <value>289, 19</value>
+ </data>
+ <data name="symSizeY.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symSizeY.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name=">>symSizeY.Name" xml:space="preserve">
+ <value>symSizeY</value>
+ </data>
+ <data name=">>symSizeY.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symSizeY.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>symSizeY.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name="symPositionX.Location" type="System.Drawing.Point, System.Drawing">
+ <value>99, 45</value>
+ </data>
+ <data name="symPositionX.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symPositionX.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name=">>symPositionX.Name" xml:space="preserve">
+ <value>symPositionX</value>
+ </data>
+ <data name=">>symPositionX.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symPositionX.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>symPositionX.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+ <value>14, 48</value>
+ </data>
+ <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+ <value>54, 13</value>
+ </data>
+ <data name="label4.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="label4.Text" xml:space="preserve">
+ <value>Position X</value>
+ </data>
+ <data name=">>label4.Name" xml:space="preserve">
+ <value>label4</value>
+ </data>
+ <data name=">>label4.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label4.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label4.ZOrder" xml:space="preserve">
+ <value>9</value>
+ </data>
+ <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+ <value>14, 22</value>
+ </data>
+ <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+ <value>37, 13</value>
+ </data>
+ <data name="label3.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="label3.Text" xml:space="preserve">
+ <value>Size X</value>
+ </data>
+ <data name=">>label3.Name" xml:space="preserve">
+ <value>label3</value>
+ </data>
+ <data name=">>label3.Type" xml:space="preserve">
+ <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>10</value>
+ </data>
+ <data name="symSizeX.Location" type="System.Drawing.Point, System.Drawing">
+ <value>99, 19</value>
+ </data>
+ <data name="symSizeX.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symSizeX.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>symSizeX.Name" xml:space="preserve">
+ <value>symSizeX</value>
+ </data>
+ <data name=">>symSizeX.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symSizeX.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>symSizeX.ZOrder" xml:space="preserve">
+ <value>11</value>
+ </data>
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 324</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>515, 111</value>
+ </data>
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>15</value>
+ </data>
+ <data name="groupBox1.Text" xml:space="preserve">
+ <value>Other Settings</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox1.Type" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
</metadata>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
- <value>554, 399</value>
+ <value>546, 476</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
@@ -460,6 +784,6 @@
<value>ImageDialog</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Form, 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/SymbolDefinition/GraphicsEditors/PathDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.Designer.cs 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.Designer.cs 2012-02-18 15:24:50 UTC (rev 6523)
@@ -39,6 +39,13 @@
this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.btnClose = new System.Windows.Forms.Button();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.TAB_GENERAL = new System.Windows.Forms.TabPage();
+ this.TAB_ADVANCED = new System.Windows.Forms.TabPage();
+ this.label13 = new System.Windows.Forms.Label();
+ this.label14 = new System.Windows.Forms.Label();
+ this.symScaleX = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.symScaleY = new Maestro.Editors.SymbolDefinition.SymbolField();
this.symFillColor = new Maestro.Editors.SymbolDefinition.SymbolField();
this.symLineColor = new Maestro.Editors.SymbolDefinition.SymbolField();
this.symLineWeight = new Maestro.Editors.SymbolDefinition.SymbolField();
@@ -46,6 +53,9 @@
this.symLineCap = new Maestro.Editors.SymbolDefinition.SymbolField();
this.symLineJoin = new Maestro.Editors.SymbolDefinition.SymbolField();
this.symLineMiterLimit = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.tabControl1.SuspendLayout();
+ this.TAB_GENERAL.SuspendLayout();
+ this.TAB_ADVANCED.SuspendLayout();
this.SuspendLayout();
//
// label1
@@ -101,85 +111,123 @@
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
+ // tabControl1
+ //
+ resources.ApplyResources(this.tabControl1, "tabControl1");
+ this.tabControl1.Controls.Add(this.TAB_GENERAL);
+ this.tabControl1.Controls.Add(this.TAB_ADVANCED);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ //
+ // TAB_GENERAL
+ //
+ this.TAB_GENERAL.Controls.Add(this.symLineMiterLimit);
+ this.TAB_GENERAL.Controls.Add(this.symLineJoin);
+ this.TAB_GENERAL.Controls.Add(this.symLineCap);
+ this.TAB_GENERAL.Controls.Add(this.symLineWeightScalable);
+ this.TAB_GENERAL.Controls.Add(this.symLineWeight);
+ this.TAB_GENERAL.Controls.Add(this.symLineColor);
+ this.TAB_GENERAL.Controls.Add(this.symFillColor);
+ this.TAB_GENERAL.Controls.Add(this.label2);
+ this.TAB_GENERAL.Controls.Add(this.label3);
+ this.TAB_GENERAL.Controls.Add(this.label4);
+ this.TAB_GENERAL.Controls.Add(this.label5);
+ this.TAB_GENERAL.Controls.Add(this.label6);
+ this.TAB_GENERAL.Controls.Add(this.label7);
+ this.TAB_GENERAL.Controls.Add(this.label8);
+ resources.ApplyResources(this.TAB_GENERAL, "TAB_GENERAL");
+ this.TAB_GENERAL.Name = "TAB_GENERAL";
+ this.TAB_GENERAL.UseVisualStyleBackColor = true;
+ //
+ // TAB_ADVANCED
+ //
+ this.TAB_ADVANCED.Controls.Add(this.label13);
+ this.TAB_ADVANCED.Controls.Add(this.label14);
+ this.TAB_ADVANCED.Controls.Add(this.symScaleX);
+ this.TAB_ADVANCED.Controls.Add(this.symScaleY);
+ resources.ApplyResources(this.TAB_ADVANCED, "TAB_ADVANCED");
+ this.TAB_ADVANCED.Name = "TAB_ADVANCED";
+ this.TAB_ADVANCED.UseVisualStyleBackColor = true;
+ //
+ // label13
+ //
+ resources.ApplyResources(this.label13, "label13");
+ this.label13.Name = "label13";
+ //
+ // label14
+ //
+ resources.ApplyResources(this.label14, "label14");
+ this.label14.Name = "label14";
+ //
+ // symScaleX
+ //
+ resources.ApplyResources(this.symScaleX, "symScaleX");
+ this.symScaleX.Name = "symScaleX";
+ this.symScaleX.SupportedEnhancedDataTypes = null;
+ //
+ // symScaleY
+ //
+ resources.ApplyResources(this.symScaleY, "symScaleY");
+ this.symScaleY.Name = "symScaleY";
+ this.symScaleY.SupportedEnhancedDataTypes = null;
+ //
// symFillColor
//
resources.ApplyResources(this.symFillColor, "symFillColor");
this.symFillColor.Name = "symFillColor";
this.symFillColor.SupportedEnhancedDataTypes = null;
- this.symFillColor.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symFillColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symLineColor
//
resources.ApplyResources(this.symLineColor, "symLineColor");
this.symLineColor.Name = "symLineColor";
this.symLineColor.SupportedEnhancedDataTypes = null;
- this.symLineColor.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symLineColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symLineWeight
//
resources.ApplyResources(this.symLineWeight, "symLineWeight");
this.symLineWeight.Name = "symLineWeight";
this.symLineWeight.SupportedEnhancedDataTypes = null;
- this.symLineWeight.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symLineWeight.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symLineWeightScalable
//
resources.ApplyResources(this.symLineWeightScalable, "symLineWeightScalable");
this.symLineWeightScalable.Name = "symLineWeightScalable";
this.symLineWeightScalable.SupportedEnhancedDataTypes = null;
- this.symLineWeightScalable.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symLineWeightScalable.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symLineCap
//
resources.ApplyResources(this.symLineCap, "symLineCap");
this.symLineCap.Name = "symLineCap";
this.symLineCap.SupportedEnhancedDataTypes = null;
- this.symLineCap.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symLineCap.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symLineJoin
//
resources.ApplyResources(this.symLineJoin, "symLineJoin");
this.symLineJoin.Name = "symLineJoin";
this.symLineJoin.SupportedEnhancedDataTypes = null;
- this.symLineJoin.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symLineJoin.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symLineMiterLimit
//
resources.ApplyResources(this.symLineMiterLimit, "symLineMiterLimit");
this.symLineMiterLimit.Name = "symLineMiterLimit";
this.symLineMiterLimit.SupportedEnhancedDataTypes = null;
- this.symLineMiterLimit.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symLineMiterLimit.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// PathDialog
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
resources.ApplyResources(this, "$this");
this.ControlBox = false;
- this.Controls.Add(this.symLineMiterLimit);
- this.Controls.Add(this.symLineJoin);
- this.Controls.Add(this.symLineCap);
- this.Controls.Add(this.symLineWeightScalable);
- this.Controls.Add(this.symLineWeight);
- this.Controls.Add(this.symLineColor);
- this.Controls.Add(this.symFillColor);
+ this.Controls.Add(this.tabControl1);
this.Controls.Add(this.btnClose);
- this.Controls.Add(this.label8);
- this.Controls.Add(this.label7);
- this.Controls.Add(this.label6);
- this.Controls.Add(this.label5);
- this.Controls.Add(this.label4);
- this.Controls.Add(this.label3);
- this.Controls.Add(this.label2);
this.Controls.Add(this.txtGeometry);
this.Controls.Add(this.label1);
this.Name = "PathDialog";
+ this.tabControl1.ResumeLayout(false);
+ this.TAB_GENERAL.ResumeLayout(false);
+ this.TAB_GENERAL.PerformLayout();
+ this.TAB_ADVANCED.ResumeLayout(false);
+ this.TAB_ADVANCED.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -197,12 +245,19 @@
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Button btnClose;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage TAB_GENERAL;
+ private System.Windows.Forms.TabPage TAB_ADVANCED;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.Label label14;
+ private SymbolField symScaleX;
+ private SymbolField symScaleY;
+ private SymbolField symLineMiterLimit;
+ private SymbolField symLineJoin;
+ private SymbolField symLineCap;
+ private SymbolField symLineWeightScalable;
+ private SymbolField symLineWeight;
+ private SymbolField symLineColor;
private SymbolField symFillColor;
- private SymbolField symLineColor;
- private SymbolField symLineWeight;
- private SymbolField symLineWeightScalable;
- private SymbolField symLineCap;
- private SymbolField symLineJoin;
- private SymbolField symLineMiterLimit;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs 2012-02-18 15:24:50 UTC (rev 6523)
@@ -60,6 +60,17 @@
symLineMiterLimit.Bind(_path, "LineMiterLimit");
symLineWeight.Bind(_path, "LineWeight");
symLineWeightScalable.Bind(_path, "LineWeightScalable");
+
+ IPathGraphic2 path2 = _path as IPathGraphic2;
+ if (path2 != null)
+ {
+ symScaleX.Bind(path2, "ScaleX");
+ symScaleY.Bind(path2, "ScaleY");
+ }
+ else
+ {
+ tabControl1.TabPages.Remove(TAB_ADVANCED);
+ }
}
finally
{
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.resx 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.resx 2012-02-18 15:24:50 UTC (rev 6523)
@@ -112,16 +112,16 @@
<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="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 13</value>
</data>
@@ -138,15 +138,15 @@
<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>$this</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>16</value>
+ <value>3</value>
</data>
- <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="txtGeometry.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -157,7 +157,7 @@
<value>True</value>
</data>
<data name="txtGeometry.Size" type="System.Drawing.Size, System.Drawing">
- <value>305, 117</value>
+ <value>296, 71</value>
</data>
<data name="txtGeometry.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -166,19 +166,19 @@
<value>txtGeometry</value>
</data>
<data name=">>txtGeometry.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=">>txtGeometry.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>txtGeometry.ZOrder" xml:space="preserve">
- <value>15</value>
+ <value>2</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 167</value>
+ <value>12, 20</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 13</value>
@@ -193,19 +193,19 @@
<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>$this</value>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>label2.ZOrder" xml:space="preserve">
- <value>14</value>
+ <value>7</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 193</value>
+ <value>12, 46</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 13</value>
@@ -220,19 +220,19 @@
<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>$this</value>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>label3.ZOrder" xml:space="preserve">
- <value>13</value>
+ <value>8</value>
</data>
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 221</value>
+ <value>12, 74</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>64, 13</value>
@@ -247,19 +247,19 @@
<value>label4</value>
</data>
<data name=">>label4.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=">>label4.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>label4.ZOrder" xml:space="preserve">
- <value>12</value>
+ <value>9</value>
</data>
<data name="label5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 247</value>
+ <value>12, 100</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
<value>108, 13</value>
@@ -274,19 +274,19 @@
<value>label5</value>
</data>
<data name=">>label5.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=">>label5.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>label5.ZOrder" xml:space="preserve">
- <value>11</value>
+ <value>10</value>
</data>
<data name="label6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 273</value>
+ <value>12, 126</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>49, 13</value>
@@ -301,19 +301,19 @@
<value>label6</value>
</data>
<data name=">>label6.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=">>label6.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>label6.ZOrder" xml:space="preserve">
- <value>10</value>
+ <value>11</value>
</data>
<data name="label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 299</value>
+ <value>12, 152</value>
</data>
<data name="label7.Size" type="System.Drawing.Size, System.Drawing">
<value>49, 13</value>
@@ -328,19 +328,19 @@
<value>label7</value>
</data>
<data name=">>label7.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=">>label7.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>label7.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>12</value>
</data>
<data name="label8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 325</value>
+ <value>12, 178</value>
</data>
<data name="label8.Size" type="System.Drawing.Size, System.Drawing">
<value>77, 13</value>
@@ -355,19 +355,19 @@
<value>label8</value>
</data>
<data name=">>label8.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=">>label8.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>label8.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>13</value>
</data>
<data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
- <value>246, 355</value>
+ <value>237, 355</value>
</data>
<data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -382,166 +382,343 @@
<value>btnClose</value>
</data>
<data name=">>btnClose.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=">>btnClose.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>btnClose.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>1</value>
</data>
- <data name="symFillColor.Location" type="System.Drawing.Point, System.Drawing">
- <value>169, 164</value>
+ <data name="tabControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
</data>
- <data name="symFillColor.Size" type="System.Drawing.Size, System.Drawing">
- <value>152, 21</value>
+ <data name="symLineMiterLimit.Location" type="System.Drawing.Point, System.Drawing">
+ <value>132, 175</value>
</data>
- <data name="symFillColor.TabIndex" type="System.Int32, mscorlib">
- <value>18</value>
+ <data name="symLineMiterLimit.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
</data>
- <data name=">>symFillColor.Name" xml:space="preserve">
- <value>symFillColor</value>
+ <data name="symLineMiterLimit.TabIndex" type="System.Int32, mscorlib">
+ <value>15</value>
</data>
- <data name=">>symFillColor.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <data name=">>symLineMiterLimit.Name" xml:space="preserve">
+ <value>symLineMiterLimit</value>
</data>
- <data name=">>symFillColor.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name=">>symLineMiterLimit.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
- <data name=">>symFillColor.ZOrder" xml:space="preserve">
- <value>6</value>
+ <data name=">>symLineMiterLimit.Parent" xml:space="preserve">
+ <value>TAB_GENERAL</value>
</data>
- <data name="symLineColor.Location" type="System.Drawing.Point, System.Drawing">
- <value>169, 190</value>
+ <data name=">>symLineMiterLimit.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
- <data name="symLineColor.Size" type="System.Drawing.Size, System.Drawing">
- <value>152, 21</value>
+ <data name="symLineJoin.Location" type="System.Drawing.Point, System.Drawing">
+ <value>132, 149</value>
</data>
- <data name="symLineColor.TabIndex" type="System.Int32, mscorlib">
- <value>19</value>
+ <data name="symLineJoin.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
</data>
- <data name=">>symLineColor.Name" xml:space="preserve">
- <value>symLineColor</value>
+ <data name="symLineJoin.TabIndex" type="System.Int32, mscorlib">
+ <value>14</value>
</data>
- <data name=">>symLineColor.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <data name=">>symLineJoin.Name" xml:space="preserve">
+ <value>symLineJoin</value>
</data>
- <data name=">>symLineColor.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name=">>symLineJoin.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
- <data name=">>symLineColor.ZOrder" xml:space="preserve">
- <value>5</value>
+ <data name=">>symLineJoin.Parent" xml:space="preserve">
+ <value>TAB_GENERAL</value>
</data>
- <data name="symLineWeight.Location" type="System.Drawing.Point, System.Drawing">
- <value>169, 218</value>
+ <data name=">>symLineJoin.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
- <data name="symLineWeight.Size" type="System.Drawing.Size, System.Drawing">
- <value>152, 21</value>
+ <data name="symLineCap.Location" type="System.Drawing.Point, System.Drawing">
+ <value>132, 123</value>
</data>
- <data name="symLineWeight.TabIndex" type="System.Int32, mscorlib">
- <value>20</value>
+ <data name="symLineCap.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
</data>
- <data name=">>symLineWeight.Name" xml:space="preserve">
- <value>symLineWeight</value>
+ <data name="symLineCap.TabIndex" type="System.Int32, mscorlib">
+ <value>13</value>
</data>
- <data name=">>symLineWeight.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <data name=">>symLineCap.Name" xml:space="preserve">
+ <value>symLineCap</value>
</data>
- <data name=">>symLineWeight.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name=">>symLineCap.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
- <data name=">>symLineWeight.ZOrder" xml:space="preserve">
- <value>4</value>
+ <data name=">>symLineCap.Parent" xml:space="preserve">
+ <value>TAB_GENERAL</value>
</data>
+ <data name=">>symLineCap.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
<data name="symLineWeightScalable.Location" type="System.Drawing.Point, System.Drawing">
- <value>169, 244</value>
+ <value>132, 97</value>
</data>
<data name="symLineWeightScalable.Size" type="System.Drawing.Size, System.Drawing">
- <value>152, 21</value>
+ <value>115, 21</value>
</data>
<data name="symLineWeightScalable.TabIndex" type="System.Int32, mscorlib">
- <value>21</value>
+ <value>12</value>
</data>
<data name=">>symLineWeightScalable.Name" xml:space="preserve">
<value>symLineWeightScalable</value>
</data>
<data name=">>symLineWeightScalable.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symLineWeightScalable.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>symLineWeightScalable.ZOrder" xml:space="preserve">
<value>3</value>
</data>
- <data name="symLineCap.Location" type="System.Drawing.Point, System.Drawing">
- <value>169, 270</value>
+ <data name="symLineWeight.Location" type="System.Drawing.Point, System.Drawing">
+ <value>132, 71</value>
</data>
- <data name="symLineCap.Size" type="System.Drawing.Size, System.Drawing">
- <value>152, 21</value>
+ <data name="symLineWeight.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
</data>
- <data name="symLineCap.TabIndex" type="System.Int32, mscorlib">
- <value>22</value>
+ <data name="symLineWeight.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
</data>
- <data name=">>symLineCap.Name" xml:space="preserve">
- <value>symLineCap</value>
+ <data name=">>symLineWeight.Name" xml:space="preserve">
+ <value>symLineWeight</value>
</data>
- <data name=">>symLineCap.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <data name=">>symLineWeight.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
- <data name=">>symLineCap.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name=">>symLineWeight.Parent" xml:space="preserve">
+ <value>TAB_GENERAL</value>
</data>
- <data name=">>symLineCap.ZOrder" xml:space="preserve">
+ <data name=">>symLineWeight.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="symLineColor.Location" type="System.Drawing.Point, System.Drawing">
+ <value>132, 43</value>
+ </data>
+ <data name="symLineColor.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symLineColor.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name=">>symLineColor.Name" xml:space="preserve">
+ <value>symLineColor</value>
+ </data>
+ <data name=">>symLineColor.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symLineColor.Parent" xml:space="preserve">
+ <value>TAB_GENERAL</value>
+ </data>
+ <data name=">>symLineColor.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="symFillColor.Location" type="System.Drawing.Point, System.Drawing">
+ <value>132, 17</value>
+ </data>
+ <data name="symFillColor.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symFillColor.TabIndex" type="System.Int32, mscorlib">
+ <value>9</value>
+ </data>
+ <data name=">>symFillColor.Name" xml:space="preserve">
+ <value>symFillColor</value>
+ </data>
+ <data name=">>symFillColor.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symFillColor.Parent" xml:space="preserve">
+ <value>TAB_GENERAL</value>
+ </data>
+ <data name=">>symFillColor.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="TAB_GENERAL.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="TAB_GENERAL.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TAB_GENERAL.Size" type="System.Drawing.Size, System.Drawing">
+ <value>288, 216</value>
+ </data>
+ <data name="TAB_GENERAL.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="TAB_GENERAL.Text" xml:space="preserve">
+ <value>General</value>
+ </data>
+ <data name=">>TAB_GENERAL.Name" xml:space="preserve">
+ <value>TAB_GENERAL</value>
+ </data>
+ <data name=">>TAB_GENERAL.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TAB_GENERAL.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>TAB_GENERAL.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+ <value>14, 44</value>
+ </data>
+ <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+ <value>44, 13</value>
+ </data>
+ <data name="label13.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
+ </data>
+ <data name="label13.Text" xml:space="preserve">
+ <value>Scale Y</value>
+ </data>
+ <data name=">>label13.Name" xml:space="preserve">
+ <value>label13</value>
+ </data>
+ <data name=">>label13.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label13.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>label13.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="label14.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label14.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
+ <value>14, 16</value>
+ </data>
+ <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
+ <value>44, 13</value>
+ </data>
+ <data name="label14.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name="label14.Text" xml:space="preserve">
+ <value>Scale X</value>
+ </data>
+ <data name=">>label14.Name" xml:space="preserve">
+ <value>label14</value>
+ </data>
+ <data name=">>label14.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label14.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>label14.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="symScaleX.Location" type="System.Drawing.Point, System.Drawing">
+ <value>109, 13</value>
+ </data>
+ <data name="symScaleX.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symScaleX.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
+ </data>
+ <data name=">>symScaleX.Name" xml:space="preserve">
+ <value>symScaleX</value>
+ </data>
+ <data name=">>symScaleX.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symScaleX.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>symScaleX.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="symLineJoin.Location" type="System.Drawing.Point, System.Drawing">
- <value>169, 296</value>
+ <data name="symScaleY.Location" type="System.Drawing.Point, System.Drawing">
+ <value>109, 41</value>
</data>
- <data name="symLineJoin.Size" type="System.Drawing.Size, System.Drawing">
- <value>152, 21</value>
+ <data name="symScaleY.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
</data>
- <data name="symLineJoin.TabIndex" type="System.Int32, mscorlib">
- <value>23</value>
+ <data name="symScaleY.TabIndex" type="System.Int32, mscorlib">
+ <value>9</value>
</data>
- <data name=">>symLineJoin.Name" xml:space="preserve">
- <value>symLineJoin</value>
+ <data name=">>symScaleY.Name" xml:space="preserve">
+ <value>symScaleY</value>
</data>
- <data name=">>symLineJoin.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <data name=">>symScaleY.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
- <data name=">>symLineJoin.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name=">>symScaleY.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
</data>
- <data name=">>symLineJoin.ZOrder" xml:space="preserve">
+ <data name=">>symScaleY.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="TAB_ADVANCED.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="TAB_ADVANCED.Size" type="System.Drawing.Size, System.Drawing">
+ <value>288, 216</value>
+ </data>
+ <data name="TAB_ADVANCED.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
- <data name="symLineMiterLimit.Location" type="System.Drawing.Point, System.Drawing">
- <value>169, 322</value>
+ <data name="TAB_ADVANCED.Text" xml:space="preserve">
+ <value>Advanced</value>
</data>
- <data name="symLineMiterLimit.Size" type="System.Drawing.Size, System.Drawing">
- <value>152, 21</value>
+ <data name=">>TAB_ADVANCED.Name" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
</data>
- <data name="symLineMiterLimit.TabIndex" type="System.Int32, mscorlib">
- <value>24</value>
+ <data name=">>TAB_ADVANCED.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>symLineMiterLimit.Name" xml:space="preserve">
- <value>symLineMiterLimit</value>
+ <data name=">>TAB_ADVANCED.Parent" xml:space="preserve">
+ <value>tabControl1</value>
</data>
- <data name=">>symLineMiterLimit.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <data name=">>TAB_ADVANCED.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
- <data name=">>symLineMiterLimit.Parent" xml:space="preserve">
+ <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>16, 107</value>
+ </data>
+ <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>296, 242</value>
+ </data>
+ <data name="tabControl1.TabIndex" type="System.Int32, mscorlib">
+ <value>25</value>
+ </data>
+ <data name=">>tabControl1.Name" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>tabControl1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>tabControl1.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>symLineMiterLimit.ZOrder" xml:space="preserve">
+ <data name=">>tabControl1.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.ClientSize" type="System.Drawing.Size, System.Drawing">
- <value>337, 390</value>
+ <value>324, 390</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
@@ -553,6 +730,6 @@
<value>PathDialog</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Form, 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/SymbolDefinition/GraphicsEditors/TextDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.Designer.cs 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.Designer.cs 2012-02-18 15:24:50 UTC (rev 6523)
@@ -79,11 +79,29 @@
this.label20 = new System.Windows.Forms.Label();
this.btnClose = new System.Windows.Forms.Button();
this.btnContent = new System.Windows.Forms.Button();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.TAB_GENERAL = new System.Windows.Forms.TabPage();
+ this.TAB_POSITION = new System.Windows.Forms.TabPage();
+ this.TAB_FRAME = new System.Windows.Forms.TabPage();
+ this.TAB_ADVANCED = new System.Windows.Forms.TabPage();
+ this.label21 = new System.Windows.Forms.Label();
+ this.symOverlined = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.symObliqueAngle = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.label22 = new System.Windows.Forms.Label();
+ this.symTrackSpacing = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.label23 = new System.Windows.Forms.Label();
+ this.symMarkup = new Maestro.Editors.SymbolDefinition.SymbolField();
+ this.label24 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.grpTextFrame.SuspendLayout();
this.groupBox5.SuspendLayout();
+ this.tabControl1.SuspendLayout();
+ this.TAB_GENERAL.SuspendLayout();
+ this.TAB_POSITION.SuspendLayout();
+ this.TAB_FRAME.SuspendLayout();
+ this.TAB_ADVANCED.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
@@ -106,32 +124,32 @@
resources.ApplyResources(this.symFontUnderlined, "symFontUnderlined");
this.symFontUnderlined.Name = "symFontUnderlined";
this.symFontUnderlined.SupportedEnhancedDataTypes = null;
+ this.symFontUnderlined.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symFontUnderlined.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symFontUnderlined.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symFontItalic
//
resources.ApplyResources(this.symFontItalic, "symFontItalic");
this.symFontItalic.Name = "symFontItalic";
this.symFontItalic.SupportedEnhancedDataTypes = null;
+ this.symFontItalic.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symFontItalic.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symFontItalic.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symFontBold
//
resources.ApplyResources(this.symFontBold, "symFontBold");
this.symFontBold.Name = "symFontBold";
this.symFontBold.SupportedEnhancedDataTypes = null;
+ this.symFontBold.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symFontBold.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symFontBold.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symFontFamily
//
resources.ApplyResources(this.symFontFamily, "symFontFamily");
this.symFontFamily.Name = "symFontFamily";
this.symFontFamily.SupportedEnhancedDataTypes = null;
+ this.symFontFamily.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symFontFamily.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symFontFamily.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// lnkSelectFont
//
@@ -196,40 +214,40 @@
resources.ApplyResources(this.symPositionY, "symPositionY");
this.symPositionY.Name = "symPositionY";
this.symPositionY.SupportedEnhancedDataTypes = null;
+ this.symPositionY.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symPositionY.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symPositionY.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symPositionX
//
resources.ApplyResources(this.symPositionX, "symPositionX");
this.symPositionX.Name = "symPositionX";
this.symPositionX.SupportedEnhancedDataTypes = null;
+ this.symPositionX.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symPositionX.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symPositionX.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symAngle
//
resources.ApplyResources(this.symAngle, "symAngle");
this.symAngle.Name = "symAngle";
this.symAngle.SupportedEnhancedDataTypes = null;
+ this.symAngle.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symAngle.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symAngle.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symHeightScalable
//
resources.ApplyResources(this.symHeightScalable, "symHeightScalable");
this.symHeightScalable.Name = "symHeightScalable";
this.symHeightScalable.SupportedEnhancedDataTypes = null;
+ this.symHeightScalable.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symHeightScalable.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symHeightScalable.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symHeight
//
resources.ApplyResources(this.symHeight, "symHeight");
this.symHeight.Name = "symHeight";
this.symHeight.SupportedEnhancedDataTypes = null;
+ this.symHeight.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symHeight.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symHeight.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// label10
//
@@ -268,24 +286,24 @@
resources.ApplyResources(this.symAlignmentJustification, "symAlignmentJustification");
this.symAlignmentJustification.Name = "symAlignmentJustification";
this.symAlignmentJustification.SupportedEnhancedDataTypes = null;
+ this.symAlignmentJustification.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symAlignmentJustification.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symAlignmentJustification.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symAlignmentVertical
//
resources.ApplyResources(this.symAlignmentVertical, "symAlignmentVertical");
this.symAlignmentVertical.Name = "symAlignmentVertical";
this.symAlignmentVertical.SupportedEnhancedDataTypes = null;
+ this.symAlignmentVertical.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symAlignmentVertical.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symAlignmentVertical.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symAlignmentHorizontal
//
resources.ApplyResources(this.symAlignmentHorizontal, "symAlignmentHorizontal");
this.symAlignmentHorizontal.Name = "symAlignmentHorizontal";
this.symAlignmentHorizontal.SupportedEnhancedDataTypes = null;
+ this.symAlignmentHorizontal.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symAlignmentHorizontal.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symAlignmentHorizontal.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// label11
//
@@ -321,32 +339,32 @@
resources.ApplyResources(this.symOffsetY, "symOffsetY");
this.symOffsetY.Name = "symOffsetY";
this.symOffsetY.SupportedEnhancedDataTypes = null;
+ this.symOffsetY.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symOffsetY.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symOffsetY.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symOffsetX
//
resources.ApplyResources(this.symOffsetX, "symOffsetX");
this.symOffsetX.Name = "symOffsetX";
this.symOffsetX.SupportedEnhancedDataTypes = null;
+ this.symOffsetX.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symOffsetX.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symOffsetX.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symFillColor
//
resources.ApplyResources(this.symFillColor, "symFillColor");
this.symFillColor.Name = "symFillColor";
this.symFillColor.SupportedEnhancedDataTypes = null;
+ this.symFillColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symFillColor.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symFillColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symLineColor
//
resources.ApplyResources(this.symLineColor, "symLineColor");
this.symLineColor.Name = "symLineColor";
this.symLineColor.SupportedEnhancedDataTypes = null;
+ this.symLineColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symLineColor.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symLineColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// label17
//
@@ -392,24 +410,24 @@
resources.ApplyResources(this.symGhostColor, "symGhostColor");
this.symGhostColor.Name = "symGhostColor";
this.symGhostColor.SupportedEnhancedDataTypes = null;
+ this.symGhostColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symGhostColor.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symGhostColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symTextColor
//
resources.ApplyResources(this.symTextColor, "symTextColor");
this.symTextColor.Name = "symTextColor";
this.symTextColor.SupportedEnhancedDataTypes = null;
+ this.symTextColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symTextColor.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symTextColor.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// symLineSpacing
//
resources.ApplyResources(this.symLineSpacing, "symLineSpacing");
this.symLineSpacing.Name = "symLineSpacing";
this.symLineSpacing.SupportedEnhancedDataTypes = null;
+ this.symLineSpacing.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
this.symLineSpacing.ContentChanged += new System.EventHandler(this.OnContentChanged);
- this.symLineSpacing.RequestBrowse += new Maestro.Editors.SymbolDefinition.SymbolField.BrowseEventHandler(this.OnRequestBrowse);
//
// label18
//
@@ -440,21 +458,108 @@
this.btnContent.UseVisualStyleBackColor = true;
this.btnContent.Click += new System.EventHandler(this.btnContent_Click);
//
+ // tabControl1
+ //
+ resources.ApplyResources(this.tabControl1, "tabControl1");
+ this.tabControl1.Controls.Add(this.TAB_GENERAL);
+ this.tabControl1.Controls.Add(this.TAB_POSITION);
+ this.tabControl1.Controls.Add(this.TAB_FRAME);
+ this.tabControl1.Controls.Add(this.TAB_ADVANCED);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ //
+ // TAB_GENERAL
+ //
+ this.TAB_GENERAL.Controls.Add(this.groupBox1);
+ this.TAB_GENERAL.Controls.Add(this.groupBox5);
+ resources.ApplyResources(this.TAB_GENERAL, "TAB_GENERAL");
+ this.TAB_GENERAL.Name = "TAB_GENERAL";
+ this.TAB_GENERAL.UseVisualStyleBackColor = true;
+ //
+ // TAB_POSITION
+ //
+ this.TAB_POSITION.Controls.Add(this.groupBox3);
+ this.TAB_POSITION.Controls.Add(this.groupBox2);
+ resources.ApplyResources(this.TAB_POSITION, "TAB_POSITION");
+ this.TAB_POSITION.Name = "TAB_POSITION";
+ this.TAB_POSITION.UseVisualStyleBackColor = true;
+ //
+ // TAB_FRAME
+ //
+ this.TAB_FRAME.Controls.Add(this.chkTextFrame);
+ this.TAB_FRAME.Controls.Add(this.grpTextFrame);
+ resources.ApplyResources(this.TAB_FRAME, "TAB_FRAME");
+ this.TAB_FRAME.Name = "TAB_FRAME";
+ this.TAB_FRAME.UseVisualStyleBackColor = true;
+ //
+ // TAB_ADVANCED
+ //
+ this.TAB_ADVANCED.Controls.Add(this.symMarkup);
+ this.TAB_ADVANCED.Controls.Add(this.label24);
+ this.TAB_ADVANCED.Controls.Add(this.symTrackSpacing);
+ this.TAB_ADVANCED.Controls.Add(this.label23);
+ this.TAB_ADVANCED.Controls.Add(this.symObliqueAngle);
+ this.TAB_ADVANCED.Controls.Add(this.label22);
+ this.TAB_ADVANCED.Controls.Add(this.symOverlined);
+ this.TAB_ADVANCED.Controls.Add(this.label21);
+ resources.ApplyResources(this.TAB_ADVANCED, "TAB_ADVANCED");
+ this.TAB_ADVANCED.Name = "TAB_ADVANCED";
+ this.TAB_ADVANCED.UseVisualStyleBackColor = true;
+ //
+ // label21
+ //
+ resources.ApplyResources(this.label21, "label21");
+ this.label21.Name = "label21";
+ //
+ // symOverlined
+ //
+ resources.ApplyResources(this.symOverlined, "symOverlined");
+ this.symOverlined.Name = "symOverlined";
+ this.symOverlined.SupportedEnhancedDataTypes = null;
+ //
+ // symObliqueAngle
+ //
+ resources.ApplyResources(this.symObliqueAngle, "symObliqueAngle");
+ this.symObliqueAngle.Name = "symObliqueAngle";
+ this.symObliqueAngle.SupportedEnhancedDataTypes = null;
+ //
+ // label22
+ //
+ resources.ApplyResources(this.label22, "label22");
+ this.label22.Name = "label22";
+ //
+ // symTrackSpacing
+ //
+ resources.ApplyResources(this.symTrackSpacing, "symTrackSpacing");
+ this.symTrackSpacing.Name = "symTrackSpacing";
+ this.symTrackSpacing.SupportedEnhancedDataTypes = null;
+ //
+ // label23
+ //
+ resources.ApplyResources(this.label23, "label23");
+ this.label23.Name = "label23";
+ //
+ // symMarkup
+ //
+ resources.ApplyResources(this.symMarkup, "symMarkup");
+ this.symMarkup.Name = "symMarkup";
+ this.symMarkup.SupportedEnhancedDataTypes = null;
+ //
+ // label24
+ //
+ resources.ApplyResources(this.label24, "label24");
+ this.label24.Name = "label24";
+ //
// TextDialog
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
resources.ApplyResources(this, "$this");
this.ControlBox = false;
+ this.Controls.Add(this.tabControl1);
this.Controls.Add(this.btnContent);
this.Controls.Add(this.btnClose);
- this.Controls.Add(this.groupBox5);
- this.Controls.Add(this.chkTextFrame);
- this.Controls.Add(this.grpTextFrame);
- this.Controls.Add(this.groupBox3);
- this.Controls.Add(this.groupBox2);
this.Controls.Add(this.txtContent);
this.Controls.Add(this.label1);
- this.Controls.Add(this.groupBox1);
this.Name = "TextDialog";
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
@@ -466,6 +571,13 @@
this.grpTextFrame.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
+ this.tabControl1.ResumeLayout(false);
+ this.TAB_GENERAL.ResumeLayout(false);
+ this.TAB_POSITION.ResumeLayout(false);
+ this.TAB_FRAME.ResumeLayout(false);
+ this.TAB_FRAME.PerformLayout();
+ this.TAB_ADVANCED.ResumeLayout(false);
+ this.TAB_ADVANCED.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -523,5 +635,18 @@
private SymbolField symTextColor;
private SymbolField symLineSpacing;
private System.Windows.Forms.Button btnContent;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage TAB_GENERAL;
+ private System.Windows.Forms.TabPage TAB_POSITION;
+ private System.Windows.Forms.TabPage TAB_FRAME;
+ private System.Windows.Forms.TabPage TAB_ADVANCED;
+ private SymbolField symMarkup;
+ private System.Windows.Forms.Label label24;
+ private SymbolField symTrackSpacing;
+ private System.Windows.Forms.Label label23;
+ private SymbolField symObliqueAngle;
+ private System.Windows.Forms.Label label22;
+ private SymbolField symOverlined;
+ private System.Windows.Forms.Label label21;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs 2012-02-18 15:24:50 UTC (rev 6523)
@@ -83,6 +83,19 @@
symLineColor.Bind(_frame, "LineColor");
symOffsetX.Bind(_frame, "OffsetX");
symOffsetY.Bind(_frame, "OffsetY");
+
+ var text2 = _text as ITextGraphic2;
+ if (text2 != null)
+ {
+ symOverlined.Bind(text2, "Overlined");
+ symObliqueAngle.Bind(text2, "ObliqueAngle");
+ symTrackSpacing.Bind(text2, "TrackSpacing");
+ symMarkup.Bind(text2, "Markup");
+ }
+ else
+ {
+ tabControl1.TabPages.Remove(TAB_ADVANCED);
+ }
}
finally
{
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.resx 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.resx 2012-02-18 15:24:50 UTC (rev 6523)
@@ -112,22 +112,22 @@
<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>
- <metadata name="fontDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="fontDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="symFontUnderlined.Location" type="System.Drawing.Point, System.Drawing">
<value>125, 97</value>
</data>
<data name="symFontUnderlined.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 21</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="symFontUnderlined.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
@@ -135,7 +135,7 @@
<value>symFontUnderlined</value>
</data>
<data name=">>symFontUnderlined.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symFontUnderlined.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -156,7 +156,7 @@
<value>symFontItalic</value>
</data>
<data name=">>symFontItalic.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symFontItalic.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -177,7 +177,7 @@
<value>symFontBold</value>
</data>
<data name=">>symFontBold.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symFontBold.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -198,7 +198,7 @@
<value>symFontFamily</value>
</data>
<data name=">>symFontFamily.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symFontFamily.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -225,7 +225,7 @@
<value>lnkSelectFont</value>
</data>
<data name=">>lnkSelectFont.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lnkSelectFont.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -252,7 +252,7 @@
<value>label5</value>
</data>
<data name=">>label5.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=">>label5.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -279,7 +279,7 @@
<value>label4</value>
</data>
<data name=">>label4.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=">>label4.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -306,7 +306,7 @@
<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>
@@ -333,7 +333,7 @@
<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>
@@ -342,7 +342,7 @@
<value>8</value>
</data>
<data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 73</value>
+ <value>13, 13</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>300, 128</value>
@@ -357,13 +357,13 @@
<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>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>groupBox1.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>0</value>
</data>
<data name="label6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -384,7 +384,7 @@
<value>label6</value>
</data>
<data name=">>label6.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=">>label6.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -392,7 +392,7 @@
<data name=">>label6.ZOrder" xml:space="preserve">
<value>8</value>
</data>
- <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="txtContent.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -403,7 +403,7 @@
<value>True</value>
</data>
<data name="txtContent.Size" type="System.Drawing.Size, System.Drawing">
- <value>492, 57</value>
+ <value>284, 57</value>
</data>
<data name="txtContent.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
@@ -412,13 +412,13 @@
<value>txtContent</value>
</data>
<data name=">>txtContent.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=">>txtContent.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>txtContent.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>3</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -439,13 +439,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>$this</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>4</value>
</data>
<data name="symPositionY.Location" type="System.Drawing.Point, System.Drawing">
<value>121, 123</value>
@@ -460,7 +460,7 @@
<value>symPositionY</value>
</data>
<data name=">>symPositionY.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symPositionY.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -481,7 +481,7 @@
<value>symPositionX</value>
</data>
<data name=">>symPositionX.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symPositionX.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -502,7 +502,7 @@
<value>symAngle</value>
</data>
<data name=">>symAngle.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symAngle.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -523,7 +523,7 @@
<value>symHeightScalable</value>
</data>
<data name=">>symHeightScalable.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symHeightScalable.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -544,7 +544,7 @@
<value>symHeight</value>
</data>
<data name=">>symHeight.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symHeight.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -571,7 +571,7 @@
<value>label10</value>
</data>
<data name=">>label10.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=">>label10.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -598,7 +598,7 @@
<value>label8</value>
</data>
<data name=">>label8.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=">>label8.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -625,7 +625,7 @@
<value>label9</value>
</data>
<data name=">>label9.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=">>label9.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -652,7 +652,7 @@
<value>label7</value>
</data>
<data name=">>label7.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=">>label7.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -661,10 +661,10 @@
<value>9</value>
</data>
<data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
- <value>327, 73</value>
+ <value>16, 15</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
- <value>299, 204</value>
+ <value>299, 158</value>
</data>
<data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
@@ -676,13 +676,13 @@
<value>groupBox2</value>
</data>
<data name=">>groupBox2.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=">>groupBox2.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_POSITION</value>
</data>
<data name=">>groupBox2.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>1</value>
</data>
<data name="symAlignmentJustification.Location" type="System.Drawing.Point, System.Drawing">
<value>125, 71</value>
@@ -697,7 +697,7 @@
<value>symAlignmentJustification</value>
</data>
<data name=">>symAlignmentJustification.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symAlignmentJustification.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -718,7 +718,7 @@
<value>symAlignmentVertical</value>
</data>
<data name=">>symAlignmentVertical.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symAlignmentVertical.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -739,7 +739,7 @@
<value>symAlignmentHorizontal</value>
</data>
<data name=">>symAlignmentHorizontal.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symAlignmentHorizontal.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -766,7 +766,7 @@
<value>label11</value>
</data>
<data name=">>label11.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=">>label11.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -793,7 +793,7 @@
<value>label12</value>
</data>
<data name=">>label12.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=">>label12.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -820,7 +820,7 @@
<value>label13</value>
</data>
<data name=">>label13.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=">>label13.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -829,7 +829,7 @@
<value>5</value>
</data>
<data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 216</value>
+ <value>16, 180</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>300, 106</value>
@@ -844,13 +844,13 @@
<value>groupBox3</value>
</data>
<data name=">>groupBox3.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=">>groupBox3.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_POSITION</value>
</data>
<data name=">>groupBox3.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>0</value>
</data>
<data name="symOffsetY.Location" type="System.Drawing.Point, System.Drawing">
<value>121, 97</value>
@@ -865,7 +865,7 @@
<value>symOffsetY</value>
</data>
<data name=">>symOffsetY.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symOffsetY.Parent" xml:space="preserve">
<value>grpTextFrame</value>
@@ -886,7 +886,7 @@
<value>symOffsetX</value>
</data>
<data name=">>symOffsetX.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symOffsetX.Parent" xml:space="preserve">
<value>grpTextFrame</value>
@@ -907,7 +907,7 @@
<value>symFillColor</value>
</data>
<data name=">>symFillColor.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symFillColor.Parent" xml:space="preserve">
<value>grpTextFrame</value>
@@ -928,7 +928,7 @@
<value>symLineColor</value>
</data>
<data name=">>symLineColor.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symLineColor.Parent" xml:space="preserve">
<value>grpTextFrame</value>
@@ -955,7 +955,7 @@
<value>label17</value>
</data>
<data name=">>label17.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=">>label17.Parent" xml:space="preserve">
<value>grpTextFrame</value>
@@ -982,7 +982,7 @@
<value>label16</value>
</data>
<data name=">>label16.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=">>label16.Parent" xml:space="preserve">
<value>grpTextFrame</value>
@@ -1009,7 +1009,7 @@
<value>label15</value>
</data>
<data name=">>label15.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=">>label15.Parent" xml:space="preserve">
<value>grpTextFrame</value>
@@ -1036,7 +1036,7 @@
<value>label14</value>
</data>
<data name=">>label14.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=">>label14.Parent" xml:space="preserve">
<value>grpTextFrame</value>
@@ -1045,7 +1045,7 @@
<value>7</value>
</data>
<data name="grpTextFrame.Location" type="System.Drawing.Point, System.Drawing">
- <value>327, 306</value>
+ <value>12, 36</value>
</data>
<data name="grpTextFrame.Size" type="System.Drawing.Size, System.Drawing">
<value>300, 127</value>
@@ -1057,19 +1057,19 @@
<value>grpTextFrame</value>
</data>
<data name=">>grpTextFrame.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=">>grpTextFrame.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_FRAME</value>
</data>
<data name=">>grpTextFrame.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>1</value>
</data>
<data name="chkTextFrame.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="chkTextFrame.Location" type="System.Drawing.Point, System.Drawing">
- <value>327, 283</value>
+ <value>12, 14</value>
</data>
<data name="chkTextFrame.Size" type="System.Drawing.Size, System.Drawing">
<value>108, 17</value>
@@ -1084,13 +1084,13 @@
<value>chkTextFrame</value>
</data>
<data name=">>chkTextFrame.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=">>chkTextFrame.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_FRAME</value>
</data>
<data name=">>chkTextFrame.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>0</value>
</data>
<data name="symGhostColor.Location" type="System.Drawing.Point, System.Drawing">
<value>125, 73</value>
@@ -1105,7 +1105,7 @@
<value>symGhostColor</value>
</data>
<data name=">>symGhostColor.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symGhostColor.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -1126,7 +1126,7 @@
<value>symTextColor</value>
</data>
<data name=">>symTextColor.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symTextColor.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -1147,7 +1147,7 @@
<value>symLineSpacing</value>
</data>
<data name=">>symLineSpacing.Type" xml:space="preserve">
- <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>symLineSpacing.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -1174,7 +1174,7 @@
<value>label18</value>
</data>
<data name=">>label18.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=">>label18.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -1201,7 +1201,7 @@
<value>label19</value>
</data>
<data name=">>label19.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=">>label19.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -1228,7 +1228,7 @@
<value>label20</value>
</data>
<data name=">>label20.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=">>label20.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -1237,7 +1237,7 @@
<value>5</value>
</data>
<data name="groupBox5.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 328</value>
+ <value>13, 150</value>
</data>
<data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>300, 106</value>
@@ -1252,19 +1252,19 @@
<value>groupBox5</value>
</data>
<data name=">>groupBox5.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=">>groupBox5.Parent" xml:space="preserve">
- <value>$this</value>
+ <value>TAB_GENERAL</value>
</data>
<data name=">>groupBox5.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>1</value>
</data>
<data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
- <value>553, 442</value>
+ <value>326, 398</value>
</data>
<data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -1279,19 +1279,19 @@
<value>btnClose</value>
</data>
<data name=">>btnClose.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=">>btnClose.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>btnClose.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="btnContent.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="btnContent.Location" type="System.Drawing.Point, System.Drawing">
- <value>581, 8</value>
+ <value>373, 12</value>
</data>
<data name="btnContent.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 23</value>
@@ -1306,19 +1306,346 @@
<value>btnContent</value>
</data>
<data name=">>btnContent.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=">>btnContent.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>btnContent.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="tabControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="TAB_GENERAL.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="TAB_GENERAL.Size" type="System.Drawing.Size, System.Drawing">
+ <value>381, 294</value>
+ </data>
+ <data name="TAB_GENERAL.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="TAB_GENERAL.Text" xml:space="preserve">
+ <value>General</value>
+ </data>
+ <data name=">>TAB_GENERAL.Name" xml:space="preserve">
+ <value>TAB_GENERAL</value>
+ </data>
+ <data name=">>TAB_GENERAL.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TAB_GENERAL.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>TAB_GENERAL.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">
+ <data name="TAB_POSITION.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="TAB_POSITION.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TAB_POSITION.Size" type="System.Drawing.Size, System.Drawing">
+ <value>381, 294</value>
+ </data>
+ <data name="TAB_POSITION.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="TAB_POSITION.Text" xml:space="preserve">
+ <value>Positioning / Alignment</value>
+ </data>
+ <data name=">>TAB_POSITION.Name" xml:space="preserve">
+ <value>TAB_POSITION</value>
+ </data>
+ <data name=">>TAB_POSITION.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TAB_POSITION.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>TAB_POSITION.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="TAB_FRAME.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="TAB_FRAME.Size" type="System.Drawing.Size, System.Drawing">
+ <value>381, 294</value>
+ </data>
+ <data name="TAB_FRAME.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="TAB_FRAME.Text" xml:space="preserve">
+ <value>Text Frame</value>
+ </data>
+ <data name=">>TAB_FRAME.Name" xml:space="preserve">
+ <value>TAB_FRAME</value>
+ </data>
+ <data name=">>TAB_FRAME.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TAB_FRAME.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>TAB_FRAME.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="symMarkup.Location" type="System.Drawing.Point, System.Drawing">
+ <value>111, 97</value>
+ </data>
+ <data name="symMarkup.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symMarkup.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name=">>symMarkup.Name" xml:space="preserve">
+ <value>symMarkup</value>
+ </data>
+ <data name=">>symMarkup.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symMarkup.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>symMarkup.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="label24.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
+ </data>
+ <data name="label24.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label24.Location" type="System.Drawing.Point, System.Drawing">
+ <value>21, 100</value>
+ </data>
+ <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
+ <value>43, 13</value>
+ </data>
+ <data name="label24.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name="label24.Text" xml:space="preserve">
+ <value>Markup</value>
+ </data>
+ <data name=">>label24.Name" xml:space="preserve">
+ <value>label24</value>
+ </data>
+ <data name=">>label24.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label24.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>label24.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="symTrackSpacing.Location" type="System.Drawing.Point, System.Drawing">
+ <value>111, 70</value>
+ </data>
+ <data name="symTrackSpacing.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symTrackSpacing.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name=">>symTrackSpacing.Name" xml:space="preserve">
+ <value>symTrackSpacing</value>
+ </data>
+ <data name=">>symTrackSpacing.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symTrackSpacing.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>symTrackSpacing.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="label23.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label23.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label23.Location" type="System.Drawing.Point, System.Drawing">
+ <value>21, 73</value>
+ </data>
+ <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
+ <value>77, 13</value>
+ </data>
+ <data name="label23.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name="label23.Text" xml:space="preserve">
+ <value>Track Spacing</value>
+ </data>
+ <data name=">>label23.Name" xml:space="preserve">
+ <value>label23</value>
+ </data>
+ <data name=">>label23.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label23.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>label23.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="symObliqueAngle.Location" type="System.Drawing.Point, System.Drawing">
+ <value>111, 43</value>
+ </data>
+ <data name="symObliqueAngle.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symObliqueAngle.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name=">>symObliqueAngle.Name" xml:space="preserve">
+ <value>symObliqueAngle</value>
+ </data>
+ <data name=">>symObliqueAngle.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symObliqueAngle.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>symObliqueAngle.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="label22.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label22.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label22.Location" type="System.Drawing.Point, System.Drawing">
+ <value>21, 46</value>
+ </data>
+ <data name="label22.Size" type="System.Drawing.Size, System.Drawing">
+ <value>73, 13</value>
+ </data>
+ <data name="label22.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="label22.Text" xml:space="preserve">
+ <value>Oblique Angle</value>
+ </data>
+ <data name=">>label22.Name" xml:space="preserve">
+ <value>label22</value>
+ </data>
+ <data name=">>label22.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label22.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>label22.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="symOverlined.Location" type="System.Drawing.Point, System.Drawing">
+ <value>111, 16</value>
+ </data>
+ <data name="symOverlined.Size" type="System.Drawing.Size, System.Drawing">
+ <value>115, 21</value>
+ </data>
+ <data name="symOverlined.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name=">>symOverlined.Name" xml:space="preserve">
+ <value>symOverlined</value>
+ </data>
+ <data name=">>symOverlined.Type" xml:space="preserve">
+ <value>Maestro.Editors.SymbolDefinition.SymbolField, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>symOverlined.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>symOverlined.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="label21.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label21.Location" type="System.Drawing.Point, System.Drawing">
+ <value>21, 19</value>
+ </data>
+ <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
+ <value>52, 13</value>
+ </data>
+ <data name="label21.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="label21.Text" xml:space="preserve">
+ <value>Overlined</value>
+ </data>
+ <data name=">>label21.Name" xml:space="preserve">
+ <value>label21</value>
+ </data>
+ <data name=">>label21.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label21.Parent" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>label21.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name="TAB_ADVANCED.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="TAB_ADVANCED.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TAB_ADVANCED.Size" type="System.Drawing.Size, System.Drawing">
+ <value>381, 294</value>
+ </data>
+ <data name="TAB_ADVANCED.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="TAB_ADVANCED.Text" xml:space="preserve">
+ <value>Advanced</value>
+ </data>
+ <data name=">>TAB_ADVANCED.Name" xml:space="preserve">
+ <value>TAB_ADVANCED</value>
+ </data>
+ <data name=">>TAB_ADVANCED.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TAB_ADVANCED.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>TAB_ADVANCED.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 73</value>
+ </data>
+ <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>389, 320</value>
+ </data>
+ <data name="tabControl1.TabIndex" type="System.Int32, mscorlib">
+ <value>25</value>
+ </data>
+ <data name=">>tabControl1.Name" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name=">>tabControl1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>tabControl1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>tabControl1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
</metadata>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
- <value>640, 477</value>
+ <value>412, 433</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
@@ -1330,12 +1657,12 @@
<value>fontDialog1</value>
</data>
<data name=">>fontDialog1.Type" xml:space="preserve">
- <value>System.Windows.Forms.FontDialog, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.FontDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>TextDialog</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Form, 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/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs 2012-02-18 15:18:31 UTC (rev 6522)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs 2012-02-18 15:24:50 UTC (rev 6523)
@@ -610,7 +610,7 @@
}
/// <summary>
- ///
+ /// Enumerates the allowed DataType values
/// </summary>
[System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
[System.SerializableAttribute()]
@@ -634,107 +634,6 @@
}
/// <summary>
- ///
- /// </summary>
- [System.SerializableAttribute()]
- public enum DataType2
- {
-
- /// <remarks/>
- String,
-
- /// <remarks/>
- Boolean,
-
- /// <remarks/>
- Integer,
-
- /// <remarks/>
- Real,
-
- /// <remarks/>
- Color,
-
- /// <remarks/>
- Angle,
-
- /// <remarks/>
- FillColor,
-
- /// <remarks/>
- LineColor,
-
- /// <remarks/>
- LineWeight,
-
- /// <remarks/>
- Content,
-
- /// <remarks/>
- Markup,
-
- /// <remarks/>
- FontName,
-
- /// <remarks/>
- Bold,
-
- /// <remarks/>
- Italic,
-
- /// <remarks/>
- Underlined,
-
- /// <remarks/>
- Overlined,
-
- /// <remarks/>
- ObliqueAngle,
-
- /// <remarks/>
- TrackSpacing,
-
- /// <remarks/>
- FontHeight,
-
- /// <remarks/>
- HorizontalAlignment,
-
- /// <remarks/>
- VerticalAlignment,
-
- /// <remarks/>
- Justification,
-
- /// <remarks/>
- LineSpacing,
-
- /// <remarks/>
- TextColor,
-
- /// <remarks/>
- GhostColor,
-
- /// <remarks/>
- FrameLineColor,
-
- /// <remarks/>
- FrameFillColor,
-
- /// <remarks/>
- StartOffset,
-
- /// <remarks/>
- EndOffset,
-
- /// <remarks/>
- RepeatX,
-
- /// <remarks/>
- RepeatY,
- }
-
- /// <summary>
/// Defines a parameter
/// </summary>
public interface IParameter : IExpressionPropertySource
@@ -943,23 +842,6 @@
}
/// <summary>
- /// Path with support for scaling. Only applicable for Symbol Definition schema
- /// 2.4.0 and higher
- /// </summary>
- public interface IPathGraphic2 : IPathGraphic
- {
- /// <summary>
- /// >The amount to scale the path geometry in the horizontal direction. This is only applied to the Geometry element. Defaults to 1 if not specified.
- /// </summary>
- string ScaleX { get; set; }
-
- /// <summary>
- /// The amount to scale the path geometry in the vertical direction. This is only applied to the Geometry element. Defaults to 1 if not specified
- /// </summary>
- string ScaleY { get; set; }
- }
-
- /// <summary>
/// An image reference
/// </summary>
public interface IImageReference : IImageBase
@@ -1291,7 +1173,7 @@
/// </summary>
OverlapDirect,
/// <summary>
- ///
+ /// Introduced with Symbol Definition 1.1.0 schema
/// </summary>
OverlapNoWrap,
/// <summary>
@@ -1503,7 +1385,7 @@
#region Symbol Definition 1.1.0 interfaces
/// <summary>
- /// An extension of the text element to support rich text
+ /// An extension of the text element to support rich text. Introduced with the Symbol Definition 1.1.0 schema
/// </summary>
public interface ITextGraphic2 : ITextGraphic
{
@@ -1527,5 +1409,125 @@
/// </summary>
string TrackSpacing { get; set; }
}
+
+ /// <summary>
+ /// Enumerates the allowed DataType values. Introduced with Symbol Definition 1.1.0 schema
+ /// </summary>
+ [System.SerializableAttribute()]
+ public enum DataType2
+ {
+
+ /// <remarks/>
+ String,
+
+ /// <remarks/>
+ Boolean,
+
+ /// <remarks/>
+ Integer,
+
+ /// <remarks/>
+ Real,
+
+ /// <remarks/>
+ Color,
+
+ /// <remarks/>
+ Angle,
+
+ /// <remarks/>
+ FillColor,
+
+ /// <remarks/>
+ LineColor,
+
+ /// <remarks/>
+ LineWeight,
+
+ /// <remarks/>
+ Content,
+
+ /// <remarks/>
+ Markup,
+
+ /// <remarks/>
+ FontName,
+
+ /// <remarks/>
+ Bold,
+
+ /// <remarks/>
+ Italic,
+
+ /// <remarks/>
+ Underlined,
+
+ /// <remarks/>
+ Overlined,
+
+ /// <remarks/>
+ ObliqueAngle,
+
+ /// <remarks/>
+ TrackSpacing,
+
+ /// <remarks/>
+ FontHeight,
+
+ /// <remarks/>
+ HorizontalAlignment,
+
+ /// <remarks/>
+ VerticalAlignment,
+
+ /// <remarks/>
+ Justification,
+
+ /// <remarks/>
+ LineSpacing,
+
+ /// <remarks/>
+ TextColor,
+
+ /// <remarks/>
+ GhostColor,
+
+ /// <remarks/>
+ FrameLineColor,
+
+ /// <remarks/>
+ FrameFillColor,
+
+ /// <remarks/>
+ StartOffset,
+
+ /// <remarks/>
+ EndOffset,
+
+ /// <remarks/>
+ RepeatX,
+
+ /// <remarks/>
+ RepeatY,
+ }
#endregion
+
+ #region Symbol Definition 2.4.0 interfaces
+ /// <summary>
+ /// Path with support for scaling. Only applicable for Symbol Definition schema
+ /// 2.4.0 and higher
+ /// </summary>
+ public interface IPathGraphic2 : IPathGraphic
+ {
+ /// <summary>
+ /// >The amount to scale the path geometry in the horizontal direction. This is only applied to the Geometry element. Defaults to 1 if not specified.
+ /// </summary>
+ string ScaleX { get; set; }
+
+ /// <summary>
+ /// The amount to scale the path geometry in the vertical direction. This is only applied to the Geometry element. Defaults to 1 if not specified
+ /// </summary>
+ string ScaleY { get; set; }
+ }
+ #endregion
}
More information about the mapguide-commits
mailing list