[mapguide-commits] r8014 - in trunk/Tools/Maestro/Maestro.Editors: . LayerDefinition LayerDefinition/Vector
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Apr 7 05:56:29 PDT 2014
Author: jng
Date: 2014-04-07 05:56:29 -0700 (Mon, 07 Apr 2014)
New Revision: 8014
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Strings.resx
Log:
#2320: Fix inability to switch Feature Sources in Layer Definition editor. Unlike Studio, Maestro won't nuke the existing styles on change of Feature Class. We'll just show an informative message about what could be broken in the styles as a result of changing Feature Classes.
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs 2014-04-07 11:22:39 UTC (rev 8013)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs 2014-04-07 12:56:29 UTC (rev 8014)
@@ -64,26 +64,17 @@
protected override void UnsubscribeEventHandlers()
{
- //if (_props != null)
- // _props.ListChanged -= OnPropertyListChanged;
-
if (_vl != null)
_vl.PropertyChanged -= OnVectorLayerPropertyChanged;
base.UnsubscribeEventHandlers();
}
- //void OnPropertyListChanged(object sender, ListChangedEventArgs e)
- //{
- // OnResourceChanged();
- //}
-
void OnVectorLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
{
//Feature Source changed
if (e.PropertyName == "ResourceId") //NOXLATE
{
- _vl.RemoveAllScaleRanges();
PopulatePropertyList();
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs 2014-04-07 11:22:39 UTC (rev 8013)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs 2014-04-07 12:56:29 UTC (rev 8014)
@@ -125,12 +125,14 @@
resources.ApplyResources(this.txtGeometry, "txtGeometry");
this.txtGeometry.Name = "txtGeometry";
this.txtGeometry.ReadOnly = true;
+ this.txtGeometry.TextChanged += new System.EventHandler(this.txtGeometry_TextChanged);
//
// txtFeatureClass
//
resources.ApplyResources(this.txtFeatureClass, "txtFeatureClass");
this.txtFeatureClass.Name = "txtFeatureClass";
this.txtFeatureClass.ReadOnly = true;
+ this.txtFeatureClass.TextChanged += new System.EventHandler(this.txtFeatureClass_TextChanged);
//
// grpLayerSettings
//
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2014-04-07 11:22:39 UTC (rev 8013)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2014-04-07 12:56:29 UTC (rev 8014)
@@ -64,10 +64,16 @@
_vl = res.SubLayer as IVectorLayerDefinition;
Debug.Assert(_vl != null);
- TextBoxBinder.BindText(txtFeatureSource, _vl, "ResourceId");
+ //TextBoxBinder.BindText(txtFeatureSource, _vl, "ResourceId");
+ //TextBoxBinder.BindText(txtFeatureClass, _vl, "FeatureName");
+ //TextBoxBinder.BindText(txtGeometry, _vl, "Geometry");
+ txtFeatureClass.Text = _vl.FeatureName;
+ txtGeometry.Text = _vl.Geometry;
+ if (string.IsNullOrEmpty(txtFeatureClass.Text) || string.IsNullOrEmpty(txtGeometry.Text))
+ TryFillUIFromNewFeatureSource(_vl.ResourceId);
+ else
+ txtFeatureSource.Text = _vl.ResourceId;
- TextBoxBinder.BindText(txtFeatureClass, _vl, "FeatureName");
- TextBoxBinder.BindText(txtGeometry, _vl, "Geometry");
//TextBoxBinder.BindText(txtFilter, _vl, "Filter");
txtFilter.Text = _vl.Filter;
@@ -120,6 +126,9 @@
private void txtFeatureSource_TextChanged(object sender, EventArgs e)
{
+ if (_init)
+ return;
+
if (string.IsNullOrEmpty(txtFeatureSource.Text))
return;
@@ -137,6 +146,18 @@
}
}
+ private void txtFeatureClass_TextChanged(object sender, EventArgs e)
+ {
+ if (txtFeatureClass.Text != _vl.FeatureName)
+ _vl.FeatureName = txtFeatureClass.Text;
+ }
+
+ private void txtGeometry_TextChanged(object sender, EventArgs e)
+ {
+ if (txtGeometry.Text != _vl.Geometry)
+ _vl.Geometry = txtGeometry.Text;
+ }
+
internal event EventHandler FeatureClassChanged;
private void OnFeatureClassChanged()
@@ -144,6 +165,12 @@
var handler = this.FeatureClassChanged;
if (handler != null)
handler(this, EventArgs.Empty);
+
+ if (_lastClassName != _selectedClass.QualifiedName && _lastClassName != null)
+ {
+ MessageBox.Show(Strings.LayerChangedFeatureClass);
+ }
+ _lastClassName = _selectedClass.QualifiedName;
}
private void btnBrowseFeatureSource_Click(object sender, EventArgs e)
@@ -153,14 +180,46 @@
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
- txtFeatureSource.Text = picker.ResourceID;
- //Invalidate
- _cachedFs = null;
- OnResourceChanged(); //Maybe same feature class, different feature source
+ string fsId = picker.ResourceID;
+ if (fsId != txtFeatureSource.Text)
+ {
+ TryFillUIFromNewFeatureSource(fsId);
+ OnResourceChanged(); //Maybe same feature class, different feature source
+ }
}
}
}
+ private void TryFillUIFromNewFeatureSource(string fsId)
+ {
+ try
+ {
+ _init = true;
+ //Before setting the Feature Source, invalidate related parts too
+ txtFeatureClass.Text = string.Empty;
+ txtGeometry.Text = string.Empty;
+
+ //But if this is a single-class FS, let's try to auto-fill this stuff
+ string[] names = _edsvc.FeatureService.GetClassNames(fsId, null);
+ if (names.Length == 1)
+ txtFeatureClass.Text = names[0];
+
+ txtFeatureSource.Text = fsId;
+ _vl.ResourceId = fsId;
+ if (names.Length == 1)
+ {
+ ClassDefinition clsDef = _edsvc.FeatureService.GetClassDefinition(fsId, names[0]);
+ SetFeatureClass(clsDef);
+ }
+ }
+ finally
+ {
+ //Invalidate
+ _cachedFs = null;
+ _init = false;
+ }
+ }
+
internal string FeatureSourceID
{
get { return txtFeatureSource.Text; }
@@ -236,6 +295,8 @@
}
}
+ private string _lastClassName = null;
+
private void SetFeatureClass(ClassDefinition item)
{
txtFeatureClass.Text = item.QualifiedName;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx 2014-04-07 11:22:39 UTC (rev 8013)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx 2014-04-07 12:56:29 UTC (rev 8014)
@@ -150,21 +150,6 @@
<data name="grpLayerSettings.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="btnEditTooltip.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Right</value>
- </data>
- <data name="btnEditTooltip.Location" type="System.Drawing.Point, System.Drawing">
- <value>377, 66</value>
- </data>
- <data name="btnEditTooltip.Size" type="System.Drawing.Size, System.Drawing">
- <value>30, 23</value>
- </data>
- <data name="btnEditTooltip.TabIndex" type="System.Int32, mscorlib">
- <value>8</value>
- </data>
- <data name="btnEditTooltip.Text" xml:space="preserve">
- <value>...</value>
- </data>
<data name=">>btnEditTooltip.Name" xml:space="preserve">
<value>btnEditTooltip</value>
</data>
@@ -177,21 +162,6 @@
<data name=">>btnEditTooltip.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="btnEditHyperlink.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Right</value>
- </data>
- <data name="btnEditHyperlink.Location" type="System.Drawing.Point, System.Drawing">
- <value>377, 42</value>
- </data>
- <data name="btnEditHyperlink.Size" type="System.Drawing.Size, System.Drawing">
- <value>30, 23</value>
- </data>
- <data name="btnEditHyperlink.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
- </data>
- <data name="btnEditHyperlink.Text" xml:space="preserve">
- <value>...</value>
- </data>
<data name=">>btnEditHyperlink.Name" xml:space="preserve">
<value>btnEditHyperlink</value>
</data>
@@ -204,21 +174,6 @@
<data name=">>btnEditHyperlink.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="btnEditFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Right</value>
- </data>
- <data name="btnEditFilter.Location" type="System.Drawing.Point, System.Drawing">
- <value>377, 17</value>
- </data>
- <data name="btnEditFilter.Size" type="System.Drawing.Size, System.Drawing">
- <value>30, 23</value>
- </data>
- <data name="btnEditFilter.TabIndex" type="System.Int32, mscorlib">
- <value>6</value>
- </data>
- <data name="btnEditFilter.Text" xml:space="preserve">
- <value>...</value>
- </data>
<data name=">>btnEditFilter.Name" xml:space="preserve">
<value>btnEditFilter</value>
</data>
@@ -231,18 +186,6 @@
<data name=">>btnEditFilter.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="txtTooltip.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
- <data name="txtTooltip.Location" type="System.Drawing.Point, System.Drawing">
- <value>121, 68</value>
- </data>
- <data name="txtTooltip.Size" type="System.Drawing.Size, System.Drawing">
- <value>250, 20</value>
- </data>
- <data name="txtTooltip.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
- </data>
<data name=">>txtTooltip.Name" xml:space="preserve">
<value>txtTooltip</value>
</data>
@@ -255,18 +198,6 @@
<data name=">>txtTooltip.ZOrder" xml:space="preserve">
<value>3</value>
</data>
- <data name="txtHyperlink.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
- <data name="txtHyperlink.Location" type="System.Drawing.Point, System.Drawing">
- <value>121, 44</value>
- </data>
- <data name="txtHyperlink.Size" type="System.Drawing.Size, System.Drawing">
- <value>250, 20</value>
- </data>
- <data name="txtHyperlink.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
- </data>
<data name=">>txtHyperlink.Name" xml:space="preserve">
<value>txtHyperlink</value>
</data>
@@ -279,18 +210,6 @@
<data name=">>txtHyperlink.ZOrder" xml:space="preserve">
<value>4</value>
</data>
- <data name="txtFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
- <data name="txtFilter.Location" type="System.Drawing.Point, System.Drawing">
- <value>121, 19</value>
- </data>
- <data name="txtFilter.Size" type="System.Drawing.Size, System.Drawing">
- <value>250, 20</value>
- </data>
- <data name="txtFilter.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
<data name=">>txtFilter.Name" xml:space="preserve">
<value>txtFilter</value>
</data>
@@ -303,21 +222,6 @@
<data name=">>txtFilter.ZOrder" xml:space="preserve">
<value>5</value>
</data>
- <data name="label6.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 71</value>
- </data>
- <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
- <value>39, 13</value>
- </data>
- <data name="label6.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name="label6.Text" xml:space="preserve">
- <value>Tooltip</value>
- </data>
<data name=">>label6.Name" xml:space="preserve">
<value>label6</value>
</data>
@@ -330,21 +234,6 @@
<data name=">>label6.ZOrder" xml:space="preserve">
<value>6</value>
</data>
- <data name="label5.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 47</value>
- </data>
- <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
- <value>51, 13</value>
- </data>
- <data name="label5.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name="label5.Text" xml:space="preserve">
- <value>Hyperlink</value>
- </data>
<data name=">>label5.Name" xml:space="preserve">
<value>label5</value>
</data>
@@ -357,21 +246,6 @@
<data name=">>label5.ZOrder" xml:space="preserve">
<value>7</value>
</data>
- <data name="label4.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 22</value>
- </data>
- <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
- <value>29, 13</value>
- </data>
- <data name="label4.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name="label4.Text" xml:space="preserve">
- <value>Filter</value>
- </data>
<data name=">>label4.Name" xml:space="preserve">
<value>label4</value>
</data>
@@ -411,6 +285,21 @@
<data name="grpFeatureClass.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name="btnBrowseGeometry.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnBrowseGeometry.Location" type="System.Drawing.Point, System.Drawing">
+ <value>377, 42</value>
+ </data>
+ <data name="btnBrowseGeometry.Size" type="System.Drawing.Size, System.Drawing">
+ <value>30, 23</value>
+ </data>
+ <data name="btnBrowseGeometry.TabIndex" type="System.Int32, mscorlib">
+ <value>12</value>
+ </data>
+ <data name="btnBrowseGeometry.Text" xml:space="preserve">
+ <value>...</value>
+ </data>
<data name=">>btnBrowseGeometry.Name" xml:space="preserve">
<value>btnBrowseGeometry</value>
</data>
@@ -423,6 +312,21 @@
<data name=">>btnBrowseGeometry.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 47</value>
+ </data>
+ <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+ <value>94, 13</value>
+ </data>
+ <data name="label3.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="label3.Text" xml:space="preserve">
+ <value>Geometry Property</value>
+ </data>
<data name=">>label3.Name" xml:space="preserve">
<value>label3</value>
</data>
@@ -435,6 +339,21 @@
<data name=">>label3.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="btnBrowseSchema.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnBrowseSchema.Location" type="System.Drawing.Point, System.Drawing">
+ <value>377, 17</value>
+ </data>
+ <data name="btnBrowseSchema.Size" type="System.Drawing.Size, System.Drawing">
+ <value>30, 23</value>
+ </data>
+ <data name="btnBrowseSchema.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
+ </data>
+ <data name="btnBrowseSchema.Text" xml:space="preserve">
+ <value>...</value>
+ </data>
<data name=">>btnBrowseSchema.Name" xml:space="preserve">
<value>btnBrowseSchema</value>
</data>
@@ -447,6 +366,21 @@
<data name=">>btnBrowseSchema.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>15, 22</value>
+ </data>
+ <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>71, 13</value>
+ </data>
+ <data name="label2.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="label2.Text" xml:space="preserve">
+ <value>Feature Class</value>
+ </data>
<data name=">>label2.Name" xml:space="preserve">
<value>label2</value>
</data>
@@ -459,6 +393,18 @@
<data name=">>label2.ZOrder" xml:space="preserve">
<value>3</value>
</data>
+ <data name="txtGeometry.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="txtGeometry.Location" type="System.Drawing.Point, System.Drawing">
+ <value>121, 44</value>
+ </data>
+ <data name="txtGeometry.Size" type="System.Drawing.Size, System.Drawing">
+ <value>250, 20</value>
+ </data>
+ <data name="txtGeometry.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
<data name=">>txtGeometry.Name" xml:space="preserve">
<value>txtGeometry</value>
</data>
@@ -471,6 +417,18 @@
<data name=">>txtGeometry.ZOrder" xml:space="preserve">
<value>4</value>
</data>
+ <data name="txtFeatureClass.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="txtFeatureClass.Location" type="System.Drawing.Point, System.Drawing">
+ <value>121, 19</value>
+ </data>
+ <data name="txtFeatureClass.Size" type="System.Drawing.Size, System.Drawing">
+ <value>250, 20</value>
+ </data>
+ <data name="txtFeatureClass.TabIndex" type="System.Int32, mscorlib">
+ <value>9</value>
+ </data>
<data name=">>txtFeatureClass.Name" xml:space="preserve">
<value>txtFeatureClass</value>
</data>
@@ -600,162 +558,240 @@
<data name=">>contentPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="btnBrowseGeometry.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <data name="btnEditTooltip.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
- <data name="btnBrowseGeometry.Location" type="System.Drawing.Point, System.Drawing">
- <value>377, 42</value>
+ <data name="btnEditTooltip.Location" type="System.Drawing.Point, System.Drawing">
+ <value>377, 66</value>
</data>
- <data name="btnBrowseGeometry.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="btnEditTooltip.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 23</value>
</data>
- <data name="btnBrowseGeometry.TabIndex" type="System.Int32, mscorlib">
- <value>12</value>
+ <data name="btnEditTooltip.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
</data>
- <data name="btnBrowseGeometry.Text" xml:space="preserve">
+ <data name="btnEditTooltip.Text" xml:space="preserve">
<value>...</value>
</data>
- <data name=">>btnBrowseGeometry.Name" xml:space="preserve">
- <value>btnBrowseGeometry</value>
+ <data name=">>btnEditTooltip.Name" xml:space="preserve">
+ <value>btnEditTooltip</value>
</data>
- <data name=">>btnBrowseGeometry.Type" xml:space="preserve">
+ <data name=">>btnEditTooltip.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=">>btnBrowseGeometry.Parent" xml:space="preserve">
- <value>grpFeatureClass</value>
+ <data name=">>btnEditTooltip.Parent" xml:space="preserve">
+ <value>grpLayerSettings</value>
</data>
- <data name=">>btnBrowseGeometry.ZOrder" xml:space="preserve">
+ <data name=">>btnEditTooltip.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="label3.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name="btnEditHyperlink.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
</data>
- <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 47</value>
+ <data name="btnEditHyperlink.Location" type="System.Drawing.Point, System.Drawing">
+ <value>377, 42</value>
</data>
- <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
- <value>94, 13</value>
+ <data name="btnEditHyperlink.Size" type="System.Drawing.Size, System.Drawing">
+ <value>30, 23</value>
</data>
- <data name="label3.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
+ <data name="btnEditHyperlink.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
</data>
- <data name="label3.Text" xml:space="preserve">
- <value>Geometry Property</value>
+ <data name="btnEditHyperlink.Text" xml:space="preserve">
+ <value>...</value>
</data>
- <data name=">>label3.Name" xml:space="preserve">
- <value>label3</value>
+ <data name=">>btnEditHyperlink.Name" xml:space="preserve">
+ <value>btnEditHyperlink</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 name=">>btnEditHyperlink.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=">>label3.Parent" xml:space="preserve">
- <value>grpFeatureClass</value>
+ <data name=">>btnEditHyperlink.Parent" xml:space="preserve">
+ <value>grpLayerSettings</value>
</data>
- <data name=">>label3.ZOrder" xml:space="preserve">
+ <data name=">>btnEditHyperlink.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="btnBrowseSchema.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <data name="btnEditFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
- <data name="btnBrowseSchema.Location" type="System.Drawing.Point, System.Drawing">
+ <data name="btnEditFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>377, 17</value>
</data>
- <data name="btnBrowseSchema.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="btnEditFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 23</value>
</data>
- <data name="btnBrowseSchema.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
+ <data name="btnEditFilter.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
</data>
- <data name="btnBrowseSchema.Text" xml:space="preserve">
+ <data name="btnEditFilter.Text" xml:space="preserve">
<value>...</value>
</data>
- <data name=">>btnBrowseSchema.Name" xml:space="preserve">
- <value>btnBrowseSchema</value>
+ <data name=">>btnEditFilter.Name" xml:space="preserve">
+ <value>btnEditFilter</value>
</data>
- <data name=">>btnBrowseSchema.Type" xml:space="preserve">
+ <data name=">>btnEditFilter.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=">>btnBrowseSchema.Parent" xml:space="preserve">
- <value>grpFeatureClass</value>
+ <data name=">>btnEditFilter.Parent" xml:space="preserve">
+ <value>grpLayerSettings</value>
</data>
- <data name=">>btnBrowseSchema.ZOrder" xml:space="preserve">
+ <data name=">>btnEditFilter.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="label2.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name="txtTooltip.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
</data>
- <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 22</value>
+ <data name="txtTooltip.Location" type="System.Drawing.Point, System.Drawing">
+ <value>121, 68</value>
</data>
- <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>71, 13</value>
+ <data name="txtTooltip.Size" type="System.Drawing.Size, System.Drawing">
+ <value>250, 20</value>
</data>
- <data name="label2.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
+ <data name="txtTooltip.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
</data>
- <data name="label2.Text" xml:space="preserve">
- <value>Feature Class</value>
+ <data name=">>txtTooltip.Name" xml:space="preserve">
+ <value>txtTooltip</value>
</data>
- <data name=">>label2.Name" xml:space="preserve">
- <value>label2</value>
+ <data name=">>txtTooltip.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=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>txtTooltip.Parent" xml:space="preserve">
+ <value>grpLayerSettings</value>
</data>
- <data name=">>label2.Parent" xml:space="preserve">
- <value>grpFeatureClass</value>
- </data>
- <data name=">>label2.ZOrder" xml:space="preserve">
+ <data name=">>txtTooltip.ZOrder" xml:space="preserve">
<value>3</value>
</data>
- <data name="txtGeometry.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <data name="txtHyperlink.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="txtGeometry.Location" type="System.Drawing.Point, System.Drawing">
+ <data name="txtHyperlink.Location" type="System.Drawing.Point, System.Drawing">
<value>121, 44</value>
</data>
- <data name="txtGeometry.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="txtHyperlink.Size" type="System.Drawing.Size, System.Drawing">
<value>250, 20</value>
</data>
- <data name="txtGeometry.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
+ <data name="txtHyperlink.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
</data>
- <data name=">>txtGeometry.Name" xml:space="preserve">
- <value>txtGeometry</value>
+ <data name=">>txtHyperlink.Name" xml:space="preserve">
+ <value>txtHyperlink</value>
</data>
- <data name=">>txtGeometry.Type" xml:space="preserve">
+ <data name=">>txtHyperlink.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=">>txtGeometry.Parent" xml:space="preserve">
- <value>grpFeatureClass</value>
+ <data name=">>txtHyperlink.Parent" xml:space="preserve">
+ <value>grpLayerSettings</value>
</data>
- <data name=">>txtGeometry.ZOrder" xml:space="preserve">
+ <data name=">>txtHyperlink.ZOrder" xml:space="preserve">
<value>4</value>
</data>
- <data name="txtFeatureClass.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <data name="txtFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="txtFeatureClass.Location" type="System.Drawing.Point, System.Drawing">
+ <data name="txtFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>121, 19</value>
</data>
- <data name="txtFeatureClass.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="txtFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>250, 20</value>
</data>
- <data name="txtFeatureClass.TabIndex" type="System.Int32, mscorlib">
- <value>9</value>
+ <data name="txtFilter.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
</data>
- <data name=">>txtFeatureClass.Name" xml:space="preserve">
- <value>txtFeatureClass</value>
+ <data name=">>txtFilter.Name" xml:space="preserve">
+ <value>txtFilter</value>
</data>
- <data name=">>txtFeatureClass.Type" xml:space="preserve">
+ <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=">>txtFeatureClass.Parent" xml:space="preserve">
- <value>grpFeatureClass</value>
+ <data name=">>txtFilter.Parent" xml:space="preserve">
+ <value>grpLayerSettings</value>
</data>
- <data name=">>txtFeatureClass.ZOrder" xml:space="preserve">
+ <data name=">>txtFilter.ZOrder" xml:space="preserve">
<value>5</value>
</data>
+ <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 71</value>
+ </data>
+ <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+ <value>39, 13</value>
+ </data>
+ <data name="label6.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="label6.Text" xml:space="preserve">
+ <value>Tooltip</value>
+ </data>
+ <data name=">>label6.Name" xml:space="preserve">
+ <value>label6</value>
+ </data>
+ <data name=">>label6.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=">>label6.Parent" xml:space="preserve">
+ <value>grpLayerSettings</value>
+ </data>
+ <data name=">>label6.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="label5.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 47</value>
+ </data>
+ <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+ <value>51, 13</value>
+ </data>
+ <data name="label5.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="label5.Text" xml:space="preserve">
+ <value>Hyperlink</value>
+ </data>
+ <data name=">>label5.Name" xml:space="preserve">
+ <value>label5</value>
+ </data>
+ <data name=">>label5.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=">>label5.Parent" xml:space="preserve">
+ <value>grpLayerSettings</value>
+ </data>
+ <data name=">>label5.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 22</value>
+ </data>
+ <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+ <value>29, 13</value>
+ </data>
+ <data name="label4.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="label4.Text" xml:space="preserve">
+ <value>Filter</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>grpLayerSettings</value>
+ </data>
+ <data name=">>label4.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -769,6 +805,6 @@
<value>VectorLayerSettingsSectionCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=5.1.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2014-04-07 11:22:39 UTC (rev 8013)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2014-04-07 12:56:29 UTC (rev 8014)
@@ -1508,6 +1508,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to You have changed the Feature Class for this layer. Styles made for the previous Feature Class may no longer be applicable to this Feature Class. You should review such style settings (eg. Settings involving FDO expressions) to see if anything needs to be changed..
+ /// </summary>
+ internal static string LayerChangedFeatureClass {
+ get {
+ return ResourceManager.GetString("LayerChangedFeatureClass", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Layer Group ({0}) successfully converted to Base Layer Group ({1}).
/// </summary>
internal static string LayerGroupConvertedToBaseLayerGroup {
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2014-04-07 11:22:39 UTC (rev 8013)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2014-04-07 12:56:29 UTC (rev 8014)
@@ -1569,4 +1569,7 @@
<data name="CompositeThemeRequiresFirstRuleAsTemplate" xml:space="preserve">
<value>Generating a theme for a composite style, requires a composite rule</value>
</data>
+ <data name="LayerChangedFeatureClass" xml:space="preserve">
+ <value>You have changed the Feature Class for this layer. Styles made for the previous Feature Class may no longer be applicable to this Feature Class. You should review such style settings (eg. Settings involving FDO expressions) to see if anything needs to be changed.</value>
+ </data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list