[mapguide-commits] r4343 - in
trunk/Tools/Maestro/Maestro/ResourceEditors: .
GeometryStyleEditors LayerEditorControls/ScaleControls
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Nov 11 17:06:47 EST 2009
Author: ksgeograf
Date: 2009-11-11 17:06:46 -0500 (Wed, 11 Nov 2009)
New Revision: 4343
Modified:
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/ConditionListButtons.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/EditorTemplateForm.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs
Log:
Maestro:
Fixed issue #1081, improvements of the base style editor for the theme dialog
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs 2009-11-11 22:06:46 UTC (rev 4343)
@@ -395,7 +395,6 @@
fillStyleEditor.fillCombo.SelectedValue = m_item.Fill.FillPattern;
if (fillStyleEditor.fillCombo.SelectedItem == null && fillStyleEditor.fillCombo.Items.Count > 0)
fillStyleEditor.fillCombo.SelectedIndex = fillStyleEditor.fillCombo.FindString(m_item.Fill.FillPattern);
-
}
lineStyleEditor.displayLine.Checked = m_item.Stroke != null;
@@ -569,5 +568,13 @@
Changed(this, new EventArgs());
}
- }
+
+ internal void SetupForTheming()
+ {
+ fillStyleEditor.foregroundColor.Enabled =
+ fillStyleEditor.lblForeground.Enabled =
+ fillStyleEditor.displayFill.Enabled =
+ false;
+ }
+ }
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.cs 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.cs 2009-11-11 22:06:46 UTC (rev 4343)
@@ -37,8 +37,8 @@
public ResourceEditors.GeometryStyleEditors.ImageStylePicker fillCombo;
public System.Windows.Forms.CheckBox displayFill;
- private System.Windows.Forms.Label lblBackground;
- private System.Windows.Forms.Label lblForeground;
+ private System.Windows.Forms.Label lblBackground;
+ public Label lblForeground;
private System.Windows.Forms.Label lblFill;
/// <summary>
@@ -56,6 +56,9 @@
foregroundColor.ResetColors();
backgroundColor.ResetColors();
+
+ fillCombo.Items.Clear();
+ fillCombo.Items.AddRange(FeaturePreviewRender.FillImages);
}
/// <summary>
@@ -80,103 +83,100 @@
/// </summary>
private void InitializeComponent()
{
- System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(FillStyleEditor));
- this.lblBackground = new System.Windows.Forms.Label();
- this.lblForeground = new System.Windows.Forms.Label();
- this.lblFill = new System.Windows.Forms.Label();
- this.foregroundColor = new ResourceEditors.GeometryStyleEditors.ColorComboBox();
- this.backgroundColor = new ResourceEditors.GeometryStyleEditors.ColorComboBox();
- this.fillCombo = new ResourceEditors.GeometryStyleEditors.ImageStylePicker();
- this.displayFill = new System.Windows.Forms.CheckBox();
- this.SuspendLayout();
- //
- // lblBackground
- //
- this.lblBackground.Location = new System.Drawing.Point(0, 80);
- this.lblBackground.Name = "lblBackground";
- this.lblBackground.Size = new System.Drawing.Size(96, 16);
- this.lblBackground.TabIndex = 8;
- this.lblBackground.Text = "Background color";
- //
- // lblForeground
- //
- this.lblForeground.Location = new System.Drawing.Point(0, 48);
- this.lblForeground.Name = "lblForeground";
- this.lblForeground.Size = new System.Drawing.Size(96, 16);
- this.lblForeground.TabIndex = 7;
- this.lblForeground.Text = "Foreground color";
- //
- // lblFill
- //
- this.lblFill.Location = new System.Drawing.Point(0, 24);
- this.lblFill.Name = "lblFill";
- this.lblFill.Size = new System.Drawing.Size(96, 16);
- this.lblFill.TabIndex = 6;
- this.lblFill.Text = "Fill pattern";
- //
- // foregroundColor
- //
- this.foregroundColor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.foregroundColor.Location = new System.Drawing.Point(120, 48);
- this.foregroundColor.Name = "foregroundColor";
- this.foregroundColor.Size = new System.Drawing.Size(184, 21);
- this.foregroundColor.TabIndex = 10;
- //
- // backgroundColor
- //
- this.backgroundColor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.backgroundColor.Location = new System.Drawing.Point(120, 80);
- this.backgroundColor.Name = "backgroundColor";
- this.backgroundColor.Size = new System.Drawing.Size(184, 21);
- this.backgroundColor.TabIndex = 11;
- //
- // fillCombo
- //
- this.fillCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.fillCombo.DisplayMember = "Name";
- this.fillCombo.Location = new System.Drawing.Point(120, 16);
- this.fillCombo.Name = "fillCombo";
- this.fillCombo.Size = new System.Drawing.Size(184, 21);
- this.fillCombo.TabIndex = 12;
- this.fillCombo.TextWidth = 50;
- this.fillCombo.ValueMember = "Name";
- //
- // displayFill
- //
- this.displayFill.Checked = true;
- this.displayFill.CheckState = System.Windows.Forms.CheckState.Checked;
- this.displayFill.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.displayFill.Location = new System.Drawing.Point(0, 0);
- this.displayFill.Name = "displayFill";
- this.displayFill.Size = new System.Drawing.Size(168, 16);
- this.displayFill.TabIndex = 13;
- this.displayFill.Text = "Display fill";
- this.displayFill.CheckedChanged += new System.EventHandler(this.displayFill_CheckedChanged);
- //
- // FillStyleEditor
- //
- this.Controls.Add(this.displayFill);
- this.Controls.Add(this.fillCombo);
- this.Controls.Add(this.backgroundColor);
- this.Controls.Add(this.foregroundColor);
- this.Controls.Add(this.lblBackground);
- this.Controls.Add(this.lblForeground);
- this.Controls.Add(this.lblFill);
- this.Name = "FillStyleEditor";
- this.Size = new System.Drawing.Size(304, 104);
- this.Load += new System.EventHandler(this.FillStyleEditor_Load);
- this.ResumeLayout(false);
+ this.lblBackground = new System.Windows.Forms.Label();
+ this.lblForeground = new System.Windows.Forms.Label();
+ this.lblFill = new System.Windows.Forms.Label();
+ this.foregroundColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
+ this.backgroundColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
+ this.fillCombo = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ImageStylePicker();
+ this.displayFill = new System.Windows.Forms.CheckBox();
+ this.SuspendLayout();
+ //
+ // lblBackground
+ //
+ this.lblBackground.Location = new System.Drawing.Point(0, 80);
+ this.lblBackground.Name = "lblBackground";
+ this.lblBackground.Size = new System.Drawing.Size(96, 16);
+ this.lblBackground.TabIndex = 8;
+ this.lblBackground.Text = "Background color";
+ //
+ // lblForeground
+ //
+ this.lblForeground.Location = new System.Drawing.Point(0, 48);
+ this.lblForeground.Name = "lblForeground";
+ this.lblForeground.Size = new System.Drawing.Size(96, 16);
+ this.lblForeground.TabIndex = 7;
+ this.lblForeground.Text = "Foreground color";
+ //
+ // lblFill
+ //
+ this.lblFill.Location = new System.Drawing.Point(0, 24);
+ this.lblFill.Name = "lblFill";
+ this.lblFill.Size = new System.Drawing.Size(96, 16);
+ this.lblFill.TabIndex = 6;
+ this.lblFill.Text = "Fill pattern";
+ //
+ // foregroundColor
+ //
+ this.foregroundColor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.foregroundColor.Location = new System.Drawing.Point(120, 48);
+ this.foregroundColor.Name = "foregroundColor";
+ this.foregroundColor.Size = new System.Drawing.Size(184, 21);
+ this.foregroundColor.TabIndex = 10;
+ //
+ // backgroundColor
+ //
+ this.backgroundColor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.backgroundColor.Location = new System.Drawing.Point(120, 80);
+ this.backgroundColor.Name = "backgroundColor";
+ this.backgroundColor.Size = new System.Drawing.Size(184, 21);
+ this.backgroundColor.TabIndex = 11;
+ //
+ // fillCombo
+ //
+ this.fillCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.fillCombo.DisplayMember = "Name";
+ this.fillCombo.Location = new System.Drawing.Point(120, 16);
+ this.fillCombo.Name = "fillCombo";
+ this.fillCombo.Size = new System.Drawing.Size(184, 21);
+ this.fillCombo.TabIndex = 12;
+ this.fillCombo.TextWidth = 50;
+ this.fillCombo.ValueMember = "Name";
+ //
+ // displayFill
+ //
+ this.displayFill.Checked = true;
+ this.displayFill.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.displayFill.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.displayFill.Location = new System.Drawing.Point(0, 0);
+ this.displayFill.Name = "displayFill";
+ this.displayFill.Size = new System.Drawing.Size(168, 16);
+ this.displayFill.TabIndex = 13;
+ this.displayFill.Text = "Display fill";
+ this.displayFill.CheckedChanged += new System.EventHandler(this.displayFill_CheckedChanged);
+ //
+ // FillStyleEditor
+ //
+ this.Controls.Add(this.displayFill);
+ this.Controls.Add(this.fillCombo);
+ this.Controls.Add(this.backgroundColor);
+ this.Controls.Add(this.foregroundColor);
+ this.Controls.Add(this.lblBackground);
+ this.Controls.Add(this.lblForeground);
+ this.Controls.Add(this.lblFill);
+ this.Name = "FillStyleEditor";
+ this.Size = new System.Drawing.Size(304, 104);
+ this.Load += new System.EventHandler(this.FillStyleEditor_Load);
+ this.ResumeLayout(false);
}
#endregion
private void FillStyleEditor_Load(object sender, System.EventArgs e)
{
- fillCombo.Items.Clear();
- fillCombo.Items.AddRange(FeaturePreviewRender.FillImages);
}
private void displayFill_CheckedChanged(object sender, System.EventArgs e)
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.resx 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.resx 2009-11-11 22:06:46 UTC (rev 4343)
@@ -3,7 +3,7 @@
<!--
Microsoft ResX Schema
- Version 1.3
+ 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
@@ -14,16 +14,17 @@
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">1.3</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">this is my long string</data>
+ <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">
- [base64 mime encoded serialized .NET Framework object]
+ <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">
- [base64 mime encoded string representing a byte array form of the .NET Framework object]
+ <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
@@ -35,7 +36,7 @@
Classes that don't support this are serialized and stored with the
mimetype set.
- The mimetype is used forserialized objects, and tells the
+ 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:
@@ -45,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -59,18 +60,37 @@
: 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" msdata:Ordinal="1" />
+ <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">
@@ -89,105 +109,12 @@
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
- <value>1.3</value>
+ <value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="lblBackground.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="lblBackground.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblBackground.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblForeground.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="lblForeground.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblForeground.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblFill.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="lblFill.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblFill.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="foregroundColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="foregroundColor.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="foregroundColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Public</value>
- </data>
- <data name="backgroundColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="backgroundColor.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="backgroundColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Public</value>
- </data>
- <data name="fillCombo.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="fillCombo.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="fillCombo.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Public</value>
- </data>
- <data name="displayFill.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="displayFill.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="displayFill.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Public</value>
- </data>
- <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </data>
- <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </data>
- <data name="$this.Name">
- <value>FillStyleEditor</value>
- </data>
- <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>80</value>
- </data>
- <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>(Default)</value>
- </data>
- <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>8, 8</value>
- </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs 2009-11-11 22:06:46 UTC (rev 4343)
@@ -37,7 +37,7 @@
/// </summary>
private System.ComponentModel.Container components = null;
private System.Windows.Forms.GroupBox CompositeGroup;
- private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel AdvancedPanel;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.PictureBox previewPicture;
@@ -205,12 +205,17 @@
this.applyLineStyle = new System.Windows.Forms.CheckBox();
this.compositeLines = new System.Windows.Forms.CheckBox();
this.CompositeGroup = new System.Windows.Forms.GroupBox();
+ this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+ this.AddStyleButton = new System.Windows.Forms.ToolStripButton();
+ this.RemoveStyleButton = new System.Windows.Forms.ToolStripButton();
this.lineStyles = new System.Windows.Forms.ListBox();
- this.panel1 = new System.Windows.Forms.Panel();
+ this.AdvancedPanel = new System.Windows.Forms.Panel();
this.compositePanel = new System.Windows.Forms.Panel();
this.propertyPanel = new System.Windows.Forms.Panel();
this.previewGroup = new System.Windows.Forms.GroupBox();
this.previewPicture = new System.Windows.Forms.PictureBox();
+ this.lineGroup = new System.Windows.Forms.GroupBox();
+ this.lineStyleEditor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor();
this.sizeGroup = new System.Windows.Forms.GroupBox();
this.sizeUnitsCombo = new System.Windows.Forms.ComboBox();
this.UnitsTable = new System.Data.DataTable();
@@ -222,24 +227,19 @@
this.dataColumn4 = new System.Data.DataColumn();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
- this.lineGroup = new System.Windows.Forms.GroupBox();
- this.lineStyleEditor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor();
this.ComboBoxDataSet = new System.Data.DataSet();
- this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.AddStyleButton = new System.Windows.Forms.ToolStripButton();
- this.RemoveStyleButton = new System.Windows.Forms.ToolStripButton();
this.CompositeGroup.SuspendLayout();
- this.panel1.SuspendLayout();
+ this.toolStrip1.SuspendLayout();
+ this.AdvancedPanel.SuspendLayout();
this.compositePanel.SuspendLayout();
this.propertyPanel.SuspendLayout();
this.previewGroup.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
+ this.lineGroup.SuspendLayout();
this.sizeGroup.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
- this.lineGroup.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
- this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// applyLineStyle
@@ -268,18 +268,48 @@
//
// CompositeGroup
//
- this.CompositeGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
this.CompositeGroup.Controls.Add(this.toolStrip1);
this.CompositeGroup.Controls.Add(this.lineStyles);
+ this.CompositeGroup.Dock = System.Windows.Forms.DockStyle.Top;
this.CompositeGroup.Location = new System.Drawing.Point(0, 0);
this.CompositeGroup.Name = "CompositeGroup";
- this.CompositeGroup.Size = new System.Drawing.Size(288, 160);
+ this.CompositeGroup.Size = new System.Drawing.Size(290, 160);
this.CompositeGroup.TabIndex = 2;
this.CompositeGroup.TabStop = false;
this.CompositeGroup.Text = "Composite line";
+ this.CompositeGroup.Enter += new System.EventHandler(this.CompositeGroup_Enter);
//
+ // toolStrip1
+ //
+ this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.AddStyleButton,
+ this.RemoveStyleButton});
+ this.toolStrip1.Location = new System.Drawing.Point(3, 16);
+ this.toolStrip1.Name = "toolStrip1";
+ this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+ this.toolStrip1.Size = new System.Drawing.Size(284, 25);
+ this.toolStrip1.TabIndex = 1;
+ //
+ // AddStyleButton
+ //
+ this.AddStyleButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.AddStyleButton.Image = ((System.Drawing.Image)(resources.GetObject("AddStyleButton.Image")));
+ this.AddStyleButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.AddStyleButton.Name = "AddStyleButton";
+ this.AddStyleButton.Size = new System.Drawing.Size(23, 22);
+ this.AddStyleButton.Click += new System.EventHandler(this.AddStyleButton_Click);
+ //
+ // RemoveStyleButton
+ //
+ this.RemoveStyleButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.RemoveStyleButton.Enabled = false;
+ this.RemoveStyleButton.Image = ((System.Drawing.Image)(resources.GetObject("RemoveStyleButton.Image")));
+ this.RemoveStyleButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.RemoveStyleButton.Name = "RemoveStyleButton";
+ this.RemoveStyleButton.Size = new System.Drawing.Size(23, 22);
+ this.RemoveStyleButton.Click += new System.EventHandler(this.RemoveStyleButton_Click);
+ //
// lineStyles
//
this.lineStyles.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -288,53 +318,49 @@
this.lineStyles.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.lineStyles.Location = new System.Drawing.Point(16, 56);
this.lineStyles.Name = "lineStyles";
- this.lineStyles.Size = new System.Drawing.Size(256, 95);
+ this.lineStyles.Size = new System.Drawing.Size(258, 95);
this.lineStyles.TabIndex = 0;
this.lineStyles.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.lineStyles_DrawItem);
this.lineStyles.SelectedIndexChanged += new System.EventHandler(this.lineStyles_SelectedIndexChanged);
//
- // panel1
+ // AdvancedPanel
//
- this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.panel1.Controls.Add(this.compositeLines);
- this.panel1.Controls.Add(this.applyLineStyle);
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(290, 48);
- this.panel1.TabIndex = 3;
+ this.AdvancedPanel.Controls.Add(this.compositeLines);
+ this.AdvancedPanel.Controls.Add(this.applyLineStyle);
+ this.AdvancedPanel.Dock = System.Windows.Forms.DockStyle.Top;
+ this.AdvancedPanel.Location = new System.Drawing.Point(0, 0);
+ this.AdvancedPanel.Name = "AdvancedPanel";
+ this.AdvancedPanel.Size = new System.Drawing.Size(290, 48);
+ this.AdvancedPanel.TabIndex = 3;
//
// compositePanel
//
- this.compositePanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
this.compositePanel.Controls.Add(this.CompositeGroup);
- this.compositePanel.Location = new System.Drawing.Point(0, 56);
+ this.compositePanel.Dock = System.Windows.Forms.DockStyle.Top;
+ this.compositePanel.Location = new System.Drawing.Point(0, 48);
this.compositePanel.Name = "compositePanel";
this.compositePanel.Size = new System.Drawing.Size(290, 160);
this.compositePanel.TabIndex = 4;
//
// propertyPanel
//
- this.propertyPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
this.propertyPanel.Controls.Add(this.previewGroup);
+ this.propertyPanel.Controls.Add(this.lineGroup);
this.propertyPanel.Controls.Add(this.sizeGroup);
- this.propertyPanel.Controls.Add(this.lineGroup);
- this.propertyPanel.Location = new System.Drawing.Point(0, 224);
+ this.propertyPanel.Dock = System.Windows.Forms.DockStyle.Top;
+ this.propertyPanel.Location = new System.Drawing.Point(0, 208);
this.propertyPanel.Name = "propertyPanel";
- this.propertyPanel.Size = new System.Drawing.Size(290, 256);
+ this.propertyPanel.Size = new System.Drawing.Size(290, 240);
this.propertyPanel.TabIndex = 5;
//
// previewGroup
//
- this.previewGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
this.previewGroup.Controls.Add(this.previewPicture);
- this.previewGroup.Location = new System.Drawing.Point(0, 208);
+ this.previewGroup.Dock = System.Windows.Forms.DockStyle.Top;
+ this.previewGroup.Location = new System.Drawing.Point(0, 192);
+ this.previewGroup.Margin = new System.Windows.Forms.Padding(3, 12, 3, 3);
this.previewGroup.Name = "previewGroup";
- this.previewGroup.Size = new System.Drawing.Size(288, 48);
+ this.previewGroup.Size = new System.Drawing.Size(290, 48);
this.previewGroup.TabIndex = 10;
this.previewGroup.TabStop = false;
this.previewGroup.Text = "Preview";
@@ -347,22 +373,41 @@
this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.previewPicture.Location = new System.Drawing.Point(8, 16);
this.previewPicture.Name = "previewPicture";
- this.previewPicture.Size = new System.Drawing.Size(272, 24);
+ this.previewPicture.Size = new System.Drawing.Size(274, 24);
this.previewPicture.TabIndex = 0;
this.previewPicture.TabStop = false;
this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
//
+ // lineGroup
+ //
+ this.lineGroup.Controls.Add(this.lineStyleEditor);
+ this.lineGroup.Dock = System.Windows.Forms.DockStyle.Top;
+ this.lineGroup.Location = new System.Drawing.Point(0, 80);
+ this.lineGroup.Name = "lineGroup";
+ this.lineGroup.Size = new System.Drawing.Size(290, 112);
+ this.lineGroup.TabIndex = 0;
+ this.lineGroup.TabStop = false;
+ this.lineGroup.Text = "Line style";
+ //
+ // lineStyleEditor
+ //
+ this.lineStyleEditor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lineStyleEditor.Location = new System.Drawing.Point(8, 16);
+ this.lineStyleEditor.Name = "lineStyleEditor";
+ this.lineStyleEditor.Size = new System.Drawing.Size(274, 88);
+ this.lineStyleEditor.TabIndex = 0;
+ //
// sizeGroup
//
- this.sizeGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
this.sizeGroup.Controls.Add(this.sizeUnitsCombo);
this.sizeGroup.Controls.Add(this.sizeContextCombo);
this.sizeGroup.Controls.Add(this.label3);
this.sizeGroup.Controls.Add(this.label2);
+ this.sizeGroup.Dock = System.Windows.Forms.DockStyle.Top;
this.sizeGroup.Location = new System.Drawing.Point(0, 0);
this.sizeGroup.Name = "sizeGroup";
- this.sizeGroup.Size = new System.Drawing.Size(288, 80);
+ this.sizeGroup.Size = new System.Drawing.Size(290, 80);
this.sizeGroup.TabIndex = 1;
this.sizeGroup.TabStop = false;
this.sizeGroup.Text = "Size";
@@ -376,7 +421,7 @@
this.sizeUnitsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.sizeUnitsCombo.Location = new System.Drawing.Point(120, 44);
this.sizeUnitsCombo.Name = "sizeUnitsCombo";
- this.sizeUnitsCombo.Size = new System.Drawing.Size(160, 21);
+ this.sizeUnitsCombo.Size = new System.Drawing.Size(162, 21);
this.sizeUnitsCombo.TabIndex = 11;
this.sizeUnitsCombo.ValueMember = "Value";
this.sizeUnitsCombo.SelectedIndexChanged += new System.EventHandler(this.sizeUnitsCombo_SelectedIndexChanged);
@@ -407,7 +452,7 @@
this.sizeContextCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.sizeContextCombo.Location = new System.Drawing.Point(120, 12);
this.sizeContextCombo.Name = "sizeContextCombo";
- this.sizeContextCombo.Size = new System.Drawing.Size(160, 21);
+ this.sizeContextCombo.Size = new System.Drawing.Size(162, 21);
this.sizeContextCombo.TabIndex = 10;
this.sizeContextCombo.ValueMember = "Value";
this.sizeContextCombo.SelectedIndexChanged += new System.EventHandler(this.sizeContextCombo_SelectedIndexChanged);
@@ -445,27 +490,6 @@
this.label2.TabIndex = 8;
this.label2.Text = "Size context";
//
- // lineGroup
- //
- this.lineGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lineGroup.Controls.Add(this.lineStyleEditor);
- this.lineGroup.Location = new System.Drawing.Point(0, 88);
- this.lineGroup.Name = "lineGroup";
- this.lineGroup.Size = new System.Drawing.Size(288, 112);
- this.lineGroup.TabIndex = 0;
- this.lineGroup.TabStop = false;
- this.lineGroup.Text = "Line style";
- //
- // lineStyleEditor
- //
- this.lineStyleEditor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lineStyleEditor.Location = new System.Drawing.Point(8, 16);
- this.lineStyleEditor.Name = "lineStyleEditor";
- this.lineStyleEditor.Size = new System.Drawing.Size(272, 88);
- this.lineStyleEditor.TabIndex = 0;
- //
// ComboBoxDataSet
//
this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
@@ -474,59 +498,29 @@
this.SizeContextTable,
this.UnitsTable});
//
- // toolStrip1
- //
- this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
- this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.AddStyleButton,
- this.RemoveStyleButton});
- this.toolStrip1.Location = new System.Drawing.Point(3, 16);
- this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
- this.toolStrip1.Size = new System.Drawing.Size(282, 25);
- this.toolStrip1.TabIndex = 1;
- //
- // AddStyleButton
- //
- this.AddStyleButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.AddStyleButton.Image = ((System.Drawing.Image)(resources.GetObject("AddStyleButton.Image")));
- this.AddStyleButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.AddStyleButton.Name = "AddStyleButton";
- this.AddStyleButton.Size = new System.Drawing.Size(23, 22);
- this.AddStyleButton.Click += new System.EventHandler(this.AddStyleButton_Click);
- //
- // RemoveStyleButton
- //
- this.RemoveStyleButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.RemoveStyleButton.Enabled = false;
- this.RemoveStyleButton.Image = ((System.Drawing.Image)(resources.GetObject("RemoveStyleButton.Image")));
- this.RemoveStyleButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.RemoveStyleButton.Name = "RemoveStyleButton";
- this.RemoveStyleButton.Size = new System.Drawing.Size(23, 22);
- this.RemoveStyleButton.Click += new System.EventHandler(this.RemoveStyleButton_Click);
- //
// LineFeatureStyleEditor
//
this.AutoScroll = true;
this.AutoScrollMinSize = new System.Drawing.Size(290, 480);
this.Controls.Add(this.propertyPanel);
this.Controls.Add(this.compositePanel);
- this.Controls.Add(this.panel1);
+ this.Controls.Add(this.AdvancedPanel);
this.Name = "LineFeatureStyleEditor";
- this.Size = new System.Drawing.Size(290, 480);
+ this.Size = new System.Drawing.Size(273, 435);
this.CompositeGroup.ResumeLayout(false);
this.CompositeGroup.PerformLayout();
- this.panel1.ResumeLayout(false);
+ this.toolStrip1.ResumeLayout(false);
+ this.toolStrip1.PerformLayout();
+ this.AdvancedPanel.ResumeLayout(false);
this.compositePanel.ResumeLayout(false);
this.propertyPanel.ResumeLayout(false);
this.previewGroup.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
+ this.lineGroup.ResumeLayout(false);
this.sizeGroup.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
- this.lineGroup.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
- this.toolStrip1.ResumeLayout(false);
- this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
}
@@ -638,12 +632,9 @@
private void compositeLines_CheckedChanged(object sender, System.EventArgs e)
{
if (compositePanel.Visible && !compositeLines.Checked)
- {
- this.Height -= compositePanel.Height;
- //this.MinScrollSize
- }
+ this.AutoScrollMinSize = new Size(this.AutoScrollMinSize.Width, this.AutoScrollMinSize.Height - compositePanel.Height);
else if (!compositePanel.Visible && compositeLines.Checked)
- this.Height += compositePanel.Height;
+ this.AutoScrollMinSize = new Size(this.AutoScrollMinSize.Width, this.AutoScrollMinSize.Height + compositePanel.Height);
compositePanel.Visible = compositeLines.Checked;
@@ -690,5 +681,18 @@
lineStyles.SelectedIndex = lineStyles.Items.Count - 1;
}
- }
+
+ internal void SetupForTheming()
+ {
+ lineStyleEditor.colorCombo.Enabled =
+ lineStyleEditor.lblColor.Enabled =
+ AdvancedPanel.Enabled =
+ false;
+ }
+
+ private void CompositeGroup_Enter(object sender, EventArgs e)
+ {
+
+ }
+ }
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx 2009-11-11 22:06:46 UTC (rev 4343)
@@ -124,32 +124,31 @@
<data name="AddStyleButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAhhJREFUOE99kt9L
- U2Ecxif7SxwlCRGVF6VF5DCiCLuJrqJuoo3TVYsKiyyTUIKKdAUVtH6Ji2gsDepiLVo7IGOWbHncKHVH
- bWBsTg5rusX21PPaWZyd1QsPnPfwfT/v83zfb4Pl94p+VFDI5yxWq5Vb0yqXy+JfqVS0dHTYG0wFsjyG
- SqWC/I/SfxUIBOHzvURdAA9nl4sGaQUNmdzqH60gGHwPJamaIXSgA+a+LSH5dUEUqul89Zt7v3+0KoOT
- egBCMrkVsD+EzqrfBSwUkpFS02CcapR/AXjwUyxZjcU44xNTwq0BQOpq8aco1CPwNkaoBURin+sDantA
- AGGMEP8yjYHXd3Dm2Vm4PKcRViJmB/UAi5kCvG992Ou243L4PO5N3sb18T4cetoJ56Djbw8YQQfonacD
- 2m290QKXLOFqvBtKehLDicfoip6C/WFbfQBt88moXm8f2oY2wzF2FF0RCVktKwAnI8ex/1U7Dg7uWYPo
- DthlHRBTVDgfSGjxNkNOhcRhTiuHi9+OwDFs7F+3BuCEMQLffWYui4n4rJDr0TlsGWoSt99N9GK5sIR3
- 8yO4Gb+EfaO7RDyDA+anZhY0Ib/8AZvcNnSGm+BMNGNRm4cndQGHoxuwbXg9Lj7vNjugC3ZfF4t2PmmE
- NNUIT/oIeqZ34MAbG3Zf225sImNQnLBaXbnfIxrWOmBD+62tkNwn8GLELwC/ACt9xxnW2QbqAAAAAElF
- TkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPfZLfS1NhHMb9VxwpCRGWF6VJpBBRhN1EV2I3
+ 4sbpykWFRZZJGEFKugILnP0QJ+FYGtTFXLR2QMYs2fK4UeqOs4GyqRx0asEefV47y+M59cID7+F838/7
+ fZ73W1S0syJfFASDMmR53FL8R/n9AbDetHgwn89jbf3Xf0WA1/vWDCGAh7OrWwZpOQ2Zlc0/2kAg8AlK
+ QjVD9gLmfy4j8WNBFKrptcKe3z7faEGGTqwAhGRWNsB8CJ1TlwSMWSTVtDGPfwF48Gs0UbBFOxOT08Ku
+ IVBSN7d+i0LdAm+jhf2AcPSbNUAPcS+Ae1qIfZ9B9/unuDZ0HU73VYSUsLkDK8BiJgfPmBdnXLW4G7qJ
+ Z1NP8GiiAxdf18HRY//7nLSgA/TkaYHtVnZWwClLuB9rhZKewmD8JVoizajtr7IGsG0+GdXu6UDVQDns
+ 4w1oCUvIalkBuBJuxLl3NbjQc3oXonfAlHVAVFHh6JNQ4SmDnAyKw5xWDhf3dv9lHHpwYBfACaMFvvvs
+ fBaTsTkh54sbODJQKm7vjbdjNbeMj6kRdMXu4OzoSWHP0AH9U7MLmpBP/ozDLhvqQqVwxMuwqKXgTt7C
+ pchBHBsswe03reYO2AXT18Wi6lfFkKaL4U7Xo23mBM5/sOHUw+PGEGmD4oTt173nbSKwym4bah4fheRq
+ wvCITwC2AbpY3noXadHQAAAAAElFTkSuQmCC
</value>
</data>
<data name="RemoveStyleButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgJJREFUOE99k99L
- U2Ecxif7U4IQFIR+QBgIXjQvlhQRYtSVN5FF5C/oYjioOdBJIl0Iq6siCCI9URHDcdATB5b4CyeTwVKP
- TLHcXOm2s+W2J5/3cE4enb3w4X3fw3mf8zzf93tqHIdjdj6GfDbjcDqd3FqjXC6LZ5w5dD3vaGm5UmN7
- iRtVjaBQPEA29+e/hMMyPk1IqCrAw+lfRYtURodBQTzjWpanEYtrGB//YBehA1NgY3MX8URSwEOceYhI
- 0kcLm0g1AR6gGOvDeXUjLcSmlAjWtS0wjhXlNAc/UnnMLa4ciVUQe7q1CSiKKorIrEcjcL2wFLfVhY6q
- ChyvASNoW1kRIRH7jkgwiK9eD754PEh8mz3p4LQiqu8lyDfd2A48wf7rl9gdG8FCRzvedd3/VwNGMAX4
- VfMWonPLCLkb8dvbh/LzQVSCo2LW/R5Eb7iqCzC3eW2hQABrV5tQevwAlSEvKs98Bv092LndivCta4aI
- 6YBNYwosxTSEuh9h23UJGUVGLrVj42dfJyYvNxgC7DBGYOPwvhejawIWTHOdw76vF/lXIwZvDnkxLBww
- ns0B85PV5J4gElIx09QAve08KvcuWJTuXBTC6oD3pAO6YAOZKP6niLrqkeuoRenhGRTvnkXyej0kd7O9
- iIxB2GHHeev34XN7Kyab64RtXqH5V/4FyU/RgaVjSCgAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH0SURBVDhPfZPfS1NhHMb9XwQRFIQ0iALBm91MUSLEsCtv
+ xIwof4AXw0GtQU2U6EJYXRVCEOqJijhsHPTIgSn+wsliMLUjUyynljq32dyTz3t4546bHvjwvudwvs/5
+ Ps/7PWVl59f8YgS6bsAwQjbkM65EVQPg+0UXC9OZfzhOnl5LMKjh66RSLEIBFu/9yeRJHKRgkRbPuNe0
+ aUSiJiYmPttFCgU2t/YRjcUFLOLKIqIoX/LYREoJsIBizIfr+uaeEJvSQ/hpboN28llc1cGvxAkWln8U
+ 2EqLe9q1CTBhhkivhRa4X1qJ2nJhRyUFZIhSgBbM7WNhIRZZQ8jvx4zbhe8uF2Kz88UdXBaQIRrjCrR7
+ Tuz4nuHowzvsj45gqaMNn552X2RAC1KAX5WnEF5Yheq8jb/ufpy9eYmc/7VYU14XwncdpQVoQR6b6vNh
+ o7Ee2YFHyL1yIzfssRjsxW57E4L3my0R2QGHRgqsREyoPU+w47iFA11DMrFr43f/QwTu1FgCnDBa4ODw
+ vJfDGwIGZjpu4MjTh5P3IxZj57wdEh3Qnq0D+ifr8UNBSDUwV1+DVGstcl11ebIPbgph44W7uAN2wQGS
+ 6N7nCDuqkeyoRPZxOTKdFYi3VENxNthDpA3CCbvMR68H39qaEGioEm3zCOVf+R87WeXQgnPczgAAAABJ
+ RU5ErkJggg==
</value>
</data>
<metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs 2009-11-11 22:06:46 UTC (rev 4343)
@@ -34,8 +34,8 @@
{
public ResourceEditors.GeometryStyleEditors.ImageStylePicker fillCombo;
- public ResourceEditors.GeometryStyleEditors.ColorComboBox colorCombo;
- private System.Windows.Forms.Label lblColor;
+ public ResourceEditors.GeometryStyleEditors.ColorComboBox colorCombo;
+ public Label lblColor;
private System.Windows.Forms.Label lblThickness;
private System.Windows.Forms.Label lblFill;
public System.Windows.Forms.CheckBox displayLine;
@@ -81,112 +81,110 @@
/// </summary>
private void InitializeComponent()
{
- System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(LineStyleEditor));
- this.colorCombo = new ResourceEditors.GeometryStyleEditors.ColorComboBox();
- this.fillCombo = new ResourceEditors.GeometryStyleEditors.ImageStylePicker();
- this.lblColor = new System.Windows.Forms.Label();
- this.lblThickness = new System.Windows.Forms.Label();
- this.lblFill = new System.Windows.Forms.Label();
- this.displayLine = new System.Windows.Forms.CheckBox();
- this.panel1 = new System.Windows.Forms.Panel();
- this.thicknessUpDown = new System.Windows.Forms.NumericUpDown();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.thicknessUpDown)).BeginInit();
- this.SuspendLayout();
- //
- // colorCombo
- //
- this.colorCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.colorCombo = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
+ this.fillCombo = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ImageStylePicker();
+ this.lblColor = new System.Windows.Forms.Label();
+ this.lblThickness = new System.Windows.Forms.Label();
+ this.lblFill = new System.Windows.Forms.Label();
+ this.displayLine = new System.Windows.Forms.CheckBox();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.thicknessUpDown = new System.Windows.Forms.NumericUpDown();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.thicknessUpDown)).BeginInit();
+ this.SuspendLayout();
+ //
+ // colorCombo
+ //
+ this.colorCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.colorCombo.Location = new System.Drawing.Point(120, 64);
+ this.colorCombo.Name = "colorCombo";
+ this.colorCombo.Size = new System.Drawing.Size(312, 21);
+ this.colorCombo.TabIndex = 11;
+ //
+ // fillCombo
+ //
+ this.fillCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.fillCombo.DisplayMember = "Name";
+ this.fillCombo.Location = new System.Drawing.Point(120, 0);
+ this.fillCombo.Name = "fillCombo";
+ this.fillCombo.Size = new System.Drawing.Size(312, 21);
+ this.fillCombo.TabIndex = 9;
+ this.fillCombo.TextWidth = 40;
+ this.fillCombo.ValueMember = "Name";
+ //
+ // lblColor
+ //
+ this.lblColor.Location = new System.Drawing.Point(0, 64);
+ this.lblColor.Name = "lblColor";
+ this.lblColor.Size = new System.Drawing.Size(96, 16);
+ this.lblColor.TabIndex = 8;
+ this.lblColor.Text = "Color";
+ //
+ // lblThickness
+ //
+ this.lblThickness.Location = new System.Drawing.Point(0, 32);
+ this.lblThickness.Name = "lblThickness";
+ this.lblThickness.Size = new System.Drawing.Size(96, 16);
+ this.lblThickness.TabIndex = 7;
+ this.lblThickness.Text = "Thickness";
+ //
+ // lblFill
+ //
+ this.lblFill.Location = new System.Drawing.Point(0, 8);
+ this.lblFill.Name = "lblFill";
+ this.lblFill.Size = new System.Drawing.Size(96, 16);
+ this.lblFill.TabIndex = 6;
+ this.lblFill.Text = "Line style";
+ //
+ // displayLine
+ //
+ this.displayLine.Checked = true;
+ this.displayLine.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.displayLine.Dock = System.Windows.Forms.DockStyle.Top;
+ this.displayLine.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.displayLine.Location = new System.Drawing.Point(0, 0);
+ this.displayLine.Name = "displayLine";
+ this.displayLine.Size = new System.Drawing.Size(432, 16);
+ this.displayLine.TabIndex = 14;
+ this.displayLine.Text = "Display edge";
+ this.displayLine.CheckedChanged += new System.EventHandler(this.displayLine_CheckedChanged);
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.thicknessUpDown);
+ this.panel1.Controls.Add(this.fillCombo);
+ this.panel1.Controls.Add(this.lblColor);
+ this.panel1.Controls.Add(this.lblThickness);
+ this.panel1.Controls.Add(this.lblFill);
+ this.panel1.Controls.Add(this.colorCombo);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Location = new System.Drawing.Point(0, 16);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(432, 88);
+ this.panel1.TabIndex = 15;
+ //
+ // thicknessUpDown
+ //
+ this.thicknessUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.thicknessUpDown.Location = new System.Drawing.Point(120, 32);
+ this.thicknessUpDown.Name = "thicknessUpDown";
+ this.thicknessUpDown.Size = new System.Drawing.Size(312, 20);
+ this.thicknessUpDown.TabIndex = 12;
+ //
+ // LineStyleEditor
+ //
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.displayLine);
+ this.Name = "LineStyleEditor";
+ this.Size = new System.Drawing.Size(432, 104);
+ this.Load += new System.EventHandler(this.LineStyleEditor_Load);
+ this.panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.thicknessUpDown)).EndInit();
+ this.ResumeLayout(false);
- this.colorCombo.Location = new System.Drawing.Point(120, 64);
- this.colorCombo.Name = "colorCombo";
- this.colorCombo.Size = new System.Drawing.Size(312, 21);
- this.colorCombo.TabIndex = 11;
- //
- // fillCombo
- //
- this.fillCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.fillCombo.DisplayMember = "Name";
- this.fillCombo.Location = new System.Drawing.Point(120, 0);
- this.fillCombo.Name = "fillCombo";
- this.fillCombo.Size = new System.Drawing.Size(312, 21);
- this.fillCombo.TabIndex = 9;
- this.fillCombo.TextWidth = 40;
- this.fillCombo.ValueMember = "Name";
- //
- // lblColor
- //
- this.lblColor.Location = new System.Drawing.Point(0, 64);
- this.lblColor.Name = "lblColor";
- this.lblColor.Size = new System.Drawing.Size(96, 16);
- this.lblColor.TabIndex = 8;
- this.lblColor.Text = "Color";
- //
- // lblThickness
- //
- this.lblThickness.Location = new System.Drawing.Point(0, 32);
- this.lblThickness.Name = "lblThickness";
- this.lblThickness.Size = new System.Drawing.Size(96, 16);
- this.lblThickness.TabIndex = 7;
- this.lblThickness.Text = "Thickness";
- //
- // lblFill
- //
- this.lblFill.Location = new System.Drawing.Point(0, 8);
- this.lblFill.Name = "lblFill";
- this.lblFill.Size = new System.Drawing.Size(96, 16);
- this.lblFill.TabIndex = 6;
- this.lblFill.Text = "Line style";
- //
- // displayLine
- //
- this.displayLine.Checked = true;
- this.displayLine.CheckState = System.Windows.Forms.CheckState.Checked;
- this.displayLine.Dock = System.Windows.Forms.DockStyle.Top;
- this.displayLine.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.displayLine.Location = new System.Drawing.Point(0, 0);
- this.displayLine.Name = "displayLine";
- this.displayLine.Size = new System.Drawing.Size(432, 16);
- this.displayLine.TabIndex = 14;
- this.displayLine.Text = "Display edge";
- this.displayLine.CheckedChanged += new System.EventHandler(this.displayLine_CheckedChanged);
- //
- // panel1
- //
- this.panel1.Controls.Add(this.thicknessUpDown);
- this.panel1.Controls.Add(this.fillCombo);
- this.panel1.Controls.Add(this.lblColor);
- this.panel1.Controls.Add(this.lblThickness);
- this.panel1.Controls.Add(this.lblFill);
- this.panel1.Controls.Add(this.colorCombo);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Location = new System.Drawing.Point(0, 16);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(432, 88);
- this.panel1.TabIndex = 15;
- //
- // thicknessUpDown
- //
- this.thicknessUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.thicknessUpDown.Location = new System.Drawing.Point(120, 32);
- this.thicknessUpDown.Name = "thicknessUpDown";
- this.thicknessUpDown.Size = new System.Drawing.Size(312, 20);
- this.thicknessUpDown.TabIndex = 12;
- //
- // LineStyleEditor
- //
- this.Controls.Add(this.panel1);
- this.Controls.Add(this.displayLine);
- this.Name = "LineStyleEditor";
- this.Size = new System.Drawing.Size(432, 104);
- this.Load += new System.EventHandler(this.LineStyleEditor_Load);
- this.panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.thicknessUpDown)).EndInit();
- this.ResumeLayout(false);
-
}
#endregion
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx 2009-11-11 22:06:46 UTC (rev 4343)
@@ -3,7 +3,7 @@
<!--
Microsoft ResX Schema
- Version 1.3
+ 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
@@ -14,16 +14,17 @@
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">1.3</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">this is my long string</data>
+ <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">
- [base64 mime encoded serialized .NET Framework object]
+ <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">
- [base64 mime encoded string representing a byte array form of the .NET Framework object]
+ <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
@@ -35,7 +36,7 @@
Classes that don't support this are serialized and stored with the
mimetype set.
- The mimetype is used forserialized objects, and tells the
+ 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:
@@ -45,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -59,18 +60,37 @@
: 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" msdata:Ordinal="1" />
+ <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">
@@ -89,123 +109,12 @@
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
- <value>1.3</value>
+ <value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="colorCombo.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="colorCombo.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="colorCombo.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Public</value>
- </data>
- <data name="fillCombo.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="fillCombo.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="fillCombo.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Public</value>
- </data>
- <data name="lblColor.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="lblColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblThickness.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="lblThickness.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblThickness.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblFill.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="lblFill.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="lblFill.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="displayLine.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="displayLine.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="displayLine.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Public</value>
- </data>
- <data name="panel1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="panel1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </data>
- <data name="panel1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="panel1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>8, 8</value>
- </data>
- <data name="panel1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </data>
- <data name="panel1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="thicknessUpDown.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="thicknessUpDown.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="thicknessUpDown.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Public</value>
- </data>
- <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </data>
- <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </data>
- <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>80</value>
- </data>
- <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>(Default)</value>
- </data>
- <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="$this.Name">
- <value>LineStyleEditor</value>
- </data>
- <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>8, 8</value>
- </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs 2009-11-11 22:06:46 UTC (rev 4343)
@@ -1388,5 +1388,16 @@
if (Changed != null)
Changed(this, new EventArgs());
}
+
+ internal void SetupForTheming()
+ {
+ fillStyleEditor.foregroundColor.Enabled =
+ lineStyleEditor.lblColor.Enabled =
+ colorFontForeground.Enabled =
+ lblForeground.Enabled =
+ DisplayPoints.Enabled =
+ fillStyleEditor.displayFill.Enabled =
+ false;
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/ConditionListButtons.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/ConditionListButtons.cs 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/ConditionListButtons.cs 2009-11-11 22:06:46 UTC (rev 4343)
@@ -144,24 +144,14 @@
object owner = null;
object item = null;
- //TODO: Would be nice if the user could specify the default styles
if (m_point != null)
- {
owner = m_point;
- item = new PointSymbolization2DType();
- }
else if (m_line != null)
- {
owner = m_line;
- item = new StrokeTypeCollection();
- }
else if (m_area != null)
- {
owner = m_area;
- item = new AreaSymbolizationFillType();
- }
- ThemeCreator dlg = new ThemeCreator(m_owner.Editor, m_owner.Resource as LayerDefinition, m_owner.Schema, owner, item);
+ ThemeCreator dlg = new ThemeCreator(m_owner.Editor, m_owner.Resource as LayerDefinition, m_owner.Schema, owner);
if (dlg.ShowDialog(this) == DialogResult.OK)
{
m_owner.Editor.HasChanged();
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/EditorTemplateForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/EditorTemplateForm.cs 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/EditorTemplateForm.cs 2009-11-11 22:06:46 UTC (rev 4343)
@@ -38,7 +38,7 @@
{
if (ItemPanel.Controls.Count > 0 && ItemPanel.Controls[0] as UserControl != null)
{
- this.Height = ButtonPanel.Height + ItemPanel.Top + (ItemPanel.Controls[0] as UserControl).AutoScrollMinSize.Height + (8 * 4);
+ this.Height = ButtonPanel.Height + ItemPanel.Top + (ItemPanel.Controls[0] as UserControl).AutoScrollMinSize.Height + (8 * 6);
this.Width = Math.Max(this.Width, (ItemPanel.Controls[0] as UserControl).AutoScrollMinSize.Width + 2 * ItemPanel.Left + (8 * 4));
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs 2009-11-11 17:56:07 UTC (rev 4342)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs 2009-11-11 22:06:46 UTC (rev 4343)
@@ -66,15 +66,17 @@
NUMERIC_TYPES = new Type[] { typeof(byte), typeof(int), typeof(float), typeof(double) };
}
- public ThemeCreator(EditorInterface editor, MaestroAPI.LayerDefinition layer, MaestroAPI.FeatureSourceDescription.FeatureSourceSchema schema, object ruleCollection, object defaultItem)
+ public ThemeCreator(EditorInterface editor, MaestroAPI.LayerDefinition layer, MaestroAPI.FeatureSourceDescription.FeatureSourceSchema schema, object ruleCollection)
: this()
{
m_editor = editor;
m_layer = layer;
m_schema = schema;
m_ruleCollection = ruleCollection;
- m_defaultItem = defaultItem;
+ //TODO: Would be nice if the user could specify the default styles
+ PrepareDefaultItem();
+
ColorBrewerColorSet.SetCustomRender(new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.CustomCombo.RenderCustomItem(DrawColorSetPreview));
}
@@ -664,11 +666,17 @@
r.LegendLabel = entry.Label;
if (r.Item.Item == null)
r.Item.Item = new OSGeo.MapGuide.MaestroAPI.MarkSymbolType();
- if (((MaestroAPI.MarkSymbolType)r.Item.Item).Fill == null)
- ((MaestroAPI.MarkSymbolType)r.Item.Item).Fill = new OSGeo.MapGuide.MaestroAPI.FillType();
+ if (r.Item.Item is MaestroAPI.MarkSymbolType)
+ {
+ if (((MaestroAPI.MarkSymbolType)r.Item.Item).Fill == null)
+ ((MaestroAPI.MarkSymbolType)r.Item.Item).Fill = new OSGeo.MapGuide.MaestroAPI.FillType();
+ ((MaestroAPI.MarkSymbolType)r.Item.Item).Fill.ForegroundColor = entry.Color;
+ }
+ else if (r.Item.Item is MaestroAPI.FontSymbolType)
+ {
+ ((MaestroAPI.FontSymbolType)r.Item.Item).ForegroundColor = entry.Color;
+ }
- ((MaestroAPI.MarkSymbolType)r.Item.Item).Fill.BackgroundColor = entry.Color;
-
col.PointRule.Add(r);
}
}
@@ -689,11 +697,6 @@
l.Items.Add(new OSGeo.MapGuide.MaestroAPI.StrokeType());
l.Items[0].Color = entry.Color;
- if (string.IsNullOrEmpty(l.Items[0].LineStyle))
- l.Items[0].LineStyle = "Solid";
- if (string.IsNullOrEmpty(l.Items[0].Thickness))
- l.Items[0].Thickness = "1";
-
col.LineRule.Add(l);
}
}
@@ -712,13 +715,7 @@
r.LegendLabel = entry.Label;
if (r.Item.Fill == null)
r.Item.Fill = new OSGeo.MapGuide.MaestroAPI.FillType();
- if (r.Item.Fill.BackgroundColorAsHTML == null)
- r.Item.Fill.BackgroundColor = Color.Black;
- if (r.Item.Fill.ForegroundColorAsHTML == null)
- r.Item.Fill.ForegroundColor = entry.Color;
- if (string.IsNullOrEmpty(r.Item.Fill.FillPattern))
- r.Item.Fill.FillPattern = "Solid";
-
+ r.Item.Fill.ForegroundColor = entry.Color;
col.AreaRule.Add(r);
}
}
@@ -753,6 +750,64 @@
RefreshPreview();
}
+ private void PrepareDefaultItem()
+ {
+ if (m_ruleCollection is MaestroAPI.PointTypeStyleType)
+ {
+ MaestroAPI.PointSymbolization2DType i = new MaestroAPI.PointSymbolization2DType();
+ MaestroAPI.MarkSymbolType m = new OSGeo.MapGuide.MaestroAPI.MarkSymbolType();
+
+ i.Item = m;
+ m.SizeContext = OSGeo.MapGuide.MaestroAPI.SizeContextType.DeviceUnits;
+ m.SizeX = "10";
+ m.SizeY = "10";
+ m.Rotation = "0";
+ m.Unit = OSGeo.MapGuide.MaestroAPI.LengthUnitType.Points;
+ m.Fill = new OSGeo.MapGuide.MaestroAPI.FillType();
+ m.Fill.FillPattern = "Solid";
+ m.Fill.ForegroundColor = Color.Black;
+ m.Fill.BackgroundColor = Color.Transparent;
+ m.Edge = new OSGeo.MapGuide.MaestroAPI.StrokeType();
+ m.Edge.Color = Color.Black;
+ m.Edge.SizeContext = OSGeo.MapGuide.MaestroAPI.SizeContextType.DeviceUnits;
+ m.Edge.Thickness = "1";
+ m.Edge.Unit = OSGeo.MapGuide.MaestroAPI.LengthUnitType.Points;
+ m.Edge.LineStyle = "Solid";
+
+ m_defaultItem = i;
+ }
+ else if (m_ruleCollection is MaestroAPI.LineTypeStyleType)
+ {
+ MaestroAPI.StrokeTypeCollection i = new OSGeo.MapGuide.MaestroAPI.StrokeTypeCollection();
+ MaestroAPI.StrokeType s = new OSGeo.MapGuide.MaestroAPI.StrokeType();
+ s.Color = Color.Black;
+ s.LineStyle = "Solid";
+ s.SizeContext = OSGeo.MapGuide.MaestroAPI.SizeContextType.DeviceUnits;
+ s.Thickness = "1";
+ s.Unit = OSGeo.MapGuide.MaestroAPI.LengthUnitType.Points;
+
+ i.Add(s);
+
+ m_defaultItem = i;
+ }
+ else if (m_ruleCollection is MaestroAPI.AreaTypeStyleType)
+ {
+ MaestroAPI.AreaSymbolizationFillType i = new MaestroAPI.AreaSymbolizationFillType();
+ i.Fill = new OSGeo.MapGuide.MaestroAPI.FillType();
+ i.Fill.BackgroundColor = Color.Transparent;
+ i.Fill.ForegroundColor = Color.Black;
+ i.Fill.FillPattern = "Solid";
+ i.Stroke = new OSGeo.MapGuide.MaestroAPI.StrokeType();
+ i.Stroke.Color = Color.Black;
+ i.Stroke.LineStyle = "Solid";
+ i.Stroke.SizeContext = OSGeo.MapGuide.MaestroAPI.SizeContextType.DeviceUnits;
+ i.Stroke.Thickness = "1";
+ i.Stroke.Unit = OSGeo.MapGuide.MaestroAPI.LengthUnitType.Points;
+
+ m_defaultItem = i;
+ }
+ }
+
private void ChangeBaseStyleBtn_Click(object sender, EventArgs e)
{
UserControl uc = null;
@@ -760,16 +815,19 @@
{
uc = new GeometryStyleEditors.PointFeatureStyleEditor();
((GeometryStyleEditors.PointFeatureStyleEditor)uc).Item = (MaestroAPI.PointSymbolization2DType)MaestroAPI.Utility.XmlDeepCopy(m_defaultItem);
+ ((GeometryStyleEditors.PointFeatureStyleEditor)uc).SetupForTheming();
}
else if (m_ruleCollection is MaestroAPI.LineTypeStyleType)
{
uc = new GeometryStyleEditors.LineFeatureStyleEditor();
((GeometryStyleEditors.LineFeatureStyleEditor)uc).Item = (MaestroAPI.StrokeTypeCollection)MaestroAPI.Utility.XmlDeepCopy(m_defaultItem);
+ ((GeometryStyleEditors.LineFeatureStyleEditor)uc).SetupForTheming();
}
else if (m_ruleCollection is MaestroAPI.AreaTypeStyleType)
{
uc = new GeometryStyleEditors.AreaFeatureStyleEditor();
((GeometryStyleEditors.AreaFeatureStyleEditor)uc).Item = (MaestroAPI.AreaSymbolizationFillType)MaestroAPI.Utility.XmlDeepCopy(m_defaultItem);
+ ((GeometryStyleEditors.AreaFeatureStyleEditor)uc).SetupForTheming();
}
if (uc != null)
More information about the mapguide-commits
mailing list