[mapguide-commits] r6929 - in branches/maestro-4.0.x: . Maestro.Editors/LayerDefinition/Vector/Thematics
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jul 31 07:16:18 PDT 2012
Author: jng
Date: 2012-07-31 07:16:17 -0700 (Tue, 31 Jul 2012)
New Revision: 6929
Modified:
branches/maestro-4.0.x/
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.designer.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.resx
Log:
#2085: Backport r6928 to 4.0.x
Property changes on: branches/maestro-4.0.x
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Tools/Maestro:6490-6494,6923-6924,6926
+ /trunk/Tools/Maestro:6490-6494,6923-6924,6926,6928
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs 2012-07-31 14:10:41 UTC (rev 6928)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs 2012-07-31 14:16:17 UTC (rev 6929)
@@ -52,7 +52,6 @@
private DataPropertyType m_dataType;
private object m_ruleCollection;
- private object m_defaultItem;
private static readonly Type[] NUMERIC_TYPES = null;
@@ -908,50 +907,6 @@
RefreshPreview();
}
- private void ChangeBaseStyleBtn_Click(object sender, EventArgs e)
- {
- IVectorLayerDefinition vl = (IVectorLayerDefinition)m_layer.SubLayer;
- UserControl uc = null;
- if (m_ruleCollection is IPointVectorStyle)
- {
- uc = new PointFeatureStyleEditor(m_editor, m_schema, vl.ResourceId);
- ((PointFeatureStyleEditor)uc).Item = (IPointSymbolization2D)Utility.XmlDeepCopy(m_defaultItem);
- ((PointFeatureStyleEditor)uc).SetupForTheming();
- }
- else if (m_ruleCollection is ILineVectorStyle)
- {
- uc = new LineFeatureStyleEditor(m_editor, m_schema, vl.ResourceId, _factory);
- var rule = _factory.CreateDefaultLineRule();
- ((LineFeatureStyleEditor)uc).Item = new List<IStroke>(rule.Strokes);
- ((LineFeatureStyleEditor)uc).SetupForTheming();
- }
- else if (m_ruleCollection is IAreaVectorStyle)
- {
- uc = new AreaFeatureStyleEditor(m_editor, m_schema, vl.ResourceId);
- ((AreaFeatureStyleEditor)uc).Item = (IAreaSymbolizationFill)Utility.XmlDeepCopy(m_defaultItem);
- ((AreaFeatureStyleEditor)uc).SetupForTheming();
- }
-
- if (uc != null)
- {
- EditorTemplateForm dlg = new EditorTemplateForm();
- dlg.ItemPanel.Controls.Add(uc);
- uc.Dock = DockStyle.Fill;
- dlg.RefreshSize();
-
- if (dlg.ShowDialog(this) == DialogResult.OK)
- {
- if (m_ruleCollection is IPointVectorStyle)
- m_defaultItem = ((PointFeatureStyleEditor)uc).Item;
- else if (m_ruleCollection is ILineVectorStyle)
- m_defaultItem = ((LineFeatureStyleEditor)uc).Item;
- else if (m_ruleCollection is IAreaVectorStyle)
- m_defaultItem = ((AreaFeatureStyleEditor)uc).Item;
- }
- }
-
- }
-
private void ColorBrewerDataType_SelectedIndexChanged(object sender, EventArgs e)
{
string prevSet = ColorBrewerColorSet.Text;
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.designer.cs 2012-07-31 14:10:41 UTC (rev 6928)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.designer.cs 2012-07-31 14:16:17 UTC (rev 6929)
@@ -52,7 +52,6 @@
this.GradientToColor = new Maestro.Editors.Common.ColorComboBox();
this.GradientFromColor = new Maestro.Editors.Common.ColorComboBox();
this.label4 = new System.Windows.Forms.Label();
- this.ChangeBaseStyleBtn = new System.Windows.Forms.Button();
this.ColorBrewerColors = new System.Windows.Forms.RadioButton();
this.GradientColors = new System.Windows.Forms.RadioButton();
this.PreviewGroup = new System.Windows.Forms.GroupBox();
@@ -180,7 +179,6 @@
this.DisplayGroup.Controls.Add(this.ColorBrewerPanel);
this.DisplayGroup.Controls.Add(this.ColorBrewerLabel);
this.DisplayGroup.Controls.Add(this.panel2);
- this.DisplayGroup.Controls.Add(this.ChangeBaseStyleBtn);
this.DisplayGroup.Controls.Add(this.ColorBrewerColors);
this.DisplayGroup.Controls.Add(this.GradientColors);
this.DisplayGroup.Name = "DisplayGroup";
@@ -249,13 +247,6 @@
resources.ApplyResources(this.label4, "label4");
this.label4.Name = "label4";
//
- // ChangeBaseStyleBtn
- //
- resources.ApplyResources(this.ChangeBaseStyleBtn, "ChangeBaseStyleBtn");
- this.ChangeBaseStyleBtn.Name = "ChangeBaseStyleBtn";
- this.ChangeBaseStyleBtn.UseVisualStyleBackColor = true;
- this.ChangeBaseStyleBtn.Click += new System.EventHandler(this.ChangeBaseStyleBtn_Click);
- //
// ColorBrewerColors
//
resources.ApplyResources(this.ColorBrewerColors, "ColorBrewerColors");
@@ -358,7 +349,6 @@
private System.Windows.Forms.Button CancelBtn;
private System.Windows.Forms.Button OKBtn;
private System.Windows.Forms.Panel panel2;
- private System.Windows.Forms.Button ChangeBaseStyleBtn;
private System.Windows.Forms.RadioButton ColorBrewerColors;
private System.Windows.Forms.RadioButton GradientColors;
private CustomCombo ColorBrewerColorSet;
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.resx 2012-07-31 14:10:41 UTC (rev 6928)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.resx 2012-07-31 14:16:17 UTC (rev 6929)
@@ -648,30 +648,6 @@
<data name=">>panel2.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="ChangeBaseStyleBtn.Location" type="System.Drawing.Point, System.Drawing">
- <value>16, 80</value>
- </data>
- <data name="ChangeBaseStyleBtn.Size" type="System.Drawing.Size, System.Drawing">
- <value>112, 23</value>
- </data>
- <data name="ChangeBaseStyleBtn.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name="ChangeBaseStyleBtn.Text" xml:space="preserve">
- <value>Change base style</value>
- </data>
- <data name=">>ChangeBaseStyleBtn.Name" xml:space="preserve">
- <value>ChangeBaseStyleBtn</value>
- </data>
- <data name=">>ChangeBaseStyleBtn.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>ChangeBaseStyleBtn.Parent" xml:space="preserve">
- <value>DisplayGroup</value>
- </data>
- <data name=">>ChangeBaseStyleBtn.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
<data name="ColorBrewerColors.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -694,7 +670,7 @@
<value>DisplayGroup</value>
</data>
<data name=">>ColorBrewerColors.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>3</value>
</data>
<data name="GradientColors.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -721,7 +697,7 @@
<value>DisplayGroup</value>
</data>
<data name=">>GradientColors.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>4</value>
</data>
<data name="DisplayGroup.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 152</value>
More information about the mapguide-commits
mailing list