[mapguide-commits] r6884 - branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Jul 9 09:31:59 PDT 2012
Author: jng
Date: 2012-07-09 09:31:59 -0700 (Mon, 09 Jul 2012)
New Revision: 6884
Modified:
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:
#2065: Backport r6882 to 4.0.x
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-09 16:26:48 UTC (rev 6883)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs 2012-07-09 16:31:59 UTC (rev 6884)
@@ -712,6 +712,45 @@
RefreshPreview();
}
+ private IPointRule CreatePointRule(IPointRule template, ILayerElementFactory factory)
+ {
+ var ptRule = factory.CreateDefaultPointRule();
+
+ var srcSym = template.PointSymbolization2D;
+ if (srcSym != null)
+ {
+ ptRule.PointSymbolization2D = srcSym.Clone();
+ }
+ var srcLabel = template.Label;
+ if (srcLabel != null)
+ {
+ ptRule.Label = srcLabel.Clone();
+ }
+ return ptRule;
+ }
+
+ private ILineRule CreateLineRule(ILineRule template, ILayerElementFactory factory)
+ {
+ var lrule = factory.CreateDefaultLineRule();
+ foreach (var st in template.Strokes)
+ {
+ lrule.AddStroke(st.Clone());
+ }
+ if (template.Label != null)
+ lrule.Label = template.Label.Clone();
+ return lrule;
+ }
+
+ private IAreaRule CreateAreaRule(IAreaRule template, ILayerElementFactory factory)
+ {
+ var arule = factory.CreateDefaultAreaRule();
+ if (template.AreaSymbolization2D != null)
+ arule.AreaSymbolization2D = template.AreaSymbolization2D.Clone();
+ if (template.Label != null)
+ arule.Label = template.Label.Clone();
+ return arule;
+ }
+
private void OKBtn_Click(object sender, EventArgs e)
{
try
@@ -728,12 +767,18 @@
{
IPointVectorStyle col = m_ruleCollection as IPointVectorStyle;
+ IPointRule template = null;
+ if (chkUseFirstRuleAsTemplate.Checked && col.RuleCount > 0)
+ {
+ template = col.GetRuleAt(0);
+ }
+
if (OverwriteRules.Checked)
col.RemoveAllRules();
foreach (RuleItem entry in rules)
{
- IPointRule r = _factory.CreateDefaultPointRule();
+ IPointRule r = (template != null) ? CreatePointRule(template, _factory) : _factory.CreateDefaultPointRule();
r.Filter = entry.Filter;
r.LegendLabel = entry.Label;
var sym = r.PointSymbolization2D.Symbol;
@@ -745,7 +790,6 @@
{
((IFontSymbol)sym).ForegroundColor = Utility.SerializeHTMLColor(entry.Color, true);
}
-
col.AddRule(r);
}
}
@@ -753,12 +797,18 @@
{
ILineVectorStyle col = m_ruleCollection as ILineVectorStyle;
+ ILineRule template = null;
+ if (chkUseFirstRuleAsTemplate.Checked && col.RuleCount > 0)
+ {
+ template = col.GetRuleAt(0);
+ }
+
if (OverwriteRules.Checked)
col.RemoveAllRules();
foreach (RuleItem entry in rules)
{
- var l = _factory.CreateDefaultLineRule();
+ var l = (template != null) ? CreateLineRule(template, _factory) : _factory.CreateDefaultLineRule();
l.Filter = entry.Filter;
l.LegendLabel = entry.Label;
foreach (var st in l.Strokes)
@@ -772,12 +822,18 @@
{
IAreaVectorStyle col = m_ruleCollection as IAreaVectorStyle;
+ IAreaRule template = null;
+ if (chkUseFirstRuleAsTemplate.Checked && col.RuleCount > 0)
+ {
+ template = col.GetRuleAt(0);
+ }
+
if (OverwriteRules.Checked)
col.RemoveAllRules();
foreach (RuleItem entry in rules)
{
- var r = _factory.CreateDefaultAreaRule();
+ var r = (template != null) ? CreateAreaRule(template, _factory) : _factory.CreateDefaultAreaRule();
r.Filter = entry.Filter;
r.LegendLabel = entry.Label;
r.AreaSymbolization2D.Fill.ForegroundColor = Utility.SerializeHTMLColor(entry.Color, true);
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-09 16:26:48 UTC (rev 6883)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.designer.cs 2012-07-09 16:31:59 UTC (rev 6884)
@@ -39,17 +39,18 @@
this.RuleCount = new System.Windows.Forms.NumericUpDown();
this.AggregateCombo = new System.Windows.Forms.ComboBox();
this.DataGroup = new System.Windows.Forms.GroupBox();
+ this.chkUseFirstRuleAsTemplate = new System.Windows.Forms.CheckBox();
this.GroupPanel = new System.Windows.Forms.Panel();
this.RuleCountPanel = new System.Windows.Forms.Panel();
this.DisplayGroup = new System.Windows.Forms.GroupBox();
this.ColorBrewerPanel = new System.Windows.Forms.Panel();
this.label3 = new System.Windows.Forms.Label();
this.ColorBrewerDataType = new System.Windows.Forms.ComboBox();
- this.ColorBrewerColorSet = new CustomCombo();
+ this.ColorBrewerColorSet = new Maestro.Editors.Common.CustomCombo();
this.ColorBrewerLabel = new System.Windows.Forms.LinkLabel();
this.panel2 = new System.Windows.Forms.Panel();
- this.GradientToColor = new ColorComboBox();
- this.GradientFromColor = new ColorComboBox();
+ 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();
@@ -59,7 +60,7 @@
this.ButtonPanel = new System.Windows.Forms.Panel();
this.CancelBtn = new System.Windows.Forms.Button();
this.OKBtn = new System.Windows.Forms.Button();
- this.colorComboBox1 = new ColorComboBox();
+ this.colorComboBox1 = new Maestro.Editors.Common.ColorComboBox();
((System.ComponentModel.ISupportInitialize)(this.RuleCount)).BeginInit();
this.DataGroup.SuspendLayout();
this.GroupPanel.SuspendLayout();
@@ -141,6 +142,7 @@
// DataGroup
//
resources.ApplyResources(this.DataGroup, "DataGroup");
+ this.DataGroup.Controls.Add(this.chkUseFirstRuleAsTemplate);
this.DataGroup.Controls.Add(this.GroupPanel);
this.DataGroup.Controls.Add(this.RuleCountPanel);
this.DataGroup.Controls.Add(this.ColumnCombo);
@@ -150,6 +152,14 @@
this.DataGroup.Name = "DataGroup";
this.DataGroup.TabStop = false;
//
+ // chkUseFirstRuleAsTemplate
+ //
+ resources.ApplyResources(this.chkUseFirstRuleAsTemplate, "chkUseFirstRuleAsTemplate");
+ this.chkUseFirstRuleAsTemplate.Checked = true;
+ this.chkUseFirstRuleAsTemplate.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkUseFirstRuleAsTemplate.Name = "chkUseFirstRuleAsTemplate";
+ this.chkUseFirstRuleAsTemplate.UseVisualStyleBackColor = true;
+ //
// GroupPanel
//
this.GroupPanel.Controls.Add(this.AggregateLabel);
@@ -303,8 +313,8 @@
//
// ThemeCreator
//
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
resources.ApplyResources(this, "$this");
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.ButtonPanel);
this.Controls.Add(this.PreviewGroup);
this.Controls.Add(this.DisplayGroup);
@@ -363,5 +373,6 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.ComboBox ColorBrewerDataType;
private System.Windows.Forms.LinkLabel ColorBrewerLabel;
+ private System.Windows.Forms.CheckBox chkUseFirstRuleAsTemplate;
}
}
\ No newline at end of file
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-09 16:26:48 UTC (rev 6883)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.resx 2012-07-09 16:31:59 UTC (rev 6884)
@@ -112,16 +112,16 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.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" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 16</value>
</data>
@@ -138,13 +138,13 @@
<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>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>DataGroup</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>6</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -165,7 +165,7 @@
<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>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label2.Parent" xml:space="preserve">
<value>RuleCountPanel</value>
@@ -192,7 +192,7 @@
<value>AggregateLabel</value>
</data>
<data name=">>AggregateLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>AggregateLabel.Parent" xml:space="preserve">
<value>GroupPanel</value>
@@ -219,13 +219,13 @@
<value>OverwriteRules</value>
</data>
<data name=">>OverwriteRules.Type" xml:space="preserve">
- <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>OverwriteRules.Parent" xml:space="preserve">
<value>DataGroup</value>
</data>
<data name=">>OverwriteRules.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
<data name="AppendRules.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -246,15 +246,15 @@
<value>AppendRules</value>
</data>
<data name=">>AppendRules.Type" xml:space="preserve">
- <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>AppendRules.Parent" xml:space="preserve">
<value>DataGroup</value>
</data>
<data name=">>AppendRules.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ColumnCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -271,13 +271,13 @@
<value>ColumnCombo</value>
</data>
<data name=">>ColumnCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ColumnCombo.Parent" xml:space="preserve">
<value>DataGroup</value>
</data>
<data name=">>ColumnCombo.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="RuleCount.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -295,7 +295,7 @@
<value>RuleCount</value>
</data>
<data name=">>RuleCount.Type" xml:space="preserve">
- <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>RuleCount.Parent" xml:space="preserve">
<value>RuleCountPanel</value>
@@ -331,7 +331,7 @@
<value>AggregateCombo</value>
</data>
<data name=">>AggregateCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>AggregateCombo.Parent" xml:space="preserve">
<value>GroupPanel</value>
@@ -342,6 +342,33 @@
<data name="DataGroup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name="chkUseFirstRuleAsTemplate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Bottom, Left, Right</value>
+ </data>
+ <data name="chkUseFirstRuleAsTemplate.Location" type="System.Drawing.Point, System.Drawing">
+ <value>147, 94</value>
+ </data>
+ <data name="chkUseFirstRuleAsTemplate.Size" type="System.Drawing.Size, System.Drawing">
+ <value>165, 36</value>
+ </data>
+ <data name="chkUseFirstRuleAsTemplate.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
+ </data>
+ <data name="chkUseFirstRuleAsTemplate.Text" xml:space="preserve">
+ <value>Use geometry and label style from current first rule</value>
+ </data>
+ <data name=">>chkUseFirstRuleAsTemplate.Name" xml:space="preserve">
+ <value>chkUseFirstRuleAsTemplate</value>
+ </data>
+ <data name=">>chkUseFirstRuleAsTemplate.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkUseFirstRuleAsTemplate.Parent" xml:space="preserve">
+ <value>DataGroup</value>
+ </data>
+ <data name=">>chkUseFirstRuleAsTemplate.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="GroupPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 40</value>
</data>
@@ -355,13 +382,13 @@
<value>GroupPanel</value>
</data>
<data name=">>GroupPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>GroupPanel.Parent" xml:space="preserve">
<value>DataGroup</value>
</data>
<data name=">>GroupPanel.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
<data name="RuleCountPanel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -379,13 +406,13 @@
<value>RuleCountPanel</value>
</data>
<data name=">>RuleCountPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>RuleCountPanel.Parent" xml:space="preserve">
<value>DataGroup</value>
</data>
<data name=">>RuleCountPanel.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="DataGroup.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
@@ -403,7 +430,7 @@
<value>DataGroup</value>
</data>
<data name=">>DataGroup.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>DataGroup.Parent" xml:space="preserve">
<value>$this</value>
@@ -433,7 +460,7 @@
<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>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>ColorBrewerPanel</value>
@@ -454,7 +481,7 @@
<value>ColorBrewerDataType</value>
</data>
<data name=">>ColorBrewerDataType.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ColorBrewerDataType.Parent" xml:space="preserve">
<value>ColorBrewerPanel</value>
@@ -475,7 +502,7 @@
<value>ColorBrewerColorSet</value>
</data>
<data name=">>ColorBrewerColorSet.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.CustomCombo, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.CustomCombo, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>ColorBrewerColorSet.Parent" xml:space="preserve">
<value>ColorBrewerPanel</value>
@@ -496,7 +523,7 @@
<value>ColorBrewerPanel</value>
</data>
<data name=">>ColorBrewerPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ColorBrewerPanel.Parent" xml:space="preserve">
<value>DisplayGroup</value>
@@ -523,7 +550,7 @@
<value>ColorBrewerLabel</value>
</data>
<data name=">>ColorBrewerLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ColorBrewerLabel.Parent" xml:space="preserve">
<value>DisplayGroup</value>
@@ -544,7 +571,7 @@
<value>GradientToColor</value>
</data>
<data name=">>GradientToColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>GradientToColor.Parent" xml:space="preserve">
<value>panel2</value>
@@ -565,7 +592,7 @@
<value>GradientFromColor</value>
</data>
<data name=">>GradientFromColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>GradientFromColor.Parent" xml:space="preserve">
<value>panel2</value>
@@ -592,7 +619,7 @@
<value>label4</value>
</data>
<data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label4.Parent" xml:space="preserve">
<value>panel2</value>
@@ -613,7 +640,7 @@
<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>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>panel2.Parent" xml:space="preserve">
<value>DisplayGroup</value>
@@ -637,7 +664,7 @@
<value>ChangeBaseStyleBtn</value>
</data>
<data name=">>ChangeBaseStyleBtn.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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>
@@ -661,7 +688,7 @@
<value>ColorBrewerColors</value>
</data>
<data name=">>ColorBrewerColors.Type" xml:space="preserve">
- <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ColorBrewerColors.Parent" xml:space="preserve">
<value>DisplayGroup</value>
@@ -688,7 +715,7 @@
<value>GradientColors</value>
</data>
<data name=">>GradientColors.Type" xml:space="preserve">
- <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>GradientColors.Parent" xml:space="preserve">
<value>DisplayGroup</value>
@@ -712,7 +739,7 @@
<value>DisplayGroup</value>
</data>
<data name=">>DisplayGroup.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>DisplayGroup.Parent" xml:space="preserve">
<value>$this</value>
@@ -736,7 +763,7 @@
<value>PreviewPicture</value>
</data>
<data name=">>PreviewPicture.Type" xml:space="preserve">
- <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>PreviewPicture.Parent" xml:space="preserve">
<value>PreviewGroup</value>
@@ -760,7 +787,7 @@
<value>PreviewGroup</value>
</data>
<data name=">>PreviewGroup.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>PreviewGroup.Parent" xml:space="preserve">
<value>$this</value>
@@ -787,7 +814,7 @@
<value>CancelBtn</value>
</data>
<data name=">>CancelBtn.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>CancelBtn.Parent" xml:space="preserve">
<value>ButtonPanel</value>
@@ -814,7 +841,7 @@
<value>OKBtn</value>
</data>
<data name=">>OKBtn.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>OKBtn.Parent" xml:space="preserve">
<value>ButtonPanel</value>
@@ -838,7 +865,7 @@
<value>ButtonPanel</value>
</data>
<data name=">>ButtonPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ButtonPanel.Parent" xml:space="preserve">
<value>$this</value>
@@ -859,14 +886,11 @@
<value>colorComboBox1</value>
</data>
<data name=">>colorComboBox1.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
- <value>6, 13</value>
- </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>333, 363</value>
</data>
@@ -877,6 +901,6 @@
<value>ThemeCreator</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list