[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mapguide-commits
Subject:    [mapguide-commits] r6811 - in trunk/Tools/Maestro/Maestro.Editors: . LayerDefinition/Vector/StyleEdi
From:       svn_mapguide () osgeo ! org
Date:       2012-06-25 15:16:51
Message-ID: 20120625151651.BFC123904D5 () trac ! osgeo ! org
[Download RAW message or body]

Author: jng
Date: 2012-06-25 08:16:50 -0700 (Mon, 25 Jun 2012)
New Revision: 6811

Modified:
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
  trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.resx
  trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
Log:
#2028: Break the Point Feature Style editor interface into tabs to free up vertical \
space.

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
 ===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs	2012-06-25 \
                14:47:52 UTC (rev 6810)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs	2012-06-25 \
15:16:50 UTC (rev 6811) @@ -120,6 +120,9 @@
         private ColorComboWithTransparency cmbW2DLineColor;
         private CheckBox chkW2DFillColor;
         private ColorComboWithTransparency cmbW2DFillColor;
+        private TabControl tabControl1;
+        private TabPage TAB_STYLE;
+        private TabPage TAB_FILL_BORDER;
         private ILayerElementFactory _factory;
 
         public PointFeatureStyleEditor(IEditorService editor, ClassDefinition \
schema, string featureSource) @@ -149,6 +152,7 @@
 			// Required for Windows Form Designer support
 			//
 			InitializeComponent();
+            //this.AutoScroll = false;
             using(System.IO.StringReader sr = new \
System.IO.StringReader(Properties.Resources.GeometryStyleComboDataset))  \
ComboBoxDataSet.ReadXml(sr);  
@@ -339,551 +343,582 @@
 		/// </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";
-		    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();
+            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.tabControl1 = new System.Windows.Forms.TabControl(); +            this.TAB_STYLE \
= new System.Windows.Forms.TabPage(); +            this.TAB_FILL_BORDER = new \
System.Windows.Forms.TabPage(); +            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.tabControl1.SuspendLayout();
+            this.TAB_STYLE.SuspendLayout();
+            this.TAB_FILL_BORDER.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
+            // 
+            resources.ApplyResources(this.grpW2DStyle, "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);
+            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); +            // 
+            // tabControl1
+            // 
+            resources.ApplyResources(this.tabControl1, "tabControl1");
+            this.tabControl1.Controls.Add(this.TAB_STYLE);
+            this.tabControl1.Controls.Add(this.TAB_FILL_BORDER);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            // 
+            // TAB_STYLE
+            // 
+            this.TAB_STYLE.Controls.Add(this.groupBox1);
+            this.TAB_STYLE.Controls.Add(this.grpW2DStyle);
+            this.TAB_STYLE.Controls.Add(this.groupBoxFont);
+            this.TAB_STYLE.Controls.Add(this.groupBoxSymbolLocation);
+            resources.ApplyResources(this.TAB_STYLE, "TAB_STYLE");
+            this.TAB_STYLE.Name = "TAB_STYLE";
+            this.TAB_STYLE.UseVisualStyleBackColor = true;
+            // 
+            // TAB_FILL_BORDER
+            // 
+            this.TAB_FILL_BORDER.Controls.Add(this.grpSymbolFill);
+            this.TAB_FILL_BORDER.Controls.Add(this.grpSymbolBorder);
+            resources.ApplyResources(this.TAB_FILL_BORDER, "TAB_FILL_BORDER");
+            this.TAB_FILL_BORDER.Name = "TAB_FILL_BORDER";
+            this.TAB_FILL_BORDER.UseVisualStyleBackColor = true;
+            // 
+            // PointFeatureStyleEditor
+            // 
+            resources.ApplyResources(this, "$this");
+            this.Controls.Add(this.tabControl1);
+            this.Controls.Add(this.DisplayPoints);
+            this.Controls.Add(this.groupBox4);
+            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.tabControl1.ResumeLayout(false);
+            this.TAB_STYLE.ResumeLayout(false);
+            this.TAB_FILL_BORDER.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
 		}
 		#endregion
 

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.resx
 ===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.resx	2012-06-25 \
                14:47:52 UTC (rev 6810)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.resx	2012-06-25 \
15:16:50 UTC (rev 6811) @@ -129,7 +129,7 @@
     <value>128, 176</value>
   </data>
   <data name="RotationBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>208, 21</value>
+    <value>211, 21</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, \
PublicKeyToken=b77a5c561934e089" />  <data name="RotationBox.TabIndex" \
type="System.Int32, mscorlib"> @@ -184,7 +184,7 @@
     <value>128, 144</value>
   </data>
   <data name="HeightText.Size" type="System.Drawing.Size, System.Drawing">
-    <value>208, 21</value>
+    <value>211, 21</value>
   </data>
   <data name="HeightText.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -211,7 +211,7 @@
     <value>128, 112</value>
   </data>
   <data name="WidthText.Size" type="System.Drawing.Size, System.Drawing">
-    <value>208, 21</value>
+    <value>211, 21</value>
   </data>
   <data name="WidthText.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -235,7 +235,7 @@
     <value>128, 80</value>
   </data>
   <data name="SizeUnits.Size" type="System.Drawing.Size, System.Drawing">
-    <value>208, 21</value>
+    <value>211, 21</value>
   </data>
   <data name="SizeUnits.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -259,7 +259,7 @@
     <value>128, 48</value>
   </data>
   <data name="SizeContext.Size" type="System.Drawing.Size, System.Drawing">
-    <value>208, 21</value>
+    <value>211, 21</value>
   </data>
   <data name="SizeContext.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -283,7 +283,7 @@
     <value>128, 16</value>
   </data>
   <data name="Symbol.Size" type="System.Drawing.Size, System.Drawing">
-    <value>208, 21</value>
+    <value>211, 21</value>
   </data>
   <data name="Symbol.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -436,10 +436,10 @@
     <value>11</value>
   </data>
   <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 24</value>
+    <value>6, 6</value>
   </data>
   <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 208</value>
+    <value>347, 208</value>
   </data>
   <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -454,10 +454,10 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089</value>  </data>
   <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>TAB_STYLE</value>
   </data>
   <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>0</value>
   </data>
   <data name="grpSymbolFill.Anchor" type="System.Windows.Forms.AnchorStyles, \
System.Windows.Forms">  <value>Top, Left, Right</value>
@@ -469,7 +469,7 @@
     <value>3, 16</value>
   </data>
   <data name="fillStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
-    <value>338, 149</value>
+    <value>341, 149</value>
   </data>
   <data name="fillStyleEditor.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -487,10 +487,10 @@
     <value>0</value>
   </data>
   <data name="grpSymbolFill.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 540</value>
+    <value>6, 6</value>
   </data>
   <data name="grpSymbolFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 168</value>
+    <value>347, 168</value>
   </data>
   <data name="grpSymbolFill.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -505,10 +505,10 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089</value>  </data>
   <data name="&gt;&gt;grpSymbolFill.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>TAB_FILL_BORDER</value>
   </data>
   <data name="&gt;&gt;grpSymbolFill.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>0</value>
   </data>
   <data name="grpSymbolBorder.Anchor" type="System.Windows.Forms.AnchorStyles, \
System.Windows.Forms">  <value>Top, Left, Right</value>
@@ -520,7 +520,7 @@
     <value>3, 16</value>
   </data>
   <data name="lineStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
-    <value>338, 133</value>
+    <value>341, 133</value>
   </data>
   <data name="lineStyleEditor.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -538,10 +538,10 @@
     <value>0</value>
   </data>
   <data name="grpSymbolBorder.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 714</value>
+    <value>6, 180</value>
   </data>
   <data name="grpSymbolBorder.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 152</value>
+    <value>347, 152</value>
   </data>
   <data name="grpSymbolBorder.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -556,10 +556,10 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089</value>  </data>
   <data name="&gt;&gt;grpSymbolBorder.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>TAB_FILL_BORDER</value>
   </data>
   <data name="&gt;&gt;grpSymbolBorder.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>1</value>
   </data>
   <data name="groupBox4.Anchor" type="System.Windows.Forms.AnchorStyles, \
System.Windows.Forms">  <value>Top, Left, Right</value>
@@ -571,7 +571,7 @@
     <value>8, 16</value>
   </data>
   <data name="previewPicture.Size" type="System.Drawing.Size, System.Drawing">
-    <value>328, 24</value>
+    <value>362, 24</value>
   </data>
   <data name="previewPicture.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -589,10 +589,10 @@
     <value>0</value>
   </data>
   <data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 869</value>
+    <value>0, 585</value>
   </data>
   <data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 48</value>
+    <value>378, 48</value>
   </data>
   <data name="groupBox4.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -610,7 +610,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;groupBox4.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>2</value>
   </data>
   <metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, \
System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">  \
<value>122, 17</value> @@ -640,7 +640,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;DisplayPoints.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>1</value>
   </data>
   <data name="groupBoxFont.Anchor" type="System.Windows.Forms.AnchorStyles, \
System.Windows.Forms">  <value>Top, Left, Right</value>
@@ -682,7 +682,7 @@
     <value>96, 56</value>
   </data>
   <data name="colorFontForeground.Size" type="System.Drawing.Size, System.Drawing">
-    <value>136, 48</value>
+    <value>139, 48</value>
   </data>
   <data name="colorFontForeground.TabIndex" type="System.Int32, mscorlib">
     <value>14</value>
@@ -700,7 +700,7 @@
     <value>1</value>
   </data>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, \
                System.Drawing, Version=4.0.0.0, Culture=neutral, \
                PublicKeyToken=b03f5f7f11d50a3a">
-    <value>0, 0</value>
+    <value>17, 17</value>
   </metadata>
   <data name="FontBoldButton.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9pt, style=Bold</value>
@@ -868,7 +868,7 @@
     <value>Top, Right</value>
   </data>
   <data name="comboBoxCharacter.Location" type="System.Drawing.Point, \
                System.Drawing">
-    <value>248, 24</value>
+    <value>251, 24</value>
   </data>
   <data name="comboBoxCharacter.MaxLength" type="System.Int32, mscorlib">
     <value>1</value>
@@ -898,7 +898,7 @@
     <value>96, 24</value>
   </data>
   <data name="fontCombo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>136, 21</value>
+    <value>139, 21</value>
   </data>
   <data name="fontCombo.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -943,10 +943,10 @@
     <value>6</value>
   </data>
   <data name="groupBoxFont.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 316</value>
+    <value>6, 298</value>
   </data>
   <data name="groupBoxFont.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 112</value>
+    <value>347, 112</value>
   </data>
   <data name="groupBoxFont.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -961,7 +961,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089</value>  </data>
   <data name="&gt;&gt;groupBoxFont.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>TAB_STYLE</value>
   </data>
   <data name="&gt;&gt;groupBoxFont.ZOrder" xml:space="preserve">
     <value>2</value>
@@ -1123,7 +1123,7 @@
     <value>124, 16</value>
   </data>
   <data name="MaintainAspectRatio.Size" type="System.Drawing.Size, System.Drawing">
-    <value>208, 16</value>
+    <value>211, 16</value>
   </data>
   <data name="MaintainAspectRatio.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
@@ -1144,10 +1144,10 @@
     <value>6</value>
   </data>
   <data name="groupBoxSymbolLocation.Location" type="System.Drawing.Point, \
                System.Drawing">
-    <value>0, 238</value>
+    <value>6, 220</value>
   </data>
   <data name="groupBoxSymbolLocation.Size" type="System.Drawing.Size, \
                System.Drawing">
-    <value>344, 72</value>
+    <value>347, 72</value>
   </data>
   <data name="groupBoxSymbolLocation.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -1162,11 +1162,14 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089</value>  </data>
   <data name="&gt;&gt;groupBoxSymbolLocation.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>TAB_STYLE</value>
   </data>
   <data name="&gt;&gt;groupBoxSymbolLocation.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
   </data>
+  <data name="grpW2DStyle.Anchor" type="System.Windows.Forms.AnchorStyles, \
System.Windows.Forms"> +    <value>Top, Left, Right</value>
+  </data>
   <data name="chkW2DTextColor.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -1207,7 +1210,7 @@
     <value>124, 73</value>
   </data>
   <data name="cmbW2DTextColor.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 21</value>
+    <value>220, 21</value>
   </data>
   <data name="cmbW2DTextColor.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -1264,7 +1267,7 @@
     <value>124, 46</value>
   </data>
   <data name="cmbW2DLineColor.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 21</value>
+    <value>220, 21</value>
   </data>
   <data name="cmbW2DLineColor.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -1318,7 +1321,7 @@
     <value>124, 19</value>
   </data>
   <data name="cmbW2DFillColor.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 21</value>
+    <value>220, 21</value>
   </data>
   <data name="cmbW2DFillColor.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1336,10 +1339,10 @@
     <value>5</value>
   </data>
   <data name="grpW2DStyle.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 434</value>
+    <value>6, 416</value>
   </data>
   <data name="grpW2DStyle.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 100</value>
+    <value>347, 100</value>
   </data>
   <data name="grpW2DStyle.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -1354,22 +1357,100 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089</value>  </data>
   <data name="&gt;&gt;grpW2DStyle.Parent" xml:space="preserve">
-    <value>$this</value>
+    <value>TAB_STYLE</value>
   </data>
   <data name="&gt;&gt;grpW2DStyle.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="tabControl1.Anchor" type="System.Windows.Forms.AnchorStyles, \
System.Windows.Forms"> +    <value>Top, Left, Right</value>
+  </data>
+  <data name="TAB_STYLE.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 22</value>
+  </data>
+  <data name="TAB_STYLE.Padding" type="System.Windows.Forms.Padding, \
System.Windows.Forms"> +    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TAB_STYLE.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 529</value>
+  </data>
+  <data name="TAB_STYLE.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
+  <data name="TAB_STYLE.Text" xml:space="preserve">
+    <value>Point Style</value>
+  </data>
+  <data name="&gt;&gt;TAB_STYLE.Name" xml:space="preserve">
+    <value>TAB_STYLE</value>
+  </data>
+  <data name="&gt;&gt;TAB_STYLE.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089</value> +  </data>
+  <data name="&gt;&gt;TAB_STYLE.Parent" xml:space="preserve">
+    <value>tabControl1</value>
+  </data>
+  <data name="&gt;&gt;TAB_STYLE.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="TAB_FILL_BORDER.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 22</value>
+  </data>
+  <data name="TAB_FILL_BORDER.Padding" type="System.Windows.Forms.Padding, \
System.Windows.Forms"> +    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TAB_FILL_BORDER.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 529</value>
+  </data>
+  <data name="TAB_FILL_BORDER.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="TAB_FILL_BORDER.Text" xml:space="preserve">
+    <value>Fill/Border</value>
+  </data>
+  <data name="&gt;&gt;TAB_FILL_BORDER.Name" xml:space="preserve">
+    <value>TAB_FILL_BORDER</value>
+  </data>
+  <data name="&gt;&gt;TAB_FILL_BORDER.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089</value> +  </data>
+  <data name="&gt;&gt;TAB_FILL_BORDER.Parent" xml:space="preserve">
+    <value>tabControl1</value>
+  </data>
+  <data name="&gt;&gt;TAB_FILL_BORDER.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 24</value>
+  </data>
+  <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>367, 555</value>
+  </data>
+  <data name="tabControl1.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
+  <data name="&gt;&gt;tabControl1.Name" xml:space="preserve">
+    <value>tabControl1</value>
+  </data>
+  <data name="&gt;&gt;tabControl1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089</value> +  </data>
+  <data name="&gt;&gt;tabControl1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;tabControl1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, \
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">  \
<value>True</value>  </metadata>
-  <data name="$this.AutoScroll" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, \
Culture=neutral, PublicKeyToken=b77a5c561934e089"> +    <value>46</value>
+  </metadata>
   <data name="$this.AutoScrollMinSize" type="System.Drawing.Size, System.Drawing">
-    <value>344, 824</value>
+    <value>344, 640</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 921</value>
+    <value>378, 640</value>
   </data>
   <data name="&gt;&gt;RotationTable.Name" xml:space="preserve">
     <value>RotationTable</value>

Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2012-06-25 14:47:52 \
                UTC (rev 6810)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2012-06-25 15:16:50 \
UTC (rev 6811) @@ -1366,6 +1366,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="FeatureSource\Providers\Odbc\OdbcProviderCtrl.resx">
       <DependentUpon>OdbcProviderCtrl.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource \
Include="FeatureSource\Providers\Odbc\OverrideEditor\TableConfigCtrl.resx">  \
<DependentUpon>TableConfigCtrl.cs</DependentUpon> @@ -1425,6 +1426,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Fusion\FlexibleLayoutEditor.resx">
       <DependentUpon>FlexibleLayoutEditor.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Fusion\FlexLayoutSettingsCtrl.resx">
       <DependentUpon>FlexLayoutSettingsCtrl.cs</DependentUpon>
@@ -1434,6 +1436,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Fusion\MapSettingsCtrl.resx">
       <DependentUpon>MapSettingsCtrl.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Fusion\NewWidgetDialog.resx">
       <DependentUpon>NewWidgetDialog.cs</DependentUpon>
@@ -1521,6 +1524,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Fusion\WidgetSettingsCtrl.resx">
       <DependentUpon>WidgetSettingsCtrl.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Generic\ResourceDataPanel.resx">
       <DependentUpon>ResourceDataPanel.cs</DependentUpon>
@@ -1574,9 +1578,11 @@
     </EmbeddedResource>
     <EmbeddedResource Include="LayerDefinition\Vector\Scales\ConditionList.resx">
       <DependentUpon>ConditionList.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource \
Include="LayerDefinition\Vector\Scales\ConditionListButtons.resx">  \
<DependentUpon>ConditionListButtons.cs</DependentUpon> +      \
<SubType>Designer</SubType>  </EmbeddedResource>
     <EmbeddedResource \
Include="LayerDefinition\Vector\Scales\EditorTemplateForm.resx">  \
<DependentUpon>EditorTemplateForm.cs</DependentUpon>

_______________________________________________
mapguide-commits mailing list
mapguide-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/mapguide-commits


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic