[mapguide-commits] r7992 - trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Mar 21 05:16:11 PDT 2014
Author: jng
Date: 2014-03-21 05:16:11 -0700 (Fri, 21 Mar 2014)
New Revision: 7992
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.resx
Log:
#2407: Add filtering support for the external lookup class
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs 2014-03-21 12:06:43 UTC (rev 7991)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs 2014-03-21 12:16:11 UTC (rev 7992)
@@ -37,6 +37,7 @@
using System.Collections.Specialized;
using Maestro.Editors.Generic;
using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
namespace Maestro.Editors.LayerDefinition.Vector.Thematics
{
@@ -1129,11 +1130,14 @@
string className = cmbFeatureClass.SelectedItem.ToString();
string key = cmbKeyProperty.SelectedItem.ToString();
string value = cmbValueProperty.SelectedItem.ToString();
+ string filter = null;
+ if (!string.IsNullOrEmpty(txtFilter.Text))
+ filter = txtFilter.Text;
BusyWaitDialog.Run(Strings.ComputingThemeParameters,
() => { //Worker method
List<LookupPair> res = new List<LookupPair>();
- using (var reader = m_editor.FeatureService.QueryFeatureSource(fsId, className, null, new string[] { key, value }))
+ using (var reader = m_editor.FeatureService.QueryFeatureSource(fsId, className, filter, new string[] { key, value }))
{
while(reader.ReadNext())
{
@@ -1196,5 +1200,16 @@
}
});
}
+
+ private void btnFilter_Click(object sender, EventArgs e)
+ {
+ string fsId = txtFeatureSource.Text;
+ string className = cmbFeatureClass.SelectedItem.ToString();
+ IFeatureSource fs = (IFeatureSource)m_editor.ResourceService.GetResource(fsId);
+ ClassDefinition clsDef = m_editor.FeatureService.GetClassDefinition(fsId, className);
+ string expr = m_editor.EditExpression(txtFilter.Text, clsDef, fs.Provider, fsId, false);
+ if (expr != null)
+ txtFilter.Text = expr;
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.designer.cs 2014-03-21 12:06:43 UTC (rev 7991)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.designer.cs 2014-03-21 12:16:11 UTC (rev 7992)
@@ -76,6 +76,9 @@
this.OKBtn = new System.Windows.Forms.Button();
this.grpThemeGeneration = new System.Windows.Forms.GroupBox();
this.colorComboBox1 = new Maestro.Editors.Common.ColorComboBox();
+ this.btnFilter = new System.Windows.Forms.Button();
+ this.txtFilter = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.RuleCount)).BeginInit();
this.DataGroup.SuspendLayout();
this.grpValuesFromLookup.SuspendLayout();
@@ -188,6 +191,9 @@
// grpValuesFromLookup
//
resources.ApplyResources(this.grpValuesFromLookup, "grpValuesFromLookup");
+ this.grpValuesFromLookup.Controls.Add(this.btnFilter);
+ this.grpValuesFromLookup.Controls.Add(this.txtFilter);
+ this.grpValuesFromLookup.Controls.Add(this.label9);
this.grpValuesFromLookup.Controls.Add(this.btnUpdateThemeParameters);
this.grpValuesFromLookup.Controls.Add(this.btnBrowseFeatureSource);
this.grpValuesFromLookup.Controls.Add(this.cmbValueProperty);
@@ -440,6 +446,24 @@
resources.ApplyResources(this.colorComboBox1, "colorComboBox1");
this.colorComboBox1.Name = "colorComboBox1";
//
+ // btnFilter
+ //
+ resources.ApplyResources(this.btnFilter, "btnFilter");
+ this.btnFilter.Name = "btnFilter";
+ this.btnFilter.UseVisualStyleBackColor = true;
+ this.btnFilter.Click += new System.EventHandler(this.btnFilter_Click);
+ //
+ // txtFilter
+ //
+ resources.ApplyResources(this.txtFilter, "txtFilter");
+ this.txtFilter.Name = "txtFilter";
+ this.txtFilter.ReadOnly = true;
+ //
+ // label9
+ //
+ resources.ApplyResources(this.label9, "label9");
+ this.label9.Name = "label9";
+ //
// ThemeCreator
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -525,5 +549,8 @@
private System.Windows.Forms.RadioButton rdValuesFromClass;
private System.Windows.Forms.GroupBox grpThemeGeneration;
private System.Windows.Forms.Button btnUpdateThemeParameters;
+ private System.Windows.Forms.Button btnFilter;
+ private System.Windows.Forms.TextBox txtFilter;
+ private System.Windows.Forms.Label label9;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.resx 2014-03-21 12:06:43 UTC (rev 7991)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.resx 2014-03-21 12:16:11 UTC (rev 7992)
@@ -364,7 +364,7 @@
<value>NoControl</value>
</data>
<data name="rdValuesFromLookup.Location" type="System.Drawing.Point, System.Drawing">
- <value>17, 133</value>
+ <value>19, 108</value>
</data>
<data name="rdValuesFromLookup.Size" type="System.Drawing.Size, System.Drawing">
<value>244, 17</value>
@@ -394,7 +394,7 @@
<value>NoControl</value>
</data>
<data name="rdValuesFromClass.Location" type="System.Drawing.Point, System.Drawing">
- <value>17, 61</value>
+ <value>18, 52</value>
</data>
<data name="rdValuesFromClass.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 17</value>
@@ -420,6 +420,84 @@
<data name="grpValuesFromLookup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name="btnFilter.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="btnFilter.Location" type="System.Drawing.Point, System.Drawing">
+ <value>278, 122</value>
+ </data>
+ <data name="btnFilter.Size" type="System.Drawing.Size, System.Drawing">
+ <value>25, 23</value>
+ </data>
+ <data name="btnFilter.TabIndex" type="System.Int32, mscorlib">
+ <value>21</value>
+ </data>
+ <data name="btnFilter.Text" xml:space="preserve">
+ <value>...</value>
+ </data>
+ <data name=">>btnFilter.Name" xml:space="preserve">
+ <value>btnFilter</value>
+ </data>
+ <data name=">>btnFilter.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=">>btnFilter.Parent" xml:space="preserve">
+ <value>grpValuesFromLookup</value>
+ </data>
+ <data name=">>btnFilter.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="txtFilter.Location" type="System.Drawing.Point, System.Drawing">
+ <value>103, 124</value>
+ </data>
+ <data name="txtFilter.Size" type="System.Drawing.Size, System.Drawing">
+ <value>169, 20</value>
+ </data>
+ <data name="txtFilter.TabIndex" type="System.Int32, mscorlib">
+ <value>20</value>
+ </data>
+ <data name=">>txtFilter.Name" xml:space="preserve">
+ <value>txtFilter</value>
+ </data>
+ <data name=">>txtFilter.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtFilter.Parent" xml:space="preserve">
+ <value>grpValuesFromLookup</value>
+ </data>
+ <data name=">>txtFilter.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="label9.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label9.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
+ <value>7, 127</value>
+ </data>
+ <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
+ <value>29, 13</value>
+ </data>
+ <data name="label9.TabIndex" type="System.Int32, mscorlib">
+ <value>19</value>
+ </data>
+ <data name="label9.Text" xml:space="preserve">
+ <value>Filter</value>
+ </data>
+ <data name=">>label9.Name" xml:space="preserve">
+ <value>label9</value>
+ </data>
+ <data name=">>label9.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label9.Parent" xml:space="preserve">
+ <value>grpValuesFromLookup</value>
+ </data>
+ <data name=">>label9.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
<data name="btnUpdateThemeParameters.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
@@ -445,13 +523,13 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>btnUpdateThemeParameters.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>3</value>
</data>
<data name="btnBrowseFeatureSource.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnBrowseFeatureSource.Location" type="System.Drawing.Point, System.Drawing">
- <value>271, 15</value>
+ <value>278, 15</value>
</data>
<data name="btnBrowseFeatureSource.Size" type="System.Drawing.Size, System.Drawing">
<value>25, 23</value>
@@ -472,7 +550,7 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>btnBrowseFeatureSource.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>4</value>
</data>
<data name="cmbValueProperty.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -496,7 +574,7 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>cmbValueProperty.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>5</value>
</data>
<data name="label8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -526,7 +604,7 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>label8.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>6</value>
</data>
<data name="cmbKeyProperty.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -550,7 +628,7 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>cmbKeyProperty.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>7</value>
</data>
<data name="label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -580,7 +658,7 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>label7.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>8</value>
</data>
<data name="cmbFeatureClass.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -604,7 +682,7 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>cmbFeatureClass.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>9</value>
</data>
<data name="label6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -634,13 +712,13 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>label6.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>10</value>
</data>
<data name="txtFeatureSource.Location" type="System.Drawing.Point, System.Drawing">
<value>103, 17</value>
</data>
<data name="txtFeatureSource.Size" type="System.Drawing.Size, System.Drawing">
- <value>162, 20</value>
+ <value>169, 20</value>
</data>
<data name="txtFeatureSource.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -655,7 +733,7 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>txtFeatureSource.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>11</value>
</data>
<data name="label5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -685,13 +763,13 @@
<value>grpValuesFromLookup</value>
</data>
<data name=">>label5.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>12</value>
</data>
<data name="grpValuesFromLookup.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 139</value>
+ <value>10, 114</value>
</data>
<data name="grpValuesFromLookup.Size" type="System.Drawing.Size, System.Drawing">
- <value>308, 124</value>
+ <value>308, 154</value>
</data>
<data name="grpValuesFromLookup.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@@ -711,18 +789,6 @@
<data name="grpValuesFromClass.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="GroupPanel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
- <data name="GroupPanel.Location" type="System.Drawing.Point, System.Drawing">
- <value>5, 19</value>
- </data>
- <data name="GroupPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>295, 24</value>
- </data>
- <data name="GroupPanel.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
<data name=">>GroupPanel.Name" xml:space="preserve">
<value>GroupPanel</value>
</data>
@@ -736,7 +802,7 @@
<value>0</value>
</data>
<data name="grpValuesFromClass.Location" type="System.Drawing.Point, System.Drawing">
- <value>9, 65</value>
+ <value>10, 56</value>
</data>
<data name="grpValuesFromClass.Size" type="System.Drawing.Size, System.Drawing">
<value>307, 52</value>
@@ -760,7 +826,7 @@
<value>8, 8</value>
</data>
<data name="DataGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>330, 271</value>
+ <value>330, 277</value>
</data>
<data name="DataGroup.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@@ -780,6 +846,30 @@
<data name=">>DataGroup.ZOrder" xml:space="preserve">
<value>4</value>
</data>
+ <data name="GroupPanel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="GroupPanel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>5, 19</value>
+ </data>
+ <data name="GroupPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>295, 24</value>
+ </data>
+ <data name="GroupPanel.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name=">>GroupPanel.Name" xml:space="preserve">
+ <value>GroupPanel</value>
+ </data>
+ <data name=">>GroupPanel.Type" xml:space="preserve">
+ <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>grpValuesFromClass</value>
+ </data>
+ <data name=">>GroupPanel.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="chkUseFirstRuleAsTemplate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
@@ -837,6 +927,102 @@
<data name="DisplayGroup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name=">>btnFlipColorBrewer.Name" xml:space="preserve">
+ <value>btnFlipColorBrewer</value>
+ </data>
+ <data name=">>btnFlipColorBrewer.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=">>btnFlipColorBrewer.Parent" xml:space="preserve">
+ <value>DisplayGroup</value>
+ </data>
+ <data name=">>btnFlipColorBrewer.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>ColorBrewerPanel.Name" xml:space="preserve">
+ <value>ColorBrewerPanel</value>
+ </data>
+ <data name=">>ColorBrewerPanel.Type" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>ColorBrewerPanel.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>ColorBrewerLabel.Name" xml:space="preserve">
+ <value>ColorBrewerLabel</value>
+ </data>
+ <data name=">>ColorBrewerLabel.Type" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>ColorBrewerLabel.ZOrder" xml:space="preserve">
+ <value>2</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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>panel2.Parent" xml:space="preserve">
+ <value>DisplayGroup</value>
+ </data>
+ <data name=">>panel2.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name=">>ColorBrewerColors.Name" xml:space="preserve">
+ <value>ColorBrewerColors</value>
+ </data>
+ <data name=">>ColorBrewerColors.Type" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>ColorBrewerColors.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name=">>GradientColors.Name" xml:space="preserve">
+ <value>GradientColors</value>
+ </data>
+ <data name=">>GradientColors.Type" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>GradientColors.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="DisplayGroup.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 400</value>
+ </data>
+ <data name="DisplayGroup.Size" type="System.Drawing.Size, System.Drawing">
+ <value>330, 112</value>
+ </data>
+ <data name="DisplayGroup.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name="DisplayGroup.Text" xml:space="preserve">
+ <value>Display setup</value>
+ </data>
+ <data name=">>DisplayGroup.Name" xml:space="preserve">
+ <value>DisplayGroup</value>
+ </data>
+ <data name=">>DisplayGroup.Type" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>DisplayGroup.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
<data name="btnFlipColorBrewer.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
@@ -867,6 +1053,63 @@
<data name=">>btnFlipColorBrewer.ZOrder" xml:space="preserve">
<value>0</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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label3.Parent" xml:space="preserve">
+ <value>ColorBrewerPanel</value>
+ </data>
+ <data name=">>label3.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>ColorBrewerDataType.Name" xml:space="preserve">
+ <value>ColorBrewerDataType</value>
+ </data>
+ <data name=">>ColorBrewerDataType.Type" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>ColorBrewerDataType.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>ColorBrewerColorSet.Name" xml:space="preserve">
+ <value>ColorBrewerColorSet</value>
+ </data>
+ <data name=">>ColorBrewerColorSet.Type" xml:space="preserve">
+ <value>Maestro.Editors.Common.CustomCombo, Maestro.Editors, Version=5.1.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>ColorBrewerColorSet.Parent" xml:space="preserve">
+ <value>ColorBrewerPanel</value>
+ </data>
+ <data name=">>ColorBrewerColorSet.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="ColorBrewerPanel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>112, 48</value>
+ </data>
+ <data name="ColorBrewerPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>200, 24</value>
+ </data>
+ <data name="ColorBrewerPanel.TabIndex" type="System.Int32, mscorlib">
+ <value>9</value>
+ </data>
+ <data name=">>ColorBrewerPanel.Name" xml:space="preserve">
+ <value>ColorBrewerPanel</value>
+ </data>
+ <data name=">>ColorBrewerPanel.Type" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>ColorBrewerPanel.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -939,27 +1182,6 @@
<data name=">>ColorBrewerColorSet.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="ColorBrewerPanel.Location" type="System.Drawing.Point, System.Drawing">
- <value>112, 48</value>
- </data>
- <data name="ColorBrewerPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>200, 24</value>
- </data>
- <data name="ColorBrewerPanel.TabIndex" type="System.Int32, mscorlib">
- <value>9</value>
- </data>
- <data name=">>ColorBrewerPanel.Name" xml:space="preserve">
- <value>ColorBrewerPanel</value>
- </data>
- <data name=">>ColorBrewerPanel.Type" xml:space="preserve">
- <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>
- </data>
- <data name=">>ColorBrewerPanel.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
<data name="ColorBrewerLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -990,6 +1212,63 @@
<data name=">>ColorBrewerLabel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
+ <data name=">>GradientToColor.Name" xml:space="preserve">
+ <value>GradientToColor</value>
+ </data>
+ <data name=">>GradientToColor.Type" xml:space="preserve">
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.1.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>GradientToColor.Parent" xml:space="preserve">
+ <value>panel2</value>
+ </data>
+ <data name=">>GradientToColor.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>GradientFromColor.Name" xml:space="preserve">
+ <value>GradientFromColor</value>
+ </data>
+ <data name=">>GradientFromColor.Type" xml:space="preserve">
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.1.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>GradientFromColor.Parent" xml:space="preserve">
+ <value>panel2</value>
+ </data>
+ <data name=">>GradientFromColor.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>label4.Name" xml:space="preserve">
+ <value>label4</value>
+ </data>
+ <data name=">>label4.Type" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>label4.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>112, 24</value>
+ </data>
+ <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>200, 24</value>
+ </data>
+ <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+ <value>3</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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>panel2.Parent" xml:space="preserve">
+ <value>DisplayGroup</value>
+ </data>
+ <data name=">>panel2.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
<data name="GradientToColor.Location" type="System.Drawing.Point, System.Drawing">
<value>112, 0</value>
</data>
@@ -1062,27 +1341,6 @@
<data name=">>label4.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
- <value>112, 24</value>
- </data>
- <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
- <value>200, 24</value>
- </data>
- <data name="panel2.TabIndex" type="System.Int32, mscorlib">
- <value>3</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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>panel2.Parent" xml:space="preserve">
- <value>DisplayGroup</value>
- </data>
- <data name=">>panel2.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
<data name="ColorBrewerColors.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -1140,33 +1398,45 @@
<data name=">>GradientColors.ZOrder" xml:space="preserve">
<value>5</value>
</data>
- <data name="DisplayGroup.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 394</value>
+ <data name="PreviewGroup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
</data>
- <data name="DisplayGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>330, 112</value>
+ <data name=">>PreviewPicture.Name" xml:space="preserve">
+ <value>PreviewPicture</value>
</data>
- <data name="DisplayGroup.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
+ <data name=">>PreviewPicture.Type" xml:space="preserve">
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="DisplayGroup.Text" xml:space="preserve">
- <value>Display setup</value>
+ <data name=">>PreviewPicture.Parent" xml:space="preserve">
+ <value>PreviewGroup</value>
</data>
- <data name=">>DisplayGroup.Name" xml:space="preserve">
- <value>DisplayGroup</value>
+ <data name=">>PreviewPicture.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
- <data name=">>DisplayGroup.Type" xml:space="preserve">
+ <data name="PreviewGroup.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 518</value>
+ </data>
+ <data name="PreviewGroup.Size" type="System.Drawing.Size, System.Drawing">
+ <value>330, 48</value>
+ </data>
+ <data name="PreviewGroup.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
+ </data>
+ <data name="PreviewGroup.Text" xml:space="preserve">
+ <value>Preview</value>
+ </data>
+ <data name=">>PreviewGroup.Name" xml:space="preserve">
+ <value>PreviewGroup</value>
+ </data>
+ <data name=">>PreviewGroup.Type" xml:space="preserve">
<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">
+ <data name=">>PreviewGroup.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>DisplayGroup.ZOrder" xml:space="preserve">
- <value>3</value>
+ <data name=">>PreviewGroup.ZOrder" xml:space="preserve">
+ <value>2</value>
</data>
- <data name="PreviewGroup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
<data name="PreviewPicture.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -1194,29 +1464,53 @@
<data name=">>PreviewPicture.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="PreviewGroup.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 512</value>
+ <data name=">>CancelBtn.Name" xml:space="preserve">
+ <value>CancelBtn</value>
</data>
- <data name="PreviewGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>330, 48</value>
+ <data name=">>CancelBtn.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="PreviewGroup.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
+ <data name=">>CancelBtn.Parent" xml:space="preserve">
+ <value>ButtonPanel</value>
</data>
- <data name="PreviewGroup.Text" xml:space="preserve">
- <value>Preview</value>
+ <data name=">>CancelBtn.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
- <data name=">>PreviewGroup.Name" xml:space="preserve">
- <value>PreviewGroup</value>
+ <data name=">>OKBtn.Name" xml:space="preserve">
+ <value>OKBtn</value>
</data>
- <data name=">>PreviewGroup.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>OKBtn.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=">>PreviewGroup.Parent" xml:space="preserve">
+ <data name=">>OKBtn.Parent" xml:space="preserve">
+ <value>ButtonPanel</value>
+ </data>
+ <data name=">>OKBtn.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="ButtonPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="ButtonPanel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 575</value>
+ </data>
+ <data name="ButtonPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>343, 36</value>
+ </data>
+ <data name="ButtonPanel.TabIndex" type="System.Int32, mscorlib">
+ <value>12</value>
+ </data>
+ <data name=">>ButtonPanel.Name" xml:space="preserve">
+ <value>ButtonPanel</value>
+ </data>
+ <data name=">>ButtonPanel.Type" xml:space="preserve">
+ <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>
</data>
- <data name=">>PreviewGroup.ZOrder" xml:space="preserve">
- <value>2</value>
+ <data name=">>ButtonPanel.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
<data name="CancelBtn.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top</value>
@@ -1278,35 +1572,11 @@
<data name=">>OKBtn.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="ButtonPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Bottom</value>
- </data>
- <data name="ButtonPanel.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 569</value>
- </data>
- <data name="ButtonPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>343, 36</value>
- </data>
- <data name="ButtonPanel.TabIndex" type="System.Int32, mscorlib">
- <value>12</value>
- </data>
- <data name=">>ButtonPanel.Name" xml:space="preserve">
- <value>ButtonPanel</value>
- </data>
- <data name=">>ButtonPanel.Type" xml:space="preserve">
- <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>
- </data>
- <data name=">>ButtonPanel.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
<data name="grpThemeGeneration.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="grpThemeGeneration.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 285</value>
+ <value>8, 291</value>
</data>
<data name="grpThemeGeneration.Size" type="System.Drawing.Size, System.Drawing">
<value>330, 103</value>
@@ -1348,7 +1618,7 @@
<value>True</value>
</metadata>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
- <value>343, 605</value>
+ <value>343, 611</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
More information about the mapguide-commits
mailing list