[mapguide-commits] r6147 - in trunk/Tools/Maestro/Maestro.Editors:
. Common LayerDefinition/Vector/StyleEditors
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Sep 25 11:39:06 EDT 2011
Author: jng
Date: 2011-09-25 08:39:06 -0700 (Sun, 25 Sep 2011)
New Revision: 6147
Added:
trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.resx
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs
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/LineStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.resx
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
Log:
#1811: Use a ColorPickerDialog for color selection. This is just the ColorComboWithTransparency control wrapped in a dialog
Added: trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.Designer.cs 2011-09-25 15:39:06 UTC (rev 6147)
@@ -0,0 +1,92 @@
+namespace Maestro.Editors.Common
+{
+ partial class ColorPickerDialog
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.colorComboWithTransparency1 = new Maestro.Editors.Common.ColorComboWithTransparency();
+ this.btnOK = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // colorComboWithTransparency1
+ //
+ this.colorComboWithTransparency1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.colorComboWithTransparency1.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.colorComboWithTransparency1.Location = new System.Drawing.Point(13, 13);
+ this.colorComboWithTransparency1.Name = "colorComboWithTransparency1";
+ this.colorComboWithTransparency1.Size = new System.Drawing.Size(259, 49);
+ this.colorComboWithTransparency1.TabIndex = 0;
+ //
+ // btnOK
+ //
+ this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnOK.Location = new System.Drawing.Point(116, 77);
+ this.btnOK.Name = "btnOK";
+ this.btnOK.Size = new System.Drawing.Size(75, 23);
+ this.btnOK.TabIndex = 1;
+ this.btnOK.Text = "OK";
+ this.btnOK.UseVisualStyleBackColor = true;
+ this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+ //
+ // btnCancel
+ //
+ this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.btnCancel.Location = new System.Drawing.Point(197, 77);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(75, 23);
+ this.btnCancel.TabIndex = 2;
+ this.btnCancel.Text = "Cancel";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+ //
+ // ColorPicker
+ //
+ this.AcceptButton = this.btnOK;
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+ this.CancelButton = this.btnCancel;
+ this.ClientSize = new System.Drawing.Size(284, 114);
+ this.ControlBox = false;
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.btnOK);
+ this.Controls.Add(this.colorComboWithTransparency1);
+ this.Name = "ColorPicker";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Select Color";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private ColorComboWithTransparency colorComboWithTransparency1;
+ private System.Windows.Forms.Button btnOK;
+ private System.Windows.Forms.Button btnCancel;
+ }
+}
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.cs 2011-09-25 15:39:06 UTC (rev 6147)
@@ -0,0 +1,59 @@
+#region Disclaimer / License
+// Copyright (C) 2011, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Editors.Common
+{
+ /// <summary>
+ /// A dialog to allow the user to select a color with desired transparency
+ /// </summary>
+ public partial class ColorPickerDialog : Form
+ {
+ public ColorPickerDialog()
+ {
+ InitializeComponent();
+ }
+
+ /// <summary>
+ /// Gets or sets the selected color
+ /// </summary>
+ public Color SelectedColor
+ {
+ get { return colorComboWithTransparency1.CurrentColor; }
+ set { colorComboWithTransparency1.CurrentColor = value; }
+ }
+
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = DialogResult.Cancel;
+ }
+
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = DialogResult.OK;
+ }
+ }
+}
Added: trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.resx (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.resx 2011-09-25 15:39:06 UTC (rev 6147)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <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>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs 2011-09-24 17:12:48 UTC (rev 6146)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs 2011-09-25 15:39:06 UTC (rev 6147)
@@ -25,6 +25,7 @@
using System.Text;
using System.Windows.Forms;
using OSGeo.MapGuide.MaestroAPI;
+using Maestro.Editors.Common;
namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
{
@@ -66,7 +67,7 @@
private void btnColor_Click(object sender, EventArgs e)
{
- using (var picker = new ColorDialog())
+ using (var picker = new ColorPickerDialog())
{
Color? currentColor = null;
try
@@ -76,11 +77,11 @@
catch { }
if (currentColor.HasValue)
- picker.Color = currentColor.Value;
+ picker.SelectedColor = currentColor.Value;
if (picker.ShowDialog() == DialogResult.OK)
{
- this.ColorExpression = Utility.SerializeHTMLColor(picker.Color, true);
+ this.ColorExpression = Utility.SerializeHTMLColor(picker.SelectedColor, true).ToUpper();
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2011-09-24 17:12:48 UTC (rev 6146)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2011-09-25 15:39:06 UTC (rev 6147)
@@ -97,8 +97,6 @@
internal System.Windows.Forms.Label horizontalLabel;
private CheckBox DisplayLabel;
private ColorExpressionField textColor;
- private Label label12;
- private Label label11;
private ColorExpressionField backgroundColor;
private bool m_inUpdate = false;
@@ -261,10 +259,8 @@
this.dataColumn1 = new System.Data.DataColumn();
this.dataColumn2 = new System.Data.DataColumn();
this.colorGroup = new System.Windows.Forms.GroupBox();
- this.label12 = new System.Windows.Forms.Label();
- this.label11 = new System.Windows.Forms.Label();
- this.backgroundColor = new ColorExpressionField();
- this.textColor = new ColorExpressionField();
+ 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();
@@ -480,8 +476,6 @@
// colorGroup
//
resources.ApplyResources(this.colorGroup, "colorGroup");
- this.colorGroup.Controls.Add(this.label12);
- this.colorGroup.Controls.Add(this.label11);
this.colorGroup.Controls.Add(this.backgroundColor);
this.colorGroup.Controls.Add(this.textColor);
this.colorGroup.Controls.Add(this.backgroundTypeCombo);
@@ -491,27 +485,15 @@
this.colorGroup.Name = "colorGroup";
this.colorGroup.TabStop = false;
//
- // label12
- //
- resources.ApplyResources(this.label12, "label12");
- this.label12.Name = "label12";
- //
- // label11
- //
- resources.ApplyResources(this.label11, "label11");
- this.label11.Name = "label11";
- //
// backgroundColor
//
resources.ApplyResources(this.backgroundColor, "backgroundColor");
- this.backgroundColor.ColorExpression = "00000000";
this.backgroundColor.Name = "backgroundColor";
this.backgroundColor.CurrentColorChanged += new System.EventHandler(this.backgroundColor_SelectedIndexChanged);
//
// textColor
//
resources.ApplyResources(this.textColor, "textColor");
- this.textColor.ColorExpression = "00000000";
this.textColor.Name = "textColor";
this.textColor.CurrentColorChanged += new System.EventHandler(this.textColor_SelectedIndexChanged);
//
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.resx 2011-09-24 17:12:48 UTC (rev 6146)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.resx 2011-09-25 15:39:06 UTC (rev 6147)
@@ -567,66 +567,6 @@
<data name="colorGroup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="label12.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label12.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 96</value>
- </data>
- <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 13</value>
- </data>
- <data name="label12.TabIndex" type="System.Int32, mscorlib">
- <value>15</value>
- </data>
- <data name="label12.Text" xml:space="preserve">
- <value>Transparency</value>
- </data>
- <data name=">>label12.Name" xml:space="preserve">
- <value>label12</value>
- </data>
- <data name=">>label12.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label12.Parent" xml:space="preserve">
- <value>colorGroup</value>
- </data>
- <data name=">>label12.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="label11.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label11.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 40</value>
- </data>
- <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 13</value>
- </data>
- <data name="label11.TabIndex" type="System.Int32, mscorlib">
- <value>14</value>
- </data>
- <data name="label11.Text" xml:space="preserve">
- <value>Transparency</value>
- </data>
- <data name=">>label11.Name" xml:space="preserve">
- <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>
- </data>
- <data name=">>label11.Parent" xml:space="preserve">
- <value>colorGroup</value>
- </data>
- <data name=">>label11.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
<data name="backgroundColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -643,13 +583,13 @@
<value>backgroundColor</value>
</data>
<data name=">>backgroundColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=4.0.0.6143, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>backgroundColor.Parent" xml:space="preserve">
<value>colorGroup</value>
</data>
<data name=">>backgroundColor.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>0</value>
</data>
<data name="textColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -667,13 +607,13 @@
<value>textColor</value>
</data>
<data name=">>textColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=4.0.0.6143, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>textColor.Parent" xml:space="preserve">
<value>colorGroup</value>
</data>
<data name=">>textColor.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>1</value>
</data>
<data name="backgroundTypeCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -697,7 +637,7 @@
<value>colorGroup</value>
</data>
<data name=">>backgroundTypeCombo.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>2</value>
</data>
<data name="label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -724,7 +664,7 @@
<value>colorGroup</value>
</data>
<data name=">>label7.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>3</value>
</data>
<data name="label8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -751,7 +691,7 @@
<value>colorGroup</value>
</data>
<data name=">>label8.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>4</value>
</data>
<data name="label9.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -778,7 +718,7 @@
<value>colorGroup</value>
</data>
<data name=">>label9.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>5</value>
</data>
<data name="colorGroup.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 240</value>
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs 2011-09-24 17:12:48 UTC (rev 6146)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs 2011-09-25 15:39:06 UTC (rev 6147)
@@ -41,7 +41,6 @@
private System.Windows.Forms.Panel panel1;
public ComboBox thicknessCombo;
public ColorExpressionField colorCombo;
- private Label label1;
/// <summary>
/// Required designer variable.
@@ -88,7 +87,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.thicknessCombo = new System.Windows.Forms.ComboBox();
this.colorCombo = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
- this.label1 = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
@@ -127,7 +125,6 @@
//
this.panel1.Controls.Add(this.thicknessCombo);
this.panel1.Controls.Add(this.colorCombo);
- this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.fillCombo);
this.panel1.Controls.Add(this.lblColor);
this.panel1.Controls.Add(this.lblThickness);
@@ -146,14 +143,10 @@
// colorCombo
//
resources.ApplyResources(this.colorCombo, "colorCombo");
+ this.colorCombo.ColorExpression = "";
this.colorCombo.Name = "colorCombo";
this.colorCombo.RequestExpressionEditor += new System.EventHandler(this.colorCombo_RequestExpressionEditor);
//
- // label1
- //
- resources.ApplyResources(this.label1, "label1");
- this.label1.Name = "label1";
- //
// LineStyleEditor
//
this.Controls.Add(this.panel1);
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.resx 2011-09-24 17:12:48 UTC (rev 6146)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.resx 2011-09-25 15:39:06 UTC (rev 6147)
@@ -136,13 +136,13 @@
<value>fillCombo</value>
</data>
<data name=">>fillCombo.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ImageStylePicker, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.Common.ImageStylePicker, Maestro.Editors, Version=4.0.0.6143, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>fillCombo.Parent" xml:space="preserve">
<value>panel1</value>
</data>
<data name=">>fillCombo.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>2</value>
</data>
<data name="lblColor.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -169,7 +169,7 @@
<value>panel1</value>
</data>
<data name=">>lblColor.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>3</value>
</data>
<data name="lblThickness.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -196,7 +196,7 @@
<value>panel1</value>
</data>
<data name=">>lblThickness.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>4</value>
</data>
<data name="lblFill.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -223,7 +223,7 @@
<value>panel1</value>
</data>
<data name=">>lblFill.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>5</value>
</data>
<data name="displayLine.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
@@ -298,7 +298,7 @@
<value>colorCombo</value>
</data>
<data name=">>colorCombo.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=4.0.0.6143, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>colorCombo.Parent" xml:space="preserve">
<value>panel1</value>
@@ -306,36 +306,6 @@
<data name=">>colorCombo.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="label1.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 96</value>
- </data>
- <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 13</value>
- </data>
- <data name="label1.TabIndex" type="System.Int32, mscorlib">
- <value>13</value>
- </data>
- <data name="label1.Text" xml:space="preserve">
- <value>Transparency</value>
- </data>
- <data name=">>label1.Name" xml:space="preserve">
- <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>
- </data>
- <data name=">>label1.Parent" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>label1.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
<data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2011-09-24 17:12:48 UTC (rev 6146)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2011-09-25 15:39:06 UTC (rev 6147)
@@ -59,6 +59,12 @@
<Compile Include="Common\ColorComboWithTransparency.designer.cs">
<DependentUpon>ColorComboWithTransparency.cs</DependentUpon>
</Compile>
+ <Compile Include="Common\ColorPickerDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Common\ColorPickerDialog.Designer.cs">
+ <DependentUpon>ColorPickerDialog.cs</DependentUpon>
+ </Compile>
<Compile Include="Common\CoordinateSystemPicker.cs">
<SubType>Form</SubType>
</Compile>
@@ -2201,6 +2207,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Resources\color.png" />
+ <EmbeddedResource Include="Common\ColorPickerDialog.resx">
+ <DependentUpon>ColorPickerDialog.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="LayerDefinition\Vector\Scales\CompositeStyleListCtrl.resx">
<DependentUpon>CompositeStyleListCtrl.cs</DependentUpon>
</EmbeddedResource>
More information about the mapguide-commits
mailing list