[mapguide-commits] r6620 - in
branches/maestro-4.0.x/Maestro.Editors: .
LayerDefinition/Vector/Scales
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue May 8 07:25:05 EDT 2012
Author: jng
Date: 2012-05-08 04:25:05 -0700 (Tue, 08 May 2012)
New Revision: 6620
Added:
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.resx
Modified:
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.resx
branches/maestro-4.0.x/Maestro.Editors/Maestro.Editors.csproj
Log:
Backport #1959 to 4.0.x
Copied: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.Designer.cs (from rev 6618, trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.Designer.cs)
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.Designer.cs (rev 0)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.Designer.cs 2012-05-08 11:25:05 UTC (rev 6620)
@@ -0,0 +1,89 @@
+namespace Maestro.Editors.LayerDefinition.Vector.Scales
+{
+ partial class PointStylePanel
+ {
+ /// <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 Component 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.chkEnable = new System.Windows.Forms.CheckBox();
+ this.chkDisplayAsText = new System.Windows.Forms.CheckBox();
+ this.chkAllowOverpost = new System.Windows.Forms.CheckBox();
+ this.SuspendLayout();
+ //
+ // chkEnable
+ //
+ this.chkEnable.AutoSize = true;
+ this.chkEnable.Location = new System.Drawing.Point(3, 3);
+ this.chkEnable.Name = "chkEnable";
+ this.chkEnable.Size = new System.Drawing.Size(92, 17);
+ this.chkEnable.TabIndex = 0;
+ this.chkEnable.Text = "Display Points";
+ this.chkEnable.UseVisualStyleBackColor = true;
+ this.chkEnable.CheckedChanged += new System.EventHandler(this.chkEnable_CheckedChanged);
+ //
+ // chkDisplayAsText
+ //
+ this.chkDisplayAsText.AutoSize = true;
+ this.chkDisplayAsText.Location = new System.Drawing.Point(114, 3);
+ this.chkDisplayAsText.Name = "chkDisplayAsText";
+ this.chkDisplayAsText.Size = new System.Drawing.Size(99, 17);
+ this.chkDisplayAsText.TabIndex = 1;
+ this.chkDisplayAsText.Text = "Display As Text";
+ this.chkDisplayAsText.UseVisualStyleBackColor = true;
+ this.chkDisplayAsText.CheckedChanged += new System.EventHandler(this.chkDisplayAsText_CheckedChanged);
+ //
+ // chkAllowOverpost
+ //
+ this.chkAllowOverpost.AutoSize = true;
+ this.chkAllowOverpost.Location = new System.Drawing.Point(230, 3);
+ this.chkAllowOverpost.Name = "chkAllowOverpost";
+ this.chkAllowOverpost.Size = new System.Drawing.Size(97, 17);
+ this.chkAllowOverpost.TabIndex = 2;
+ this.chkAllowOverpost.Text = "Allow Overpost";
+ this.chkAllowOverpost.UseVisualStyleBackColor = true;
+ this.chkAllowOverpost.CheckedChanged += new System.EventHandler(this.chkAllowOverpost_CheckedChanged);
+ //
+ // PointStylePanel
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.chkAllowOverpost);
+ this.Controls.Add(this.chkDisplayAsText);
+ this.Controls.Add(this.chkEnable);
+ this.Name = "PointStylePanel";
+ this.Size = new System.Drawing.Size(603, 23);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.CheckBox chkEnable;
+ private System.Windows.Forms.CheckBox chkDisplayAsText;
+ private System.Windows.Forms.CheckBox chkAllowOverpost;
+ }
+}
Copied: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.cs (from rev 6618, trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.cs)
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.cs (rev 0)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.cs 2012-05-08 11:25:05 UTC (rev 6620)
@@ -0,0 +1,111 @@
+#region Disclaimer / License
+// Copyright (C) 2012, 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.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Editors.LayerDefinition.Vector.Scales
+{
+ public partial class PointStylePanel : UserControl
+ {
+ public PointStylePanel()
+ {
+ InitializeComponent();
+ }
+
+ public bool DisplayEnabled
+ {
+ get { return chkEnable.Checked; }
+ set
+ {
+ if (value != chkEnable.Checked)
+ {
+ chkEnable.Checked = value;
+ var h = this.DisplayEnabledChanged;
+ if (h != null)
+ h(this, EventArgs.Empty);
+ }
+ chkDisplayAsText.Enabled = chkAllowOverpost.Enabled = value;
+ }
+ }
+
+ public event EventHandler DisplayEnabledChanged;
+
+ public bool DisplayAsText
+ {
+ get { return chkDisplayAsText.Checked; }
+ set
+ {
+ if (value != chkDisplayAsText.Checked)
+ {
+ chkDisplayAsText.Checked = value;
+ var h = this.DisplayAsTextChanged;
+ if (h != null)
+ h(this, EventArgs.Empty);
+ }
+ }
+ }
+
+ public event EventHandler DisplayAsTextChanged;
+
+ public bool AllowOverpost
+ {
+ get { return chkAllowOverpost.Checked; }
+ set
+ {
+ if (value != chkAllowOverpost.Checked)
+ {
+ chkAllowOverpost.Checked = value;
+ var h = this.AllowOverpostChanged;
+ if (h != null)
+ h(this, EventArgs.Empty);
+ }
+ }
+ }
+
+ public event EventHandler AllowOverpostChanged;
+
+ private void chkEnable_CheckedChanged(object sender, EventArgs e)
+ {
+ chkDisplayAsText.Enabled = chkAllowOverpost.Enabled = chkEnable.Checked;
+ var h = this.DisplayEnabledChanged;
+ if (h != null)
+ h(this, EventArgs.Empty);
+ }
+
+ private void chkDisplayAsText_CheckedChanged(object sender, EventArgs e)
+ {
+ var h = this.DisplayAsTextChanged;
+ if (h != null)
+ h(this, EventArgs.Empty);
+ }
+
+ private void chkAllowOverpost_CheckedChanged(object sender, EventArgs e)
+ {
+ var h = this.AllowOverpostChanged;
+ if (h != null)
+ h(this, EventArgs.Empty);
+ }
+ }
+}
Copied: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.resx (from rev 6618, trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.resx)
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.resx (rev 0)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/PointStylePanel.resx 2012-05-08 11:25:05 UTC (rev 6620)
@@ -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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.Designer.cs 2012-05-08 11:22:36 UTC (rev 6619)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.Designer.cs 2012-05-08 11:25:05 UTC (rev 6620)
@@ -29,23 +29,16 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VectorScaleRangeCtrl));
- this.chkPoint = new System.Windows.Forms.CheckBox();
this.chkLine = new System.Windows.Forms.CheckBox();
this.chkArea = new System.Windows.Forms.CheckBox();
this.chkComposite = new System.Windows.Forms.CheckBox();
+ this.compList = new Maestro.Editors.LayerDefinition.Vector.Scales.CompositeStyleListCtrl();
this.areaList = new Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons();
this.lineList = new Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons();
this.pointList = new Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons();
- this.compList = new Maestro.Editors.LayerDefinition.Vector.Scales.CompositeStyleListCtrl();
+ this.pointStylePanel = new Maestro.Editors.LayerDefinition.Vector.Scales.PointStylePanel();
this.SuspendLayout();
//
- // chkPoint
- //
- resources.ApplyResources(this.chkPoint, "chkPoint");
- this.chkPoint.Name = "chkPoint";
- this.chkPoint.UseVisualStyleBackColor = true;
- this.chkPoint.CheckedChanged += new System.EventHandler(this.chkPoint_CheckedChanged);
- //
// chkLine
//
resources.ApplyResources(this.chkLine, "chkLine");
@@ -67,6 +60,11 @@
this.chkComposite.UseVisualStyleBackColor = true;
this.chkComposite.CheckedChanged += new System.EventHandler(this.chkComposite_CheckedChanged);
//
+ // compList
+ //
+ resources.ApplyResources(this.compList, "compList");
+ this.compList.Name = "compList";
+ //
// areaList
//
resources.ApplyResources(this.areaList, "areaList");
@@ -85,10 +83,10 @@
this.pointList.Name = "pointList";
this.pointList.ItemChanged += new System.EventHandler(this.OnItemChanged);
//
- // compList
+ // pointStylePanel
//
- resources.ApplyResources(this.compList, "compList");
- this.compList.Name = "compList";
+ resources.ApplyResources(this.pointStylePanel, "pointStylePanel");
+ this.pointStylePanel.Name = "pointStylePanel";
//
// VectorScaleRangeCtrl
//
@@ -100,7 +98,7 @@
this.Controls.Add(this.lineList);
this.Controls.Add(this.chkLine);
this.Controls.Add(this.pointList);
- this.Controls.Add(this.chkPoint);
+ this.Controls.Add(this.pointStylePanel);
this.Name = "VectorScaleRangeCtrl";
resources.ApplyResources(this, "$this");
this.ResumeLayout(false);
@@ -109,7 +107,6 @@
#endregion
- private System.Windows.Forms.CheckBox chkPoint;
private ConditionListButtons pointList;
private System.Windows.Forms.CheckBox chkLine;
private ConditionListButtons lineList;
@@ -117,6 +114,7 @@
private ConditionListButtons areaList;
private System.Windows.Forms.CheckBox chkComposite;
private CompositeStyleListCtrl compList;
+ private PointStylePanel pointStylePanel;
}
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs 2012-05-08 11:22:36 UTC (rev 6619)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs 2012-05-08 11:25:05 UTC (rev 6620)
@@ -44,6 +44,10 @@
public VectorScaleRangeCtrl(IVectorScaleRange vsr, VectorLayerStyleSectionCtrl parent)
{
InitializeComponent();
+ //WTF: These events don't show in the designer! So bind them here
+ pointStylePanel.DisplayEnabledChanged += new EventHandler(OnPointDisplayEnabledChanged);
+ pointStylePanel.DisplayAsTextChanged += new EventHandler(OnPointDisplayAsTextChanged);
+ pointStylePanel.AllowOverpostChanged += new EventHandler(OnPointAllowOverpostChanged);
_init = true;
try
@@ -55,12 +59,12 @@
_lns = vsr.LineStyle;
_ars = vsr.AreaStyle;
- chkPoint.Checked = true;
+ pointStylePanel.DisplayEnabled = true;
chkLine.Checked = true;
chkArea.Checked = true;
chkComposite.Checked = true;
- chkPoint.Checked = (_pts != null);
+ pointStylePanel.DisplayEnabled = (_pts != null);
chkLine.Checked = (_lns != null);
chkArea.Checked = (_ars != null);
@@ -75,6 +79,9 @@
if (_pts == null)
_pts = parent.Factory.CreateDefaultPointStyle();
+ pointStylePanel.DisplayAsText = _pts.DisplayAsText;
+ pointStylePanel.AllowOverpost = _pts.AllowOverpost;
+
if (_lns == null)
_lns = parent.Factory.CreateDefaultLineStyle();
@@ -122,6 +129,25 @@
}
}
+ void OnPointDisplayEnabledChanged(object sender, EventArgs e)
+ {
+ pointList.Visible = pointStylePanel.DisplayEnabled;
+ if (_init) return;
+
+ _vsr.PointStyle = (pointStylePanel.DisplayEnabled) ? _pts : null;
+ _parent.RaiseResourceChanged();
+ }
+
+ void OnPointAllowOverpostChanged(object sender, EventArgs e)
+ {
+ _pts.AllowOverpost = pointStylePanel.AllowOverpost;
+ }
+
+ void OnPointDisplayAsTextChanged(object sender, EventArgs e)
+ {
+ _pts.DisplayAsText = pointStylePanel.DisplayAsText;
+ }
+
protected override void OnResize(EventArgs e)
{
pointList.ResizeAuto();
@@ -131,15 +157,6 @@
base.OnResize(e);
}
- private void chkPoint_CheckedChanged(object sender, EventArgs e)
- {
- pointList.Visible = chkPoint.Checked;
- if (_init) return;
-
- _vsr.PointStyle = (chkPoint.Checked) ? _pts : null;
- _parent.RaiseResourceChanged();
- }
-
private void chkLine_CheckedChanged(object sender, EventArgs e)
{
lineList.Visible = chkLine.Checked;
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.resx 2012-05-08 11:22:36 UTC (rev 6619)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.resx 2012-05-08 11:25:05 UTC (rev 6620)
@@ -112,50 +112,26 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="chkPoint.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="chkLine.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="chkPoint.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
+ <data name="chkLine.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name="chkPoint.Size" type="System.Drawing.Size, System.Drawing">
- <value>598, 24</value>
- </data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="chkPoint.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name="chkPoint.Text" xml:space="preserve">
- <value>Display Points (Note: Symbol previews only show the symbol. It doesn't consider color overrides or size/rotation settings)</value>
- </data>
- <data name=">>chkPoint.Name" xml:space="preserve">
- <value>chkPoint</value>
- </data>
- <data name=">>chkPoint.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkPoint.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>chkPoint.ZOrder" xml:space="preserve">
- <value>7</value>
- </data>
- <data name="chkLine.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="chkLine.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 121</value>
+ <value>0, 120</value>
</data>
<data name="chkLine.Size" type="System.Drawing.Size, System.Drawing">
<value>598, 24</value>
</data>
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="chkLine.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
@@ -166,7 +142,7 @@
<value>chkLine</value>
</data>
<data name=">>chkLine.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkLine.Parent" xml:space="preserve">
<value>$this</value>
@@ -177,8 +153,11 @@
<data name="chkArea.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
+ <data name="chkArea.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
<data name="chkArea.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 242</value>
+ <value>0, 241</value>
</data>
<data name="chkArea.Size" type="System.Drawing.Size, System.Drawing">
<value>598, 24</value>
@@ -193,7 +172,7 @@
<value>chkArea</value>
</data>
<data name=">>chkArea.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkArea.Parent" xml:space="preserve">
<value>$this</value>
@@ -204,8 +183,11 @@
<data name="chkComposite.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
+ <data name="chkComposite.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
<data name="chkComposite.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 363</value>
+ <value>0, 362</value>
</data>
<data name="chkComposite.Size" type="System.Drawing.Size, System.Drawing">
<value>598, 24</value>
@@ -220,7 +202,7 @@
<value>chkComposite</value>
</data>
<data name=">>chkComposite.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkComposite.Parent" xml:space="preserve">
<value>$this</value>
@@ -228,11 +210,35 @@
<data name=">>chkComposite.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="compList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="compList.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 386</value>
+ </data>
+ <data name="compList.Size" type="System.Drawing.Size, System.Drawing">
+ <value>598, 109</value>
+ </data>
+ <data name="compList.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name=">>compList.Name" xml:space="preserve">
+ <value>compList</value>
+ </data>
+ <data name=">>compList.Type" xml:space="preserve">
+ <value>Maestro.Editors.LayerDefinition.Vector.Scales.CompositeStyleListCtrl, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>compList.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>compList.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="areaList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="areaList.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 266</value>
+ <value>0, 265</value>
</data>
<data name="areaList.Size" type="System.Drawing.Size, System.Drawing">
<value>598, 97</value>
@@ -244,7 +250,7 @@
<value>areaList</value>
</data>
<data name=">>areaList.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=3.5.0.6040, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>areaList.Parent" xml:space="preserve">
<value>$this</value>
@@ -256,7 +262,7 @@
<value>Top</value>
</data>
<data name="lineList.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 145</value>
+ <value>0, 144</value>
</data>
<data name="lineList.Size" type="System.Drawing.Size, System.Drawing">
<value>598, 97</value>
@@ -268,7 +274,7 @@
<value>lineList</value>
</data>
<data name=">>lineList.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=3.5.0.6040, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>lineList.Parent" xml:space="preserve">
<value>$this</value>
@@ -280,7 +286,7 @@
<value>Top</value>
</data>
<data name="pointList.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 24</value>
+ <value>0, 23</value>
</data>
<data name="pointList.Size" type="System.Drawing.Size, System.Drawing">
<value>598, 97</value>
@@ -292,7 +298,7 @@
<value>pointList</value>
</data>
<data name=">>pointList.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=3.5.0.6040, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>pointList.Parent" xml:space="preserve">
<value>$this</value>
@@ -300,31 +306,31 @@
<data name=">>pointList.ZOrder" xml:space="preserve">
<value>6</value>
</data>
- <data name="compList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
+ <data name="pointStylePanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Top</value>
</data>
- <data name="compList.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 387</value>
+ <data name="pointStylePanel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
</data>
- <data name="compList.Size" type="System.Drawing.Size, System.Drawing">
- <value>598, 108</value>
+ <data name="pointStylePanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>598, 23</value>
</data>
- <data name="compList.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
+ <data name="pointStylePanel.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
</data>
- <data name=">>compList.Name" xml:space="preserve">
- <value>compList</value>
+ <data name=">>pointStylePanel.Name" xml:space="preserve">
+ <value>pointStylePanel</value>
</data>
- <data name=">>compList.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.Scales.CompositeStyleListCtrl, Maestro.Editors, Version=3.5.0.6040, Culture=neutral, PublicKeyToken=null</value>
+ <data name=">>pointStylePanel.Type" xml:space="preserve">
+ <value>Maestro.Editors.LayerDefinition.Vector.Scales.PointStylePanel, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
- <data name=">>compList.Parent" xml:space="preserve">
+ <data name=">>pointStylePanel.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>compList.ZOrder" xml:space="preserve">
- <value>0</value>
+ <data name=">>pointStylePanel.ZOrder" xml:space="preserve">
+ <value>7</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
@@ -334,6 +340,6 @@
<value>VectorScaleRangeCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: branches/maestro-4.0.x/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Maestro.Editors.csproj 2012-05-08 11:22:36 UTC (rev 6619)
+++ branches/maestro-4.0.x/Maestro.Editors/Maestro.Editors.csproj 2012-05-08 11:25:05 UTC (rev 6620)
@@ -702,6 +702,12 @@
<Compile Include="LayerDefinition\Vector\Scales\ItemStyle.designer.cs">
<DependentUpon>ItemStyle.cs</DependentUpon>
</Compile>
+ <Compile Include="LayerDefinition\Vector\Scales\PointStylePanel.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="LayerDefinition\Vector\Scales\PointStylePanel.Designer.cs">
+ <DependentUpon>PointStylePanel.cs</DependentUpon>
+ </Compile>
<Compile Include="LayerDefinition\Vector\Scales\SymbolInstanceEditors\ReferenceCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1511,6 +1517,9 @@
<EmbeddedResource Include="LayerDefinition\Vector\Scales\ItemStyle.resx">
<DependentUpon>ItemStyle.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="LayerDefinition\Vector\Scales\PointStylePanel.resx">
+ <DependentUpon>PointStylePanel.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="LayerDefinition\Vector\Scales\SymbolInstanceEditors\ReferenceCtrl.resx">
<DependentUpon>ReferenceCtrl.cs</DependentUpon>
</EmbeddedResource>
More information about the mapguide-commits
mailing list