[mapguide-commits] r5941 - in trunk/Tools/Maestro/Maestro.Editors:
. LayerDefinition LayerDefinition/Vector
LayerDefinition/Vector/Scales Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jun 22 13:13:00 EDT 2011
Author: jng
Date: 2011-06-22 10:13:00 -0700 (Wed, 22 Jun 2011)
New Revision: 5941
Added:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.resx
Removed:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.resx
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
Log:
#1726: Restructure the Layer Definition style editor.
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -45,6 +45,7 @@
private VectorLayerEditorCtrl m_owner;
private IServerConnection _conn;
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public VectorLayerEditorCtrl Owner
{
get { return m_owner; }
@@ -145,6 +146,7 @@
}
}
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public object Item
{
get
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -45,6 +45,7 @@
private VectorLayerEditorCtrl m_owner;
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public VectorLayerEditorCtrl Owner
{
get { return m_owner; }
@@ -81,6 +82,7 @@
SetItemInternal(parent, comp);
}
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public object SelectedItem
{
get { return m_selectedItem; }
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -33,7 +33,7 @@
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
- [ToolboxItem(false)]
+ [ToolboxItem(true)]
internal partial class ConditionListButtons : UserControl
{
private IPointVectorStyle m_point;
@@ -49,6 +49,7 @@
private VectorLayerEditorCtrl m_owner;
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public VectorLayerEditorCtrl Owner
{
get { return m_owner; }
@@ -61,12 +62,13 @@
private ILayerElementFactory _factory;
- internal ConditionListButtons()
+ public ConditionListButtons()
{
- InitializeComponent();
+ this.InitializeComponent();
conditionList.SelectionChanged += new EventHandler(conditionList_SelectionChanged);
}
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal ILayerElementFactory Factory
{
get { return _factory; }
Deleted: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1,192 +0,0 @@
-#region Disclaimer / License
-// Copyright (C) 2009, Kenneth Skovhede
-// http://www.hexad.dk, opensource at hexad.dk
-//
-// 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;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using System.Threading;
-using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
-
-namespace Maestro.Editors.LayerDefinition.Vector.Scales
-{
- //NOTE: Be careful when opening this in the Winforms designer. Chance of designer code fubar is very high!
-
- [ToolboxItem(false)]
- internal partial class ScaleRange : UserControl
- {
- private IVectorScaleRange m_vsc;
- private bool m_isUpdating = false;
-
- public event EventHandler ItemChanged;
-
- private VectorLayerEditorCtrl m_owner;
-
- public bool HasUnsupportedItems { get { return scaleRangeConditions.HasUnsupportedItems; } }
-
- public VectorLayerEditorCtrl Owner
- {
- get { return m_owner; }
- set
- {
- m_owner = value;
- scaleRangeConditions.Owner = m_owner;
- }
- }
-
- private ILayerElementFactory _factory;
-
- internal ILayerElementFactory Factory
- {
- get { return _factory; }
- set
- {
- _factory = value;
- scaleRangeConditions.Factory = value;
- }
- }
-
- public ScaleRange()
- {
- InitializeComponent();
- }
-
- public IVectorScaleRange Item { get { return m_vsc; } }
-
- public void SetItem(IVectorScaleRange vsc)
- {
- try
- {
- m_isUpdating = true;
- m_vsc = vsc;
- MaxScale.Text = m_vsc.MaxScale.HasValue ? m_vsc.MaxScale.Value.ToString(Thread.CurrentThread.CurrentUICulture) : Properties.Resources.InfiniteValue;
- MinScale.Text = m_vsc.MinScale.HasValue ? m_vsc.MinScale.Value.ToString(Thread.CurrentThread.CurrentUICulture) : Properties.Resources.InfiniteValue;
-
- //Check if elevation is supported
- var vsr2 = m_vsc as IVectorScaleRange2;
- btnElevation.Enabled = (vsr2 != null);
-
- scaleRangeConditions.SetItem(m_vsc);
- }
- finally
- {
- m_isUpdating = false;
- }
- }
-
- private void MinScale_SelectedIndexChanged(object sender, EventArgs e)
- {
- if (m_vsc == null || m_isUpdating)
- return;
-
- if (MinScale.SelectedIndex == 0)
- m_vsc.MinScale = null;
-
- if (ItemChanged != null)
- ItemChanged(m_vsc, null);
- }
-
- private void MaxScale_SelectedIndexChanged(object sender, EventArgs e)
- {
- if (m_vsc == null || m_isUpdating)
- return;
-
- if (MaxScale.SelectedIndex == 0)
- m_vsc.MaxScale = null;
-
- if (ItemChanged != null)
- ItemChanged(m_vsc, null);
- }
-
- private void MinScale_TextChanged(object sender, EventArgs e)
- {
- if (m_vsc == null || m_isUpdating)
- return;
-
- double o;
-
- if (double.TryParse(MinScale.Text, System.Globalization.NumberStyles.Number, System.Threading.Thread.CurrentThread.CurrentUICulture, out o))
- {
- m_vsc.MinScale = o;
- errorProvider.SetError(MinScale, null);
- }
- else
- errorProvider.SetError(MinScale, Properties.Resources.InvalidValueError);
-
- if (ItemChanged != null)
- ItemChanged(m_vsc, null);
- }
-
- private void MaxScale_TextChanged(object sender, EventArgs e)
- {
- if (m_vsc == null || m_isUpdating)
- return;
-
- double o;
-
- if (double.TryParse(MaxScale.Text, System.Globalization.NumberStyles.Number, System.Threading.Thread.CurrentThread.CurrentUICulture, out o))
- {
- m_vsc.MaxScale = o;
- errorProvider.SetError(MaxScale, null);
- }
- else
- errorProvider.SetError(MaxScale, Properties.Resources.InvalidValueError);
-
- if (ItemChanged != null)
- ItemChanged(m_vsc, null);
- }
-
- private void scaleRangeConditions_ItemChanged(object sender, EventArgs e)
- {
- if (m_vsc == null || m_isUpdating)
- return;
-
- if (ItemChanged != null)
- ItemChanged(m_vsc, null);
- }
-
- public int GetPreferedHeight()
- {
- return panel2.Height + scaleRangeConditions.GetPreferedHeight();
- }
-
- public void ResizeAuto()
- {
- scaleRangeConditions.ResizeAuto();
- this.Height = this.GetPreferedHeight();
- }
-
- private void btnElevation_Click(object sender, EventArgs e)
- {
- var vsr2 = m_vsc as IVectorScaleRange2;
- if (vsr2 != null)
- {
- if (new ElevationDialog(m_owner.EditorService, vsr2, m_owner.FeatureSourceId, m_owner.Schema, m_owner.GetFdoProvider()).ShowDialog() == DialogResult.OK)
- {
- m_owner.FlagDirty();
- }
- }
- }
- }
-}
Deleted: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.designer.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.designer.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1,120 +0,0 @@
-namespace Maestro.Editors.LayerDefinition.Vector.Scales
-{
- partial class ScaleRange
- {
- /// <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.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScaleRange));
- this.MinScale = new System.Windows.Forms.ComboBox();
- this.MaxScale = new System.Windows.Forms.ComboBox();
- this.panel1 = new System.Windows.Forms.Panel();
- this.btnElevation = new System.Windows.Forms.Button();
- this.panel2 = new System.Windows.Forms.Panel();
- this.scaleRangeConditions = new ScaleRangeConditions();
- this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
- this.SuspendLayout();
- //
- // MinScale
- //
- this.MinScale.FormattingEnabled = true;
- this.MinScale.Items.AddRange(new object[] {
- resources.GetString("MinScale.Items")});
- resources.ApplyResources(this.MinScale, "MinScale");
- this.MinScale.Name = "MinScale";
- this.MinScale.SelectedIndexChanged += new System.EventHandler(this.MinScale_SelectedIndexChanged);
- this.MinScale.TextChanged += new System.EventHandler(this.MinScale_TextChanged);
- //
- // MaxScale
- //
- this.MaxScale.FormattingEnabled = true;
- this.MaxScale.Items.AddRange(new object[] {
- resources.GetString("MaxScale.Items")});
- resources.ApplyResources(this.MaxScale, "MaxScale");
- this.MaxScale.Name = "MaxScale";
- this.MaxScale.SelectedIndexChanged += new System.EventHandler(this.MaxScale_SelectedIndexChanged);
- this.MaxScale.TextChanged += new System.EventHandler(this.MaxScale_TextChanged);
- //
- // panel1
- //
- this.panel1.Controls.Add(this.btnElevation);
- this.panel1.Controls.Add(this.MinScale);
- this.panel1.Controls.Add(this.MaxScale);
- resources.ApplyResources(this.panel1, "panel1");
- this.panel1.Name = "panel1";
- //
- // btnElevation
- //
- this.btnElevation.Image = global::Maestro.Editors.Properties.Resources.ruler;
- resources.ApplyResources(this.btnElevation, "btnElevation");
- this.btnElevation.Name = "btnElevation";
- this.btnElevation.UseVisualStyleBackColor = true;
- this.btnElevation.Click += new System.EventHandler(this.btnElevation_Click);
- //
- // panel2
- //
- resources.ApplyResources(this.panel2, "panel2");
- this.panel2.Name = "panel2";
- //
- // scaleRangeConditions
- //
- resources.ApplyResources(this.scaleRangeConditions, "scaleRangeConditions");
- this.scaleRangeConditions.Name = "scaleRangeConditions";
- this.scaleRangeConditions.Owner = null;
- this.scaleRangeConditions.ItemChanged += new System.EventHandler(this.scaleRangeConditions_ItemChanged);
- //
- // errorProvider
- //
- this.errorProvider.ContainerControl = this;
- //
- // ScaleRange
- //
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.Controls.Add(this.scaleRangeConditions);
- this.Controls.Add(this.panel1);
- this.Controls.Add(this.panel2);
- this.Name = "ScaleRange";
- resources.ApplyResources(this, "$this");
- this.panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private ScaleRangeConditions scaleRangeConditions;
- private System.Windows.Forms.ComboBox MinScale;
- private System.Windows.Forms.ComboBox MaxScale;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Panel panel2;
- private System.Windows.Forms.ErrorProvider errorProvider;
- private System.Windows.Forms.Button btnElevation;
- }
-}
Deleted: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.resx 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.resx 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="MinScale.Items" xml:space="preserve">
- <value>infinite</value>
- </data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="MinScale.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
- </data>
- <data name="MinScale.Size" type="System.Drawing.Size, System.Drawing">
- <value>80, 21</value>
- </data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="MinScale.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name=">>MinScale.Name" xml:space="preserve">
- <value>MinScale</value>
- </data>
- <data name=">>MinScale.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>MinScale.Parent" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>MinScale.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="MaxScale.Items" xml:space="preserve">
- <value>infinite</value>
- </data>
- <data name="MaxScale.Location" type="System.Drawing.Point, System.Drawing">
- <value>80, 0</value>
- </data>
- <data name="MaxScale.Size" type="System.Drawing.Size, System.Drawing">
- <value>80, 21</value>
- </data>
- <data name="MaxScale.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name=">>MaxScale.Name" xml:space="preserve">
- <value>MaxScale</value>
- </data>
- <data name=">>MaxScale.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>MaxScale.Parent" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>MaxScale.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name="btnElevation.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
- <value>MiddleLeft</value>
- </data>
- <data name="btnElevation.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 39</value>
- </data>
- <data name="btnElevation.Size" type="System.Drawing.Size, System.Drawing">
- <value>105, 23</value>
- </data>
- <data name="btnElevation.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
- <data name="btnElevation.Text" xml:space="preserve">
- <value>KML Elevation</value>
- </data>
- <data name="btnElevation.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
- <value>MiddleRight</value>
- </data>
- <data name=">>btnElevation.Name" xml:space="preserve">
- <value>btnElevation</value>
- </data>
- <data name=">>btnElevation.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>btnElevation.Parent" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>btnElevation.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Left</value>
- </data>
- <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
- </data>
- <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
- <value>160, 462</value>
- </data>
- <data name="panel1.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
- <data name=">>panel1.Name" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>panel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>panel1.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>panel1.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Bottom</value>
- </data>
- <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 462</value>
- </data>
- <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
- <value>802, 8</value>
- </data>
- <data name="panel2.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
- </data>
- <data name=">>panel2.Name" xml:space="preserve">
- <value>panel2</value>
- </data>
- <data name=">>panel2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>panel2.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>panel2.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name="scaleRangeConditions.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
- </data>
- <data name="scaleRangeConditions.Location" type="System.Drawing.Point, System.Drawing">
- <value>160, 0</value>
- </data>
- <data name="scaleRangeConditions.Size" type="System.Drawing.Size, System.Drawing">
- <value>642, 462</value>
- </data>
- <data name="scaleRangeConditions.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name=">>scaleRangeConditions.Name" xml:space="preserve">
- <value>scaleRangeConditions</value>
- </data>
- <data name=">>scaleRangeConditions.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.Scales.ScaleRangeConditions, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
- </data>
- <data name=">>scaleRangeConditions.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>scaleRangeConditions.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>802, 470</value>
- </data>
- <data name=">>errorProvider.Name" xml:space="preserve">
- <value>errorProvider</value>
- </data>
- <data name=">>errorProvider.Type" xml:space="preserve">
- <value>System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>$this.Name" xml:space="preserve">
- <value>ScaleRange</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>
- </data>
-</root>
\ No newline at end of file
Deleted: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1,325 +0,0 @@
-#region Disclaimer / License
-// Copyright (C) 2009, Kenneth Skovhede
-// http://www.hexad.dk, opensource at hexad.dk
-//
-// 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;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels;
-
-namespace Maestro.Editors.LayerDefinition.Vector.Scales
-{
- [ToolboxItem(false)]
- internal partial class ScaleRangeConditions: UserControl
- {
- public event EventHandler ItemChanged;
-
- private IVectorScaleRange m_vsc;
- private bool m_isUpdating = false;
- private bool m_hasUnsupportedItems = false;
-
- public bool HasUnsupportedItems { get { return m_hasUnsupportedItems; } }
-
- private VectorLayerEditorCtrl m_owner;
-
- public VectorLayerEditorCtrl Owner
- {
- get { return m_owner; }
- set
- {
- m_owner = value;
- pointConditionList.Owner = m_owner;
- lineConditionList.Owner = m_owner;
- areaConditionList.Owner = m_owner;
- compositeConditionList.Owner = m_owner;
- }
- }
-
- internal ScaleRangeConditions()
- {
- InitializeComponent();
- }
-
- private ILayerElementFactory _factory;
-
- internal ILayerElementFactory Factory
- {
- get { return _factory; }
- set
- {
- _factory = value;
- lineConditionList.Factory = value;
- pointConditionList.Factory = value;
- areaConditionList.Factory = value;
- compositeConditionList.Factory = value;
- }
- }
-
- public void SetItem(IVectorScaleRange vsc)
- {
- try
- {
- m_isUpdating = true;
- m_vsc = vsc;
-
- bool hasPoints = false;
- bool hasLines = false;
- bool hasAreas = false;
- bool hasComposite = false;
- m_hasUnsupportedItems = false;
-
- var ps = m_vsc.PointStyle;
- var ls = m_vsc.LineStyle;
- var ars = m_vsc.AreaStyle;
- ICompositeTypeStyle cs = null;
- var vsr2 = m_vsc as IVectorScaleRange2;
- if (vsr2 != null)
- cs = vsr2.CompositeStyle;
- if (ps != null)
- {
- hasPoints = true;
- pointConditionList.SetItem(m_vsc, ps);
- }
- if (ls != null)
- {
- hasLines = true;
- lineConditionList.SetItem(m_vsc, ls);
- }
- if (ars != null)
- {
- hasAreas = true;
- areaConditionList.SetItem(m_vsc, ars);
- }
- if (cs != null)
- {
- hasComposite = true;
- compositeConditionList.SetItem(vsr2, cs);
- }
-
- m_hasUnsupportedItems = !hasPoints && !hasLines && !hasAreas && !hasComposite;
-
- DisplayPoints.Checked = hasPoints;
- DisplayLines.Checked = hasLines;
- DisplayAreas.Checked = hasAreas;
- DisplayComposite.Checked = hasComposite;
- DisplayComposite.Visible = (vsr2 != null);
- }
- finally
- {
- m_isUpdating = false;
- }
- }
-
- private void DisplayPoints_CheckedChanged(object sender, EventArgs e)
- {
- pointConditionList.Visible = DisplayPoints.Checked;
-
- if (DisplayPoints.Checked)
- {
- if (DisplayPoints.Tag != null)
- {
- m_vsc.PointStyle = (IPointVectorStyle)DisplayPoints.Tag;
- DisplayPoints.Tag = null;
- }
-
- bool hasPoint = m_vsc.PointStyle != null;
-
- if (!hasPoint)
- {
- var pst = _factory.CreateDefaultPointStyle();
- m_vsc.PointStyle = pst;
- pointConditionList.SetItem(m_vsc, pst);
- }
- else
- {
- if (m_vsc.PointStyle.RuleCount == 0)
- pointConditionList.AddRule();
- }
- }
- else
- {
- DisplayPoints.Tag = m_vsc.PointStyle;
- m_vsc.PointStyle = null;
- }
-
- if (!m_isUpdating)
- SignalItemChanged();
- }
-
- private void DisplayLines_CheckedChanged(object sender, EventArgs e)
- {
- lineConditionList.Visible = DisplayLines.Checked;
-
- if (DisplayLines.Checked)
- {
- if (DisplayLines.Tag != null)
- {
- m_vsc.LineStyle = (ILineVectorStyle)DisplayLines.Tag;
- DisplayLines.Tag = null;
- }
-
- bool hasLine = m_vsc.LineStyle != null;
-
- if (!hasLine)
- {
- var ls = _factory.CreateDefaultLineStyle();
- m_vsc.LineStyle = ls;
- lineConditionList.SetItem(m_vsc, ls);
- }
- else
- {
- if (m_vsc.LineStyle.RuleCount == 0)
- lineConditionList.AddRule();
- }
- }
- else
- {
- DisplayLines.Tag = m_vsc.LineStyle;
- m_vsc.LineStyle = null;
- }
-
- if (!m_isUpdating)
- SignalItemChanged();
- }
-
- private void DisplayAreas_CheckedChanged(object sender, EventArgs e)
- {
- areaConditionList.Visible = DisplayAreas.Checked;
-
- if (DisplayAreas.Checked)
- {
- if (DisplayAreas.Tag != null)
- {
- m_vsc.AreaStyle = (IAreaVectorStyle)DisplayAreas.Tag;
- DisplayAreas.Tag = null;
- }
-
- bool hasArea = m_vsc.AreaStyle != null;
-
- if (!hasArea)
- {
- var ast = _factory.CreateDefaultAreaStyle();
- m_vsc.AreaStyle = ast;
- areaConditionList.SetItem(m_vsc, ast);
- }
- else
- {
- if (m_vsc.AreaStyle.RuleCount == 0)
- areaConditionList.AddRule();
- }
- }
- else
- {
- DisplayAreas.Tag = m_vsc.AreaStyle;
- m_vsc.AreaStyle = null;
- }
-
- if (!m_isUpdating)
- SignalItemChanged();
- }
-
- private void DisplayComposite_CheckedChanged(object sender, EventArgs e)
- {
- compositeConditionList.Visible = DisplayComposite.Checked;
- var vsr2 = m_vsc as IVectorScaleRange2;
- if (vsr2 == null)
- return;
-
- if (DisplayComposite.Checked)
- {
- if (DisplayComposite.Tag != null)
- {
- vsr2.CompositeStyle = (ICompositeTypeStyle)DisplayComposite.Tag;
- DisplayComposite.Tag = null;
- }
-
- bool hasComposite = vsr2.CompositeStyle != null;
-
- if (!hasComposite)
- {
- var cst = _factory.CreateDefaultCompositeStyle();
- vsr2.CompositeStyle = cst;
- compositeConditionList.SetItem(vsr2, cst);
- }
- else
- {
- if (vsr2.CompositeStyle.RuleCount == 0)
- compositeConditionList.AddRule();
- }
- }
- else
- {
- DisplayComposite.Tag = vsr2.CompositeStyle;
- vsr2.CompositeStyle = null;
- }
-
- if (!m_isUpdating)
- SignalItemChanged();
- }
-
- private void SignalItemChanged()
- {
- if (ItemChanged != null)
- ItemChanged(m_vsc, null);
- }
-
- private void pointConditionList_ItemChanged(object sender, EventArgs e)
- {
- SignalItemChanged();
- }
-
- private void lineConditionList_ItemChanged(object sender, EventArgs e)
- {
- SignalItemChanged();
- }
-
- private void areaConditionList_ItemChanged(object sender, EventArgs e)
- {
- SignalItemChanged();
- }
-
- public int GetPreferedHeight()
- {
- int minHeight = DisplayPoints.Height + DisplayLines.Height + DisplayAreas.Height + splitter1.Height + splitter2.Height;
-
- if (DisplayPoints.Checked)
- minHeight += pointConditionList.GetPreferedHeight();
- if (DisplayLines.Checked)
- minHeight += lineConditionList.GetPreferedHeight();
- if (DisplayAreas.Checked)
- minHeight += areaConditionList.GetPreferedHeight();
-
- return minHeight;
- }
-
- public void ResizeAuto()
- {
- pointConditionList.ResizeAuto();
- lineConditionList.ResizeAuto();
- areaConditionList.ResizeAuto();
- compositeConditionList.ResizeAuto();
- this.Height = this.GetPreferedHeight();
- }
- }
-}
Deleted: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.designer.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.designer.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1,165 +0,0 @@
-namespace Maestro.Editors.LayerDefinition.Vector.Scales
-{
- partial class ScaleRangeConditions
- {
- /// <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()
- {
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScaleRangeConditions));
- this.DisplayLines = new System.Windows.Forms.CheckBox();
- this.lineConditionList = new ConditionListButtons();
- this.DisplayPoints = new System.Windows.Forms.CheckBox();
- this.pointConditionList = new ConditionListButtons();
- this.DisplayAreas = new System.Windows.Forms.CheckBox();
- this.areaConditionList = new ConditionListButtons();
- this.splitter1 = new System.Windows.Forms.Splitter();
- this.splitter2 = new System.Windows.Forms.Splitter();
- this.splitter3 = new System.Windows.Forms.Splitter();
- this.DisplayComposite = new System.Windows.Forms.CheckBox();
- this.compositeConditionList = new ConditionListButtons();
- this.SuspendLayout();
- //
- // DisplayLines
- //
- resources.ApplyResources(this.DisplayLines, "DisplayLines");
- this.DisplayLines.Checked = true;
- this.DisplayLines.CheckState = System.Windows.Forms.CheckState.Checked;
- this.DisplayLines.Name = "DisplayLines";
- this.DisplayLines.UseVisualStyleBackColor = true;
- this.DisplayLines.CheckedChanged += new System.EventHandler(this.DisplayLines_CheckedChanged);
- //
- // lineConditionList
- //
- resources.ApplyResources(this.lineConditionList, "lineConditionList");
- this.lineConditionList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.lineConditionList.Name = "lineConditionList";
- this.lineConditionList.Owner = null;
- this.lineConditionList.ItemChanged += new System.EventHandler(this.lineConditionList_ItemChanged);
- //
- // DisplayPoints
- //
- resources.ApplyResources(this.DisplayPoints, "DisplayPoints");
- this.DisplayPoints.Checked = true;
- this.DisplayPoints.CheckState = System.Windows.Forms.CheckState.Checked;
- this.DisplayPoints.Name = "DisplayPoints";
- this.DisplayPoints.UseVisualStyleBackColor = true;
- this.DisplayPoints.CheckedChanged += new System.EventHandler(this.DisplayPoints_CheckedChanged);
- //
- // pointConditionList
- //
- resources.ApplyResources(this.pointConditionList, "pointConditionList");
- this.pointConditionList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.pointConditionList.Name = "pointConditionList";
- this.pointConditionList.Owner = null;
- this.pointConditionList.ItemChanged += new System.EventHandler(this.pointConditionList_ItemChanged);
- //
- // DisplayAreas
- //
- resources.ApplyResources(this.DisplayAreas, "DisplayAreas");
- this.DisplayAreas.Checked = true;
- this.DisplayAreas.CheckState = System.Windows.Forms.CheckState.Checked;
- this.DisplayAreas.Name = "DisplayAreas";
- this.DisplayAreas.UseVisualStyleBackColor = true;
- this.DisplayAreas.CheckedChanged += new System.EventHandler(this.DisplayAreas_CheckedChanged);
- //
- // areaConditionList
- //
- resources.ApplyResources(this.areaConditionList, "areaConditionList");
- this.areaConditionList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.areaConditionList.Name = "areaConditionList";
- this.areaConditionList.Owner = null;
- this.areaConditionList.ItemChanged += new System.EventHandler(this.areaConditionList_ItemChanged);
- //
- // splitter1
- //
- resources.ApplyResources(this.splitter1, "splitter1");
- this.splitter1.Name = "splitter1";
- this.splitter1.TabStop = false;
- //
- // splitter2
- //
- resources.ApplyResources(this.splitter2, "splitter2");
- this.splitter2.Name = "splitter2";
- this.splitter2.TabStop = false;
- //
- // splitter3
- //
- resources.ApplyResources(this.splitter3, "splitter3");
- this.splitter3.Name = "splitter3";
- this.splitter3.TabStop = false;
- //
- // DisplayComposite
- //
- resources.ApplyResources(this.DisplayComposite, "DisplayComposite");
- this.DisplayComposite.Checked = true;
- this.DisplayComposite.CheckState = System.Windows.Forms.CheckState.Checked;
- this.DisplayComposite.Name = "DisplayComposite";
- this.DisplayComposite.UseVisualStyleBackColor = true;
- this.DisplayComposite.CheckedChanged += new System.EventHandler(this.DisplayComposite_CheckedChanged);
- //
- // compositeConditionList
- //
- resources.ApplyResources(this.compositeConditionList, "compositeConditionList");
- this.compositeConditionList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.compositeConditionList.Name = "compositeConditionList";
- this.compositeConditionList.Owner = null;
- //
- // ScaleRangeConditions
- //
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.Controls.Add(this.compositeConditionList);
- this.Controls.Add(this.DisplayComposite);
- this.Controls.Add(this.splitter3);
- this.Controls.Add(this.areaConditionList);
- this.Controls.Add(this.DisplayAreas);
- this.Controls.Add(this.splitter2);
- this.Controls.Add(this.lineConditionList);
- this.Controls.Add(this.DisplayLines);
- this.Controls.Add(this.splitter1);
- this.Controls.Add(this.pointConditionList);
- this.Controls.Add(this.DisplayPoints);
- this.Name = "ScaleRangeConditions";
- resources.ApplyResources(this, "$this");
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.CheckBox DisplayLines;
- private ConditionListButtons lineConditionList;
- private ConditionListButtons pointConditionList;
- private System.Windows.Forms.CheckBox DisplayPoints;
- private ConditionListButtons areaConditionList;
- private System.Windows.Forms.CheckBox DisplayAreas;
- private System.Windows.Forms.Splitter splitter1;
- private System.Windows.Forms.Splitter splitter2;
- private System.Windows.Forms.Splitter splitter3;
- private System.Windows.Forms.CheckBox DisplayComposite;
- private ConditionListButtons compositeConditionList;
- }
-}
Deleted: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.resx 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.resx 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="DisplayLines.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="DisplayLines.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="DisplayLines.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 113</value>
- </data>
- <data name="DisplayLines.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 17</value>
- </data>
- <data name="DisplayLines.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
- </data>
- <data name="DisplayLines.Text" xml:space="preserve">
- <value>Display lines</value>
- </data>
- <data name=">>DisplayLines.Name" xml:space="preserve">
- <value>DisplayLines</value>
- </data>
- <data name=">>DisplayLines.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=">>DisplayLines.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>DisplayLines.ZOrder" xml:space="preserve">
- <value>7</value>
- </data>
- <data name="lineConditionList.AutoScroll" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="lineConditionList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="lineConditionList.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 130</value>
- </data>
- <data name="lineConditionList.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 88</value>
- </data>
- <data name="lineConditionList.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
- <data name=">>lineConditionList.Name" xml:space="preserve">
- <value>lineConditionList</value>
- </data>
- <data name=">>lineConditionList.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
- </data>
- <data name=">>lineConditionList.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>lineConditionList.ZOrder" xml:space="preserve">
- <value>6</value>
- </data>
- <data name="DisplayPoints.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="DisplayPoints.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="DisplayPoints.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
- </data>
- <data name="DisplayPoints.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 17</value>
- </data>
- <data name="DisplayPoints.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
- </data>
- <data name="DisplayPoints.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=">>DisplayPoints.Name" xml:space="preserve">
- <value>DisplayPoints</value>
- </data>
- <data name=">>DisplayPoints.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>DisplayPoints.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>DisplayPoints.ZOrder" xml:space="preserve">
- <value>10</value>
- </data>
- <data name="pointConditionList.AutoScroll" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="pointConditionList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="pointConditionList.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 17</value>
- </data>
- <data name="pointConditionList.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 88</value>
- </data>
- <data name="pointConditionList.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
- <data name=">>pointConditionList.Name" xml:space="preserve">
- <value>pointConditionList</value>
- </data>
- <data name=">>pointConditionList.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
- </data>
- <data name=">>pointConditionList.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>pointConditionList.ZOrder" xml:space="preserve">
- <value>9</value>
- </data>
- <data name="DisplayAreas.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="DisplayAreas.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="DisplayAreas.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 226</value>
- </data>
- <data name="DisplayAreas.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 17</value>
- </data>
- <data name="DisplayAreas.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
- </data>
- <data name="DisplayAreas.Text" xml:space="preserve">
- <value>Display areas</value>
- </data>
- <data name=">>DisplayAreas.Name" xml:space="preserve">
- <value>DisplayAreas</value>
- </data>
- <data name=">>DisplayAreas.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=">>DisplayAreas.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>DisplayAreas.ZOrder" xml:space="preserve">
- <value>4</value>
- </data>
- <data name="areaConditionList.AutoScroll" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="areaConditionList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="areaConditionList.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 243</value>
- </data>
- <data name="areaConditionList.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 91</value>
- </data>
- <data name="areaConditionList.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
- <data name=">>areaConditionList.Name" xml:space="preserve">
- <value>areaConditionList</value>
- </data>
- <data name=">>areaConditionList.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
- </data>
- <data name=">>areaConditionList.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>areaConditionList.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
- <data name="splitter1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="splitter1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 105</value>
- </data>
- <data name="splitter1.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 8</value>
- </data>
- <data name="splitter1.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
- </data>
- <data name=">>splitter1.Name" xml:space="preserve">
- <value>splitter1</value>
- </data>
- <data name=">>splitter1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Splitter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>splitter1.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>splitter1.ZOrder" xml:space="preserve">
- <value>8</value>
- </data>
- <data name="splitter2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="splitter2.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 218</value>
- </data>
- <data name="splitter2.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 8</value>
- </data>
- <data name="splitter2.TabIndex" type="System.Int32, mscorlib">
- <value>12</value>
- </data>
- <data name=">>splitter2.Name" xml:space="preserve">
- <value>splitter2</value>
- </data>
- <data name=">>splitter2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Splitter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>splitter2.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>splitter2.ZOrder" xml:space="preserve">
- <value>5</value>
- </data>
- <data name="splitter3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="splitter3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="splitter3.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 334</value>
- </data>
- <data name="splitter3.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 8</value>
- </data>
- <data name="splitter3.TabIndex" type="System.Int32, mscorlib">
- <value>13</value>
- </data>
- <data name=">>splitter3.Name" xml:space="preserve">
- <value>splitter3</value>
- </data>
- <data name=">>splitter3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Splitter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>splitter3.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>splitter3.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name="DisplayComposite.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="DisplayComposite.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="DisplayComposite.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="DisplayComposite.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 342</value>
- </data>
- <data name="DisplayComposite.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 17</value>
- </data>
- <data name="DisplayComposite.TabIndex" type="System.Int32, mscorlib">
- <value>14</value>
- </data>
- <data name="DisplayComposite.Text" xml:space="preserve">
- <value>Display composite styles</value>
- </data>
- <data name=">>DisplayComposite.Name" xml:space="preserve">
- <value>DisplayComposite</value>
- </data>
- <data name=">>DisplayComposite.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=">>DisplayComposite.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>DisplayComposite.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="compositeConditionList.AutoScroll" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="compositeConditionList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="compositeConditionList.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 359</value>
- </data>
- <data name="compositeConditionList.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 99</value>
- </data>
- <data name="compositeConditionList.TabIndex" type="System.Int32, mscorlib">
- <value>15</value>
- </data>
- <data name=">>compositeConditionList.Name" xml:space="preserve">
- <value>compositeConditionList</value>
- </data>
- <data name=">>compositeConditionList.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionListButtons, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
- </data>
- <data name=">>compositeConditionList.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>compositeConditionList.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>597, 458</value>
- </data>
- <data name=">>$this.Name" xml:space="preserve">
- <value>ScaleRangeConditions</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>
- </data>
-</root>
\ No newline at end of file
Deleted: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1,151 +0,0 @@
-#region Disclaimer / License
-// Copyright (C) 2009, Kenneth Skovhede
-// http://www.hexad.dk, opensource at hexad.dk
-//
-// 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;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.LayerDefinition.Vector.Scales;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Editors.LayerDefinition;
-
-namespace OSGeo.MapGuide.Maestro.ResourceEditors.LayerEditorControls.ScaleControls
-{
- [ToolboxItem(false)]
- internal partial class ScaleRangeList : UserControl
- {
- private IVectorLayerDefinition m_vldef;
- public event EventHandler ItemChanged;
- public event EventHandler SelectionChanged;
- private IVectorScaleRange m_selectedItem;
- private VectorLayerEditorCtrl m_owner;
-
- public bool HasUnsupportedItems
- {
- get
- {
- foreach (ScaleRange sr in this.ControlList.Controls)
- if (sr.HasUnsupportedItems)
- return true;
-
- return false;
- }
- }
-
- public VectorLayerEditorCtrl Owner
- {
- get { return m_owner; }
- set
- {
- m_owner = value;
- foreach (ScaleRange sr in this.ControlList.Controls)
- sr.Owner = m_owner;
- }
- }
-
- public ScaleRangeList()
- {
- m_selectedItem = null;
- InitializeComponent();
- }
-
- public IVectorLayerDefinition Item
- {
- get { return m_vldef; }
- }
-
- public void SetItem(IVectorLayerDefinition vldef)
- {
- ControlList.Controls.Clear();
- m_vldef = vldef;
-
- foreach (IVectorScaleRange sc in m_vldef.VectorScaleRange)
- AddScaleRange(sc);
- }
-
- public IVectorScaleRange SelectedItem
- {
- get
- {
- return m_selectedItem;
- }
- }
-
- public ScaleRange AddScaleRange(IVectorScaleRange sc)
- {
- ScaleRange sr = new ScaleRange();
- sr.Factory = (ILayerElementFactory)m_owner.Editor.GetEditedResource();
- sr.Owner = m_owner;
- sr.SetItem(sc);
- sr.Dock = DockStyle.Top;
- ControlList.Controls.Add(sr);
- sr.BringToFront();
- sr.ItemChanged += new EventHandler(Scale_ItemChanged);
- sr.Enter += new EventHandler(Scale_Enter);
- sr.Leave += new EventHandler(Scale_Leave);
- return sr;
- }
-
- void Scale_Leave(object sender, EventArgs e)
- {
- m_selectedItem = null;
- if (SelectionChanged != null)
- SelectionChanged(this, null);
-
- if (sender as ScaleRange != null)
- (sender as ScaleRange).BackColor = SystemColors.Control;
- }
-
- void Scale_Enter(object sender, EventArgs e)
- {
- m_selectedItem = sender as ScaleRange == null ? null : (sender as ScaleRange).Item;
- if (SelectionChanged != null)
- SelectionChanged(this, null);
-
- if (sender as ScaleRange != null)
- (sender as ScaleRange).BackColor = Color.FromArgb(Math.Min(SystemColors.Control.R + 20, 255), Math.Min(SystemColors.Control.G + 20, 255), Math.Min(SystemColors.Control.B + 20, 255));
- }
-
- void Scale_ItemChanged(object sender, EventArgs e)
- {
- if (ItemChanged != null)
- ItemChanged(m_vldef, null);
- }
-
- public void RemoveScaleRange(IVectorScaleRange sc)
- {
- foreach(ScaleRange sr in ControlList.Controls)
- if (sr.Item == sc)
- {
- ControlList.Controls.Remove(sr);
- break;
- }
- }
-
- public void ResizeAuto()
- {
- foreach (ScaleRange sr in ControlList.Controls)
- sr.ResizeAuto();
- }
- }
-}
Deleted: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.designer.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.designer.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1,89 +0,0 @@
-namespace OSGeo.MapGuide.Maestro.ResourceEditors.LayerEditorControls.ScaleControls
-{
- partial class ScaleRangeList
- {
- /// <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()
- {
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScaleRangeList));
- this.panel1 = new System.Windows.Forms.Panel();
- this.label3 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.ControlList = new System.Windows.Forms.Panel();
- this.panel1.SuspendLayout();
- this.SuspendLayout();
- //
- // panel1
- //
- this.panel1.Controls.Add(this.label3);
- this.panel1.Controls.Add(this.label2);
- this.panel1.Controls.Add(this.label1);
- resources.ApplyResources(this.panel1, "panel1");
- this.panel1.Name = "panel1";
- //
- // label3
- //
- resources.ApplyResources(this.label3, "label3");
- this.label3.Name = "label3";
- //
- // label2
- //
- resources.ApplyResources(this.label2, "label2");
- this.label2.Name = "label2";
- //
- // label1
- //
- resources.ApplyResources(this.label1, "label1");
- this.label1.Name = "label1";
- //
- // ControlList
- //
- resources.ApplyResources(this.ControlList, "ControlList");
- this.ControlList.Name = "ControlList";
- //
- // ScaleRangeList
- //
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.Controls.Add(this.ControlList);
- this.Controls.Add(this.panel1);
- this.Name = "ScaleRangeList";
- resources.ApplyResources(this, "$this");
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Panel ControlList;
- }
-}
Deleted: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.resx 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.resx 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="label3.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
- <value>160, 8</value>
- </data>
- <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
- <value>90, 13</value>
- </data>
- <data name="label3.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name="label3.Text" xml:space="preserve">
- <value>Display properties</value>
- </data>
- <data name=">>label3.Name" xml:space="preserve">
- <value>label3</value>
- </data>
- <data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label3.Parent" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>label3.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="label2.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
- <value>80, 8</value>
- </data>
- <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>51, 13</value>
- </data>
- <data name="label2.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name="label2.Text" xml:space="preserve">
- <value>Maximum</value>
- </data>
- <data name=">>label2.Name" xml:space="preserve">
- <value>label2</value>
- </data>
- <data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label2.Parent" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>label2.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="label1.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 8</value>
- </data>
- <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
- <value>48, 13</value>
- </data>
- <data name="label1.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name="label1.Text" xml:space="preserve">
- <value>Minimum</value>
- </data>
- <data name=">>label1.Name" xml:space="preserve">
- <value>label1</value>
- </data>
- <data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label1.Parent" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>label1.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
- </data>
- <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
- <value>790, 24</value>
- </data>
- <data name="panel1.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name=">>panel1.Name" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>panel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>panel1.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>panel1.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="ControlList.AutoScroll" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="ControlList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
- </data>
- <data name="ControlList.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 24</value>
- </data>
- <data name="ControlList.Size" type="System.Drawing.Size, System.Drawing">
- <value>790, 511</value>
- </data>
- <data name="ControlList.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name=">>ControlList.Name" xml:space="preserve">
- <value>ControlList</value>
- </data>
- <data name=">>ControlList.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>ControlList.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>ControlList.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>790, 535</value>
- </data>
- <data name=">>$this.Name" xml:space="preserve">
- <value>ScaleRangeList</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>
- </data>
-</root>
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.Designer.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -0,0 +1,153 @@
+namespace Maestro.Editors.LayerDefinition.Vector.Scales
+{
+ partial class VectorScaleRangeCtrl
+ {
+ /// <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.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.ConditionListButtons();
+ 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.SuspendLayout();
+ //
+ // chkPoint
+ //
+ this.chkPoint.Dock = System.Windows.Forms.DockStyle.Top;
+ this.chkPoint.Location = new System.Drawing.Point(0, 0);
+ this.chkPoint.Name = "chkPoint";
+ this.chkPoint.Size = new System.Drawing.Size(598, 24);
+ this.chkPoint.TabIndex = 0;
+ this.chkPoint.Text = "Display Points (Note: Symbol previews only show the symbol. It doesn\'t consider c" +
+ "olor overrides or size/rotation settings)";
+ this.chkPoint.UseVisualStyleBackColor = true;
+ this.chkPoint.CheckedChanged += new System.EventHandler(this.chkPoint_CheckedChanged);
+ //
+ // chkLine
+ //
+ this.chkLine.Dock = System.Windows.Forms.DockStyle.Top;
+ this.chkLine.Location = new System.Drawing.Point(0, 121);
+ this.chkLine.Name = "chkLine";
+ this.chkLine.Size = new System.Drawing.Size(598, 24);
+ this.chkLine.TabIndex = 2;
+ this.chkLine.Text = "Display Lines";
+ this.chkLine.UseVisualStyleBackColor = true;
+ this.chkLine.CheckedChanged += new System.EventHandler(this.chkLine_CheckedChanged);
+ //
+ // chkArea
+ //
+ this.chkArea.Dock = System.Windows.Forms.DockStyle.Top;
+ this.chkArea.Location = new System.Drawing.Point(0, 242);
+ this.chkArea.Name = "chkArea";
+ this.chkArea.Size = new System.Drawing.Size(598, 24);
+ this.chkArea.TabIndex = 4;
+ this.chkArea.Text = "Display Areas";
+ this.chkArea.UseVisualStyleBackColor = true;
+ this.chkArea.CheckedChanged += new System.EventHandler(this.chkArea_CheckedChanged);
+ //
+ // chkComposite
+ //
+ this.chkComposite.Dock = System.Windows.Forms.DockStyle.Top;
+ this.chkComposite.Location = new System.Drawing.Point(0, 363);
+ this.chkComposite.Name = "chkComposite";
+ this.chkComposite.Size = new System.Drawing.Size(598, 24);
+ this.chkComposite.TabIndex = 6;
+ this.chkComposite.Text = "Display Composite";
+ this.chkComposite.UseVisualStyleBackColor = true;
+ this.chkComposite.CheckedChanged += new System.EventHandler(this.chkComposite_CheckedChanged);
+ //
+ // compList
+ //
+ this.compList.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.compList.Location = new System.Drawing.Point(0, 387);
+ this.compList.Name = "compList";
+ this.compList.Size = new System.Drawing.Size(598, 108);
+ this.compList.TabIndex = 7;
+ this.compList.ItemChanged += new System.EventHandler(this.OnItemChanged);
+ //
+ // areaList
+ //
+ this.areaList.Dock = System.Windows.Forms.DockStyle.Top;
+ this.areaList.Location = new System.Drawing.Point(0, 266);
+ this.areaList.Name = "areaList";
+ this.areaList.Size = new System.Drawing.Size(598, 97);
+ this.areaList.TabIndex = 5;
+ this.areaList.ItemChanged += new System.EventHandler(this.OnItemChanged);
+ //
+ // lineList
+ //
+ this.lineList.Dock = System.Windows.Forms.DockStyle.Top;
+ this.lineList.Location = new System.Drawing.Point(0, 145);
+ this.lineList.Name = "lineList";
+ this.lineList.Size = new System.Drawing.Size(598, 97);
+ this.lineList.TabIndex = 3;
+ this.lineList.ItemChanged += new System.EventHandler(this.OnItemChanged);
+ //
+ // pointList
+ //
+ this.pointList.Dock = System.Windows.Forms.DockStyle.Top;
+ this.pointList.Location = new System.Drawing.Point(0, 24);
+ this.pointList.Name = "pointList";
+ this.pointList.Size = new System.Drawing.Size(598, 97);
+ this.pointList.TabIndex = 1;
+ this.pointList.ItemChanged += new System.EventHandler(this.OnItemChanged);
+ //
+ // VectorScaleRangeCtrl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.compList);
+ this.Controls.Add(this.chkComposite);
+ this.Controls.Add(this.areaList);
+ this.Controls.Add(this.chkArea);
+ this.Controls.Add(this.lineList);
+ this.Controls.Add(this.chkLine);
+ this.Controls.Add(this.pointList);
+ this.Controls.Add(this.chkPoint);
+ this.Name = "VectorScaleRangeCtrl";
+ this.Size = new System.Drawing.Size(598, 495);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.CheckBox chkPoint;
+ private ConditionListButtons pointList;
+ private System.Windows.Forms.CheckBox chkLine;
+ private ConditionListButtons lineList;
+ private System.Windows.Forms.CheckBox chkArea;
+ private ConditionListButtons areaList;
+ private System.Windows.Forms.CheckBox chkComposite;
+ private ConditionListButtons compList;
+
+
+ }
+}
Added: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -0,0 +1,171 @@
+#region Disclaimer / License
+// Copyright (C) 2011, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+
+namespace Maestro.Editors.LayerDefinition.Vector.Scales
+{
+ [ToolboxItem(false)]
+ internal partial class VectorScaleRangeCtrl : UserControl
+ {
+ private IPointVectorStyle _pts;
+ private ILineVectorStyle _lns;
+ private IAreaVectorStyle _ars;
+ private ICompositeTypeStyle _cts;
+
+ private VectorLayerStyleSectionCtrl _parent;
+
+ private IVectorScaleRange _vsr;
+ private bool _init;
+
+ public VectorScaleRangeCtrl(IVectorScaleRange vsr, VectorLayerStyleSectionCtrl parent)
+ {
+ InitializeComponent();
+ _init = true;
+
+ try
+ {
+ _parent = parent;
+ _vsr = vsr;
+
+ _pts = vsr.PointStyle;
+ _lns = vsr.LineStyle;
+ _ars = vsr.AreaStyle;
+
+ chkPoint.Checked = true;
+ chkLine.Checked = true;
+ chkArea.Checked = true;
+ chkComposite.Checked = true;
+
+ chkPoint.Checked = (_pts != null);
+ chkLine.Checked = (_lns != null);
+ chkArea.Checked = (_ars != null);
+
+ pointList.Owner = parent.Owner;
+ lineList.Owner = parent.Owner;
+ areaList.Owner = parent.Owner;
+
+ if (_pts == null)
+ _pts = parent.Factory.CreateDefaultPointStyle();
+
+ if (_lns == null)
+ _lns = parent.Factory.CreateDefaultLineStyle();
+
+ if (_ars == null)
+ _ars = parent.Factory.CreateDefaultAreaStyle();
+
+ pointList.SetItem(vsr, _pts);
+ lineList.SetItem(vsr, _lns);
+ areaList.SetItem(vsr, _ars);
+
+ if (_pts.RuleCount == 0)
+ pointList.AddRule();
+
+ if (_lns.RuleCount == 0)
+ lineList.AddRule();
+
+ if (_ars.RuleCount == 0)
+ areaList.AddRule();
+
+ var vsr2 = vsr as IVectorScaleRange2;
+ if (vsr2 != null)
+ {
+ _cts = vsr2.CompositeStyle;
+ chkComposite.Checked = (_cts != null);
+
+ compList.Owner = parent.Owner;
+ if (_cts == null)
+ _cts = parent.Factory.CreateDefaultCompositeStyle();
+
+ compList.SetItem(vsr, _cts);
+ if (_cts.RuleCount == 0)
+ compList.AddRule();
+ }
+ else
+ {
+ chkComposite.Checked = false;
+ }
+ chkComposite.Enabled = (vsr2 != null);
+ }
+ finally
+ {
+ _init = false;
+ }
+ }
+
+ protected override void OnResize(EventArgs e)
+ {
+ pointList.ResizeAuto();
+ lineList.ResizeAuto();
+ areaList.ResizeAuto();
+ compList.ResizeAuto();
+ 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;
+ if (_init) return;
+
+ _vsr.LineStyle = (chkLine.Checked) ? _lns : null;
+ _parent.RaiseResourceChanged();
+ }
+
+ private void chkArea_CheckedChanged(object sender, EventArgs e)
+ {
+ areaList.Visible = chkArea.Checked;
+ if (_init) return;
+
+ _vsr.AreaStyle = (chkArea.Checked) ? _ars : null;
+ _parent.RaiseResourceChanged();
+ }
+
+ private void chkComposite_CheckedChanged(object sender, EventArgs e)
+ {
+ compList.Visible = chkComposite.Checked;
+ if (_init) return;
+ var vsr2 = _vsr as IVectorScaleRange2;
+ if (vsr2 == null) return;
+
+ vsr2.CompositeStyle = (chkComposite.Checked) ? _cts : null;
+ _parent.RaiseResourceChanged();
+ }
+
+ private void OnItemChanged(object sender, EventArgs e)
+ {
+ _parent.RaiseResourceChanged();
+ }
+ }
+}
Added: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.resx (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.resx 2011-06-22 17:13:00 UTC (rev 5941)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.Designer.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.Designer.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -28,36 +28,52 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VectorLayerStyleSectionCtrl));
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.btnAdd = new System.Windows.Forms.ToolStripButton();
this.btnDelete = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.btnDuplicate = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.btnSort = new System.Windows.Forms.ToolStripButton();
- this.scaleRangeList = new OSGeo.MapGuide.Maestro.ResourceEditors.LayerEditorControls.ScaleControls.ScaleRangeList();
+ this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.lstScaleRanges = new System.Windows.Forms.ListBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.btnKmlElevation = new System.Windows.Forms.Button();
+ this.cmbMinScale = new System.Windows.Forms.ComboBox();
+ this.cmbMaxScale = new System.Windows.Forms.ComboBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.grpScaleRange = new System.Windows.Forms.GroupBox();
+ this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
this.contentPanel.SuspendLayout();
this.toolStrip1.SuspendLayout();
+ this.splitContainer1.Panel1.SuspendLayout();
+ this.splitContainer1.Panel2.SuspendLayout();
+ this.splitContainer1.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
this.SuspendLayout();
//
// contentPanel
//
- this.contentPanel.Controls.Add(this.scaleRangeList);
- this.contentPanel.Controls.Add(this.toolStrip1);
+ this.contentPanel.Controls.Add(this.splitContainer1);
+ resources.ApplyResources(this.contentPanel, "contentPanel");
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.btnAdd,
this.btnDelete,
+ this.toolStripSeparator1,
this.btnDuplicate,
- this.toolStripSeparator1,
this.btnSort});
resources.ApplyResources(this.toolStrip1, "toolStrip1");
this.toolStrip1.Name = "toolStrip1";
//
// btnAdd
//
+ this.btnAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.btnAdd.Image = global::Maestro.Editors.Properties.Resources.plus_circle;
resources.ApplyResources(this.btnAdd, "btnAdd");
this.btnAdd.Name = "btnAdd";
@@ -65,47 +81,126 @@
//
// btnDelete
//
+ this.btnDelete.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.btnDelete.Image = global::Maestro.Editors.Properties.Resources.minus_circle;
resources.ApplyResources(this.btnDelete, "btnDelete");
this.btnDelete.Name = "btnDelete";
this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
//
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+ //
// btnDuplicate
//
+ this.btnDuplicate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.btnDuplicate.Image = global::Maestro.Editors.Properties.Resources.document_copy;
resources.ApplyResources(this.btnDuplicate, "btnDuplicate");
this.btnDuplicate.Name = "btnDuplicate";
this.btnDuplicate.Click += new System.EventHandler(this.btnDuplicate_Click);
//
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
- //
// btnSort
//
+ this.btnSort.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.btnSort.Image = global::Maestro.Editors.Properties.Resources.sort_number;
resources.ApplyResources(this.btnSort, "btnSort");
this.btnSort.Name = "btnSort";
this.btnSort.Click += new System.EventHandler(this.btnSort_Click);
//
- // scaleRangeList
+ // splitContainer1
//
- resources.ApplyResources(this.scaleRangeList, "scaleRangeList");
- this.scaleRangeList.Name = "scaleRangeList";
- this.scaleRangeList.Owner = null;
- this.scaleRangeList.SelectionChanged += new System.EventHandler(this.scaleRangeList_SelectionChanged);
- this.scaleRangeList.ItemChanged += new System.EventHandler(this.scaleRangeList_ItemChanged);
+ resources.ApplyResources(this.splitContainer1, "splitContainer1");
+ this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+ this.splitContainer1.Name = "splitContainer1";
//
+ // splitContainer1.Panel1
+ //
+ this.splitContainer1.Panel1.Controls.Add(this.lstScaleRanges);
+ this.splitContainer1.Panel1.Controls.Add(this.groupBox1);
+ this.splitContainer1.Panel1.Controls.Add(this.toolStrip1);
+ //
+ // splitContainer1.Panel2
+ //
+ this.splitContainer1.Panel2.Controls.Add(this.grpScaleRange);
+ //
+ // lstScaleRanges
+ //
+ this.lstScaleRanges.DisplayMember = "ScaleDisplayString";
+ resources.ApplyResources(this.lstScaleRanges, "lstScaleRanges");
+ this.lstScaleRanges.FormattingEnabled = true;
+ this.lstScaleRanges.Name = "lstScaleRanges";
+ this.lstScaleRanges.SelectedIndexChanged += new System.EventHandler(this.lstScaleRanges_SelectedIndexChanged);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.btnKmlElevation);
+ this.groupBox1.Controls.Add(this.cmbMinScale);
+ this.groupBox1.Controls.Add(this.cmbMaxScale);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.label1);
+ resources.ApplyResources(this.groupBox1, "groupBox1");
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.TabStop = false;
+ //
+ // btnKmlElevation
+ //
+ this.btnKmlElevation.Image = global::Maestro.Editors.Properties.Resources.ruler;
+ resources.ApplyResources(this.btnKmlElevation, "btnKmlElevation");
+ this.btnKmlElevation.Name = "btnKmlElevation";
+ this.btnKmlElevation.UseVisualStyleBackColor = true;
+ this.btnKmlElevation.Click += new System.EventHandler(this.btnKmlElevation_Click);
+ //
+ // cmbMinScale
+ //
+ resources.ApplyResources(this.cmbMinScale, "cmbMinScale");
+ this.cmbMinScale.FormattingEnabled = true;
+ this.cmbMinScale.Name = "cmbMinScale";
+ this.cmbMinScale.TextChanged += new System.EventHandler(this.cmbMinScale_TextChanged);
+ //
+ // cmbMaxScale
+ //
+ resources.ApplyResources(this.cmbMaxScale, "cmbMaxScale");
+ this.cmbMaxScale.FormattingEnabled = true;
+ this.cmbMaxScale.Name = "cmbMaxScale";
+ this.cmbMaxScale.TextChanged += new System.EventHandler(this.cmbMaxScale_TextChanged);
+ //
+ // label2
+ //
+ resources.ApplyResources(this.label2, "label2");
+ this.label2.Name = "label2";
+ //
+ // label1
+ //
+ resources.ApplyResources(this.label1, "label1");
+ this.label1.Name = "label1";
+ //
+ // grpScaleRange
+ //
+ resources.ApplyResources(this.grpScaleRange, "grpScaleRange");
+ this.grpScaleRange.Name = "grpScaleRange";
+ this.grpScaleRange.TabStop = false;
+ //
+ // errorProvider
+ //
+ this.errorProvider.ContainerControl = this;
+ //
// VectorLayerStyleSectionCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.HeaderText = "Layer Styles";
this.Name = "VectorLayerStyleSectionCtrl";
+ resources.ApplyResources(this, "$this");
this.contentPanel.ResumeLayout(false);
- this.contentPanel.PerformLayout();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
+ this.splitContainer1.Panel1.ResumeLayout(false);
+ this.splitContainer1.Panel1.PerformLayout();
+ this.splitContainer1.Panel2.ResumeLayout(false);
+ this.splitContainer1.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
this.ResumeLayout(false);
}
@@ -113,11 +208,20 @@
#endregion
private System.Windows.Forms.ToolStrip toolStrip1;
- private OSGeo.MapGuide.Maestro.ResourceEditors.LayerEditorControls.ScaleControls.ScaleRangeList scaleRangeList;
private System.Windows.Forms.ToolStripButton btnAdd;
private System.Windows.Forms.ToolStripButton btnDelete;
private System.Windows.Forms.ToolStripButton btnDuplicate;
+ private System.Windows.Forms.ToolStripButton btnSort;
+ private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
- private System.Windows.Forms.ToolStripButton btnSort;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.ComboBox cmbMaxScale;
+ private System.Windows.Forms.ComboBox cmbMinScale;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.GroupBox grpScaleRange;
+ private System.Windows.Forms.ListBox lstScaleRanges;
+ private System.Windows.Forms.ErrorProvider errorProvider;
+ private System.Windows.Forms.Button btnKmlElevation;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -29,6 +29,9 @@
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
using System.Collections;
using Maestro.Editors.Common;
+using System.Globalization;
+using Maestro.Editors.LayerDefinition.Vector.Scales;
+using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
namespace Maestro.Editors.LayerDefinition.Vector
{
@@ -39,6 +42,9 @@
public VectorLayerStyleSectionCtrl()
{
InitializeComponent();
+ cmbMinScale.Items.Add("0");
+ cmbMaxScale.Items.Add(Properties.Resources.Infinity);
+ lstScaleRanges.DataSource = _scales;
}
private ILayerElementFactory _factory;
@@ -52,40 +58,35 @@
var res = (ILayerDefinition)service.GetEditedResource();
_vl = (IVectorLayerDefinition)res.SubLayer;
_factory = (ILayerElementFactory)res;
-
- scaleRangeList.SetItem(_vl);
- scaleRangeList.ResizeAuto();
-
+ BindScaleList(_vl.VectorScaleRange);
EvaluateCommands();
}
- public VectorLayerEditorCtrl Owner
- {
- set { scaleRangeList.Owner = value; }
- }
+ public VectorLayerEditorCtrl Owner { get; internal set; }
+ public ILayerElementFactory Factory { get { return _factory; } }
+
private void btnAdd_Click(object sender, EventArgs e)
{
- AddScaleRange(_factory.CreateVectorScaleRange());
+ AddScaleRange(new VectorScaleRange() { Item = _factory.CreateVectorScaleRange() });
}
private void btnDelete_Click(object sender, EventArgs e)
{
- if (scaleRangeList.SelectedItem == null)
- return;
- IVectorScaleRange vsc = scaleRangeList.SelectedItem;
- scaleRangeList.RemoveScaleRange(vsc);
- _vl.RemoveVectorScaleRange(vsc);
-
- _edsvc.HasChanged();
+ var vsc = lstScaleRanges.SelectedItem as VectorScaleRange;
+ if (vsc != null)
+ {
+ RemoveScaleRange(vsc);
+ }
}
private void btnDuplicate_Click(object sender, EventArgs e)
{
- if (scaleRangeList.SelectedItem == null)
- return;
-
- AddScaleRange(scaleRangeList.SelectedItem.Clone());
+ var vsc = lstScaleRanges.SelectedItem as VectorScaleRange;
+ if (vsc != null)
+ {
+ AddScaleRange(vsc.Clone());
+ }
}
private void btnSort_Click(object sender, EventArgs e)
@@ -111,12 +112,86 @@
}
//Refresh display
- scaleRangeList.SetItem(_vl);
- scaleRangeList.ResizeAuto();
+ BindScaleList(_vl.VectorScaleRange);
_edsvc.HasChanged();
}
+ private BindingList<VectorScaleRange> _scales = new BindingList<VectorScaleRange>();
+
+ private void BindScaleList(IEnumerable<IVectorScaleRange> scales)
+ {
+ _scales.Clear();
+ foreach (var scale in scales)
+ {
+ _scales.Add(new VectorScaleRange() { Item = scale });
+ }
+ }
+
+ class VectorScaleRange : INotifyPropertyChanged
+ {
+ public IVectorScaleRange Item { get; set; }
+
+ public string ScaleDisplayString
+ {
+ get
+ {
+ return string.Format("{0} : {1}",
+ this.Item.MinScale.HasValue ? this.Item.MinScale.Value.ToString(CultureInfo.InvariantCulture) : "0",
+ this.Item.MaxScale.HasValue ? this.Item.MaxScale.Value.ToString(CultureInfo.InvariantCulture) : Properties.Resources.Infinity);
+ }
+ }
+
+ public bool SupportsElevation
+ {
+ get
+ {
+ var it = this.Item as IVectorScaleRange2;
+ return (it != null);
+ }
+ }
+
+ public double? MinScale
+ {
+ get
+ {
+ return this.Item.MinScale;
+ }
+ set
+ {
+ this.Item.MinScale = value;
+ OnPropertyChanged("ScaleDisplayString");
+ }
+ }
+
+ public double? MaxScale
+ {
+ get
+ {
+ return this.Item.MaxScale;
+ }
+ set
+ {
+ this.Item.MaxScale = value;
+ OnPropertyChanged("ScaleDisplayString");
+ }
+ }
+
+ internal VectorScaleRange Clone()
+ {
+ return new VectorScaleRange() { Item = this.Item.Clone() };
+ }
+
+ private void OnPropertyChanged(string name)
+ {
+ var handler = this.PropertyChanged;
+ if (handler != null)
+ handler(this, new PropertyChangedEventArgs(name));
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+ }
+
/// <summary>
/// Sort helper used to sort the scale ranges
/// </summary>
@@ -152,35 +227,146 @@
}
}
- private void AddScaleRange(IVectorScaleRange vsc)
+ private void RemoveScaleRange(VectorScaleRange vsc)
{
- if (_vl == null)
- return;
+ _scales.Remove(vsc);
+ _vl.RemoveVectorScaleRange(vsc.Item);
+ if (_rangeCtrls.ContainsKey(vsc))
+ {
+ _rangeCtrls[vsc].Dispose();
+ _rangeCtrls.Remove(vsc);
+ }
+ }
- _vl.AddVectorScaleRange(vsc);
- Control c = scaleRangeList.AddScaleRange(vsc);
- scaleRangeList.ResizeAuto();
- _edsvc.HasChanged();
+ private void AddScaleRange(VectorScaleRange vsc)
+ {
+ _scales.Add(vsc);
+ _vl.AddVectorScaleRange(vsc.Item);
+
+ }
- try { c.Focus(); }
- catch { }
+ private void EvaluateCommands()
+ {
+ btnDelete.Enabled = btnDuplicate.Enabled = lstScaleRanges.SelectedItem != null;
+ btnSort.Enabled = _vl.HasVectorScaleRanges();
}
- private void scaleRangeList_ItemChanged(object sender, EventArgs e)
+ private Dictionary<VectorScaleRange, VectorScaleRangeCtrl> _rangeCtrls = new Dictionary<VectorScaleRange, VectorScaleRangeCtrl>();
+
+ private void lstScaleRanges_SelectedIndexChanged(object sender, EventArgs e)
{
- scaleRangeList.ResizeAuto();
- _edsvc.HasChanged();
+ var vsc = lstScaleRanges.SelectedItem as VectorScaleRange;
+ if (vsc != null)
+ {
+ try
+ {
+ _update = true;
+
+ if (vsc.Item.MinScale.HasValue)
+ cmbMinScale.Text = vsc.Item.MinScale.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ cmbMinScale.SelectedIndex = 0;
+
+ if (vsc.Item.MaxScale.HasValue)
+ cmbMaxScale.Text = vsc.Item.MaxScale.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ cmbMaxScale.SelectedIndex = 0;
+
+ grpScaleRange.Text = string.Format("{0} ({1})", Properties.Resources.ScaleRange, vsc.ScaleDisplayString);
+ grpScaleRange.Controls.Clear();
+
+ btnKmlElevation.Enabled = vsc.SupportsElevation;
+
+ VectorScaleRangeCtrl ctrl = null;
+ if (!_rangeCtrls.ContainsKey(vsc))
+ {
+ ctrl = new VectorScaleRangeCtrl(vsc.Item, this);
+ ctrl.Dock = DockStyle.Fill;
+ _rangeCtrls[vsc] = ctrl;
+ }
+ else
+ {
+ ctrl = _rangeCtrls[vsc];
+ }
+ grpScaleRange.Controls.Add(ctrl);
+ }
+ finally
+ {
+ _update = false;
+ }
+ }
}
- private void scaleRangeList_SelectionChanged(object sender, EventArgs e)
+ private bool _update = false;
+
+ private void cmbMinScale_TextChanged(object sender, EventArgs e)
{
- EvaluateCommands();
+ if (_update) return;
+ errorProvider.Clear();
+
+ var vsc = lstScaleRanges.SelectedItem as VectorScaleRange;
+ if (vsc != null)
+ {
+ if (cmbMinScale.Text == "0")
+ {
+ vsc.MinScale = null;
+ }
+ else
+ {
+ double o;
+ if (double.TryParse(cmbMinScale.Text, System.Globalization.NumberStyles.Number, System.Threading.Thread.CurrentThread.CurrentUICulture, out o))
+ {
+ vsc.MinScale = o;
+ errorProvider.SetError(cmbMinScale, null);
+ }
+ else
+ {
+ errorProvider.SetError(cmbMinScale, Properties.Resources.InvalidValueError);
+ }
+ }
+ OnResourceChanged();
+ }
}
- private void EvaluateCommands()
+ private void cmbMaxScale_TextChanged(object sender, EventArgs e)
{
- btnDelete.Enabled = btnDuplicate.Enabled = scaleRangeList.SelectedItem != null;
- btnSort.Enabled = _vl.HasVectorScaleRanges();
+ if (_update) return;
+ errorProvider.Clear();
+
+ var vsc = lstScaleRanges.SelectedItem as VectorScaleRange;
+ if (vsc != null)
+ {
+ if (cmbMaxScale.Text == Properties.Resources.Infinity)
+ {
+ vsc.MaxScale = null;
+ }
+ else
+ {
+ double o;
+ if (double.TryParse(cmbMaxScale.Text, System.Globalization.NumberStyles.Number, System.Threading.Thread.CurrentThread.CurrentUICulture, out o))
+ {
+ vsc.MaxScale = o;
+ errorProvider.SetError(cmbMaxScale, null);
+ }
+ else
+ {
+ errorProvider.SetError(cmbMaxScale, Properties.Resources.InvalidValueError);
+ }
+ }
+ OnResourceChanged();
+ }
}
+
+ private void btnKmlElevation_Click(object sender, EventArgs e)
+ {
+ var vsc = lstScaleRanges.SelectedItem as VectorScaleRange;
+ if (vsc != null && vsc.SupportsElevation)
+ {
+ if (new ElevationDialog(_edsvc, (IVectorScaleRange2)vsc.Item, Owner.FeatureSourceId, Owner.Schema, Owner.GetFdoProvider()).ShowDialog() == DialogResult.OK)
+ {
+ OnResourceChanged();
+ }
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.resx 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.resx 2011-06-22 17:13:00 UTC (rev 5941)
@@ -118,40 +118,202 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.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="scaleRangeList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <data name="splitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="scaleRangeList.Location" type="System.Drawing.Point, System.Drawing">
+ <data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
+ </data>
+ <data name="lstScaleRanges.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="lstScaleRanges.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 25</value>
</data>
- <data name="scaleRangeList.Size" type="System.Drawing.Size, System.Drawing">
- <value>449, 267</value>
+ <data name="lstScaleRanges.Size" type="System.Drawing.Size, System.Drawing">
+ <value>182, 212</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="scaleRangeList.TabIndex" type="System.Int32, mscorlib">
+ <data name="lstScaleRanges.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name=">>lstScaleRanges.Name" xml:space="preserve">
+ <value>lstScaleRanges</value>
+ </data>
+ <data name=">>lstScaleRanges.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>lstScaleRanges.Parent" xml:space="preserve">
+ <value>splitContainer1.Panel1</value>
+ </data>
+ <data name=">>lstScaleRanges.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="btnKmlElevation.Location" type="System.Drawing.Point, System.Drawing">
+ <value>20, 121</value>
+ </data>
+ <data name="btnKmlElevation.Size" type="System.Drawing.Size, System.Drawing">
+ <value>101, 23</value>
+ </data>
+ <data name="btnKmlElevation.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name="btnKmlElevation.Text" xml:space="preserve">
+ <value>KML Elevation</value>
+ </data>
+ <data name="btnKmlElevation.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+ <value>ImageBeforeText</value>
+ </data>
+ <data name=">>btnKmlElevation.Name" xml:space="preserve">
+ <value>btnKmlElevation</value>
+ </data>
+ <data name=">>btnKmlElevation.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnKmlElevation.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>btnKmlElevation.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="cmbMinScale.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="cmbMinScale.Location" type="System.Drawing.Point, System.Drawing">
+ <value>20, 44</value>
+ </data>
+ <data name="cmbMinScale.Size" type="System.Drawing.Size, System.Drawing">
+ <value>140, 21</value>
+ </data>
+ <data name="cmbMinScale.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name=">>cmbMinScale.Name" xml:space="preserve">
+ <value>cmbMinScale</value>
+ </data>
+ <data name=">>cmbMinScale.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbMinScale.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>cmbMinScale.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name=">>scaleRangeList.Name" xml:space="preserve">
- <value>scaleRangeList</value>
+ <data name="cmbMaxScale.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
</data>
- <data name=">>scaleRangeList.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.LayerEditorControls.ScaleControls.ScaleRangeList, Maestro.Editors, Version=3.0.0.5334, Culture=neutral, PublicKeyToken=null</value>
+ <data name="cmbMaxScale.Location" type="System.Drawing.Point, System.Drawing">
+ <value>20, 89</value>
</data>
- <data name=">>scaleRangeList.Parent" xml:space="preserve">
- <value>contentPanel</value>
+ <data name="cmbMaxScale.Size" type="System.Drawing.Size, System.Drawing">
+ <value>140, 21</value>
</data>
- <data name=">>scaleRangeList.ZOrder" xml:space="preserve">
+ <data name="cmbMaxScale.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name=">>cmbMaxScale.Name" xml:space="preserve">
+ <value>cmbMaxScale</value>
+ </data>
+ <data name=">>cmbMaxScale.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbMaxScale.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>cmbMaxScale.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>17, 72</value>
+ </data>
+ <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>57, 13</value>
+ </data>
+ <data name="label2.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="label2.Text" xml:space="preserve">
+ <value>Max Scale</value>
+ </data>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>17, 27</value>
+ </data>
+ <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>54, 13</value>
+ </data>
+ <data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
+ <data name="label1.Text" xml:space="preserve">
+ <value>Min Scale</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>label1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label1.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label1.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 245</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>182, 160</value>
+ </data>
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="groupBox1.Text" xml:space="preserve">
+ <value>Scale Range</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox1.Parent" xml:space="preserve">
+ <value>splitContainer1.Panel1</value>
+ </data>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
+ <value>0, 0</value>
</metadata>
<data name="btnAdd.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
- <value>49, 22</value>
+ <value>23, 22</value>
</data>
<data name="btnAdd.Text" xml:space="preserve">
<value>Add</value>
@@ -163,7 +325,7 @@
<value>Magenta</value>
</data>
<data name="btnDelete.Size" type="System.Drawing.Size, System.Drawing">
- <value>60, 22</value>
+ <value>23, 22</value>
</data>
<data name="btnDelete.Text" xml:space="preserve">
<value>Delete</value>
@@ -171,23 +333,23 @@
<data name="btnDelete.ToolTipText" xml:space="preserve">
<value>Delete selected scale range</value>
</data>
+ <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>6, 25</value>
+ </data>
<data name="btnDuplicate.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="btnDuplicate.Size" type="System.Drawing.Size, System.Drawing">
- <value>77, 22</value>
+ <value>23, 22</value>
</data>
<data name="btnDuplicate.Text" xml:space="preserve">
<value>Duplicate</value>
</data>
- <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
- <value>6, 25</value>
- </data>
<data name="btnSort.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="btnSort.Size" type="System.Drawing.Size, System.Drawing">
- <value>48, 22</value>
+ <value>23, 22</value>
</data>
<data name="btnSort.Text" xml:space="preserve">
<value>Sort</value>
@@ -199,7 +361,7 @@
<value>0, 0</value>
</data>
<data name="toolStrip1.Size" type="System.Drawing.Size, System.Drawing">
- <value>449, 25</value>
+ <value>182, 25</value>
</data>
<data name="toolStrip1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -214,11 +376,83 @@
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>toolStrip1.Parent" xml:space="preserve">
- <value>contentPanel</value>
+ <value>splitContainer1.Panel1</value>
</data>
<data name=">>toolStrip1.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name=">>splitContainer1.Panel1.Name" xml:space="preserve">
+ <value>splitContainer1.Panel1</value>
+ </data>
+ <data name=">>splitContainer1.Panel1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>splitContainer1.Panel1.Parent" xml:space="preserve">
+ <value>splitContainer1</value>
+ </data>
+ <data name=">>splitContainer1.Panel1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="grpScaleRange.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="grpScaleRange.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
+ </data>
+ <data name="grpScaleRange.Size" type="System.Drawing.Size, System.Drawing">
+ <value>452, 405</value>
+ </data>
+ <data name="grpScaleRange.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>grpScaleRange.Name" xml:space="preserve">
+ <value>grpScaleRange</value>
+ </data>
+ <data name=">>grpScaleRange.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>grpScaleRange.Parent" xml:space="preserve">
+ <value>splitContainer1.Panel2</value>
+ </data>
+ <data name=">>grpScaleRange.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>splitContainer1.Panel2.Name" xml:space="preserve">
+ <value>splitContainer1.Panel2</value>
+ </data>
+ <data name=">>splitContainer1.Panel2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>splitContainer1.Panel2.Parent" xml:space="preserve">
+ <value>splitContainer1</value>
+ </data>
+ <data name=">>splitContainer1.Panel2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>638, 405</value>
+ </data>
+ <data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
+ <value>182</value>
+ </data>
+ <data name="splitContainer1.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name=">>splitContainer1.Name" xml:space="preserve">
+ <value>splitContainer1</value>
+ </data>
+ <data name=">>splitContainer1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>splitContainer1.Parent" xml:space="preserve">
+ <value>contentPanel</value>
+ </data>
+ <data name=">>splitContainer1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="contentPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>638, 405</value>
+ </data>
<data name=">>contentPanel.Name" xml:space="preserve">
<value>contentPanel</value>
</data>
@@ -231,9 +465,15 @@
<data name=">>contentPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+ <value>638, 432</value>
+ </data>
<data name=">>btnAdd.Name" xml:space="preserve">
<value>btnAdd</value>
</data>
@@ -246,28 +486,34 @@
<data name=">>btnDelete.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name=">>toolStripSeparator1.Name" xml:space="preserve">
+ <value>toolStripSeparator1</value>
+ </data>
+ <data name=">>toolStripSeparator1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>btnDuplicate.Name" xml:space="preserve">
<value>btnDuplicate</value>
</data>
<data name=">>btnDuplicate.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>toolStripSeparator1.Name" xml:space="preserve">
- <value>toolStripSeparator1</value>
- </data>
- <data name=">>toolStripSeparator1.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name=">>btnSort.Name" xml:space="preserve">
<value>btnSort</value>
</data>
<data name=">>btnSort.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name=">>errorProvider.Name" xml:space="preserve">
+ <value>errorProvider</value>
+ </data>
+ <data name=">>errorProvider.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>$this.Name" xml:space="preserve">
<value>VectorLayerStyleSectionCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=3.0.0.5334, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -24,6 +24,7 @@
{
InitializeComponent();
resSettings.FeatureClassChanged += new EventHandler(OnFeatureClassChanged);
+ layerStyles.Owner = this;
}
void OnFeatureClassChanged(object sender, EventArgs e)
@@ -50,7 +51,6 @@
service.RegisterCustomNotifier(this);
resSettings.Bind(service);
layerProperties.Bind(service);
- layerStyles.Owner = this;
layerStyles.Bind(service);
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.resx 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.resx 2011-06-22 17:13:00 UTC (rev 5941)
@@ -126,7 +126,7 @@
<value>0, 0</value>
</data>
<data name="resSettings.Size" type="System.Drawing.Size, System.Drawing">
- <value>655, 267</value>
+ <value>638, 267</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="resSettings.TabIndex" type="System.Int32, mscorlib">
@@ -136,7 +136,7 @@
<value>resSettings</value>
</data>
<data name=">>resSettings.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.VectorLayerSettingsSectionCtrl, Maestro.Editors, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.VectorLayerSettingsSectionCtrl, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>resSettings.Parent" xml:space="preserve">
<value>$this</value>
@@ -151,7 +151,7 @@
<value>0, 267</value>
</data>
<data name="layerProperties.Size" type="System.Drawing.Size, System.Drawing">
- <value>655, 235</value>
+ <value>638, 235</value>
</data>
<data name="layerProperties.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -160,7 +160,7 @@
<value>layerProperties</value>
</data>
<data name=">>layerProperties.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.LayerPropertiesSectionCtrl, Maestro.Editors, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.LayerPropertiesSectionCtrl, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>layerProperties.Parent" xml:space="preserve">
<value>$this</value>
@@ -175,7 +175,7 @@
<value>0, 502</value>
</data>
<data name="layerStyles.Size" type="System.Drawing.Size, System.Drawing">
- <value>655, 319</value>
+ <value>638, 539</value>
</data>
<data name="layerStyles.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -184,7 +184,7 @@
<value>layerStyles</value>
</data>
<data name=">>layerStyles.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.VectorLayerStyleSectionCtrl, Maestro.Editors, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.VectorLayerStyleSectionCtrl, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>layerStyles.Parent" xml:space="preserve">
<value>$this</value>
@@ -199,12 +199,12 @@
<value>True</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>655, 530</value>
+ <value>638, 530</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>VectorLayerEditorCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.EditorBase, Maestro.Editors, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.EditorBase, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2011-06-22 17:13:00 UTC (rev 5941)
@@ -686,24 +686,6 @@
<Compile Include="LayerDefinition\Vector\Scales\ItemStyle.designer.cs">
<DependentUpon>ItemStyle.cs</DependentUpon>
</Compile>
- <Compile Include="LayerDefinition\Vector\Scales\ScaleRange.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="LayerDefinition\Vector\Scales\ScaleRange.designer.cs">
- <DependentUpon>ScaleRange.cs</DependentUpon>
- </Compile>
- <Compile Include="LayerDefinition\Vector\Scales\ScaleRangeConditions.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="LayerDefinition\Vector\Scales\ScaleRangeConditions.designer.cs">
- <DependentUpon>ScaleRangeConditions.cs</DependentUpon>
- </Compile>
- <Compile Include="LayerDefinition\Vector\Scales\ScaleRangeList.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="LayerDefinition\Vector\Scales\ScaleRangeList.designer.cs">
- <DependentUpon>ScaleRangeList.cs</DependentUpon>
- </Compile>
<Compile Include="LayerDefinition\Vector\Scales\SymbolInstancesDialog.cs">
<SubType>Form</SubType>
</Compile>
@@ -716,6 +698,12 @@
<Compile Include="LayerDefinition\Vector\Scales\SymbolInstanceSettingsCtrl.Designer.cs">
<DependentUpon>SymbolInstanceSettingsCtrl.cs</DependentUpon>
</Compile>
+ <Compile Include="LayerDefinition\Vector\Scales\VectorScaleRangeCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="LayerDefinition\Vector\Scales\VectorScaleRangeCtrl.Designer.cs">
+ <DependentUpon>VectorScaleRangeCtrl.cs</DependentUpon>
+ </Compile>
<Compile Include="LayerDefinition\Vector\StyleEditors\AreaFeatureStyleEditor.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1454,21 +1442,15 @@
<EmbeddedResource Include="LayerDefinition\Vector\Scales\ItemStyle.resx">
<DependentUpon>ItemStyle.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="LayerDefinition\Vector\Scales\ScaleRange.resx">
- <DependentUpon>ScaleRange.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="LayerDefinition\Vector\Scales\ScaleRangeConditions.resx">
- <DependentUpon>ScaleRangeConditions.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="LayerDefinition\Vector\Scales\ScaleRangeList.resx">
- <DependentUpon>ScaleRangeList.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="LayerDefinition\Vector\Scales\SymbolInstancesDialog.resx">
<DependentUpon>SymbolInstancesDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="LayerDefinition\Vector\Scales\SymbolInstanceSettingsCtrl.resx">
<DependentUpon>SymbolInstanceSettingsCtrl.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="LayerDefinition\Vector\Scales\VectorScaleRangeCtrl.resx">
+ <DependentUpon>VectorScaleRangeCtrl.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="LayerDefinition\Vector\StyleEditors\AreaFeatureStyleEditor.resx">
<DependentUpon>AreaFeatureStyleEditor.cs</DependentUpon>
</EmbeddedResource>
Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2011-06-22 17:13:00 UTC (rev 5941)
@@ -2384,6 +2384,15 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Scale Range.
+ /// </summary>
+ internal static string ScaleRange {
+ get {
+ return ResourceManager.GetString("ScaleRange", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Bitmap scissors_blue {
get {
object obj = ResourceManager.GetObject("scissors-blue", resourceCulture);
Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx 2011-06-22 14:49:33 UTC (rev 5940)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx 2011-06-22 17:13:00 UTC (rev 5941)
@@ -1238,4 +1238,7 @@
<data name="FsPreview_RasterPropertyNodeTooltip" xml:space="preserve">
<value>Name: {0}{6}Description: {1}{6}Nullable: {2}{6}Image X Size: {3}{6}Image Y Size: {4}{6}Spatial Context: {5}</value>
</data>
+ <data name="ScaleRange" xml:space="preserve">
+ <value>Scale Range</value>
+ </data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list