[mapguide-commits] r6686 -
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue May 22 13:23:01 EDT 2012
Author: jng
Date: 2012-05-22 10:23:01 -0700 (Tue, 22 May 2012)
New Revision: 6686
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.resx
Log:
#2008: Some expression buttons didn't have handlers wired up. This submission fixes that.
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2012-05-22 16:58:48 UTC (rev 6685)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2012-05-22 17:23:01 UTC (rev 6686)
@@ -128,168 +128,169 @@
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AreaFeatureStyleEditor));
- this.fillStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor();
- this.lineStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor();
- this.sizeUnitsCombo = new System.Windows.Forms.ComboBox();
- this.UnitsTable = new System.Data.DataTable();
- this.dataColumn5 = new System.Data.DataColumn();
- this.dataColumn6 = new System.Data.DataColumn();
- this.sizeContextCombo = new System.Windows.Forms.ComboBox();
- this.SizeContextTable = new System.Data.DataTable();
- this.dataColumn3 = new System.Data.DataColumn();
- this.dataColumn4 = new System.Data.DataColumn();
- this.label4 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.previewGroup = new System.Windows.Forms.GroupBox();
- this.previewPicture = new System.Windows.Forms.PictureBox();
- this.ComboBoxDataSet = new System.Data.DataSet();
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.previewGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
- this.SuspendLayout();
- //
- // fillStyleEditor
- //
- resources.ApplyResources(this.fillStyleEditor, "fillStyleEditor");
- this.fillStyleEditor.Name = "fillStyleEditor";
- this.fillStyleEditor.ForegroundRequiresExpression += new System.EventHandler(this.fillStyleEditor_ForegroundRequiresExpression);
- this.fillStyleEditor.BackgroundRequiresExpression += new System.EventHandler(this.fillStyleEditor_BackgroundRequiresExpression);
- //
- // lineStyleEditor
- //
- resources.ApplyResources(this.lineStyleEditor, "lineStyleEditor");
- this.lineStyleEditor.Name = "lineStyleEditor";
- //
- // sizeUnitsCombo
- //
- resources.ApplyResources(this.sizeUnitsCombo, "sizeUnitsCombo");
- this.sizeUnitsCombo.DataSource = this.UnitsTable;
- this.sizeUnitsCombo.DisplayMember = "Display";
- this.sizeUnitsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.sizeUnitsCombo.Name = "sizeUnitsCombo";
- this.sizeUnitsCombo.ValueMember = "Value";
- this.sizeUnitsCombo.SelectedIndexChanged += new System.EventHandler(this.sizeUnitsCombo_SelectedIndexChanged);
- //
- // UnitsTable
- //
- this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn5,
- this.dataColumn6});
- this.UnitsTable.TableName = "Units";
- //
- // dataColumn5
- //
- this.dataColumn5.Caption = "Display";
- this.dataColumn5.ColumnName = "Display";
- //
- // dataColumn6
- //
- this.dataColumn6.Caption = "Value";
- this.dataColumn6.ColumnName = "Value";
- //
- // sizeContextCombo
- //
- resources.ApplyResources(this.sizeContextCombo, "sizeContextCombo");
- this.sizeContextCombo.DataSource = this.SizeContextTable;
- this.sizeContextCombo.DisplayMember = "Display";
- this.sizeContextCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.sizeContextCombo.Name = "sizeContextCombo";
- this.sizeContextCombo.ValueMember = "Value";
- this.sizeContextCombo.SelectedIndexChanged += new System.EventHandler(this.sizeContextCombo_SelectedIndexChanged);
- //
- // SizeContextTable
- //
- this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn3,
- this.dataColumn4});
- this.SizeContextTable.TableName = "SizeContext";
- //
- // dataColumn3
- //
- this.dataColumn3.Caption = "Display";
- this.dataColumn3.ColumnName = "Display";
- //
- // dataColumn4
- //
- this.dataColumn4.Caption = "Value";
- this.dataColumn4.ColumnName = "Value";
- //
- // label4
- //
- resources.ApplyResources(this.label4, "label4");
- this.label4.Name = "label4";
- //
- // label3
- //
- resources.ApplyResources(this.label3, "label3");
- this.label3.Name = "label3";
- //
- // groupBox1
- //
- resources.ApplyResources(this.groupBox1, "groupBox1");
- this.groupBox1.Controls.Add(this.sizeUnitsCombo);
- this.groupBox1.Controls.Add(this.sizeContextCombo);
- this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Controls.Add(this.lineStyleEditor);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.TabStop = false;
- //
- // groupBox2
- //
- resources.ApplyResources(this.groupBox2, "groupBox2");
- this.groupBox2.Controls.Add(this.fillStyleEditor);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.TabStop = false;
- //
- // previewGroup
- //
- resources.ApplyResources(this.previewGroup, "previewGroup");
- this.previewGroup.Controls.Add(this.previewPicture);
- this.previewGroup.Name = "previewGroup";
- this.previewGroup.TabStop = false;
- //
- // previewPicture
- //
- resources.ApplyResources(this.previewPicture, "previewPicture");
- this.previewPicture.BackColor = System.Drawing.Color.White;
- this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.previewPicture.Name = "previewPicture";
- this.previewPicture.TabStop = false;
- this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
- //
- // ComboBoxDataSet
- //
- this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
- this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
- this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
- this.SizeContextTable,
- this.UnitsTable});
- //
- // AreaFeatureStyleEditor
- //
- resources.ApplyResources(this, "$this");
- this.Controls.Add(this.previewGroup);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
- this.Name = "AreaFeatureStyleEditor";
- this.Load += new System.EventHandler(this.AreaFeatureStyleEditor_Load);
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
- this.groupBox1.ResumeLayout(false);
- this.groupBox2.ResumeLayout(false);
- this.previewGroup.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
- this.ResumeLayout(false);
-
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AreaFeatureStyleEditor));
+ this.fillStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor();
+ this.lineStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor();
+ this.sizeUnitsCombo = new System.Windows.Forms.ComboBox();
+ this.UnitsTable = new System.Data.DataTable();
+ this.dataColumn5 = new System.Data.DataColumn();
+ this.dataColumn6 = new System.Data.DataColumn();
+ this.sizeContextCombo = new System.Windows.Forms.ComboBox();
+ this.SizeContextTable = new System.Data.DataTable();
+ this.dataColumn3 = new System.Data.DataColumn();
+ this.dataColumn4 = new System.Data.DataColumn();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.previewGroup = new System.Windows.Forms.GroupBox();
+ this.previewPicture = new System.Windows.Forms.PictureBox();
+ this.ComboBoxDataSet = new System.Data.DataSet();
+ ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.previewGroup.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
+ this.SuspendLayout();
+ //
+ // fillStyleEditor
+ //
+ resources.ApplyResources(this.fillStyleEditor, "fillStyleEditor");
+ this.fillStyleEditor.Name = "fillStyleEditor";
+ this.fillStyleEditor.ForegroundRequiresExpression += new System.EventHandler(this.fillStyleEditor_ForegroundRequiresExpression);
+ this.fillStyleEditor.BackgroundRequiresExpression += new System.EventHandler(this.fillStyleEditor_BackgroundRequiresExpression);
+ //
+ // lineStyleEditor
+ //
+ resources.ApplyResources(this.lineStyleEditor, "lineStyleEditor");
+ this.lineStyleEditor.ColorExpression = "";
+ this.lineStyleEditor.Name = "lineStyleEditor";
+ this.lineStyleEditor.RequiresExpressionEditor += new System.EventHandler(this.LineStyleEditor_RequiresExpressionEditor);
+ //
+ // sizeUnitsCombo
+ //
+ resources.ApplyResources(this.sizeUnitsCombo, "sizeUnitsCombo");
+ this.sizeUnitsCombo.DataSource = this.UnitsTable;
+ this.sizeUnitsCombo.DisplayMember = "Display";
+ this.sizeUnitsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.sizeUnitsCombo.Name = "sizeUnitsCombo";
+ this.sizeUnitsCombo.ValueMember = "Value";
+ this.sizeUnitsCombo.SelectedIndexChanged += new System.EventHandler(this.sizeUnitsCombo_SelectedIndexChanged);
+ //
+ // UnitsTable
+ //
+ this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn5,
+ this.dataColumn6});
+ this.UnitsTable.TableName = "Units";
+ //
+ // dataColumn5
+ //
+ this.dataColumn5.Caption = "Display";
+ this.dataColumn5.ColumnName = "Display";
+ //
+ // dataColumn6
+ //
+ this.dataColumn6.Caption = "Value";
+ this.dataColumn6.ColumnName = "Value";
+ //
+ // sizeContextCombo
+ //
+ resources.ApplyResources(this.sizeContextCombo, "sizeContextCombo");
+ this.sizeContextCombo.DataSource = this.SizeContextTable;
+ this.sizeContextCombo.DisplayMember = "Display";
+ this.sizeContextCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.sizeContextCombo.Name = "sizeContextCombo";
+ this.sizeContextCombo.ValueMember = "Value";
+ this.sizeContextCombo.SelectedIndexChanged += new System.EventHandler(this.sizeContextCombo_SelectedIndexChanged);
+ //
+ // SizeContextTable
+ //
+ this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn3,
+ this.dataColumn4});
+ this.SizeContextTable.TableName = "SizeContext";
+ //
+ // dataColumn3
+ //
+ this.dataColumn3.Caption = "Display";
+ this.dataColumn3.ColumnName = "Display";
+ //
+ // dataColumn4
+ //
+ this.dataColumn4.Caption = "Value";
+ this.dataColumn4.ColumnName = "Value";
+ //
+ // label4
+ //
+ resources.ApplyResources(this.label4, "label4");
+ this.label4.Name = "label4";
+ //
+ // label3
+ //
+ resources.ApplyResources(this.label3, "label3");
+ this.label3.Name = "label3";
+ //
+ // groupBox1
+ //
+ resources.ApplyResources(this.groupBox1, "groupBox1");
+ this.groupBox1.Controls.Add(this.sizeUnitsCombo);
+ this.groupBox1.Controls.Add(this.sizeContextCombo);
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.label3);
+ this.groupBox1.Controls.Add(this.lineStyleEditor);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.TabStop = false;
+ //
+ // groupBox2
+ //
+ resources.ApplyResources(this.groupBox2, "groupBox2");
+ this.groupBox2.Controls.Add(this.fillStyleEditor);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.TabStop = false;
+ //
+ // previewGroup
+ //
+ resources.ApplyResources(this.previewGroup, "previewGroup");
+ this.previewGroup.Controls.Add(this.previewPicture);
+ this.previewGroup.Name = "previewGroup";
+ this.previewGroup.TabStop = false;
+ //
+ // previewPicture
+ //
+ resources.ApplyResources(this.previewPicture, "previewPicture");
+ this.previewPicture.BackColor = System.Drawing.Color.White;
+ this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.previewPicture.Name = "previewPicture";
+ this.previewPicture.TabStop = false;
+ this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
+ //
+ // ComboBoxDataSet
+ //
+ this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
+ this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
+ this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
+ this.SizeContextTable,
+ this.UnitsTable});
+ //
+ // AreaFeatureStyleEditor
+ //
+ resources.ApplyResources(this, "$this");
+ this.Controls.Add(this.previewGroup);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.Name = "AreaFeatureStyleEditor";
+ this.Load += new System.EventHandler(this.AreaFeatureStyleEditor_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox2.ResumeLayout(false);
+ this.previewGroup.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
+ this.ResumeLayout(false);
}
#endregion
@@ -554,5 +555,12 @@
if (expr != null)
fillStyleEditor.foregroundColor.ColorExpression = expr;
}
+
+ void LineStyleEditor_RequiresExpressionEditor(object sender, EventArgs e)
+ {
+ string expr = m_editor.EditExpression(lineStyleEditor.colorCombo.ColorExpression, m_schema, m_providername, m_featureSource, true);
+ if (expr != null)
+ lineStyleEditor.colorCombo.ColorExpression = expr;
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.resx 2012-05-22 16:58:48 UTC (rev 6685)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.resx 2012-05-22 17:23:01 UTC (rev 6686)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -112,23 +112,23 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="fillStyleEditor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</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="fillStyleEditor.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 16</value>
</data>
<data name="fillStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
<value>274, 144</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="fillStyleEditor.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
@@ -136,7 +136,7 @@
<value>fillStyleEditor</value>
</data>
<data name=">>fillStyleEditor.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>fillStyleEditor.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -160,7 +160,7 @@
<value>lineStyleEditor</value>
</data>
<data name=">>lineStyleEditor.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -184,7 +184,7 @@
<value>sizeUnitsCombo</value>
</data>
<data name=">>sizeUnitsCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>sizeUnitsCombo.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -208,7 +208,7 @@
<value>sizeContextCombo</value>
</data>
<data name=">>sizeContextCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>sizeContextCombo.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -232,7 +232,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>
@@ -256,7 +256,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>
@@ -283,7 +283,7 @@
<value>groupBox1</value>
</data>
<data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox1.Parent" xml:space="preserve">
<value>$this</value>
@@ -310,7 +310,7 @@
<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>
@@ -337,7 +337,7 @@
<value>previewPicture</value>
</data>
<data name=">>previewPicture.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=">>previewPicture.Parent" xml:space="preserve">
<value>previewGroup</value>
@@ -361,7 +361,7 @@
<value>previewGroup</value>
</data>
<data name=">>previewGroup.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=">>previewGroup.Parent" xml:space="preserve">
<value>$this</value>
@@ -369,10 +369,10 @@
<data name=">>previewGroup.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <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.AutoScroll" type="System.Boolean, mscorlib">
@@ -388,48 +388,48 @@
<value>UnitsTable</value>
</data>
<data name=">>UnitsTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn5.Name" xml:space="preserve">
<value>dataColumn5</value>
</data>
<data name=">>dataColumn5.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn6.Name" xml:space="preserve">
<value>dataColumn6</value>
</data>
<data name=">>dataColumn6.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>SizeContextTable.Name" xml:space="preserve">
<value>SizeContextTable</value>
</data>
<data name=">>SizeContextTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn3.Name" xml:space="preserve">
<value>dataColumn3</value>
</data>
<data name=">>dataColumn3.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn4.Name" xml:space="preserve">
<value>dataColumn4</value>
</data>
<data name=">>dataColumn4.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ComboBoxDataSet.Name" xml:space="preserve">
<value>ComboBoxDataSet</value>
</data>
<data name=">>ComboBoxDataSet.Type" xml:space="preserve">
- <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataSet, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>AreaFeatureStyleEditor</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2012-05-22 16:58:48 UTC (rev 6685)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2012-05-22 17:23:01 UTC (rev 6686)
@@ -232,482 +232,485 @@
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FontStyleEditor));
- this.fontGroup = new System.Windows.Forms.GroupBox();
- this.sizeCombo = new System.Windows.Forms.ComboBox();
- this.unitsCombo = new System.Windows.Forms.ComboBox();
- this.UnitsTable = new System.Data.DataTable();
- this.dataColumn5 = new System.Data.DataColumn();
- this.dataColumn6 = new System.Data.DataColumn();
- this.sizeContextCombo = new System.Windows.Forms.ComboBox();
- this.SizeContextTable = new System.Data.DataTable();
- this.dataColumn3 = new System.Data.DataColumn();
- this.dataColumn4 = new System.Data.DataColumn();
- this.fontCombo = new System.Windows.Forms.ComboBox();
- this.propertyCombo = new System.Windows.Forms.ComboBox();
- this.label6 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.panel1 = new System.Windows.Forms.Panel();
- this.underlineCheck = new System.Windows.Forms.CheckBox();
- this.italicCheck = new System.Windows.Forms.CheckBox();
- this.boldCheck = new System.Windows.Forms.CheckBox();
- this.FontTable = new System.Data.DataTable();
- this.dataColumn1 = new System.Data.DataColumn();
- this.dataColumn2 = new System.Data.DataColumn();
- this.colorGroup = new System.Windows.Forms.GroupBox();
- this.backgroundColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
- this.textColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
- this.backgroundTypeCombo = new System.Windows.Forms.ComboBox();
- this.BackgroundTypeTable = new System.Data.DataTable();
- this.dataColumn9 = new System.Data.DataColumn();
- this.dataColumn10 = new System.Data.DataColumn();
- this.label7 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.label9 = new System.Windows.Forms.Label();
- this.alignmentGroup = new System.Windows.Forms.GroupBox();
- this.rotationCombo = new System.Windows.Forms.ComboBox();
- this.RotationTable = new System.Data.DataTable();
- this.dataColumn7 = new System.Data.DataColumn();
- this.dataColumn8 = new System.Data.DataColumn();
- this.verticalCombo = new System.Windows.Forms.ComboBox();
- this.VerticalTable = new System.Data.DataTable();
- this.dataColumn13 = new System.Data.DataColumn();
- this.dataColumn14 = new System.Data.DataColumn();
- this.horizontalCombo = new System.Windows.Forms.ComboBox();
- this.HorizontalTable = new System.Data.DataTable();
- this.dataColumn11 = new System.Data.DataColumn();
- this.dataColumn12 = new System.Data.DataColumn();
- this.label10 = new System.Windows.Forms.Label();
- this.verticalLabel = new System.Windows.Forms.Label();
- this.horizontalLabel = new System.Windows.Forms.Label();
- this.previewGroup = new System.Windows.Forms.GroupBox();
- this.previewPicture = new System.Windows.Forms.PictureBox();
- this.ComboBoxDataSet = new System.Data.DataSet();
- this.DisplayLabel = new System.Windows.Forms.CheckBox();
- this.fontGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.FontTable)).BeginInit();
- this.colorGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.BackgroundTypeTable)).BeginInit();
- this.alignmentGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.VerticalTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.HorizontalTable)).BeginInit();
- this.previewGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
- this.SuspendLayout();
- //
- // fontGroup
- //
- resources.ApplyResources(this.fontGroup, "fontGroup");
- this.fontGroup.Controls.Add(this.sizeCombo);
- this.fontGroup.Controls.Add(this.unitsCombo);
- this.fontGroup.Controls.Add(this.sizeContextCombo);
- this.fontGroup.Controls.Add(this.fontCombo);
- this.fontGroup.Controls.Add(this.propertyCombo);
- this.fontGroup.Controls.Add(this.label6);
- this.fontGroup.Controls.Add(this.label5);
- this.fontGroup.Controls.Add(this.label4);
- this.fontGroup.Controls.Add(this.label3);
- this.fontGroup.Controls.Add(this.label2);
- this.fontGroup.Controls.Add(this.label1);
- this.fontGroup.Controls.Add(this.panel1);
- this.fontGroup.Name = "fontGroup";
- this.fontGroup.TabStop = false;
- this.fontGroup.Enter += new System.EventHandler(this.fontGroup_Enter);
- //
- // sizeCombo
- //
- resources.ApplyResources(this.sizeCombo, "sizeCombo");
- this.sizeCombo.Items.AddRange(new object[] {
- resources.GetString("sizeCombo.Items")});
- this.sizeCombo.Name = "sizeCombo";
- this.sizeCombo.SelectedIndexChanged += new System.EventHandler(this.sizeCombo_SelectedIndexChanged);
- this.sizeCombo.TextChanged += new System.EventHandler(this.sizeCombo_TextChanged);
- //
- // unitsCombo
- //
- resources.ApplyResources(this.unitsCombo, "unitsCombo");
- this.unitsCombo.DataSource = this.UnitsTable;
- this.unitsCombo.DisplayMember = "Display";
- this.unitsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.unitsCombo.Name = "unitsCombo";
- this.unitsCombo.ValueMember = "Value";
- this.unitsCombo.SelectedIndexChanged += new System.EventHandler(this.unitsCombo_SelectedIndexChanged);
- //
- // UnitsTable
- //
- this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn5,
- this.dataColumn6});
- this.UnitsTable.TableName = "Units";
- //
- // dataColumn5
- //
- this.dataColumn5.Caption = "Display";
- this.dataColumn5.ColumnName = "Display";
- //
- // dataColumn6
- //
- this.dataColumn6.Caption = "Value";
- this.dataColumn6.ColumnName = "Value";
- //
- // sizeContextCombo
- //
- resources.ApplyResources(this.sizeContextCombo, "sizeContextCombo");
- this.sizeContextCombo.DataSource = this.SizeContextTable;
- this.sizeContextCombo.DisplayMember = "Display";
- this.sizeContextCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.sizeContextCombo.Name = "sizeContextCombo";
- this.sizeContextCombo.ValueMember = "Value";
- this.sizeContextCombo.SelectedIndexChanged += new System.EventHandler(this.sizeContextCombo_SelectedIndexChanged);
- //
- // SizeContextTable
- //
- this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn3,
- this.dataColumn4});
- this.SizeContextTable.TableName = "SizeContext";
- //
- // dataColumn3
- //
- this.dataColumn3.Caption = "Display";
- this.dataColumn3.ColumnName = "Display";
- //
- // dataColumn4
- //
- this.dataColumn4.Caption = "Value";
- this.dataColumn4.ColumnName = "Value";
- //
- // fontCombo
- //
- resources.ApplyResources(this.fontCombo, "fontCombo");
- this.fontCombo.Name = "fontCombo";
- this.fontCombo.SelectedIndexChanged += new System.EventHandler(this.fontCombo_SelectedIndexChanged);
- this.fontCombo.TextChanged += new System.EventHandler(this.fontCombo_TextChanged);
- //
- // propertyCombo
- //
- resources.ApplyResources(this.propertyCombo, "propertyCombo");
- this.propertyCombo.Name = "propertyCombo";
- this.propertyCombo.SelectedIndexChanged += new System.EventHandler(this.propertyCombo_SelectedIndexChanged);
- this.propertyCombo.TextChanged += new System.EventHandler(this.propertyCombo_TextChanged);
- //
- // label6
- //
- resources.ApplyResources(this.label6, "label6");
- this.label6.Name = "label6";
- //
- // label5
- //
- resources.ApplyResources(this.label5, "label5");
- this.label5.Name = "label5";
- //
- // label4
- //
- resources.ApplyResources(this.label4, "label4");
- this.label4.Name = "label4";
- //
- // label3
- //
- resources.ApplyResources(this.label3, "label3");
- this.label3.Name = "label3";
- //
- // label2
- //
- resources.ApplyResources(this.label2, "label2");
- this.label2.Name = "label2";
- //
- // label1
- //
- resources.ApplyResources(this.label1, "label1");
- this.label1.Name = "label1";
- //
- // panel1
- //
- resources.ApplyResources(this.panel1, "panel1");
- this.panel1.Controls.Add(this.underlineCheck);
- this.panel1.Controls.Add(this.italicCheck);
- this.panel1.Controls.Add(this.boldCheck);
- this.panel1.Name = "panel1";
- //
- // underlineCheck
- //
- resources.ApplyResources(this.underlineCheck, "underlineCheck");
- this.underlineCheck.Name = "underlineCheck";
- this.underlineCheck.CheckedChanged += new System.EventHandler(this.underlineCheck_CheckedChanged);
- //
- // italicCheck
- //
- resources.ApplyResources(this.italicCheck, "italicCheck");
- this.italicCheck.Name = "italicCheck";
- this.italicCheck.CheckedChanged += new System.EventHandler(this.italicCheck_CheckedChanged);
- //
- // boldCheck
- //
- resources.ApplyResources(this.boldCheck, "boldCheck");
- this.boldCheck.Name = "boldCheck";
- this.boldCheck.CheckedChanged += new System.EventHandler(this.boldCheck_CheckedChanged);
- //
- // FontTable
- //
- this.FontTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn1,
- this.dataColumn2});
- this.FontTable.TableName = "Font";
- //
- // dataColumn1
- //
- this.dataColumn1.Caption = "Display";
- this.dataColumn1.ColumnName = "Display";
- //
- // dataColumn2
- //
- this.dataColumn2.Caption = "Value";
- this.dataColumn2.ColumnName = "Value";
- //
- // colorGroup
- //
- resources.ApplyResources(this.colorGroup, "colorGroup");
- this.colorGroup.Controls.Add(this.backgroundColor);
- this.colorGroup.Controls.Add(this.textColor);
- this.colorGroup.Controls.Add(this.backgroundTypeCombo);
- this.colorGroup.Controls.Add(this.label7);
- this.colorGroup.Controls.Add(this.label8);
- this.colorGroup.Controls.Add(this.label9);
- this.colorGroup.Name = "colorGroup";
- this.colorGroup.TabStop = false;
- //
- // backgroundColor
- //
- resources.ApplyResources(this.backgroundColor, "backgroundColor");
- this.backgroundColor.Name = "backgroundColor";
- this.backgroundColor.CurrentColorChanged += new System.EventHandler(this.backgroundColor_SelectedIndexChanged);
- //
- // textColor
- //
- resources.ApplyResources(this.textColor, "textColor");
- this.textColor.Name = "textColor";
- this.textColor.CurrentColorChanged += new System.EventHandler(this.textColor_SelectedIndexChanged);
- //
- // backgroundTypeCombo
- //
- resources.ApplyResources(this.backgroundTypeCombo, "backgroundTypeCombo");
- this.backgroundTypeCombo.DataSource = this.BackgroundTypeTable;
- this.backgroundTypeCombo.DisplayMember = "Display";
- this.backgroundTypeCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.backgroundTypeCombo.Name = "backgroundTypeCombo";
- this.backgroundTypeCombo.ValueMember = "Value";
- this.backgroundTypeCombo.SelectedIndexChanged += new System.EventHandler(this.backgroundTypeCombo_SelectedIndexChanged);
- //
- // BackgroundTypeTable
- //
- this.BackgroundTypeTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn9,
- this.dataColumn10});
- this.BackgroundTypeTable.TableName = "BackgroundType";
- //
- // dataColumn9
- //
- this.dataColumn9.ColumnName = "Display";
- //
- // dataColumn10
- //
- this.dataColumn10.ColumnName = "Value";
- //
- // label7
- //
- resources.ApplyResources(this.label7, "label7");
- this.label7.Name = "label7";
- //
- // label8
- //
- resources.ApplyResources(this.label8, "label8");
- this.label8.Name = "label8";
- //
- // label9
- //
- resources.ApplyResources(this.label9, "label9");
- this.label9.Name = "label9";
- //
- // alignmentGroup
- //
- resources.ApplyResources(this.alignmentGroup, "alignmentGroup");
- this.alignmentGroup.Controls.Add(this.rotationCombo);
- this.alignmentGroup.Controls.Add(this.verticalCombo);
- this.alignmentGroup.Controls.Add(this.horizontalCombo);
- this.alignmentGroup.Controls.Add(this.label10);
- this.alignmentGroup.Controls.Add(this.verticalLabel);
- this.alignmentGroup.Controls.Add(this.horizontalLabel);
- this.alignmentGroup.Name = "alignmentGroup";
- this.alignmentGroup.TabStop = false;
- //
- // rotationCombo
- //
- resources.ApplyResources(this.rotationCombo, "rotationCombo");
- this.rotationCombo.DataSource = this.RotationTable;
- this.rotationCombo.DisplayMember = "Display";
- this.rotationCombo.Name = "rotationCombo";
- this.rotationCombo.ValueMember = "Value";
- this.rotationCombo.SelectedIndexChanged += new System.EventHandler(this.rotationCombo_SelectedIndexChanged);
- this.rotationCombo.TextChanged += new System.EventHandler(this.rotationCombo_TextChanged);
- //
- // RotationTable
- //
- this.RotationTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn7,
- this.dataColumn8});
- this.RotationTable.TableName = "Rotation";
- //
- // dataColumn7
- //
- this.dataColumn7.Caption = "Display";
- this.dataColumn7.ColumnName = "Display";
- //
- // dataColumn8
- //
- this.dataColumn8.Caption = "Value";
- this.dataColumn8.ColumnName = "Value";
- //
- // verticalCombo
- //
- resources.ApplyResources(this.verticalCombo, "verticalCombo");
- this.verticalCombo.DataSource = this.VerticalTable;
- this.verticalCombo.DisplayMember = "Display";
- this.verticalCombo.Name = "verticalCombo";
- this.verticalCombo.ValueMember = "Value";
- this.verticalCombo.SelectedIndexChanged += new System.EventHandler(this.verticalCombo_SelectedIndexChanged);
- this.verticalCombo.TextChanged += new System.EventHandler(this.verticalCombo_TextChanged);
- //
- // VerticalTable
- //
- this.VerticalTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn13,
- this.dataColumn14});
- this.VerticalTable.TableName = "Vertical";
- //
- // dataColumn13
- //
- this.dataColumn13.ColumnName = "Display";
- //
- // dataColumn14
- //
- this.dataColumn14.ColumnName = "Value";
- //
- // horizontalCombo
- //
- resources.ApplyResources(this.horizontalCombo, "horizontalCombo");
- this.horizontalCombo.DataSource = this.HorizontalTable;
- this.horizontalCombo.DisplayMember = "Display";
- this.horizontalCombo.Name = "horizontalCombo";
- this.horizontalCombo.ValueMember = "Value";
- this.horizontalCombo.SelectedIndexChanged += new System.EventHandler(this.horizontalCombo_SelectedIndexChanged);
- this.horizontalCombo.TextChanged += new System.EventHandler(this.horizontalCombo_TextChanged);
- //
- // HorizontalTable
- //
- this.HorizontalTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn11,
- this.dataColumn12});
- this.HorizontalTable.TableName = "Horizontal";
- //
- // dataColumn11
- //
- this.dataColumn11.ColumnName = "Display";
- //
- // dataColumn12
- //
- this.dataColumn12.ColumnName = "Value";
- //
- // label10
- //
- resources.ApplyResources(this.label10, "label10");
- this.label10.Name = "label10";
- //
- // verticalLabel
- //
- resources.ApplyResources(this.verticalLabel, "verticalLabel");
- this.verticalLabel.Name = "verticalLabel";
- //
- // horizontalLabel
- //
- resources.ApplyResources(this.horizontalLabel, "horizontalLabel");
- this.horizontalLabel.Name = "horizontalLabel";
- //
- // previewGroup
- //
- resources.ApplyResources(this.previewGroup, "previewGroup");
- this.previewGroup.Controls.Add(this.previewPicture);
- this.previewGroup.Name = "previewGroup";
- this.previewGroup.TabStop = false;
- //
- // previewPicture
- //
- resources.ApplyResources(this.previewPicture, "previewPicture");
- this.previewPicture.BackColor = System.Drawing.Color.White;
- this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.previewPicture.Name = "previewPicture";
- this.previewPicture.TabStop = false;
- this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
- //
- // ComboBoxDataSet
- //
- this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
- this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
- this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
- this.FontTable,
- this.SizeContextTable,
- this.UnitsTable,
- this.RotationTable,
- this.BackgroundTypeTable,
- this.HorizontalTable,
- this.VerticalTable});
- //
- // DisplayLabel
- //
- resources.ApplyResources(this.DisplayLabel, "DisplayLabel");
- this.DisplayLabel.Checked = true;
- this.DisplayLabel.CheckState = System.Windows.Forms.CheckState.Checked;
- this.DisplayLabel.Name = "DisplayLabel";
- this.DisplayLabel.UseVisualStyleBackColor = true;
- this.DisplayLabel.CheckedChanged += new System.EventHandler(this.DisplayLabel_CheckedChanged);
- //
- // FontStyleEditor
- //
- resources.ApplyResources(this, "$this");
- this.Controls.Add(this.DisplayLabel);
- this.Controls.Add(this.previewGroup);
- this.Controls.Add(this.colorGroup);
- this.Controls.Add(this.fontGroup);
- this.Controls.Add(this.alignmentGroup);
- this.Name = "FontStyleEditor";
- this.fontGroup.ResumeLayout(false);
- this.fontGroup.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
- this.panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.FontTable)).EndInit();
- this.colorGroup.ResumeLayout(false);
- this.colorGroup.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.BackgroundTypeTable)).EndInit();
- this.alignmentGroup.ResumeLayout(false);
- this.alignmentGroup.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.VerticalTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.HorizontalTable)).EndInit();
- this.previewGroup.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
- this.ResumeLayout(false);
- this.PerformLayout();
-
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FontStyleEditor));
+ this.fontGroup = new System.Windows.Forms.GroupBox();
+ this.sizeCombo = new System.Windows.Forms.ComboBox();
+ this.unitsCombo = new System.Windows.Forms.ComboBox();
+ this.UnitsTable = new System.Data.DataTable();
+ this.dataColumn5 = new System.Data.DataColumn();
+ this.dataColumn6 = new System.Data.DataColumn();
+ this.sizeContextCombo = new System.Windows.Forms.ComboBox();
+ this.SizeContextTable = new System.Data.DataTable();
+ this.dataColumn3 = new System.Data.DataColumn();
+ this.dataColumn4 = new System.Data.DataColumn();
+ this.fontCombo = new System.Windows.Forms.ComboBox();
+ this.propertyCombo = new System.Windows.Forms.ComboBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.underlineCheck = new System.Windows.Forms.CheckBox();
+ this.italicCheck = new System.Windows.Forms.CheckBox();
+ this.boldCheck = new System.Windows.Forms.CheckBox();
+ this.FontTable = new System.Data.DataTable();
+ this.dataColumn1 = new System.Data.DataColumn();
+ this.dataColumn2 = new System.Data.DataColumn();
+ this.colorGroup = new System.Windows.Forms.GroupBox();
+ this.backgroundColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
+ this.textColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
+ this.backgroundTypeCombo = new System.Windows.Forms.ComboBox();
+ this.BackgroundTypeTable = new System.Data.DataTable();
+ this.dataColumn9 = new System.Data.DataColumn();
+ this.dataColumn10 = new System.Data.DataColumn();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.alignmentGroup = new System.Windows.Forms.GroupBox();
+ this.rotationCombo = new System.Windows.Forms.ComboBox();
+ this.RotationTable = new System.Data.DataTable();
+ this.dataColumn7 = new System.Data.DataColumn();
+ this.dataColumn8 = new System.Data.DataColumn();
+ this.verticalCombo = new System.Windows.Forms.ComboBox();
+ this.VerticalTable = new System.Data.DataTable();
+ this.dataColumn13 = new System.Data.DataColumn();
+ this.dataColumn14 = new System.Data.DataColumn();
+ this.horizontalCombo = new System.Windows.Forms.ComboBox();
+ this.HorizontalTable = new System.Data.DataTable();
+ this.dataColumn11 = new System.Data.DataColumn();
+ this.dataColumn12 = new System.Data.DataColumn();
+ this.label10 = new System.Windows.Forms.Label();
+ this.verticalLabel = new System.Windows.Forms.Label();
+ this.horizontalLabel = new System.Windows.Forms.Label();
+ this.previewGroup = new System.Windows.Forms.GroupBox();
+ this.previewPicture = new System.Windows.Forms.PictureBox();
+ this.ComboBoxDataSet = new System.Data.DataSet();
+ this.DisplayLabel = new System.Windows.Forms.CheckBox();
+ this.fontGroup.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.FontTable)).BeginInit();
+ this.colorGroup.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.BackgroundTypeTable)).BeginInit();
+ this.alignmentGroup.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.VerticalTable)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.HorizontalTable)).BeginInit();
+ this.previewGroup.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
+ this.SuspendLayout();
+ //
+ // fontGroup
+ //
+ resources.ApplyResources(this.fontGroup, "fontGroup");
+ this.fontGroup.Controls.Add(this.sizeCombo);
+ this.fontGroup.Controls.Add(this.unitsCombo);
+ this.fontGroup.Controls.Add(this.sizeContextCombo);
+ this.fontGroup.Controls.Add(this.fontCombo);
+ this.fontGroup.Controls.Add(this.propertyCombo);
+ this.fontGroup.Controls.Add(this.label6);
+ this.fontGroup.Controls.Add(this.label5);
+ this.fontGroup.Controls.Add(this.label4);
+ this.fontGroup.Controls.Add(this.label3);
+ this.fontGroup.Controls.Add(this.label2);
+ this.fontGroup.Controls.Add(this.label1);
+ this.fontGroup.Controls.Add(this.panel1);
+ this.fontGroup.Name = "fontGroup";
+ this.fontGroup.TabStop = false;
+ this.fontGroup.Enter += new System.EventHandler(this.fontGroup_Enter);
+ //
+ // sizeCombo
+ //
+ resources.ApplyResources(this.sizeCombo, "sizeCombo");
+ this.sizeCombo.Items.AddRange(new object[] {
+ resources.GetString("sizeCombo.Items")});
+ this.sizeCombo.Name = "sizeCombo";
+ this.sizeCombo.SelectedIndexChanged += new System.EventHandler(this.sizeCombo_SelectedIndexChanged);
+ this.sizeCombo.TextChanged += new System.EventHandler(this.sizeCombo_TextChanged);
+ //
+ // unitsCombo
+ //
+ resources.ApplyResources(this.unitsCombo, "unitsCombo");
+ this.unitsCombo.DataSource = this.UnitsTable;
+ this.unitsCombo.DisplayMember = "Display";
+ this.unitsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.unitsCombo.Name = "unitsCombo";
+ this.unitsCombo.ValueMember = "Value";
+ this.unitsCombo.SelectedIndexChanged += new System.EventHandler(this.unitsCombo_SelectedIndexChanged);
+ //
+ // UnitsTable
+ //
+ this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn5,
+ this.dataColumn6});
+ this.UnitsTable.TableName = "Units";
+ //
+ // dataColumn5
+ //
+ this.dataColumn5.Caption = "Display";
+ this.dataColumn5.ColumnName = "Display";
+ //
+ // dataColumn6
+ //
+ this.dataColumn6.Caption = "Value";
+ this.dataColumn6.ColumnName = "Value";
+ //
+ // sizeContextCombo
+ //
+ resources.ApplyResources(this.sizeContextCombo, "sizeContextCombo");
+ this.sizeContextCombo.DataSource = this.SizeContextTable;
+ this.sizeContextCombo.DisplayMember = "Display";
+ this.sizeContextCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.sizeContextCombo.Name = "sizeContextCombo";
+ this.sizeContextCombo.ValueMember = "Value";
+ this.sizeContextCombo.SelectedIndexChanged += new System.EventHandler(this.sizeContextCombo_SelectedIndexChanged);
+ //
+ // SizeContextTable
+ //
+ this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn3,
+ this.dataColumn4});
+ this.SizeContextTable.TableName = "SizeContext";
+ //
+ // dataColumn3
+ //
+ this.dataColumn3.Caption = "Display";
+ this.dataColumn3.ColumnName = "Display";
+ //
+ // dataColumn4
+ //
+ this.dataColumn4.Caption = "Value";
+ this.dataColumn4.ColumnName = "Value";
+ //
+ // fontCombo
+ //
+ resources.ApplyResources(this.fontCombo, "fontCombo");
+ this.fontCombo.Name = "fontCombo";
+ this.fontCombo.SelectedIndexChanged += new System.EventHandler(this.fontCombo_SelectedIndexChanged);
+ this.fontCombo.TextChanged += new System.EventHandler(this.fontCombo_TextChanged);
+ //
+ // propertyCombo
+ //
+ resources.ApplyResources(this.propertyCombo, "propertyCombo");
+ this.propertyCombo.Name = "propertyCombo";
+ this.propertyCombo.SelectedIndexChanged += new System.EventHandler(this.propertyCombo_SelectedIndexChanged);
+ this.propertyCombo.TextChanged += new System.EventHandler(this.propertyCombo_TextChanged);
+ //
+ // label6
+ //
+ resources.ApplyResources(this.label6, "label6");
+ this.label6.Name = "label6";
+ //
+ // label5
+ //
+ resources.ApplyResources(this.label5, "label5");
+ this.label5.Name = "label5";
+ //
+ // label4
+ //
+ resources.ApplyResources(this.label4, "label4");
+ this.label4.Name = "label4";
+ //
+ // label3
+ //
+ resources.ApplyResources(this.label3, "label3");
+ this.label3.Name = "label3";
+ //
+ // label2
+ //
+ resources.ApplyResources(this.label2, "label2");
+ this.label2.Name = "label2";
+ //
+ // label1
+ //
+ resources.ApplyResources(this.label1, "label1");
+ this.label1.Name = "label1";
+ //
+ // panel1
+ //
+ resources.ApplyResources(this.panel1, "panel1");
+ this.panel1.Controls.Add(this.underlineCheck);
+ this.panel1.Controls.Add(this.italicCheck);
+ this.panel1.Controls.Add(this.boldCheck);
+ this.panel1.Name = "panel1";
+ //
+ // underlineCheck
+ //
+ resources.ApplyResources(this.underlineCheck, "underlineCheck");
+ this.underlineCheck.Name = "underlineCheck";
+ this.underlineCheck.CheckedChanged += new System.EventHandler(this.underlineCheck_CheckedChanged);
+ //
+ // italicCheck
+ //
+ resources.ApplyResources(this.italicCheck, "italicCheck");
+ this.italicCheck.Name = "italicCheck";
+ this.italicCheck.CheckedChanged += new System.EventHandler(this.italicCheck_CheckedChanged);
+ //
+ // boldCheck
+ //
+ resources.ApplyResources(this.boldCheck, "boldCheck");
+ this.boldCheck.Name = "boldCheck";
+ this.boldCheck.CheckedChanged += new System.EventHandler(this.boldCheck_CheckedChanged);
+ //
+ // FontTable
+ //
+ this.FontTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn1,
+ this.dataColumn2});
+ this.FontTable.TableName = "Font";
+ //
+ // dataColumn1
+ //
+ this.dataColumn1.Caption = "Display";
+ this.dataColumn1.ColumnName = "Display";
+ //
+ // dataColumn2
+ //
+ this.dataColumn2.Caption = "Value";
+ this.dataColumn2.ColumnName = "Value";
+ //
+ // colorGroup
+ //
+ resources.ApplyResources(this.colorGroup, "colorGroup");
+ this.colorGroup.Controls.Add(this.backgroundColor);
+ this.colorGroup.Controls.Add(this.textColor);
+ this.colorGroup.Controls.Add(this.backgroundTypeCombo);
+ this.colorGroup.Controls.Add(this.label7);
+ this.colorGroup.Controls.Add(this.label8);
+ this.colorGroup.Controls.Add(this.label9);
+ this.colorGroup.Name = "colorGroup";
+ this.colorGroup.TabStop = false;
+ //
+ // backgroundColor
+ //
+ resources.ApplyResources(this.backgroundColor, "backgroundColor");
+ this.backgroundColor.ColorExpression = "";
+ this.backgroundColor.Name = "backgroundColor";
+ this.backgroundColor.CurrentColorChanged += new System.EventHandler(this.backgroundColor_SelectedIndexChanged);
+ this.backgroundColor.RequestExpressionEditor += new System.EventHandler(this.BackgroundColor_RequestExpressionEditor);
+ //
+ // textColor
+ //
+ resources.ApplyResources(this.textColor, "textColor");
+ this.textColor.ColorExpression = "";
+ this.textColor.Name = "textColor";
+ this.textColor.CurrentColorChanged += new System.EventHandler(this.textColor_SelectedIndexChanged);
+ this.textColor.RequestExpressionEditor += new System.EventHandler(this.TextColor_RequestExpressionEditor);
+ //
+ // backgroundTypeCombo
+ //
+ resources.ApplyResources(this.backgroundTypeCombo, "backgroundTypeCombo");
+ this.backgroundTypeCombo.DataSource = this.BackgroundTypeTable;
+ this.backgroundTypeCombo.DisplayMember = "Display";
+ this.backgroundTypeCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.backgroundTypeCombo.Name = "backgroundTypeCombo";
+ this.backgroundTypeCombo.ValueMember = "Value";
+ this.backgroundTypeCombo.SelectedIndexChanged += new System.EventHandler(this.backgroundTypeCombo_SelectedIndexChanged);
+ //
+ // BackgroundTypeTable
+ //
+ this.BackgroundTypeTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn9,
+ this.dataColumn10});
+ this.BackgroundTypeTable.TableName = "BackgroundType";
+ //
+ // dataColumn9
+ //
+ this.dataColumn9.ColumnName = "Display";
+ //
+ // dataColumn10
+ //
+ this.dataColumn10.ColumnName = "Value";
+ //
+ // label7
+ //
+ resources.ApplyResources(this.label7, "label7");
+ this.label7.Name = "label7";
+ //
+ // label8
+ //
+ resources.ApplyResources(this.label8, "label8");
+ this.label8.Name = "label8";
+ //
+ // label9
+ //
+ resources.ApplyResources(this.label9, "label9");
+ this.label9.Name = "label9";
+ //
+ // alignmentGroup
+ //
+ resources.ApplyResources(this.alignmentGroup, "alignmentGroup");
+ this.alignmentGroup.Controls.Add(this.rotationCombo);
+ this.alignmentGroup.Controls.Add(this.verticalCombo);
+ this.alignmentGroup.Controls.Add(this.horizontalCombo);
+ this.alignmentGroup.Controls.Add(this.label10);
+ this.alignmentGroup.Controls.Add(this.verticalLabel);
+ this.alignmentGroup.Controls.Add(this.horizontalLabel);
+ this.alignmentGroup.Name = "alignmentGroup";
+ this.alignmentGroup.TabStop = false;
+ //
+ // rotationCombo
+ //
+ resources.ApplyResources(this.rotationCombo, "rotationCombo");
+ this.rotationCombo.DataSource = this.RotationTable;
+ this.rotationCombo.DisplayMember = "Display";
+ this.rotationCombo.Name = "rotationCombo";
+ this.rotationCombo.ValueMember = "Value";
+ this.rotationCombo.SelectedIndexChanged += new System.EventHandler(this.rotationCombo_SelectedIndexChanged);
+ this.rotationCombo.TextChanged += new System.EventHandler(this.rotationCombo_TextChanged);
+ //
+ // RotationTable
+ //
+ this.RotationTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn7,
+ this.dataColumn8});
+ this.RotationTable.TableName = "Rotation";
+ //
+ // dataColumn7
+ //
+ this.dataColumn7.Caption = "Display";
+ this.dataColumn7.ColumnName = "Display";
+ //
+ // dataColumn8
+ //
+ this.dataColumn8.Caption = "Value";
+ this.dataColumn8.ColumnName = "Value";
+ //
+ // verticalCombo
+ //
+ resources.ApplyResources(this.verticalCombo, "verticalCombo");
+ this.verticalCombo.DataSource = this.VerticalTable;
+ this.verticalCombo.DisplayMember = "Display";
+ this.verticalCombo.Name = "verticalCombo";
+ this.verticalCombo.ValueMember = "Value";
+ this.verticalCombo.SelectedIndexChanged += new System.EventHandler(this.verticalCombo_SelectedIndexChanged);
+ this.verticalCombo.TextChanged += new System.EventHandler(this.verticalCombo_TextChanged);
+ //
+ // VerticalTable
+ //
+ this.VerticalTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn13,
+ this.dataColumn14});
+ this.VerticalTable.TableName = "Vertical";
+ //
+ // dataColumn13
+ //
+ this.dataColumn13.ColumnName = "Display";
+ //
+ // dataColumn14
+ //
+ this.dataColumn14.ColumnName = "Value";
+ //
+ // horizontalCombo
+ //
+ resources.ApplyResources(this.horizontalCombo, "horizontalCombo");
+ this.horizontalCombo.DataSource = this.HorizontalTable;
+ this.horizontalCombo.DisplayMember = "Display";
+ this.horizontalCombo.Name = "horizontalCombo";
+ this.horizontalCombo.ValueMember = "Value";
+ this.horizontalCombo.SelectedIndexChanged += new System.EventHandler(this.horizontalCombo_SelectedIndexChanged);
+ this.horizontalCombo.TextChanged += new System.EventHandler(this.horizontalCombo_TextChanged);
+ //
+ // HorizontalTable
+ //
+ this.HorizontalTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn11,
+ this.dataColumn12});
+ this.HorizontalTable.TableName = "Horizontal";
+ //
+ // dataColumn11
+ //
+ this.dataColumn11.ColumnName = "Display";
+ //
+ // dataColumn12
+ //
+ this.dataColumn12.ColumnName = "Value";
+ //
+ // label10
+ //
+ resources.ApplyResources(this.label10, "label10");
+ this.label10.Name = "label10";
+ //
+ // verticalLabel
+ //
+ resources.ApplyResources(this.verticalLabel, "verticalLabel");
+ this.verticalLabel.Name = "verticalLabel";
+ //
+ // horizontalLabel
+ //
+ resources.ApplyResources(this.horizontalLabel, "horizontalLabel");
+ this.horizontalLabel.Name = "horizontalLabel";
+ //
+ // previewGroup
+ //
+ resources.ApplyResources(this.previewGroup, "previewGroup");
+ this.previewGroup.Controls.Add(this.previewPicture);
+ this.previewGroup.Name = "previewGroup";
+ this.previewGroup.TabStop = false;
+ //
+ // previewPicture
+ //
+ resources.ApplyResources(this.previewPicture, "previewPicture");
+ this.previewPicture.BackColor = System.Drawing.Color.White;
+ this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.previewPicture.Name = "previewPicture";
+ this.previewPicture.TabStop = false;
+ this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
+ //
+ // ComboBoxDataSet
+ //
+ this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
+ this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
+ this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
+ this.FontTable,
+ this.SizeContextTable,
+ this.UnitsTable,
+ this.RotationTable,
+ this.BackgroundTypeTable,
+ this.HorizontalTable,
+ this.VerticalTable});
+ //
+ // DisplayLabel
+ //
+ resources.ApplyResources(this.DisplayLabel, "DisplayLabel");
+ this.DisplayLabel.Checked = true;
+ this.DisplayLabel.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.DisplayLabel.Name = "DisplayLabel";
+ this.DisplayLabel.UseVisualStyleBackColor = true;
+ this.DisplayLabel.CheckedChanged += new System.EventHandler(this.DisplayLabel_CheckedChanged);
+ //
+ // FontStyleEditor
+ //
+ resources.ApplyResources(this, "$this");
+ this.Controls.Add(this.DisplayLabel);
+ this.Controls.Add(this.previewGroup);
+ this.Controls.Add(this.colorGroup);
+ this.Controls.Add(this.fontGroup);
+ this.Controls.Add(this.alignmentGroup);
+ this.Name = "FontStyleEditor";
+ this.fontGroup.ResumeLayout(false);
+ this.fontGroup.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
+ this.panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.FontTable)).EndInit();
+ this.colorGroup.ResumeLayout(false);
+ this.colorGroup.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.BackgroundTypeTable)).EndInit();
+ this.alignmentGroup.ResumeLayout(false);
+ this.alignmentGroup.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.VerticalTable)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.HorizontalTable)).EndInit();
+ this.previewGroup.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
@@ -1038,5 +1041,19 @@
Changed(this, new EventArgs());
}
+
+ void TextColor_RequestExpressionEditor(object sender, EventArgs e)
+ {
+ string expr = m_editor.EditExpression(textColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
+ if (expr != null)
+ textColor.ColorExpression = expr;
+ }
+
+ void BackgroundColor_RequestExpressionEditor(object sender, EventArgs e)
+ {
+ string expr = m_editor.EditExpression(backgroundColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
+ if (expr != null)
+ backgroundColor.ColorExpression = expr;
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.resx 2012-05-22 16:58:48 UTC (rev 6685)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.resx 2012-05-22 17:23:01 UTC (rev 6686)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="fontGroup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -127,14 +127,14 @@
<data name="sizeCombo.Items" xml:space="preserve">
<value>Expression...</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="sizeCombo.Location" type="System.Drawing.Point, System.Drawing">
<value>112, 144</value>
</data>
<data name="sizeCombo.Size" type="System.Drawing.Size, System.Drawing">
<value>176, 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="sizeCombo.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
@@ -142,7 +142,7 @@
<value>sizeCombo</value>
</data>
<data name=">>sizeCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>sizeCombo.Parent" xml:space="preserve">
<value>fontGroup</value>
@@ -166,7 +166,7 @@
<value>unitsCombo</value>
</data>
<data name=">>unitsCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>unitsCombo.Parent" xml:space="preserve">
<value>fontGroup</value>
@@ -190,7 +190,7 @@
<value>sizeContextCombo</value>
</data>
<data name=">>sizeContextCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>sizeContextCombo.Parent" xml:space="preserve">
<value>fontGroup</value>
@@ -214,7 +214,7 @@
<value>fontCombo</value>
</data>
<data name=">>fontCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>fontCombo.Parent" xml:space="preserve">
<value>fontGroup</value>
@@ -238,7 +238,7 @@
<value>propertyCombo</value>
</data>
<data name=">>propertyCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>propertyCombo.Parent" xml:space="preserve">
<value>fontGroup</value>
@@ -265,7 +265,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>fontGroup</value>
@@ -292,7 +292,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>fontGroup</value>
@@ -319,7 +319,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>fontGroup</value>
@@ -346,7 +346,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>fontGroup</value>
@@ -373,7 +373,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>fontGroup</value>
@@ -400,7 +400,7 @@
<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>fontGroup</value>
@@ -439,7 +439,7 @@
<value>underlineCheck</value>
</data>
<data name=">>underlineCheck.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=">>underlineCheck.Parent" xml:space="preserve">
<value>panel1</value>
@@ -475,7 +475,7 @@
<value>italicCheck</value>
</data>
<data name=">>italicCheck.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=">>italicCheck.Parent" xml:space="preserve">
<value>panel1</value>
@@ -511,7 +511,7 @@
<value>boldCheck</value>
</data>
<data name=">>boldCheck.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=">>boldCheck.Parent" xml:space="preserve">
<value>panel1</value>
@@ -532,7 +532,7 @@
<value>panel1</value>
</data>
<data name=">>panel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>panel1.Parent" xml:space="preserve">
<value>fontGroup</value>
@@ -556,7 +556,7 @@
<value>fontGroup</value>
</data>
<data name=">>fontGroup.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=">>fontGroup.Parent" xml:space="preserve">
<value>$this</value>
@@ -583,7 +583,7 @@
<value>backgroundColor</value>
</data>
<data name=">>backgroundColor.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=4.0.0.6143, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>backgroundColor.Parent" xml:space="preserve">
<value>colorGroup</value>
@@ -607,7 +607,7 @@
<value>textColor</value>
</data>
<data name=">>textColor.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=4.0.0.6143, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>textColor.Parent" xml:space="preserve">
<value>colorGroup</value>
@@ -631,7 +631,7 @@
<value>backgroundTypeCombo</value>
</data>
<data name=">>backgroundTypeCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>backgroundTypeCombo.Parent" xml:space="preserve">
<value>colorGroup</value>
@@ -658,7 +658,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>colorGroup</value>
@@ -685,7 +685,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>colorGroup</value>
@@ -712,7 +712,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>colorGroup</value>
@@ -736,7 +736,7 @@
<value>colorGroup</value>
</data>
<data name=">>colorGroup.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=">>colorGroup.Parent" xml:space="preserve">
<value>$this</value>
@@ -763,7 +763,7 @@
<value>rotationCombo</value>
</data>
<data name=">>rotationCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>rotationCombo.Parent" xml:space="preserve">
<value>alignmentGroup</value>
@@ -787,7 +787,7 @@
<value>verticalCombo</value>
</data>
<data name=">>verticalCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>verticalCombo.Parent" xml:space="preserve">
<value>alignmentGroup</value>
@@ -811,7 +811,7 @@
<value>horizontalCombo</value>
</data>
<data name=">>horizontalCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>horizontalCombo.Parent" xml:space="preserve">
<value>alignmentGroup</value>
@@ -838,7 +838,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>alignmentGroup</value>
@@ -865,7 +865,7 @@
<value>verticalLabel</value>
</data>
<data name=">>verticalLabel.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=">>verticalLabel.Parent" xml:space="preserve">
<value>alignmentGroup</value>
@@ -892,7 +892,7 @@
<value>horizontalLabel</value>
</data>
<data name=">>horizontalLabel.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=">>horizontalLabel.Parent" xml:space="preserve">
<value>alignmentGroup</value>
@@ -916,7 +916,7 @@
<value>alignmentGroup</value>
</data>
<data name=">>alignmentGroup.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=">>alignmentGroup.Parent" xml:space="preserve">
<value>$this</value>
@@ -943,7 +943,7 @@
<value>previewPicture</value>
</data>
<data name=">>previewPicture.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=">>previewPicture.Parent" xml:space="preserve">
<value>previewGroup</value>
@@ -967,7 +967,7 @@
<value>previewGroup</value>
</data>
<data name=">>previewGroup.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=">>previewGroup.Parent" xml:space="preserve">
<value>$this</value>
@@ -975,7 +975,7 @@
<data name=">>previewGroup.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="DisplayLabel.AutoSize" type="System.Boolean, mscorlib">
@@ -997,7 +997,7 @@
<value>DisplayLabel</value>
</data>
<data name=">>DisplayLabel.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=">>DisplayLabel.Parent" xml:space="preserve">
<value>$this</value>
@@ -1005,7 +1005,7 @@
<data name=">>DisplayLabel.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.AutoScroll" type="System.Boolean, mscorlib">
@@ -1021,138 +1021,138 @@
<value>UnitsTable</value>
</data>
<data name=">>UnitsTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn5.Name" xml:space="preserve">
<value>dataColumn5</value>
</data>
<data name=">>dataColumn5.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn6.Name" xml:space="preserve">
<value>dataColumn6</value>
</data>
<data name=">>dataColumn6.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>SizeContextTable.Name" xml:space="preserve">
<value>SizeContextTable</value>
</data>
<data name=">>SizeContextTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn3.Name" xml:space="preserve">
<value>dataColumn3</value>
</data>
<data name=">>dataColumn3.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn4.Name" xml:space="preserve">
<value>dataColumn4</value>
</data>
<data name=">>dataColumn4.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>FontTable.Name" xml:space="preserve">
<value>FontTable</value>
</data>
<data name=">>FontTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn1.Name" xml:space="preserve">
<value>dataColumn1</value>
</data>
<data name=">>dataColumn1.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn2.Name" xml:space="preserve">
<value>dataColumn2</value>
</data>
<data name=">>dataColumn2.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>BackgroundTypeTable.Name" xml:space="preserve">
<value>BackgroundTypeTable</value>
</data>
<data name=">>BackgroundTypeTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn9.Name" xml:space="preserve">
<value>dataColumn9</value>
</data>
<data name=">>dataColumn9.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn10.Name" xml:space="preserve">
<value>dataColumn10</value>
</data>
<data name=">>dataColumn10.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>RotationTable.Name" xml:space="preserve">
<value>RotationTable</value>
</data>
<data name=">>RotationTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn7.Name" xml:space="preserve">
<value>dataColumn7</value>
</data>
<data name=">>dataColumn7.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn8.Name" xml:space="preserve">
<value>dataColumn8</value>
</data>
<data name=">>dataColumn8.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>VerticalTable.Name" xml:space="preserve">
<value>VerticalTable</value>
</data>
<data name=">>VerticalTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn13.Name" xml:space="preserve">
<value>dataColumn13</value>
</data>
<data name=">>dataColumn13.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn14.Name" xml:space="preserve">
<value>dataColumn14</value>
</data>
<data name=">>dataColumn14.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>HorizontalTable.Name" xml:space="preserve">
<value>HorizontalTable</value>
</data>
<data name=">>HorizontalTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn11.Name" xml:space="preserve">
<value>dataColumn11</value>
</data>
<data name=">>dataColumn11.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn12.Name" xml:space="preserve">
<value>dataColumn12</value>
</data>
<data name=">>dataColumn12.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ComboBoxDataSet.Name" xml:space="preserve">
<value>ComboBoxDataSet</value>
</data>
<data name=">>ComboBoxDataSet.Type" xml:space="preserve">
- <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataSet, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>FontStyleEditor</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2012-05-22 16:58:48 UTC (rev 6685)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2012-05-22 17:23:01 UTC (rev 6686)
@@ -339,548 +339,551 @@
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PointFeatureStyleEditor));
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.RotationBox = new System.Windows.Forms.ComboBox();
- this.RotationTable = new System.Data.DataTable();
- this.dataColumn7 = new System.Data.DataColumn();
- this.dataColumn8 = new System.Data.DataColumn();
- this.label9 = new System.Windows.Forms.Label();
- this.HeightText = new System.Windows.Forms.ComboBox();
- this.WidthText = new System.Windows.Forms.ComboBox();
- this.SizeUnits = new System.Windows.Forms.ComboBox();
- this.UnitsTable = new System.Data.DataTable();
- this.dataColumn5 = new System.Data.DataColumn();
- this.dataColumn6 = new System.Data.DataColumn();
- this.SizeContext = new System.Windows.Forms.ComboBox();
- this.SizeContextTable = new System.Data.DataTable();
- this.dataColumn3 = new System.Data.DataColumn();
- this.dataColumn4 = new System.Data.DataColumn();
- this.Symbol = new System.Windows.Forms.ComboBox();
- this.SymbolMarkTable = new System.Data.DataTable();
- this.dataColumn1 = new System.Data.DataColumn();
- this.dataColumn2 = new System.Data.DataColumn();
- this.label5 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.grpSymbolFill = new System.Windows.Forms.GroupBox();
- this.fillStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor();
- this.grpSymbolBorder = new System.Windows.Forms.GroupBox();
- this.lineStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.previewPicture = new System.Windows.Forms.PictureBox();
- this.ComboBoxDataSet = new System.Data.DataSet();
- this.DisplayPoints = new System.Windows.Forms.CheckBox();
- this.groupBoxFont = new System.Windows.Forms.GroupBox();
- this.label11 = new System.Windows.Forms.Label();
- this.colorFontForeground = new Maestro.Editors.Common.ColorComboWithTransparency();
- this.panel1 = new System.Windows.Forms.Panel();
- this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.FontBoldButton = new System.Windows.Forms.ToolStripButton();
- this.FontItalicButton = new System.Windows.Forms.ToolStripButton();
- this.FontUnderlineButton = new System.Windows.Forms.ToolStripButton();
- this.lblForeground = new System.Windows.Forms.Label();
- this.comboBoxCharacter = new System.Windows.Forms.ComboBox();
- this.fontCombo = new System.Windows.Forms.ComboBox();
- this.label10 = new System.Windows.Forms.Label();
- this.groupBoxSymbolLocation = new System.Windows.Forms.GroupBox();
- this.button1 = new System.Windows.Forms.Button();
- this.ReferenceY = new System.Windows.Forms.TextBox();
- this.label8 = new System.Windows.Forms.Label();
- this.ReferenceX = new System.Windows.Forms.TextBox();
- this.label7 = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.MaintainAspectRatio = new System.Windows.Forms.CheckBox();
- this.grpW2DStyle = new System.Windows.Forms.GroupBox();
- this.chkW2DTextColor = new System.Windows.Forms.CheckBox();
- this.cmbW2DTextColor = new Maestro.Editors.Common.ColorComboWithTransparency();
- this.chkW2DLineColor = new System.Windows.Forms.CheckBox();
- this.cmbW2DLineColor = new Maestro.Editors.Common.ColorComboWithTransparency();
- this.chkW2DFillColor = new System.Windows.Forms.CheckBox();
- this.cmbW2DFillColor = new Maestro.Editors.Common.ColorComboWithTransparency();
- this.groupBox1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.SymbolMarkTable)).BeginInit();
- this.grpSymbolFill.SuspendLayout();
- this.grpSymbolBorder.SuspendLayout();
- this.groupBox4.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
- this.groupBoxFont.SuspendLayout();
- this.panel1.SuspendLayout();
- this.toolStrip1.SuspendLayout();
- this.groupBoxSymbolLocation.SuspendLayout();
- this.grpW2DStyle.SuspendLayout();
- this.SuspendLayout();
- //
- // groupBox1
- //
- resources.ApplyResources(this.groupBox1, "groupBox1");
- this.groupBox1.Controls.Add(this.RotationBox);
- this.groupBox1.Controls.Add(this.label9);
- this.groupBox1.Controls.Add(this.HeightText);
- this.groupBox1.Controls.Add(this.WidthText);
- this.groupBox1.Controls.Add(this.SizeUnits);
- this.groupBox1.Controls.Add(this.SizeContext);
- this.groupBox1.Controls.Add(this.Symbol);
- this.groupBox1.Controls.Add(this.label5);
- this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Controls.Add(this.label2);
- this.groupBox1.Controls.Add(this.label1);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.TabStop = false;
- //
- // RotationBox
- //
- resources.ApplyResources(this.RotationBox, "RotationBox");
- this.RotationBox.DataSource = this.RotationTable;
- this.RotationBox.DisplayMember = "Display";
- this.RotationBox.Name = "RotationBox";
- this.RotationBox.ValueMember = "Value";
- this.RotationBox.SelectedIndexChanged += new System.EventHandler(this.RotationBox_SelectedIndexChanged);
- this.RotationBox.TextChanged += new System.EventHandler(this.RotationBox_TextChanged);
- //
- // RotationTable
- //
- this.RotationTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn7,
- this.dataColumn8});
- this.RotationTable.TableName = "Rotation";
- //
- // dataColumn7
- //
- this.dataColumn7.Caption = "Display";
- this.dataColumn7.ColumnName = "Display";
- //
- // dataColumn8
- //
- this.dataColumn8.Caption = "Value";
- this.dataColumn8.ColumnName = "Value";
- //
- // label9
- //
- resources.ApplyResources(this.label9, "label9");
- this.label9.Name = "label9";
- //
- // HeightText
- //
- resources.ApplyResources(this.HeightText, "HeightText");
- this.HeightText.Items.AddRange(new object[] {
- resources.GetString("HeightText.Items")});
- this.HeightText.Name = "HeightText";
- this.HeightText.SelectedIndexChanged += new System.EventHandler(this.HeigthText_SelectedIndexChanged);
- this.HeightText.TextChanged += new System.EventHandler(this.HeightText_TextChanged);
- //
- // WidthText
- //
- resources.ApplyResources(this.WidthText, "WidthText");
- this.WidthText.Items.AddRange(new object[] {
- resources.GetString("WidthText.Items")});
- this.WidthText.Name = "WidthText";
- this.WidthText.SelectedIndexChanged += new System.EventHandler(this.WidthText_SelectedIndexChanged);
- this.WidthText.TextChanged += new System.EventHandler(this.WidthText_TextChanged);
- //
- // SizeUnits
- //
- resources.ApplyResources(this.SizeUnits, "SizeUnits");
- this.SizeUnits.DataSource = this.UnitsTable;
- this.SizeUnits.DisplayMember = "Display";
- this.SizeUnits.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.SizeUnits.Name = "SizeUnits";
- this.SizeUnits.ValueMember = "Value";
- this.SizeUnits.SelectedIndexChanged += new System.EventHandler(this.SizeUnits_SelectedIndexChanged);
- //
- // UnitsTable
- //
- this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn5,
- this.dataColumn6});
- this.UnitsTable.TableName = "Units";
- //
- // dataColumn5
- //
- this.dataColumn5.Caption = "Display";
- this.dataColumn5.ColumnName = "Display";
- //
- // dataColumn6
- //
- this.dataColumn6.Caption = "Value";
- this.dataColumn6.ColumnName = "Value";
- //
- // SizeContext
- //
- resources.ApplyResources(this.SizeContext, "SizeContext");
- this.SizeContext.DataSource = this.SizeContextTable;
- this.SizeContext.DisplayMember = "Display";
- this.SizeContext.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.SizeContext.Name = "SizeContext";
- this.SizeContext.ValueMember = "Value";
- this.SizeContext.SelectedIndexChanged += new System.EventHandler(this.SizeContext_SelectedIndexChanged);
- //
- // SizeContextTable
- //
- this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn3,
- this.dataColumn4});
- this.SizeContextTable.TableName = "SizeContext";
- //
- // dataColumn3
- //
- this.dataColumn3.Caption = "Display";
- this.dataColumn3.ColumnName = "Display";
- //
- // dataColumn4
- //
- this.dataColumn4.Caption = "Value";
- this.dataColumn4.ColumnName = "Value";
- //
- // Symbol
- //
- resources.ApplyResources(this.Symbol, "Symbol");
- this.Symbol.DataSource = this.SymbolMarkTable;
- this.Symbol.DisplayMember = "Display";
- this.Symbol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.Symbol.Name = "Symbol";
- this.Symbol.ValueMember = "Value";
- this.Symbol.SelectedIndexChanged += new System.EventHandler(this.Symbol_SelectedIndexChanged);
- //
- // SymbolMarkTable
- //
- this.SymbolMarkTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn1,
- this.dataColumn2});
- this.SymbolMarkTable.TableName = "SymbolMark";
- //
- // dataColumn1
- //
- this.dataColumn1.Caption = "Display";
- this.dataColumn1.ColumnName = "Display";
- //
- // dataColumn2
- //
- this.dataColumn2.Caption = "Value";
- this.dataColumn2.ColumnName = "Value";
- //
- // label5
- //
- resources.ApplyResources(this.label5, "label5");
- this.label5.Name = "label5";
- //
- // label4
- //
- resources.ApplyResources(this.label4, "label4");
- this.label4.Name = "label4";
- //
- // label3
- //
- resources.ApplyResources(this.label3, "label3");
- this.label3.Name = "label3";
- //
- // label2
- //
- resources.ApplyResources(this.label2, "label2");
- this.label2.Name = "label2";
- //
- // label1
- //
- resources.ApplyResources(this.label1, "label1");
- this.label1.Name = "label1";
- //
- // grpSymbolFill
- //
- resources.ApplyResources(this.grpSymbolFill, "grpSymbolFill");
- this.grpSymbolFill.Controls.Add(this.fillStyleEditor);
- this.grpSymbolFill.Name = "grpSymbolFill";
- this.grpSymbolFill.TabStop = false;
- //
- // fillStyleEditor
- //
- resources.ApplyResources(this.fillStyleEditor, "fillStyleEditor");
- this.fillStyleEditor.Name = "fillStyleEditor";
- //
- // grpSymbolBorder
- //
- resources.ApplyResources(this.grpSymbolBorder, "grpSymbolBorder");
- this.grpSymbolBorder.Controls.Add(this.lineStyleEditor);
- this.grpSymbolBorder.Name = "grpSymbolBorder";
- this.grpSymbolBorder.TabStop = false;
- //
- // lineStyleEditor
- //
- resources.ApplyResources(this.lineStyleEditor, "lineStyleEditor");
- this.lineStyleEditor.Name = "lineStyleEditor";
- //
- // groupBox4
- //
- resources.ApplyResources(this.groupBox4, "groupBox4");
- this.groupBox4.Controls.Add(this.previewPicture);
- this.groupBox4.Name = "groupBox4";
- this.groupBox4.TabStop = false;
- //
- // previewPicture
- //
- resources.ApplyResources(this.previewPicture, "previewPicture");
- this.previewPicture.BackColor = System.Drawing.Color.White;
- this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.previewPicture.Name = "previewPicture";
- this.previewPicture.TabStop = false;
- this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
- //
- // ComboBoxDataSet
- //
- this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
- this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
- this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
- this.SymbolMarkTable,
- this.SizeContextTable,
- this.UnitsTable,
- this.RotationTable});
- //
- // DisplayPoints
- //
- resources.ApplyResources(this.DisplayPoints, "DisplayPoints");
- this.DisplayPoints.Checked = true;
- this.DisplayPoints.CheckState = System.Windows.Forms.CheckState.Checked;
- this.DisplayPoints.Name = "DisplayPoints";
- this.DisplayPoints.UseVisualStyleBackColor = true;
- this.DisplayPoints.CheckedChanged += new System.EventHandler(this.DisplayPoints_CheckedChanged);
- //
- // groupBoxFont
- //
- resources.ApplyResources(this.groupBoxFont, "groupBoxFont");
- this.groupBoxFont.Controls.Add(this.label11);
- this.groupBoxFont.Controls.Add(this.colorFontForeground);
- this.groupBoxFont.Controls.Add(this.panel1);
- this.groupBoxFont.Controls.Add(this.lblForeground);
- this.groupBoxFont.Controls.Add(this.comboBoxCharacter);
- this.groupBoxFont.Controls.Add(this.fontCombo);
- this.groupBoxFont.Controls.Add(this.label10);
- this.groupBoxFont.Name = "groupBoxFont";
- this.groupBoxFont.TabStop = false;
- //
- // label11
- //
- resources.ApplyResources(this.label11, "label11");
- this.label11.Name = "label11";
- //
- // colorFontForeground
- //
- resources.ApplyResources(this.colorFontForeground, "colorFontForeground");
- this.colorFontForeground.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.colorFontForeground.Name = "colorFontForeground";
- //
- // panel1
- //
- this.panel1.Controls.Add(this.toolStrip1);
- resources.ApplyResources(this.panel1, "panel1");
- this.panel1.Name = "panel1";
- //
- // toolStrip1
- //
- this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
- this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.FontBoldButton,
- this.FontItalicButton,
- this.FontUnderlineButton});
- resources.ApplyResources(this.toolStrip1, "toolStrip1");
- this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
- //
- // FontBoldButton
- //
- this.FontBoldButton.CheckOnClick = true;
- this.FontBoldButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- resources.ApplyResources(this.FontBoldButton, "FontBoldButton");
- this.FontBoldButton.Name = "FontBoldButton";
- this.FontBoldButton.Click += new System.EventHandler(this.FontBoldButton_Click);
- //
- // FontItalicButton
- //
- this.FontItalicButton.CheckOnClick = true;
- this.FontItalicButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- resources.ApplyResources(this.FontItalicButton, "FontItalicButton");
- this.FontItalicButton.Name = "FontItalicButton";
- this.FontItalicButton.Click += new System.EventHandler(this.FontItalicButton_Click);
- //
- // FontUnderlineButton
- //
- this.FontUnderlineButton.CheckOnClick = true;
- this.FontUnderlineButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- resources.ApplyResources(this.FontUnderlineButton, "FontUnderlineButton");
- this.FontUnderlineButton.Name = "FontUnderlineButton";
- this.FontUnderlineButton.Click += new System.EventHandler(this.FontUnderlineButton_Click);
- //
- // lblForeground
- //
- resources.ApplyResources(this.lblForeground, "lblForeground");
- this.lblForeground.Name = "lblForeground";
- //
- // comboBoxCharacter
- //
- resources.ApplyResources(this.comboBoxCharacter, "comboBoxCharacter");
- this.comboBoxCharacter.DisplayMember = "Display";
- this.comboBoxCharacter.Name = "comboBoxCharacter";
- this.comboBoxCharacter.ValueMember = "Value";
- this.comboBoxCharacter.SelectedIndexChanged += new System.EventHandler(this.comboBoxCharacter_SelectedIndexChanged);
- this.comboBoxCharacter.TextChanged += new System.EventHandler(this.comboBoxCharacter_TextChanged);
- //
- // fontCombo
- //
- resources.ApplyResources(this.fontCombo, "fontCombo");
- this.fontCombo.DisplayMember = "Display";
- this.fontCombo.Name = "fontCombo";
- this.fontCombo.ValueMember = "Value";
- this.fontCombo.SelectedIndexChanged += new System.EventHandler(this.fontCombo_SelectedIndexChanged);
- //
- // label10
- //
- resources.ApplyResources(this.label10, "label10");
- this.label10.Name = "label10";
- //
- // groupBoxSymbolLocation
- //
- resources.ApplyResources(this.groupBoxSymbolLocation, "groupBoxSymbolLocation");
- this.groupBoxSymbolLocation.Controls.Add(this.button1);
- this.groupBoxSymbolLocation.Controls.Add(this.ReferenceY);
- this.groupBoxSymbolLocation.Controls.Add(this.label8);
- this.groupBoxSymbolLocation.Controls.Add(this.ReferenceX);
- this.groupBoxSymbolLocation.Controls.Add(this.label7);
- this.groupBoxSymbolLocation.Controls.Add(this.label6);
- this.groupBoxSymbolLocation.Controls.Add(this.MaintainAspectRatio);
- this.groupBoxSymbolLocation.Name = "groupBoxSymbolLocation";
- this.groupBoxSymbolLocation.TabStop = false;
- //
- // button1
- //
- resources.ApplyResources(this.button1, "button1");
- this.button1.Name = "button1";
- //
- // ReferenceY
- //
- resources.ApplyResources(this.ReferenceY, "ReferenceY");
- this.ReferenceY.Name = "ReferenceY";
- //
- // label8
- //
- resources.ApplyResources(this.label8, "label8");
- this.label8.Name = "label8";
- //
- // ReferenceX
- //
- resources.ApplyResources(this.ReferenceX, "ReferenceX");
- this.ReferenceX.Name = "ReferenceX";
- //
- // label7
- //
- resources.ApplyResources(this.label7, "label7");
- this.label7.Name = "label7";
- //
- // label6
- //
- resources.ApplyResources(this.label6, "label6");
- this.label6.Name = "label6";
- //
- // MaintainAspectRatio
- //
- resources.ApplyResources(this.MaintainAspectRatio, "MaintainAspectRatio");
- this.MaintainAspectRatio.Name = "MaintainAspectRatio";
- //
- // grpW2DStyle
- //
- this.grpW2DStyle.Controls.Add(this.chkW2DTextColor);
- this.grpW2DStyle.Controls.Add(this.cmbW2DTextColor);
- this.grpW2DStyle.Controls.Add(this.chkW2DLineColor);
- this.grpW2DStyle.Controls.Add(this.cmbW2DLineColor);
- this.grpW2DStyle.Controls.Add(this.chkW2DFillColor);
- this.grpW2DStyle.Controls.Add(this.cmbW2DFillColor);
- resources.ApplyResources(this.grpW2DStyle, "grpW2DStyle");
- this.grpW2DStyle.Name = "grpW2DStyle";
- this.grpW2DStyle.TabStop = false;
- //
- // chkW2DTextColor
- //
- resources.ApplyResources(this.chkW2DTextColor, "chkW2DTextColor");
- this.chkW2DTextColor.Name = "chkW2DTextColor";
- this.chkW2DTextColor.UseVisualStyleBackColor = true;
- this.chkW2DTextColor.CheckedChanged += new System.EventHandler(this.chkW2DTextColor_CheckedChanged);
- //
- // cmbW2DTextColor
- //
- resources.ApplyResources(this.cmbW2DTextColor, "cmbW2DTextColor");
- this.cmbW2DTextColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.cmbW2DTextColor.Name = "cmbW2DTextColor";
- this.cmbW2DTextColor.CurrentColorChanged += new System.EventHandler(this.cmbW2DTextColor_SelectedIndexChanged);
- //
- // chkW2DLineColor
- //
- resources.ApplyResources(this.chkW2DLineColor, "chkW2DLineColor");
- this.chkW2DLineColor.Name = "chkW2DLineColor";
- this.chkW2DLineColor.UseVisualStyleBackColor = true;
- this.chkW2DLineColor.CheckedChanged += new System.EventHandler(this.chkW2DLineColor_CheckedChanged);
- //
- // cmbW2DLineColor
- //
- resources.ApplyResources(this.cmbW2DLineColor, "cmbW2DLineColor");
- this.cmbW2DLineColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.cmbW2DLineColor.Name = "cmbW2DLineColor";
- this.cmbW2DLineColor.CurrentColorChanged += new System.EventHandler(this.cmbW2DLineColor_SelectedIndexChanged);
- //
- // chkW2DFillColor
- //
- resources.ApplyResources(this.chkW2DFillColor, "chkW2DFillColor");
- this.chkW2DFillColor.Name = "chkW2DFillColor";
- this.chkW2DFillColor.UseVisualStyleBackColor = true;
- this.chkW2DFillColor.CheckedChanged += new System.EventHandler(this.chkW2DFillColor_CheckedChanged);
- //
- // cmbW2DFillColor
- //
- resources.ApplyResources(this.cmbW2DFillColor, "cmbW2DFillColor");
- this.cmbW2DFillColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.cmbW2DFillColor.Name = "cmbW2DFillColor";
- this.cmbW2DFillColor.CurrentColorChanged += new System.EventHandler(this.cmbW2DFillColor_SelectedIndexChanged);
- //
- // PointFeatureStyleEditor
- //
- resources.ApplyResources(this, "$this");
- this.Controls.Add(this.grpW2DStyle);
- this.Controls.Add(this.groupBoxSymbolLocation);
- this.Controls.Add(this.groupBoxFont);
- this.Controls.Add(this.DisplayPoints);
- this.Controls.Add(this.groupBox4);
- this.Controls.Add(this.grpSymbolFill);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.grpSymbolBorder);
- this.Name = "PointFeatureStyleEditor";
- this.Load += new System.EventHandler(this.PointFeatureStyleEditor_Load);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.SymbolMarkTable)).EndInit();
- this.grpSymbolFill.ResumeLayout(false);
- this.grpSymbolBorder.ResumeLayout(false);
- this.groupBox4.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
- this.groupBoxFont.ResumeLayout(false);
- this.groupBoxFont.PerformLayout();
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- this.toolStrip1.ResumeLayout(false);
- this.toolStrip1.PerformLayout();
- this.groupBoxSymbolLocation.ResumeLayout(false);
- this.groupBoxSymbolLocation.PerformLayout();
- this.grpW2DStyle.ResumeLayout(false);
- this.grpW2DStyle.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PointFeatureStyleEditor));
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.RotationBox = new System.Windows.Forms.ComboBox();
+ this.RotationTable = new System.Data.DataTable();
+ this.dataColumn7 = new System.Data.DataColumn();
+ this.dataColumn8 = new System.Data.DataColumn();
+ this.label9 = new System.Windows.Forms.Label();
+ this.HeightText = new System.Windows.Forms.ComboBox();
+ this.WidthText = new System.Windows.Forms.ComboBox();
+ this.SizeUnits = new System.Windows.Forms.ComboBox();
+ this.UnitsTable = new System.Data.DataTable();
+ this.dataColumn5 = new System.Data.DataColumn();
+ this.dataColumn6 = new System.Data.DataColumn();
+ this.SizeContext = new System.Windows.Forms.ComboBox();
+ this.SizeContextTable = new System.Data.DataTable();
+ this.dataColumn3 = new System.Data.DataColumn();
+ this.dataColumn4 = new System.Data.DataColumn();
+ this.Symbol = new System.Windows.Forms.ComboBox();
+ this.SymbolMarkTable = new System.Data.DataTable();
+ this.dataColumn1 = new System.Data.DataColumn();
+ this.dataColumn2 = new System.Data.DataColumn();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.grpSymbolFill = new System.Windows.Forms.GroupBox();
+ this.fillStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor();
+ this.grpSymbolBorder = new System.Windows.Forms.GroupBox();
+ this.lineStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.previewPicture = new System.Windows.Forms.PictureBox();
+ this.ComboBoxDataSet = new System.Data.DataSet();
+ this.DisplayPoints = new System.Windows.Forms.CheckBox();
+ this.groupBoxFont = new System.Windows.Forms.GroupBox();
+ this.label11 = new System.Windows.Forms.Label();
+ this.colorFontForeground = new Maestro.Editors.Common.ColorComboWithTransparency();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+ this.FontBoldButton = new System.Windows.Forms.ToolStripButton();
+ this.FontItalicButton = new System.Windows.Forms.ToolStripButton();
+ this.FontUnderlineButton = new System.Windows.Forms.ToolStripButton();
+ this.lblForeground = new System.Windows.Forms.Label();
+ this.comboBoxCharacter = new System.Windows.Forms.ComboBox();
+ this.fontCombo = new System.Windows.Forms.ComboBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.groupBoxSymbolLocation = new System.Windows.Forms.GroupBox();
+ this.button1 = new System.Windows.Forms.Button();
+ this.ReferenceY = new System.Windows.Forms.TextBox();
+ this.label8 = new System.Windows.Forms.Label();
+ this.ReferenceX = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.MaintainAspectRatio = new System.Windows.Forms.CheckBox();
+ this.grpW2DStyle = new System.Windows.Forms.GroupBox();
+ this.chkW2DTextColor = new System.Windows.Forms.CheckBox();
+ this.cmbW2DTextColor = new Maestro.Editors.Common.ColorComboWithTransparency();
+ this.chkW2DLineColor = new System.Windows.Forms.CheckBox();
+ this.cmbW2DLineColor = new Maestro.Editors.Common.ColorComboWithTransparency();
+ this.chkW2DFillColor = new System.Windows.Forms.CheckBox();
+ this.cmbW2DFillColor = new Maestro.Editors.Common.ColorComboWithTransparency();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.SymbolMarkTable)).BeginInit();
+ this.grpSymbolFill.SuspendLayout();
+ this.grpSymbolBorder.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
+ this.groupBoxFont.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.toolStrip1.SuspendLayout();
+ this.groupBoxSymbolLocation.SuspendLayout();
+ this.grpW2DStyle.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // groupBox1
+ //
+ resources.ApplyResources(this.groupBox1, "groupBox1");
+ this.groupBox1.Controls.Add(this.RotationBox);
+ this.groupBox1.Controls.Add(this.label9);
+ this.groupBox1.Controls.Add(this.HeightText);
+ this.groupBox1.Controls.Add(this.WidthText);
+ this.groupBox1.Controls.Add(this.SizeUnits);
+ this.groupBox1.Controls.Add(this.SizeContext);
+ this.groupBox1.Controls.Add(this.Symbol);
+ this.groupBox1.Controls.Add(this.label5);
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.label3);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.TabStop = false;
+ //
+ // RotationBox
+ //
+ resources.ApplyResources(this.RotationBox, "RotationBox");
+ this.RotationBox.DataSource = this.RotationTable;
+ this.RotationBox.DisplayMember = "Display";
+ this.RotationBox.Name = "RotationBox";
+ this.RotationBox.ValueMember = "Value";
+ this.RotationBox.SelectedIndexChanged += new System.EventHandler(this.RotationBox_SelectedIndexChanged);
+ this.RotationBox.TextChanged += new System.EventHandler(this.RotationBox_TextChanged);
+ //
+ // RotationTable
+ //
+ this.RotationTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn7,
+ this.dataColumn8});
+ this.RotationTable.TableName = "Rotation";
+ //
+ // dataColumn7
+ //
+ this.dataColumn7.Caption = "Display";
+ this.dataColumn7.ColumnName = "Display";
+ //
+ // dataColumn8
+ //
+ this.dataColumn8.Caption = "Value";
+ this.dataColumn8.ColumnName = "Value";
+ //
+ // label9
+ //
+ resources.ApplyResources(this.label9, "label9");
+ this.label9.Name = "label9";
+ //
+ // HeightText
+ //
+ resources.ApplyResources(this.HeightText, "HeightText");
+ this.HeightText.Items.AddRange(new object[] {
+ resources.GetString("HeightText.Items")});
+ this.HeightText.Name = "HeightText";
+ this.HeightText.SelectedIndexChanged += new System.EventHandler(this.HeigthText_SelectedIndexChanged);
+ this.HeightText.TextChanged += new System.EventHandler(this.HeightText_TextChanged);
+ //
+ // WidthText
+ //
+ resources.ApplyResources(this.WidthText, "WidthText");
+ this.WidthText.Items.AddRange(new object[] {
+ resources.GetString("WidthText.Items")});
+ this.WidthText.Name = "WidthText";
+ this.WidthText.SelectedIndexChanged += new System.EventHandler(this.WidthText_SelectedIndexChanged);
+ this.WidthText.TextChanged += new System.EventHandler(this.WidthText_TextChanged);
+ //
+ // SizeUnits
+ //
+ resources.ApplyResources(this.SizeUnits, "SizeUnits");
+ this.SizeUnits.DataSource = this.UnitsTable;
+ this.SizeUnits.DisplayMember = "Display";
+ this.SizeUnits.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.SizeUnits.Name = "SizeUnits";
+ this.SizeUnits.ValueMember = "Value";
+ this.SizeUnits.SelectedIndexChanged += new System.EventHandler(this.SizeUnits_SelectedIndexChanged);
+ //
+ // UnitsTable
+ //
+ this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn5,
+ this.dataColumn6});
+ this.UnitsTable.TableName = "Units";
+ //
+ // dataColumn5
+ //
+ this.dataColumn5.Caption = "Display";
+ this.dataColumn5.ColumnName = "Display";
+ //
+ // dataColumn6
+ //
+ this.dataColumn6.Caption = "Value";
+ this.dataColumn6.ColumnName = "Value";
+ //
+ // SizeContext
+ //
+ resources.ApplyResources(this.SizeContext, "SizeContext");
+ this.SizeContext.DataSource = this.SizeContextTable;
+ this.SizeContext.DisplayMember = "Display";
+ this.SizeContext.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.SizeContext.Name = "SizeContext";
+ this.SizeContext.ValueMember = "Value";
+ this.SizeContext.SelectedIndexChanged += new System.EventHandler(this.SizeContext_SelectedIndexChanged);
+ //
+ // SizeContextTable
+ //
+ this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn3,
+ this.dataColumn4});
+ this.SizeContextTable.TableName = "SizeContext";
+ //
+ // dataColumn3
+ //
+ this.dataColumn3.Caption = "Display";
+ this.dataColumn3.ColumnName = "Display";
+ //
+ // dataColumn4
+ //
+ this.dataColumn4.Caption = "Value";
+ this.dataColumn4.ColumnName = "Value";
+ //
+ // Symbol
+ //
+ resources.ApplyResources(this.Symbol, "Symbol");
+ this.Symbol.DataSource = this.SymbolMarkTable;
+ this.Symbol.DisplayMember = "Display";
+ this.Symbol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.Symbol.Name = "Symbol";
+ this.Symbol.ValueMember = "Value";
+ this.Symbol.SelectedIndexChanged += new System.EventHandler(this.Symbol_SelectedIndexChanged);
+ //
+ // SymbolMarkTable
+ //
+ this.SymbolMarkTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn1,
+ this.dataColumn2});
+ this.SymbolMarkTable.TableName = "SymbolMark";
+ //
+ // dataColumn1
+ //
+ this.dataColumn1.Caption = "Display";
+ this.dataColumn1.ColumnName = "Display";
+ //
+ // dataColumn2
+ //
+ this.dataColumn2.Caption = "Value";
+ this.dataColumn2.ColumnName = "Value";
+ //
+ // label5
+ //
+ resources.ApplyResources(this.label5, "label5");
+ this.label5.Name = "label5";
+ //
+ // label4
+ //
+ resources.ApplyResources(this.label4, "label4");
+ this.label4.Name = "label4";
+ //
+ // label3
+ //
+ resources.ApplyResources(this.label3, "label3");
+ this.label3.Name = "label3";
+ //
+ // label2
+ //
+ resources.ApplyResources(this.label2, "label2");
+ this.label2.Name = "label2";
+ //
+ // label1
+ //
+ resources.ApplyResources(this.label1, "label1");
+ this.label1.Name = "label1";
+ //
+ // grpSymbolFill
+ //
+ resources.ApplyResources(this.grpSymbolFill, "grpSymbolFill");
+ this.grpSymbolFill.Controls.Add(this.fillStyleEditor);
+ this.grpSymbolFill.Name = "grpSymbolFill";
+ this.grpSymbolFill.TabStop = false;
+ //
+ // fillStyleEditor
+ //
+ resources.ApplyResources(this.fillStyleEditor, "fillStyleEditor");
+ this.fillStyleEditor.Name = "fillStyleEditor";
+ this.fillStyleEditor.ForegroundRequiresExpression += new System.EventHandler(this.FillStyleEditor_ForegroundRequiresExpression);
+ this.fillStyleEditor.BackgroundRequiresExpression += new System.EventHandler(this.FillStyleEditor_BackgroundRequiresExpression);
+ //
+ // grpSymbolBorder
+ //
+ resources.ApplyResources(this.grpSymbolBorder, "grpSymbolBorder");
+ this.grpSymbolBorder.Controls.Add(this.lineStyleEditor);
+ this.grpSymbolBorder.Name = "grpSymbolBorder";
+ this.grpSymbolBorder.TabStop = false;
+ //
+ // lineStyleEditor
+ //
+ this.lineStyleEditor.ColorExpression = "";
+ resources.ApplyResources(this.lineStyleEditor, "lineStyleEditor");
+ this.lineStyleEditor.Name = "lineStyleEditor";
+ this.lineStyleEditor.RequiresExpressionEditor += new System.EventHandler(this.LineStyleEditor_RequiresExpressionEditor);
+ //
+ // groupBox4
+ //
+ resources.ApplyResources(this.groupBox4, "groupBox4");
+ this.groupBox4.Controls.Add(this.previewPicture);
+ this.groupBox4.Name = "groupBox4";
+ this.groupBox4.TabStop = false;
+ //
+ // previewPicture
+ //
+ resources.ApplyResources(this.previewPicture, "previewPicture");
+ this.previewPicture.BackColor = System.Drawing.Color.White;
+ this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.previewPicture.Name = "previewPicture";
+ this.previewPicture.TabStop = false;
+ this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
+ //
+ // ComboBoxDataSet
+ //
+ this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
+ this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
+ this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
+ this.SymbolMarkTable,
+ this.SizeContextTable,
+ this.UnitsTable,
+ this.RotationTable});
+ //
+ // DisplayPoints
+ //
+ resources.ApplyResources(this.DisplayPoints, "DisplayPoints");
+ this.DisplayPoints.Checked = true;
+ this.DisplayPoints.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.DisplayPoints.Name = "DisplayPoints";
+ this.DisplayPoints.UseVisualStyleBackColor = true;
+ this.DisplayPoints.CheckedChanged += new System.EventHandler(this.DisplayPoints_CheckedChanged);
+ //
+ // groupBoxFont
+ //
+ resources.ApplyResources(this.groupBoxFont, "groupBoxFont");
+ this.groupBoxFont.Controls.Add(this.label11);
+ this.groupBoxFont.Controls.Add(this.colorFontForeground);
+ this.groupBoxFont.Controls.Add(this.panel1);
+ this.groupBoxFont.Controls.Add(this.lblForeground);
+ this.groupBoxFont.Controls.Add(this.comboBoxCharacter);
+ this.groupBoxFont.Controls.Add(this.fontCombo);
+ this.groupBoxFont.Controls.Add(this.label10);
+ this.groupBoxFont.Name = "groupBoxFont";
+ this.groupBoxFont.TabStop = false;
+ //
+ // label11
+ //
+ resources.ApplyResources(this.label11, "label11");
+ this.label11.Name = "label11";
+ //
+ // colorFontForeground
+ //
+ resources.ApplyResources(this.colorFontForeground, "colorFontForeground");
+ this.colorFontForeground.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.colorFontForeground.Name = "colorFontForeground";
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.toolStrip1);
+ resources.ApplyResources(this.panel1, "panel1");
+ this.panel1.Name = "panel1";
+ //
+ // toolStrip1
+ //
+ this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.FontBoldButton,
+ this.FontItalicButton,
+ this.FontUnderlineButton});
+ resources.ApplyResources(this.toolStrip1, "toolStrip1");
+ this.toolStrip1.Name = "toolStrip1";
+ this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+ //
+ // FontBoldButton
+ //
+ this.FontBoldButton.CheckOnClick = true;
+ this.FontBoldButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ resources.ApplyResources(this.FontBoldButton, "FontBoldButton");
+ this.FontBoldButton.Name = "FontBoldButton";
+ this.FontBoldButton.Click += new System.EventHandler(this.FontBoldButton_Click);
+ //
+ // FontItalicButton
+ //
+ this.FontItalicButton.CheckOnClick = true;
+ this.FontItalicButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ resources.ApplyResources(this.FontItalicButton, "FontItalicButton");
+ this.FontItalicButton.Name = "FontItalicButton";
+ this.FontItalicButton.Click += new System.EventHandler(this.FontItalicButton_Click);
+ //
+ // FontUnderlineButton
+ //
+ this.FontUnderlineButton.CheckOnClick = true;
+ this.FontUnderlineButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ resources.ApplyResources(this.FontUnderlineButton, "FontUnderlineButton");
+ this.FontUnderlineButton.Name = "FontUnderlineButton";
+ this.FontUnderlineButton.Click += new System.EventHandler(this.FontUnderlineButton_Click);
+ //
+ // lblForeground
+ //
+ resources.ApplyResources(this.lblForeground, "lblForeground");
+ this.lblForeground.Name = "lblForeground";
+ //
+ // comboBoxCharacter
+ //
+ resources.ApplyResources(this.comboBoxCharacter, "comboBoxCharacter");
+ this.comboBoxCharacter.DisplayMember = "Display";
+ this.comboBoxCharacter.Name = "comboBoxCharacter";
+ this.comboBoxCharacter.ValueMember = "Value";
+ this.comboBoxCharacter.SelectedIndexChanged += new System.EventHandler(this.comboBoxCharacter_SelectedIndexChanged);
+ this.comboBoxCharacter.TextChanged += new System.EventHandler(this.comboBoxCharacter_TextChanged);
+ //
+ // fontCombo
+ //
+ resources.ApplyResources(this.fontCombo, "fontCombo");
+ this.fontCombo.DisplayMember = "Display";
+ this.fontCombo.Name = "fontCombo";
+ this.fontCombo.ValueMember = "Value";
+ this.fontCombo.SelectedIndexChanged += new System.EventHandler(this.fontCombo_SelectedIndexChanged);
+ //
+ // label10
+ //
+ resources.ApplyResources(this.label10, "label10");
+ this.label10.Name = "label10";
+ //
+ // groupBoxSymbolLocation
+ //
+ resources.ApplyResources(this.groupBoxSymbolLocation, "groupBoxSymbolLocation");
+ this.groupBoxSymbolLocation.Controls.Add(this.button1);
+ this.groupBoxSymbolLocation.Controls.Add(this.ReferenceY);
+ this.groupBoxSymbolLocation.Controls.Add(this.label8);
+ this.groupBoxSymbolLocation.Controls.Add(this.ReferenceX);
+ this.groupBoxSymbolLocation.Controls.Add(this.label7);
+ this.groupBoxSymbolLocation.Controls.Add(this.label6);
+ this.groupBoxSymbolLocation.Controls.Add(this.MaintainAspectRatio);
+ this.groupBoxSymbolLocation.Name = "groupBoxSymbolLocation";
+ this.groupBoxSymbolLocation.TabStop = false;
+ //
+ // button1
+ //
+ resources.ApplyResources(this.button1, "button1");
+ this.button1.Name = "button1";
+ //
+ // ReferenceY
+ //
+ resources.ApplyResources(this.ReferenceY, "ReferenceY");
+ this.ReferenceY.Name = "ReferenceY";
+ //
+ // label8
+ //
+ resources.ApplyResources(this.label8, "label8");
+ this.label8.Name = "label8";
+ //
+ // ReferenceX
+ //
+ resources.ApplyResources(this.ReferenceX, "ReferenceX");
+ this.ReferenceX.Name = "ReferenceX";
+ //
+ // label7
+ //
+ resources.ApplyResources(this.label7, "label7");
+ this.label7.Name = "label7";
+ //
+ // label6
+ //
+ resources.ApplyResources(this.label6, "label6");
+ this.label6.Name = "label6";
+ //
+ // MaintainAspectRatio
+ //
+ resources.ApplyResources(this.MaintainAspectRatio, "MaintainAspectRatio");
+ this.MaintainAspectRatio.Name = "MaintainAspectRatio";
+ //
+ // grpW2DStyle
+ //
+ this.grpW2DStyle.Controls.Add(this.chkW2DTextColor);
+ this.grpW2DStyle.Controls.Add(this.cmbW2DTextColor);
+ this.grpW2DStyle.Controls.Add(this.chkW2DLineColor);
+ this.grpW2DStyle.Controls.Add(this.cmbW2DLineColor);
+ this.grpW2DStyle.Controls.Add(this.chkW2DFillColor);
+ this.grpW2DStyle.Controls.Add(this.cmbW2DFillColor);
+ resources.ApplyResources(this.grpW2DStyle, "grpW2DStyle");
+ this.grpW2DStyle.Name = "grpW2DStyle";
+ this.grpW2DStyle.TabStop = false;
+ //
+ // chkW2DTextColor
+ //
+ resources.ApplyResources(this.chkW2DTextColor, "chkW2DTextColor");
+ this.chkW2DTextColor.Name = "chkW2DTextColor";
+ this.chkW2DTextColor.UseVisualStyleBackColor = true;
+ this.chkW2DTextColor.CheckedChanged += new System.EventHandler(this.chkW2DTextColor_CheckedChanged);
+ //
+ // cmbW2DTextColor
+ //
+ resources.ApplyResources(this.cmbW2DTextColor, "cmbW2DTextColor");
+ this.cmbW2DTextColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.cmbW2DTextColor.Name = "cmbW2DTextColor";
+ this.cmbW2DTextColor.CurrentColorChanged += new System.EventHandler(this.cmbW2DTextColor_SelectedIndexChanged);
+ //
+ // chkW2DLineColor
+ //
+ resources.ApplyResources(this.chkW2DLineColor, "chkW2DLineColor");
+ this.chkW2DLineColor.Name = "chkW2DLineColor";
+ this.chkW2DLineColor.UseVisualStyleBackColor = true;
+ this.chkW2DLineColor.CheckedChanged += new System.EventHandler(this.chkW2DLineColor_CheckedChanged);
+ //
+ // cmbW2DLineColor
+ //
+ resources.ApplyResources(this.cmbW2DLineColor, "cmbW2DLineColor");
+ this.cmbW2DLineColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.cmbW2DLineColor.Name = "cmbW2DLineColor";
+ this.cmbW2DLineColor.CurrentColorChanged += new System.EventHandler(this.cmbW2DLineColor_SelectedIndexChanged);
+ //
+ // chkW2DFillColor
+ //
+ resources.ApplyResources(this.chkW2DFillColor, "chkW2DFillColor");
+ this.chkW2DFillColor.Name = "chkW2DFillColor";
+ this.chkW2DFillColor.UseVisualStyleBackColor = true;
+ this.chkW2DFillColor.CheckedChanged += new System.EventHandler(this.chkW2DFillColor_CheckedChanged);
+ //
+ // cmbW2DFillColor
+ //
+ resources.ApplyResources(this.cmbW2DFillColor, "cmbW2DFillColor");
+ this.cmbW2DFillColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.cmbW2DFillColor.Name = "cmbW2DFillColor";
+ this.cmbW2DFillColor.CurrentColorChanged += new System.EventHandler(this.cmbW2DFillColor_SelectedIndexChanged);
+ //
+ // PointFeatureStyleEditor
+ //
+ resources.ApplyResources(this, "$this");
+ this.Controls.Add(this.grpW2DStyle);
+ this.Controls.Add(this.groupBoxSymbolLocation);
+ this.Controls.Add(this.groupBoxFont);
+ this.Controls.Add(this.DisplayPoints);
+ this.Controls.Add(this.groupBox4);
+ this.Controls.Add(this.grpSymbolFill);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.grpSymbolBorder);
+ this.Name = "PointFeatureStyleEditor";
+ this.Load += new System.EventHandler(this.PointFeatureStyleEditor_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.RotationTable)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.SymbolMarkTable)).EndInit();
+ this.grpSymbolFill.ResumeLayout(false);
+ this.grpSymbolBorder.ResumeLayout(false);
+ this.groupBox4.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
+ this.groupBoxFont.ResumeLayout(false);
+ this.groupBoxFont.PerformLayout();
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.toolStrip1.ResumeLayout(false);
+ this.toolStrip1.PerformLayout();
+ this.groupBoxSymbolLocation.ResumeLayout(false);
+ this.groupBoxSymbolLocation.PerformLayout();
+ this.grpW2DStyle.ResumeLayout(false);
+ this.grpW2DStyle.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
@@ -1657,5 +1660,26 @@
if (Changed != null)
Changed(this, new EventArgs());
}
+
+ void FillStyleEditor_BackgroundRequiresExpression(object sender, EventArgs e)
+ {
+ string expr = m_editor.EditExpression(fillStyleEditor.backgroundColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
+ if (expr != null)
+ fillStyleEditor.backgroundColor.ColorExpression = expr;
+ }
+
+ void FillStyleEditor_ForegroundRequiresExpression(object sender, EventArgs e)
+ {
+ string expr = m_editor.EditExpression(fillStyleEditor.foregroundColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
+ if (expr != null)
+ fillStyleEditor.foregroundColor.ColorExpression = expr;
+ }
+
+ void LineStyleEditor_RequiresExpressionEditor(object sender, EventArgs e)
+ {
+ string expr = m_editor.EditExpression(lineStyleEditor.colorCombo.ColorExpression, m_schema, m_providername, m_featureSource, true);
+ if (expr != null)
+ lineStyleEditor.colorCombo.ColorExpression = expr;
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.resx 2012-05-22 16:58:48 UTC (rev 6685)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.resx 2012-05-22 17:23:01 UTC (rev 6686)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -112,26 +112,26 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="RotationBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</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="RotationBox.Location" type="System.Drawing.Point, System.Drawing">
<value>128, 176</value>
</data>
<data name="RotationBox.Size" type="System.Drawing.Size, System.Drawing">
<value>208, 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="RotationBox.TabIndex" type="System.Int32, mscorlib">
<value>29</value>
</data>
@@ -139,7 +139,7 @@
<value>RotationBox</value>
</data>
<data name=">>RotationBox.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>RotationBox.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -166,7 +166,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>groupBox1</value>
@@ -193,7 +193,7 @@
<value>HeightText</value>
</data>
<data name=">>HeightText.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>HeightText.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -220,7 +220,7 @@
<value>WidthText</value>
</data>
<data name=">>WidthText.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>WidthText.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -244,7 +244,7 @@
<value>SizeUnits</value>
</data>
<data name=">>SizeUnits.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>SizeUnits.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -268,7 +268,7 @@
<value>SizeContext</value>
</data>
<data name=">>SizeContext.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>SizeContext.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -292,7 +292,7 @@
<value>Symbol</value>
</data>
<data name=">>Symbol.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>Symbol.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -319,7 +319,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>
@@ -346,7 +346,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>
@@ -373,7 +373,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>
@@ -400,7 +400,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>
@@ -427,7 +427,7 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -451,7 +451,7 @@
<value>groupBox1</value>
</data>
<data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox1.Parent" xml:space="preserve">
<value>$this</value>
@@ -478,7 +478,7 @@
<value>fillStyleEditor</value>
</data>
<data name=">>fillStyleEditor.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor, Maestro.Editors, Version=3.0.0.5708, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>fillStyleEditor.Parent" xml:space="preserve">
<value>grpSymbolFill</value>
@@ -502,7 +502,7 @@
<value>grpSymbolFill</value>
</data>
<data name=">>grpSymbolFill.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=">>grpSymbolFill.Parent" xml:space="preserve">
<value>$this</value>
@@ -529,7 +529,7 @@
<value>lineStyleEditor</value>
</data>
<data name=">>lineStyleEditor.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor, Maestro.Editors, Version=3.0.0.5708, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>grpSymbolBorder</value>
@@ -553,7 +553,7 @@
<value>grpSymbolBorder</value>
</data>
<data name=">>grpSymbolBorder.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=">>grpSymbolBorder.Parent" xml:space="preserve">
<value>$this</value>
@@ -580,7 +580,7 @@
<value>previewPicture</value>
</data>
<data name=">>previewPicture.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=">>previewPicture.Parent" xml:space="preserve">
<value>groupBox4</value>
@@ -604,7 +604,7 @@
<value>groupBox4</value>
</data>
<data name=">>groupBox4.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=">>groupBox4.Parent" xml:space="preserve">
<value>$this</value>
@@ -612,7 +612,7 @@
<data name=">>groupBox4.ZOrder" xml:space="preserve">
<value>4</value>
</data>
- <metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 17</value>
</metadata>
<data name="DisplayPoints.AutoSize" type="System.Boolean, mscorlib">
@@ -634,7 +634,7 @@
<value>DisplayPoints</value>
</data>
<data name=">>DisplayPoints.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=">>DisplayPoints.Parent" xml:space="preserve">
<value>$this</value>
@@ -667,7 +667,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>groupBoxFont</value>
@@ -691,7 +691,7 @@
<value>colorFontForeground</value>
</data>
<data name=">>colorFontForeground.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboWithTransparency, Maestro.Editors, Version=3.0.0.5708, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ColorComboWithTransparency, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>colorFontForeground.Parent" xml:space="preserve">
<value>groupBoxFont</value>
@@ -699,7 +699,7 @@
<data name=">>colorFontForeground.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>0, 0</value>
</metadata>
<data name="FontBoldButton.Font" type="System.Drawing.Font, System.Drawing">
@@ -808,7 +808,7 @@
<value>toolStrip1</value>
</data>
<data name=">>toolStrip1.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>toolStrip1.Parent" xml:space="preserve">
<value>panel1</value>
@@ -829,7 +829,7 @@
<value>panel1</value>
</data>
<data name=">>panel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>panel1.Parent" xml:space="preserve">
<value>groupBoxFont</value>
@@ -856,7 +856,7 @@
<value>lblForeground</value>
</data>
<data name=">>lblForeground.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=">>lblForeground.Parent" xml:space="preserve">
<value>groupBoxFont</value>
@@ -883,7 +883,7 @@
<value>comboBoxCharacter</value>
</data>
<data name=">>comboBoxCharacter.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>comboBoxCharacter.Parent" xml:space="preserve">
<value>groupBoxFont</value>
@@ -907,7 +907,7 @@
<value>fontCombo</value>
</data>
<data name=">>fontCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>fontCombo.Parent" xml:space="preserve">
<value>groupBoxFont</value>
@@ -934,7 +934,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>groupBoxFont</value>
@@ -958,7 +958,7 @@
<value>groupBoxFont</value>
</data>
<data name=">>groupBoxFont.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=">>groupBoxFont.Parent" xml:space="preserve">
<value>$this</value>
@@ -988,7 +988,7 @@
<value>button1</value>
</data>
<data name=">>button1.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=">>button1.Parent" xml:space="preserve">
<value>groupBoxSymbolLocation</value>
@@ -1009,7 +1009,7 @@
<value>ReferenceY</value>
</data>
<data name=">>ReferenceY.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=">>ReferenceY.Parent" xml:space="preserve">
<value>groupBoxSymbolLocation</value>
@@ -1033,7 +1033,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>groupBoxSymbolLocation</value>
@@ -1054,7 +1054,7 @@
<value>ReferenceX</value>
</data>
<data name=">>ReferenceX.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=">>ReferenceX.Parent" xml:space="preserve">
<value>groupBoxSymbolLocation</value>
@@ -1078,7 +1078,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>groupBoxSymbolLocation</value>
@@ -1105,7 +1105,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>groupBoxSymbolLocation</value>
@@ -1135,7 +1135,7 @@
<value>MaintainAspectRatio</value>
</data>
<data name=">>MaintainAspectRatio.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=">>MaintainAspectRatio.Parent" xml:space="preserve">
<value>groupBoxSymbolLocation</value>
@@ -1159,7 +1159,7 @@
<value>groupBoxSymbolLocation</value>
</data>
<data name=">>groupBoxSymbolLocation.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=">>groupBoxSymbolLocation.Parent" xml:space="preserve">
<value>$this</value>
@@ -1189,7 +1189,7 @@
<value>chkW2DTextColor</value>
</data>
<data name=">>chkW2DTextColor.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=">>chkW2DTextColor.Parent" xml:space="preserve">
<value>grpW2DStyle</value>
@@ -1216,7 +1216,7 @@
<value>cmbW2DTextColor</value>
</data>
<data name=">>cmbW2DTextColor.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboWithTransparency, Maestro.Editors, Version=3.0.0.5708, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ColorComboWithTransparency, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>cmbW2DTextColor.Parent" xml:space="preserve">
<value>grpW2DStyle</value>
@@ -1246,7 +1246,7 @@
<value>chkW2DLineColor</value>
</data>
<data name=">>chkW2DLineColor.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=">>chkW2DLineColor.Parent" xml:space="preserve">
<value>grpW2DStyle</value>
@@ -1273,7 +1273,7 @@
<value>cmbW2DLineColor</value>
</data>
<data name=">>cmbW2DLineColor.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboWithTransparency, Maestro.Editors, Version=3.0.0.5708, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ColorComboWithTransparency, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>cmbW2DLineColor.Parent" xml:space="preserve">
<value>grpW2DStyle</value>
@@ -1300,7 +1300,7 @@
<value>chkW2DFillColor</value>
</data>
<data name=">>chkW2DFillColor.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=">>chkW2DFillColor.Parent" xml:space="preserve">
<value>grpW2DStyle</value>
@@ -1327,7 +1327,7 @@
<value>cmbW2DFillColor</value>
</data>
<data name=">>cmbW2DFillColor.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboWithTransparency, Maestro.Editors, Version=3.0.0.5708, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ColorComboWithTransparency, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>cmbW2DFillColor.Parent" xml:space="preserve">
<value>grpW2DStyle</value>
@@ -1351,7 +1351,7 @@
<value>grpW2DStyle</value>
</data>
<data name=">>grpW2DStyle.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=">>grpW2DStyle.Parent" xml:space="preserve">
<value>$this</value>
@@ -1359,7 +1359,7 @@
<data name=">>grpW2DStyle.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.AutoScroll" type="System.Boolean, mscorlib">
@@ -1375,102 +1375,102 @@
<value>RotationTable</value>
</data>
<data name=">>RotationTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn7.Name" xml:space="preserve">
<value>dataColumn7</value>
</data>
<data name=">>dataColumn7.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn8.Name" xml:space="preserve">
<value>dataColumn8</value>
</data>
<data name=">>dataColumn8.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>UnitsTable.Name" xml:space="preserve">
<value>UnitsTable</value>
</data>
<data name=">>UnitsTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn5.Name" xml:space="preserve">
<value>dataColumn5</value>
</data>
<data name=">>dataColumn5.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn6.Name" xml:space="preserve">
<value>dataColumn6</value>
</data>
<data name=">>dataColumn6.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>SizeContextTable.Name" xml:space="preserve">
<value>SizeContextTable</value>
</data>
<data name=">>SizeContextTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn3.Name" xml:space="preserve">
<value>dataColumn3</value>
</data>
<data name=">>dataColumn3.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn4.Name" xml:space="preserve">
<value>dataColumn4</value>
</data>
<data name=">>dataColumn4.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>SymbolMarkTable.Name" xml:space="preserve">
<value>SymbolMarkTable</value>
</data>
<data name=">>SymbolMarkTable.Type" xml:space="preserve">
- <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn1.Name" xml:space="preserve">
<value>dataColumn1</value>
</data>
<data name=">>dataColumn1.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>dataColumn2.Name" xml:space="preserve">
<value>dataColumn2</value>
</data>
<data name=">>dataColumn2.Type" xml:space="preserve">
- <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ComboBoxDataSet.Name" xml:space="preserve">
<value>ComboBoxDataSet</value>
</data>
<data name=">>ComboBoxDataSet.Type" xml:space="preserve">
- <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Data.DataSet, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>FontBoldButton.Name" xml:space="preserve">
<value>FontBoldButton</value>
</data>
<data name=">>FontBoldButton.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>FontItalicButton.Name" xml:space="preserve">
<value>FontItalicButton</value>
</data>
<data name=">>FontItalicButton.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>FontUnderlineButton.Name" xml:space="preserve">
<value>FontUnderlineButton</value>
</data>
<data name=">>FontUnderlineButton.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>PointFeatureStyleEditor</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list