[mapguide-commits] r5845 - in trunk/Tools/Maestro: Maestro.Editors Maestro.Editors/LayerDefinition Maestro.Editors/LayerDefinition/Vector/Scales Maestro.Editors/LayerDefinition/Vector/StyleEditors Maestro.Editors/Properties Maestro.Editors/Resources OSGeo.MapGuide.MaestroAPI/ObjectModels

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue May 24 11:56:21 EDT 2011


Author: jng
Date: 2011-05-24 08:56:21 -0700 (Tue, 24 May 2011)
New Revision: 5845

Added:
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.resx
   trunk/Tools/Maestro/Maestro.Editors/Resources/ruler1.png
Modified:
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.resx
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.resx
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
Log:
#1693: Implement layer editor support for KML extrusion. Also implement the "Show In Legend" checkbox which only applies to Layer Definition 1.3.0 resources


Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs	2011-05-24 15:56:21 UTC (rev 5845)
@@ -29,6 +29,7 @@
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using OSGeo.MapGuide.ObjectModels;
 using Maestro.Editors.LayerDefinition.Vector.Thematics;
+using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
 {
@@ -104,6 +105,12 @@
             m_line = item as ILineVectorStyle;
             m_area = item as IAreaVectorStyle;
 
+            var ar2 = m_area as IAreaVectorStyle2;
+            var pt2 = m_point as IPointVectorStyle2;
+            var ln2 = m_line as ILineVectorStyle2;
+
+            //Check if we're working with a 1.3.0 schema
+            ShowInLegend.Enabled = (ar2 != null || pt2 != null || ln2 != null);            
         }
 
         public void AddRule()
@@ -252,8 +259,25 @@
 
         private void ShowInLegend_CheckedChanged(object sender, EventArgs e)
         {
-            
+            var ar2 = m_area as IAreaVectorStyle2;
+            var pt2 = m_point as IPointVectorStyle2;
+            var ln2 = m_line as ILineVectorStyle2;
+
+            if (ar2 != null)
+            {
+                ar2.ShowInLegend = ShowInLegend.Checked;
+                m_owner.FlagDirty();
+            }
+            else if (pt2 != null)
+            {
+                pt2.ShowInLegend = ShowInLegend.Checked;
+                m_owner.FlagDirty();
+            }
+            else if (ln2 != null)
+            {
+                ln2.ShowInLegend = ShowInLegend.Checked;
+                m_owner.FlagDirty();
+            }
         }
-
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.designer.cs	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.designer.cs	2011-05-24 15:56:21 UTC (rev 5845)
@@ -30,7 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConditionListButtons));
-            this.conditionList = new ConditionList();
+            this.conditionList = new Maestro.Editors.LayerDefinition.Vector.Scales.ConditionList();
             this.label1 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
@@ -71,6 +71,7 @@
             // 
             // AddRuleButton
             // 
+            this.AddRuleButton.Image = global::Maestro.Editors.Properties.Resources.plus_circle;
             resources.ApplyResources(this.AddRuleButton, "AddRuleButton");
             this.AddRuleButton.Name = "AddRuleButton";
             this.toolTips.SetToolTip(this.AddRuleButton, resources.GetString("AddRuleButton.ToolTip"));
@@ -80,6 +81,7 @@
             // CopyRuleButton
             // 
             resources.ApplyResources(this.CopyRuleButton, "CopyRuleButton");
+            this.CopyRuleButton.Image = global::Maestro.Editors.Properties.Resources.document_copy;
             this.CopyRuleButton.Name = "CopyRuleButton";
             this.toolTips.SetToolTip(this.CopyRuleButton, resources.GetString("CopyRuleButton.ToolTip"));
             this.CopyRuleButton.UseVisualStyleBackColor = true;
@@ -96,6 +98,7 @@
             // MoveRuleDownButton
             // 
             resources.ApplyResources(this.MoveRuleDownButton, "MoveRuleDownButton");
+            this.MoveRuleDownButton.Image = global::Maestro.Editors.Properties.Resources.arrow_270;
             this.MoveRuleDownButton.Name = "MoveRuleDownButton";
             this.toolTips.SetToolTip(this.MoveRuleDownButton, resources.GetString("MoveRuleDownButton.ToolTip"));
             this.MoveRuleDownButton.UseVisualStyleBackColor = true;
@@ -104,6 +107,7 @@
             // MoveRuleUpButton
             // 
             resources.ApplyResources(this.MoveRuleUpButton, "MoveRuleUpButton");
+            this.MoveRuleUpButton.Image = global::Maestro.Editors.Properties.Resources.arrow_090;
             this.MoveRuleUpButton.Name = "MoveRuleUpButton";
             this.toolTips.SetToolTip(this.MoveRuleUpButton, resources.GetString("MoveRuleUpButton.ToolTip"));
             this.MoveRuleUpButton.UseVisualStyleBackColor = true;
@@ -135,11 +139,11 @@
             // 
             // ConditionListButtons
             // 
-            resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.Controls.Add(this.conditionList);
             this.Controls.Add(this.panel1);
             this.Name = "ConditionListButtons";
+            resources.ApplyResources(this, "$this");
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.ResumeLayout(false);

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.resx	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.resx	2011-05-24 15:56:21 UTC (rev 5845)
@@ -139,7 +139,7 @@
     <value>conditionList</value>
   </data>
   <data name="&gt;&gt;conditionList.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.ResourceEditors.LayerEditorControls.ScaleControls.ConditionList, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
+    <value>Maestro.Editors.LayerDefinition.Vector.Scales.ConditionList, Maestro.Editors, Version=3.0.0.5728, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;conditionList.Parent" xml:space="preserve">
     <value>$this</value>
@@ -181,13 +181,13 @@
     <value>304, 8</value>
   </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 13</value>
+    <value>69, 13</value>
   </data>
   <data name="label3.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="label3.Text" xml:space="preserve">
-    <value>Featurestyle</value>
+    <value>Feature Style</value>
   </data>
   <data name="&gt;&gt;label3.Name" xml:space="preserve">
     <value>label3</value>
@@ -208,13 +208,13 @@
     <value>440, 8</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>54, 13</value>
+    <value>59, 13</value>
   </data>
   <data name="label4.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
   <data name="label4.Text" xml:space="preserve">
-    <value>Labelstyle</value>
+    <value>Label Style</value>
   </data>
   <data name="&gt;&gt;label4.Name" xml:space="preserve">
     <value>label4</value>
@@ -231,21 +231,6 @@
   <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="AddRuleButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+Nk+9L
-        U2EUx/1Lls55vSsnmisoSVFDgl6EZDFsFJNZC+yaXiqXiK0NxVgtXJKSjAoMoTJ8UdGMIJa7iXO3NukH
-        gex14N/wre+B3Rpr1QMHzj33nM9zfj1VVRWON+5BR6RVhHolvzL7nmAtjtzrgJ68gMl0SIT64flD2H3V
-        URmkP7yIhikHhpIBxMwbmN2KYe7zDO6aM4hv3UQ0O4nAC5/40Lfs5vqwDb7nfZjYGMVU/hqms2G8L6RF
-        CInkxnF9Q0PfynEoEVspgGkffNCMwdQARrPDmMgFETLGUDyJ3DzGP16GvjmI82/6sT/hAmOsLJzRGnQ9
-        OQD/mhda5qxAgindAsyZcbHxny/lQetyMxgjAHa4caEObc/cOLPai6G3AVxZ+ymvhi3AHeO22Hk7fQhg
-        jEyHY+KH+6kT93MLVlAlhT1peaxKDGMtAI1s1r+OUXhXCiiWQEDvajeC6QDCGQ3TxojFWszPygRYGkso
-        ZmAtGBuyb0lB52sVPesunDab4DfcFiD2pR+nNptwzHChPelEyyPlVxPZSI5kb8KB7mQdPKaCc19VaB9c
-        JQD/JxUnMvXoeqlI/SVjJISL1L5kh3fdDm3bDn27GoWdvMitbz1iO2nUig99yzaR66n+BrlU2IXQd5sI
-        YQS3LdaIzx9XuUhkao1RmzgfXakWoU5bWdp/e6L/+5x/AIne8ctKOU3sAAAAAElFTkSuQmCC
-</value>
-  </data>
   <data name="AddRuleButton.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -273,21 +258,8 @@
   <data name="CopyRuleButton.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="CopyRuleButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAWBJREFUOE+Nk+lO
-        wlAQRnn/pyDxBTBGE0kUqikgVpZA4WpdAgZSSVjcQPDHmDNmkAaLNvlyp+2dM/PNbTNBUBNTqVQRxL3v
-        lyWfL0rmr4vN8Wi61iCerePTgie53MFuCID+YCIk2mpxbv9QgGSze+kQACSYgHTcnVQuQ00GsrMLA5BA
-        3Oo+qv/3+WpLy+WntMObJNAA3Wgg971YWAtFX5PHs48tBbVQrt0GxGYAmZe0/wNYKADY03iuKwU4Hezp
-        ARkACwjQ0bGnm5kHXbEi65L45XXxDShXqjpAa58Z8Myq8pzqgHvDNwUR8z4BoHrpoqXJ1gEV602nlbFm
-        M6m3+0kAVdztSNrRVBqdoZx4wa8dmKWrulOYdsAwoNOWyYZo1sw/9qhOEWylfuX2HdA61czemd+UwnlT
-        /Gq0GwDZhsjg3MOz2jM13OR/gPFsoRtNwEzrY0zzsfmbE3M6thIjcr8A7AeyRar4iUMAAAAASUVORK5C
-        YII=
-</value>
-  </data>
   <data name="CopyRuleButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>136, 0</value>
+    <value>138, 0</value>
   </data>
   <data name="CopyRuleButton.Size" type="System.Drawing.Size, System.Drawing">
     <value>32, 24</value>
@@ -327,7 +299,7 @@
 </value>
   </data>
   <data name="CreateThemeButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>104, 0</value>
+    <value>106, 0</value>
   </data>
   <data name="CreateThemeButton.Size" type="System.Drawing.Size, System.Drawing">
     <value>32, 24</value>
@@ -353,19 +325,6 @@
   <data name="MoveRuleDownButton.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="MoveRuleDownButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAZBJREFUOE+Nkk1L
-        AlEUhv19fSyDhDYlBUERUQ4IiUjQRpD6By3auDEGKiREyBhJMFPJ8SvNEZUCTQlLrcWp99QdZxoTB14O
-        zNzzcM4z12b7fhJJlaJRhRTlxhTxDhUJhyOE85YHjYPhJ/XePiYGgGBQtkIAQHO7O9TT6vTpbwAoFUtW
-        iBFQa7xQ4aHOAQBVzWucs4tzbhbRV/kPABj8oFZqbYbBRVVrmn1MAmSyjzwJ1kNNpnK8rkkoqJCIQ8YV
-        nlrv3HBcOiFf3stxKx4+ZwEIiUaAWOHg3kVH3R1yNRy0cTczPQATYO/9tET+rpOk+gqtxud5lakmEPa9
-        SacJAPBEgGhEhURPYlcHrClzPEEodDm6UJAIB63OgCVyo6qRfBum5dgCuVS7DoADvHMHPCNAJHL1C+jz
-        /0ZzIlXmwLqvsU6+jvTjIDtLm9dLfKn0iyQm0Jo9Qir1V06u0qVU8Zm2Yg79L2CFeDlndmCcAPtBkgiA
-        iWqBpLSd9oqLFMjI4x0AgsDuuPjlQ3KebuvfhMQv5TTlyUFPaVgAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="MoveRuleDownButton.Location" type="System.Drawing.Point, System.Drawing">
     <value>544, 0</value>
   </data>
@@ -393,20 +352,6 @@
   <data name="MoveRuleUpButton.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="MoveRuleUpButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAahJREFUOE+Nk01L
-        AlEYhf1l7VpEizaBFEEREmFQEGgFQYukTRD9g1atIlEESwmpxEZL0lSUydRG1Ci0ibDsY3Hq3JjRaaaP
-        gcO9c2fe577n3Bmb7fNKnudxfBxDLBY3SFvjSO3vh8H3TRcLX17f0X56+1UHBxH4fAEzhAAWtx5eTWqq
-        HbHGMRI5QvGyCK/Xb4T0Aqr1e8hXNeRlBUqjrc95z901GSBWAEK4K/MhtKLcCRizuFYaoB09i58ALExl
-        ZN1WU31BIlMQdg0AUhkivWoWuBstaIDUjQx/OfQzQAuxF8A5LVxW63DnpuAq2OGPh4U1UwdWgNvms/C9
-        HF/EZmsWKw0HnNIouP4vAJPfutiGR5nAuuqCuzYJZ3YQnuTS3wAWh1JRjJz0Y7Uyjo2HLmAs2gfPzlr3
-        FBgiLTBl+mZxrqCIwAKnh3BJTh3giA5CKuWxu+frAviFfQE6KFdbSGcrQsl0CYnzKyyfzBsAPB3LDPiA
-        KtcehXJFVWglsWACGH6s3g7YBVPWRCBD0zKgBctjJIRia981H5zB3NkwpqUh2AMDCIZCuoUPJ7XmPSyz
-        fF8AAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="MoveRuleUpButton.Location" type="System.Drawing.Point, System.Drawing">
     <value>512, 0</value>
   </data>
@@ -431,6 +376,27 @@
   <data name="&gt;&gt;MoveRuleUpButton.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="ShowInLegend.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="ShowInLegend.Location" type="System.Drawing.Point, System.Drawing">
+    <value>176, 6</value>
+  </data>
+  <data name="ShowInLegend.Size" type="System.Drawing.Size, System.Drawing">
+    <value>104, 17</value>
+  </data>
+  <data name="ShowInLegend.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="ShowInLegend.Text" xml:space="preserve">
+    <value>Show In Legend</value>
+  </data>
+  <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="ShowInLegend.ToolTip" xml:space="preserve">
+    <value>Check to show in legend (only avalible in LayerDefinition 1.3.0 and above). This can toggle legend visibility without removing your defined style rules</value>
+  </data>
   <data name="&gt;&gt;ShowInLegend.Name" xml:space="preserve">
     <value>ShowInLegend</value>
   </data>
@@ -467,45 +433,9 @@
   <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="ShowInLegend.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ShowInLegend.Location" type="System.Drawing.Point, System.Drawing">
-    <value>176, 6</value>
-  </data>
-  <data name="ShowInLegend.Size" type="System.Drawing.Size, System.Drawing">
-    <value>103, 17</value>
-  </data>
-  <data name="ShowInLegend.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
-  </data>
-  <data name="ShowInLegend.Text" xml:space="preserve">
-    <value>Show in Legend</value>
-  </data>
-  <data name="ShowInLegend.ToolTip" xml:space="preserve">
-    <value>Check to show in legend (only avalible in LayerDefinition 1.3.0 and above)</value>
-  </data>
-  <data name="&gt;&gt;ShowInLegend.Name" xml:space="preserve">
-    <value>ShowInLegend</value>
-  </data>
-  <data name="&gt;&gt;ShowInLegend.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ShowInLegend.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;ShowInLegend.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
     <value>593, 97</value>
   </data>

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs	2011-05-24 15:56:21 UTC (rev 5845)
@@ -27,9 +27,12 @@
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System.Threading;
+using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
 {
+    //NOTE: Be careful when opening this in the Winforms designer. Chance of designer code fubar is very high!
+
     [ToolboxItem(false)]
     internal partial class ScaleRange : UserControl
     {
@@ -80,6 +83,10 @@
                 MaxScale.Text = m_vsc.MaxScale.HasValue ? m_vsc.MaxScale.Value.ToString(Thread.CurrentThread.CurrentUICulture) : Properties.Resources.InfiniteValue;
                 MinScale.Text = m_vsc.MinScale.HasValue ? m_vsc.MinScale.Value.ToString(Thread.CurrentThread.CurrentUICulture) : Properties.Resources.InfiniteValue;
 
+                //Check if elevation is supported
+                var vsr2 = m_vsc as IVectorScaleRange2;
+                btnElevation.Enabled = (vsr2 != null);
+
                 scaleRangeConditions.SetItem(m_vsc);
             }
             finally
@@ -169,5 +176,17 @@
             scaleRangeConditions.ResizeAuto();
             this.Height = this.GetPreferedHeight();
         }
+
+        private void btnElevation_Click(object sender, EventArgs e)
+        {
+            var vsr2 = m_vsc as IVectorScaleRange2;
+            if (vsr2 != null)
+            {
+                if (new ElevationDialog(m_owner.EditorService, vsr2, m_owner.FeatureSourceId, m_owner.Schema, m_owner.GetFdoProvider()).ShowDialog() == DialogResult.OK)
+                {
+                    m_owner.FlagDirty();
+                }
+            }
+        }
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.designer.cs	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.designer.cs	2011-05-24 15:56:21 UTC (rev 5845)
@@ -36,6 +36,7 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.scaleRangeConditions = new ScaleRangeConditions();
             this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+            this.btnElevation = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
             this.SuspendLayout();
@@ -62,6 +63,7 @@
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.btnElevation);
             this.panel1.Controls.Add(this.MinScale);
             this.panel1.Controls.Add(this.MaxScale);
             resources.ApplyResources(this.panel1, "panel1");
@@ -83,14 +85,22 @@
             // 
             this.errorProvider.ContainerControl = this;
             // 
+            // btnElevation
+            // 
+            this.btnElevation.Image = global::Maestro.Editors.Properties.Resources.ruler;
+            resources.ApplyResources(this.btnElevation, "btnElevation");
+            this.btnElevation.Name = "btnElevation";
+            this.btnElevation.UseVisualStyleBackColor = true;
+            this.btnElevation.Click += new System.EventHandler(this.btnElevation_Click);
+            // 
             // ScaleRange
             // 
-            resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.Controls.Add(this.scaleRangeConditions);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.panel2);
             this.Name = "ScaleRange";
+            resources.ApplyResources(this, "$this");
             this.panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
             this.ResumeLayout(false);
@@ -105,5 +115,6 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.ErrorProvider errorProvider;
+        private System.Windows.Forms.Button btnElevation;
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.resx	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.resx	2011-05-24 15:56:21 UTC (rev 5845)
@@ -141,7 +141,7 @@
     <value>panel1</value>
   </data>
   <data name="&gt;&gt;MinScale.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="MaxScale.Items" xml:space="preserve">
     <value>infinite</value>
@@ -165,8 +165,38 @@
     <value>panel1</value>
   </data>
   <data name="&gt;&gt;MaxScale.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
+  <data name="btnElevation.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="btnElevation.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 39</value>
+  </data>
+  <data name="btnElevation.Size" type="System.Drawing.Size, System.Drawing">
+    <value>105, 23</value>
+  </data>
+  <data name="btnElevation.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="btnElevation.Text" xml:space="preserve">
+    <value>KML Elevation</value>
+  </data>
+  <data name="btnElevation.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
+  <data name="&gt;&gt;btnElevation.Name" xml:space="preserve">
+    <value>btnElevation</value>
+  </data>
+  <data name="&gt;&gt;btnElevation.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnElevation.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="&gt;&gt;btnElevation.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Left</value>
@@ -232,7 +262,7 @@
     <value>scaleRangeConditions</value>
   </data>
   <data name="&gt;&gt;scaleRangeConditions.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.ResourceEditors.LayerEditorControls.ScaleControls.ScaleRangeConditions, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+    <value>Maestro.Editors.LayerDefinition.Vector.Scales.ScaleRangeConditions, Maestro.Editors, Version=3.0.0.5728, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;scaleRangeConditions.Parent" xml:space="preserve">
     <value>$this</value>
@@ -246,9 +276,6 @@
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.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.Size" type="System.Drawing.Size, System.Drawing">
     <value>802, 338</value>
   </data>

Added: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.Designer.cs	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.Designer.cs	2011-05-24 15:56:21 UTC (rev 5845)
@@ -0,0 +1,233 @@
+namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
+{
+    partial class ElevationDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.btnSave = new System.Windows.Forms.Button();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.chkEnabled = new System.Windows.Forms.CheckBox();
+            this.grpSettings = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.txtZOffset = new System.Windows.Forms.TextBox();
+            this.txtZExtrusion = new System.Windows.Forms.TextBox();
+            this.cmbZOffsetType = new System.Windows.Forms.ComboBox();
+            this.cmbUnits = new System.Windows.Forms.ComboBox();
+            this.btnZOffset = new System.Windows.Forms.Button();
+            this.btnZExtrusion = new System.Windows.Forms.Button();
+            this.grpSettings.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnSave
+            // 
+            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSave.Location = new System.Drawing.Point(25, 247);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(75, 23);
+            this.btnSave.TabIndex = 0;
+            this.btnSave.Text = "Save";
+            this.btnSave.UseVisualStyleBackColor = true;
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.Location = new System.Drawing.Point(106, 247);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(75, 23);
+            this.btnCancel.TabIndex = 1;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // chkEnabled
+            // 
+            this.chkEnabled.AutoSize = true;
+            this.chkEnabled.Location = new System.Drawing.Point(12, 12);
+            this.chkEnabled.Name = "chkEnabled";
+            this.chkEnabled.Size = new System.Drawing.Size(106, 17);
+            this.chkEnabled.TabIndex = 2;
+            this.chkEnabled.Text = "Settings Enabled";
+            this.chkEnabled.UseVisualStyleBackColor = true;
+            this.chkEnabled.CheckedChanged += new System.EventHandler(this.chkEnabled_CheckedChanged);
+            // 
+            // grpSettings
+            // 
+            this.grpSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.grpSettings.Controls.Add(this.btnZExtrusion);
+            this.grpSettings.Controls.Add(this.btnZOffset);
+            this.grpSettings.Controls.Add(this.cmbUnits);
+            this.grpSettings.Controls.Add(this.cmbZOffsetType);
+            this.grpSettings.Controls.Add(this.txtZExtrusion);
+            this.grpSettings.Controls.Add(this.txtZOffset);
+            this.grpSettings.Controls.Add(this.label4);
+            this.grpSettings.Controls.Add(this.label3);
+            this.grpSettings.Controls.Add(this.label2);
+            this.grpSettings.Controls.Add(this.label1);
+            this.grpSettings.Location = new System.Drawing.Point(12, 36);
+            this.grpSettings.Name = "grpSettings";
+            this.grpSettings.Size = new System.Drawing.Size(169, 205);
+            this.grpSettings.TabIndex = 3;
+            this.grpSettings.TabStop = false;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(7, 20);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(45, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Z Offset";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(7, 104);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(72, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Z Offset Type";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(7, 62);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(60, 13);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "Z Extrusion";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(7, 150);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(31, 13);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "Units";
+            // 
+            // txtZOffset
+            // 
+            this.txtZOffset.Location = new System.Drawing.Point(10, 37);
+            this.txtZOffset.Name = "txtZOffset";
+            this.txtZOffset.Size = new System.Drawing.Size(114, 20);
+            this.txtZOffset.TabIndex = 4;
+            this.txtZOffset.TextChanged += new System.EventHandler(this.txtZOffset_TextChanged);
+            // 
+            // txtZExtrusion
+            // 
+            this.txtZExtrusion.Location = new System.Drawing.Point(10, 78);
+            this.txtZExtrusion.Name = "txtZExtrusion";
+            this.txtZExtrusion.Size = new System.Drawing.Size(114, 20);
+            this.txtZExtrusion.TabIndex = 5;
+            this.txtZExtrusion.TextChanged += new System.EventHandler(this.txtZExtrusion_TextChanged);
+            // 
+            // cmbZOffsetType
+            // 
+            this.cmbZOffsetType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbZOffsetType.FormattingEnabled = true;
+            this.cmbZOffsetType.Location = new System.Drawing.Point(10, 120);
+            this.cmbZOffsetType.Name = "cmbZOffsetType";
+            this.cmbZOffsetType.Size = new System.Drawing.Size(144, 21);
+            this.cmbZOffsetType.TabIndex = 6;
+            this.cmbZOffsetType.SelectedIndexChanged += new System.EventHandler(this.cmbZOffsetType_SelectedIndexChanged);
+            // 
+            // cmbUnits
+            // 
+            this.cmbUnits.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbUnits.FormattingEnabled = true;
+            this.cmbUnits.Location = new System.Drawing.Point(10, 167);
+            this.cmbUnits.Name = "cmbUnits";
+            this.cmbUnits.Size = new System.Drawing.Size(144, 21);
+            this.cmbUnits.TabIndex = 7;
+            this.cmbUnits.SelectedIndexChanged += new System.EventHandler(this.cmbUnits_SelectedIndexChanged);
+            // 
+            // btnZOffset
+            // 
+            this.btnZOffset.Location = new System.Drawing.Point(130, 35);
+            this.btnZOffset.Name = "btnZOffset";
+            this.btnZOffset.Size = new System.Drawing.Size(24, 23);
+            this.btnZOffset.TabIndex = 8;
+            this.btnZOffset.Text = "...";
+            this.btnZOffset.UseVisualStyleBackColor = true;
+            this.btnZOffset.Click += new System.EventHandler(this.btnZOffset_Click);
+            // 
+            // btnZExtrusion
+            // 
+            this.btnZExtrusion.Location = new System.Drawing.Point(130, 76);
+            this.btnZExtrusion.Name = "btnZExtrusion";
+            this.btnZExtrusion.Size = new System.Drawing.Size(24, 23);
+            this.btnZExtrusion.TabIndex = 9;
+            this.btnZExtrusion.Text = "...";
+            this.btnZExtrusion.UseVisualStyleBackColor = true;
+            this.btnZExtrusion.Click += new System.EventHandler(this.btnZExtrusion_Click);
+            // 
+            // ElevationDialog
+            // 
+            this.AcceptButton = this.btnSave;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(193, 282);
+            this.ControlBox = false;
+            this.Controls.Add(this.grpSettings);
+            this.Controls.Add(this.chkEnabled);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnSave);
+            this.Name = "ElevationDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "KML Elevation/Extrusion Settings";
+            this.grpSettings.ResumeLayout(false);
+            this.grpSettings.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnSave;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.CheckBox chkEnabled;
+        private System.Windows.Forms.GroupBox grpSettings;
+        private System.Windows.Forms.Button btnZOffset;
+        private System.Windows.Forms.ComboBox cmbUnits;
+        private System.Windows.Forms.ComboBox cmbZOffsetType;
+        private System.Windows.Forms.TextBox txtZExtrusion;
+        private System.Windows.Forms.TextBox txtZOffset;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button btnZExtrusion;
+    }
+}
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs	2011-05-24 15:56:21 UTC (rev 5845)
@@ -0,0 +1,143 @@
+#region Disclaimer / License
+// Copyright (C) 2011, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+
+namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
+{
+    internal partial class ElevationDialog : Form
+    {
+        private IEditorService _edSvc;
+        private IVectorScaleRange2 _vsr2;
+
+        private ClassDefinition _clsDef;
+        private string _provider;
+        private string _featureSourceId;
+
+        private IElevationSettings _elSettings;
+
+        private bool _init;
+
+        public ElevationDialog(IEditorService edSvc, IVectorScaleRange2 vsr2, string featureSourceId, ClassDefinition clsDef, string provider)
+        {
+            InitializeComponent();
+
+            _edSvc = edSvc;
+            _vsr2 = vsr2;
+            _clsDef = clsDef;
+            _provider = provider;
+            _featureSourceId = featureSourceId;
+
+            cmbUnits.DataSource = Enum.GetValues(typeof(LengthUnitType));
+            cmbZOffsetType.DataSource = Enum.GetValues(typeof(ElevationTypeType));
+
+            _elSettings = vsr2.ElevationSettings;
+            grpSettings.Enabled = (_elSettings != null);
+            chkEnabled.Checked = (_elSettings != null);
+
+            if (_elSettings == null)
+                _elSettings = vsr2.Create("0", "0", ElevationTypeType.RelativeToGround, LengthUnitType.Meters);
+
+            try
+            {
+                _init = true;
+
+                txtZExtrusion.Text = _elSettings.ZExtrusion;
+                txtZOffset.Text = _elSettings.ZOffset;
+                cmbUnits.SelectedItem = _elSettings.Unit;
+                cmbZOffsetType.SelectedItem = _elSettings.ZOffsetType;
+            }
+            finally
+            {
+                _init = false;
+            }
+        }
+
+        private void chkEnabled_CheckedChanged(object sender, EventArgs e)
+        {
+            grpSettings.Enabled = chkEnabled.Checked;
+        }
+
+        private void txtZOffset_TextChanged(object sender, EventArgs e)
+        {
+            if (_init)
+                return;
+            _elSettings.ZOffset = txtZOffset.Text;
+        }
+
+        private void txtZExtrusion_TextChanged(object sender, EventArgs e)
+        {
+            if (_init)
+                return;
+            _elSettings.ZExtrusion = txtZExtrusion.Text;
+        }
+
+        private void cmbZOffsetType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (_init)
+                return;
+            _elSettings.ZOffsetType = (ElevationTypeType)cmbZOffsetType.SelectedItem;
+        }
+
+        private void cmbUnits_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (_init)
+                return;
+            _elSettings.Unit = (LengthUnitType)cmbUnits.SelectedItem;
+        }
+
+        private void btnZOffset_Click(object sender, EventArgs e)
+        {
+            string expr = _edSvc.EditExpression(txtZOffset.Text, _clsDef, _provider, _featureSourceId);
+            if (expr != null)
+                txtZOffset.Text = expr;
+        }
+
+        private void btnZExtrusion_Click(object sender, EventArgs e)
+        {
+            string expr = _edSvc.EditExpression(txtZExtrusion.Text, _clsDef, _provider, _featureSourceId);
+            if (expr != null)
+                txtZExtrusion.Text = expr;
+        }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            //Attach or detach based on checkbox
+            if (chkEnabled.Checked)
+                _vsr2.ElevationSettings = _elSettings;
+            else
+                _vsr2.ElevationSettings = null;
+
+            this.DialogResult = DialogResult.OK;
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+        }
+    }
+}

Added: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.resx	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.resx	2011-05-24 15:56:21 UTC (rev 5845)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs	2011-05-24 15:56:21 UTC (rev 5845)
@@ -93,6 +93,14 @@
             
         }
 
+        internal void FlagDirty() { OnResourceChanged(); }
+
+        internal string GetFdoProvider()
+        {
+            var fs = (IFeatureSource)_edsvc.ResourceService.GetResource(_vl.ResourceId);
+            return fs.Provider;
+        }
+
         internal ClassDefinition Schema
         {
             get { return resSettings.GetSelectedClass(); }

Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2011-05-24 15:56:21 UTC (rev 5845)
@@ -707,6 +707,12 @@
     <Compile Include="LayerDefinition\Vector\StyleEditors\AreaFeatureStyleEditor.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="LayerDefinition\Vector\StyleEditors\ElevationDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="LayerDefinition\Vector\StyleEditors\ElevationDialog.Designer.cs">
+      <DependentUpon>ElevationDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="LayerDefinition\Vector\StyleEditors\FillStyleEditor.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -1314,6 +1320,9 @@
     <EmbeddedResource Include="LayerDefinition\Vector\StyleEditors\AreaFeatureStyleEditor.resx">
       <DependentUpon>AreaFeatureStyleEditor.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="LayerDefinition\Vector\StyleEditors\ElevationDialog.resx">
+      <DependentUpon>ElevationDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="LayerDefinition\Vector\StyleEditors\FillStyleEditor.resx">
       <DependentUpon>FillStyleEditor.cs</DependentUpon>
     </EmbeddedResource>
@@ -1944,6 +1953,7 @@
     <Content Include="OdbcDriverMap.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="Resources\ruler1.png" />
     <None Include="Resources\document-task.png" />
     <None Include="Resources\document.png" />
     <None Include="Resources\ui-separator.png" />

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2011-05-24 15:56:21 UTC (rev 5845)
@@ -2252,6 +2252,13 @@
             }
         }
         
+        internal static System.Drawing.Bitmap ruler1 {
+            get {
+                object obj = ResourceManager.GetObject("ruler1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Save Resource.
         /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx	2011-05-24 15:56:21 UTC (rev 5845)
@@ -125,12 +125,9 @@
     <value>Failed to read {0} color(s) in line {1}</value>
     <comment>An error message that is displayed if the expected color count does not match the actual count</comment>
   </data>
-  <data name="Confirm" xml:space="preserve">
-    <value>Confirm</value>
+  <data name="InvokeUrlNoMapDefined" xml:space="preserve">
+    <value>Cannot get layers. No map definition specified</value>
   </data>
-  <data name="gear--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\gear--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="minus-circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minus-circle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -143,8 +140,8 @@
   <data name="application--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\application--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="property" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\property.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ErrorLoadingWmsConfig" xml:space="preserve">
+    <value>Error loading WMS configuration document: {0}. A default document will be created</value>
   </data>
   <data name="DataReadError" xml:space="preserve">
     <value>Unable to read data from the selected column: {0}</value>
@@ -175,24 +172,27 @@
   <data name="icon_refreshmap_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_refreshmap_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="folder_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="block" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\block.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="InvokeScriptCmdDescription" xml:space="preserve">
-    <value>Invoke Script Command</value>
-  </data>
   <data name="InvalidResourceIdFolder" xml:space="preserve">
     <value>Must be valid resource id. Cannot be a folder</value>
   </data>
-  <data name="SelectProperty" xml:space="preserve">
-    <value>Select Property</value>
-  </data>
   <data name="ColHeaderName" xml:space="preserve">
     <value>Name</value>
   </data>
   <data name="SelectSpatialContext" xml:space="preserve">
     <value>Select Spatial Context</value>
   </data>
+  <data name="ui_splitter_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ui-splitter-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SaveResourceFirst" xml:space="preserve">
+    <value>Please save this resource first</value>
+  </data>
   <data name="layer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -202,16 +202,12 @@
   <data name="control" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_selectradius_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_selectradius_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sql" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_zoomout_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_zoomout_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PackageReadError" xml:space="preserve">
-    <value>Failed to read package. Error message was: {0}</value>
-    <comment>A message displayed when the package could not be read</comment>
-  </data>
   <data name="sql-join-left" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql-join-left.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -235,11 +231,11 @@
   <data name="table--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="cross-circle-frame" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\cross-circle-frame.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="TitleNewFeatureClass" xml:space="preserve">
+    <value>New Feature Class</value>
   </data>
-  <data name="InvokeUrlNoMapDefined" xml:space="preserve">
-    <value>Cannot get layers. No map definition specified</value>
+  <data name="LayerGroupConvertedToBaseLayerGroup" xml:space="preserve">
+    <value>Layer Group ({0}) successfully converted to Base Layer Group ({1})</value>
   </data>
   <data name="server" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\server.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -266,11 +262,12 @@
   <data name="document--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\document--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="layers-stack-arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\layers-stack-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PromptDeleteWidgetAndReferences" xml:space="preserve">
+    <value>Delete this widget and all references to it?</value>
   </data>
-  <data name="icon_selectwithin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_selectwithin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ContentFileMissing" xml:space="preserve">
+    <value>The content file does not exist</value>
+    <comment>A message displayed when the user selects a non-existing file</comment>
   </data>
   <data name="gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -278,6 +275,9 @@
   <data name="AggregateQuery" xml:space="preserve">
     <value>Aggregate Query</value>
   </data>
+  <data name="InvalidResourceIdNotSpecifiedType" xml:space="preserve">
+    <value>Invalid Resource Identifier. Not the specified type</value>
+  </data>
   <data name="icon_zoomin" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_zoomin.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -299,11 +299,14 @@
   <data name="SpecifySecondaryFeatureSource" xml:space="preserve">
     <value>Please specify the secondary feature source</value>
   </data>
+  <data name="globe--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="drive-download" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\drive-download.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_search" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_search.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_null" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_null.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="QualitativeName" xml:space="preserve">
     <value>Qualitative</value>
@@ -315,12 +318,11 @@
   <data name="sort-number" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sort-number.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SelectWidget" xml:space="preserve">
-    <value>Select widget</value>
+  <data name="icon_selectwithin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_selectwithin.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="InvalidValueError" xml:space="preserve">
-    <value>Invalid value</value>
-    <comment>An error message that is displayed when the entered value is invalid</comment>
+  <data name="DeleteCommand" xml:space="preserve">
+    <value>Delete Command</value>
   </data>
   <data name="sql-join-right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql-join-right.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -375,9 +377,6 @@
   <data name="ui-separator" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ui-separator.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CustomCommandsExported" xml:space="preserve">
-    <value>Custom commands exported to {0}</value>
-  </data>
   <data name="UnitsKb" xml:space="preserve">
     <value>KB</value>
   </data>
@@ -387,9 +386,6 @@
   <data name="icon_panright_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_panright_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="NoSchemasInFeatureSource" xml:space="preserve">
-    <value>Feature Source has no schemas</value>
-  </data>
   <data name="RdbmsFeatureSource" xml:space="preserve">
     <value>RDBMS Feature Source</value>
   </data>
@@ -400,25 +396,21 @@
   <data name="TestConnectionNoErrors" xml:space="preserve">
     <value>Provider reported no errors</value>
   </data>
-  <data name="icon_zoomrect" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomrect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="globe--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\globe--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_selectpolygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_selectpolygon.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CustomCommandsExported" xml:space="preserve">
+    <value>Custom commands exported to {0}</value>
   </data>
+  <data name="SelectFeatureClass" xml:space="preserve">
+    <value>Select Feature Class</value>
+  </data>
   <data name="FileDownloaded" xml:space="preserve">
     <value>File Downloaded to {0}</value>
   </data>
   <data name="map--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\map--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="InvalidColorComponent" xml:space="preserve">
-    <value>Invalid {0} color component {1} in line {2}</value>
-    <comment>An error message that is displayed if a color component is outside the [0-255] range.
-{0} is the color component, eg. R, G or B
-{1} is the value read
-{2} is the line where the error was encountered</comment>
-  </data>
   <data name="NoTypesSelected" xml:space="preserve">
     <value>You must select at least one type</value>
     <comment>A message that is displayed when the user has not selected any resource types</comment>
@@ -438,16 +430,13 @@
   <data name="Infinity" xml:space="preserve">
     <value>Infinity</value>
   </data>
-  <data name="globe--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="TitleWarning" xml:space="preserve">
+    <value>Warning</value>
   </data>
   <data name="UnknownResourceTypes" xml:space="preserve">
     <value>Unknown types</value>
     <comment>The list entry that represents unknown resource types</comment>
   </data>
-  <data name="IncompatibleConnection" xml:space="preserve">
-    <value>This connection is not compatible</value>
-  </data>
   <data name="icon_panright" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_panright.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -458,11 +447,14 @@
   <data name="icon_home" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_home.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="QuestionResetFsOverrideList" xml:space="preserve">
+    <value>Reset Feature Source override list?</value>
+  </data>
   <data name="icon_restorecenter_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_restorecenter_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="map--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\map--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SelectProperty" xml:space="preserve">
+    <value>Select Property</value>
   </data>
   <data name="icon_tasks_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_tasks_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -483,6 +475,9 @@
   <data name="icon_pan" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_pan.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_search_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_search_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon_viewoptions" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_viewoptions.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -495,12 +490,9 @@
   <data name="drive-upload" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\drive-upload.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="document--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\document--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SpatialContextsFound" xml:space="preserve">
+    <value>{0} spatial contexts found</value>
   </data>
-  <data name="application-import" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\application-import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="NewLayerGroup" xml:space="preserve">
     <value>New Layer Group</value>
   </data>
@@ -513,22 +505,31 @@
   <data name="FdoConnectionStringComponentNotFound" xml:space="preserve">
     <value>The component "{0}" could not be found in the specified FDO connection string</value>
   </data>
+  <data name="FindNothing" xml:space="preserve">
+    <value>Could not find specified string or end of document reached</value>
+  </data>
   <data name="OutputFileMissing" xml:space="preserve">
     <value>You must enter a full path to the output file</value>
     <comment>A message that is displayed when the user has not entered an output file</comment>
   </data>
-  <data name="ExpressionItem" xml:space="preserve">
-    <value>Expression...</value>
-    <comment>A value displayed in the combobox to activate the expression builder</comment>
+  <data name="FontPreviewError" xml:space="preserve">
+    <value>Cannot Preview Font "{0}"</value>
+    <comment>An error message that is displayed when the rendering fails, using the specified font</comment>
   </data>
+  <data name="InvalidConnection" xml:space="preserve">
+    <value>This is not a valid connection: {0}</value>
+  </data>
+  <data name="OdbcCannotInferDriver" xml:space="preserve">
+    <value>Could not infer ODBC driver from file name: {0}</value>
+  </data>
   <data name="OdbcConnectionStringComponentNotFound" xml:space="preserve">
     <value>The component "{0}" could not be found in the specified ODBC connection string</value>
   </data>
   <data name="UnitsMs" xml:space="preserve">
     <value>ms</value>
   </data>
-  <data name="icon_print" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_print.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ErrorMapExtentCalculationFailed" xml:space="preserve">
+    <value>Could not transform extents of any layer in this Map Definition. You will have to specify the extents manually.</value>
   </data>
   <data name="databases-relation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\databases-relation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -537,9 +538,6 @@
     <value>An error occured while validating the output file path: {0}</value>
     <comment>A message that is displayed to the user when the output path is invalid</comment>
   </data>
-  <data name="ExportNoCustomCommandsSelected" xml:space="preserve">
-    <value>No custom commands selected. Nothing to export</value>
-  </data>
   <data name="arrow-return-180" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow-return-180.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -549,6 +547,9 @@
   <data name="icon_refreshmap" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_refreshmap.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TitleQuestion" xml:space="preserve">
+    <value>Question</value>
+  </data>
   <data name="SequentialName" xml:space="preserve">
     <value>Sequential</value>
     <comment>A display name for the Sequential data type</comment>
@@ -560,6 +561,9 @@
     <value>You have entered a non-numeric value in the Reference Y field. Due to a bug in MapGuide, this will likely give an error when saving.</value>
     <comment>An error message that is displayed if the user attempts to use an expression as the InsertionPointY value (caused by an xsd bug in MapGuide)</comment>
   </data>
+  <data name="FieldRequired" xml:space="preserve">
+    <value>This field is required: {0}</value>
+  </data>
   <data name="icon_copy_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_copy_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -570,11 +574,11 @@
   <data name="SaveResource" xml:space="preserve">
     <value>Save Resource</value>
   </data>
-  <data name="OdbcCannotInferDriver" xml:space="preserve">
-    <value>Could not infer ODBC driver from file name: {0}</value>
+  <data name="CoordinateTransformationFailed" xml:space="preserve">
+    <value>Failed to transform coordinates: {0}</value>
   </data>
-  <data name="icon_measure" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_measure.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PromptName" xml:space="preserve">
+    <value>Enter the name</value>
   </data>
   <data name="PropertyTooltip" xml:space="preserve">
     <value>Property: {0}
@@ -597,13 +601,11 @@
     <value>An error occured while copying file: {0}</value>
     <comment>A message displayed when a file copy fails</comment>
   </data>
-  <data name="FiletypeMGP" xml:space="preserve">
-    <value>MapGuide Packages ({0})</value>
-    <comment>The text displayed when browsing for MGP files</comment>
+  <data name="layers-stack-arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\layers-stack-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TooManyIndiviualValuesError" xml:space="preserve">
-    <value>The selected column contains more than {0} different values, and thus cannot be used for theming with individual values</value>
-    <comment>An error message that is displayed if the selected column has too many distinct values</comment>
+  <data name="UpdatingConfiguration" xml:space="preserve">
+    <value>Updating Configuration Document</value>
   </data>
   <data name="RepositoryWipeWarning" xml:space="preserve">
     <value>You have selected to restore the package at the root.
@@ -624,11 +626,14 @@
   <data name="folder--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_plotdwf_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_plotdwf_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="folder--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FindReplaceNothing" xml:space="preserve">
-    <value>Nothing to replace</value>
+  <data name="ExportNoCustomCommandsSelected" xml:space="preserve">
+    <value>No custom commands selected. Nothing to export</value>
   </data>
   <data name="gear--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gear--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -646,6 +651,9 @@
   <data name="icon_invokescript" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_invokescript.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="WarningMapExtentCalculation" xml:space="preserve">
+    <value>Could not transform extents of one or more layers in this Map Definition. These extents have not been factored into the computed result.</value>
+  </data>
   <data name="icon_buffer_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_buffer_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -669,19 +677,25 @@
 Are you sure this is what you want?</value>
     <comment>A message displayed when the user has not entered a restore path</comment>
   </data>
+  <data name="icon_popupscrolldown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_popupscrolldown.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="cross-script" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cross-script.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_zoomin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="ExportNoCommandsSelected" xml:space="preserve">
     <value>No commands selected. Nothing to export</value>
   </data>
+  <data name="StandardQuery" xml:space="preserve">
+    <value>Standard Query</value>
+  </data>
   <data name="SymbolTypeNotSupported" xml:space="preserve">
     <value>Only symbols of type "Mark" and "Font" are currently supported</value>
     <comment>A message that is displayed when the user attempts to modify an item with an unsupported type</comment>
   </data>
+  <data name="arrow-curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="FdoConnectionStatus" xml:space="preserve">
     <value>FDO Connection Status: {0}</value>
   </data>
@@ -702,21 +716,17 @@
     <value>An error occured while building package: {0}</value>
     <comment>A message displayed when the package creation fails</comment>
   </data>
-  <data name="BetweenLabel" xml:space="preserve">
-    <value>Between {0} and {1}</value>
-    <comment>The label used for all "between" values in the graduated theme set</comment>
+  <data name="cross-circle-frame" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cross-circle-frame.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="script--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\script--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CheckGeometryFirst" xml:space="preserve">
-    <value>Ensure the Geometry box is checked</value>
-  </data>
   <data name="sql-join" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql-join.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_zoomrect_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomrect_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="NoSchemasInFeatureSource" xml:space="preserve">
+    <value>Feature Source has no schemas</value>
   </data>
   <data name="FiletypeAll" xml:space="preserve">
     <value>All files ({0})</value>
@@ -725,9 +735,15 @@
   <data name="NoActiveDataFile" xml:space="preserve">
     <value>No active resource data file selected</value>
   </data>
-  <data name="SelectFeatureClass" xml:space="preserve">
-    <value>Select Feature Class</value>
+  <data name="XmlDocIsValid" xml:space="preserve">
+    <value>Document is valid</value>
   </data>
+  <data name="map--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\map--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icon_zoomnext" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomnext.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon_zoomprev_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_zoomprev_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -741,11 +757,11 @@
     <value>You must enter a alternate name, or remove the checkmark</value>
     <comment>A message displayed when the user has not entered an alternate name for a resource</comment>
   </data>
-  <data name="globe--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\globe--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="globe--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DeleteCommand" xml:space="preserve">
-    <value>Delete Command</value>
+  <data name="icon_selectwithin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_selectwithin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_selectradius" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_selectradius.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -753,32 +769,35 @@
   <data name="application-export" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\application-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  <data name="icon_select_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_select_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="question" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="TitleError" xml:space="preserve">
     <value>Error</value>
   </data>
-  <data name="icon_search_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_search_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FindReplaceNothing" xml:space="preserve">
+    <value>Nothing to replace</value>
   </data>
-  <data name="icon_plotdwf_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_plotdwf_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_zoomin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FilterAll" xml:space="preserve">
+    <value>All File Types (*.*)|*.*</value>
   </data>
-  <data name="ui_splitter_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ui-splitter-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Confirm" xml:space="preserve">
+    <value>Confirm</value>
   </data>
-  <data name="folder_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\folder-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gear--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\gear--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_ctxarrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_ctxarrow.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ColorBrewer" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ColorBrewer.csv;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  <data name="icon_measure" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_measure.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="FilenameValidationError" xml:space="preserve">
     <value>Failed to validate the filenames: {0}</value>
@@ -787,12 +806,15 @@
   <data name="table" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="question" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="database--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\database--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FindNothing" xml:space="preserve">
-    <value>Could not find specified string or end of document reached</value>
+  <data name="icon_selectpolygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_selectpolygon.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_zoomrect" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomrect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon_panup" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_panup.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -809,12 +831,15 @@
     <value>The header file does not exist</value>
     <comment>A message displayed when the user selects a non-existing file</comment>
   </data>
-  <data name="icon_select_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_select_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_search.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ConfirmDeleteResourceData" xml:space="preserve">
     <value>Are you sure you want to delete this resource data?</value>
   </data>
+  <data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="MgCooker" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -837,6 +862,12 @@
     <value>Select the package file to edit</value>
     <comment>The title of the dialog that the is used to pick the package file to edit</comment>
   </data>
+  <data name="icon_zoomprev" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomprev.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ProcessedItem" xml:space="preserve">
+    <value>Processed: {0}</value>
+  </data>
   <data name="icon_fitwindow_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_fitwindow_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -844,8 +875,8 @@
     <value>Invalid column name</value>
     <comment>An error message that is displayed when the column selected does not exist</comment>
   </data>
-  <data name="SaveResourceFirst" xml:space="preserve">
-    <value>Please save this resource first</value>
+  <data name="icon_print" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_print.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="FilterShp" xml:space="preserve">
     <value>ESRI Shape File (*.shp)|*.shp</value>
@@ -860,9 +891,6 @@
   <data name="FilterSdf" xml:space="preserve">
     <value>Autodesk SDF (*.sdf)|*.sdf</value>
   </data>
-  <data name="icon_zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoom.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="SelectFolder" xml:space="preserve">
     <value>Select Folder</value>
   </data>
@@ -884,6 +912,12 @@
   <data name="arrow-circle-135" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow-circle-135.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="document_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document-task.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="WidgetNameExists" xml:space="preserve">
+    <value>A widget named {0} already exists</value>
+  </data>
   <data name="CustomCommandsImported" xml:space="preserve">
     <value>{0} custom commands imported from {1}. The following commands had to be renamed to prevent clashes: {2}</value>
   </data>
@@ -913,6 +947,12 @@
   <data name="icon_buffer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_buffer.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_zoomrect_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomrect_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrow-090" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="AllResourceTypes" xml:space="preserve">
     <value>All types</value>
     <comment>The list entry that represents all resource types</comment>
@@ -938,27 +978,35 @@
   <data name="PropEnumNoValues" xml:space="preserve">
     <value>Could not find possible values for enumerable property</value>
   </data>
-  <data name="SelectLayerFirst" xml:space="preserve">
-    <value>Please select the layer first</value>
+  <data name="CheckGeometryFirst" xml:space="preserve">
+    <value>Ensure the Geometry box is checked</value>
   </data>
+  <data name="SelectColumnPlaceholder" xml:space="preserve">
+    <value>&lt;Select column&gt;</value>
+    <comment>A placeholder message displayed when the user has not yet selected a column</comment>
+  </data>
   <data name="ModeNotAllowed" xml:space="preserve">
     <value>Mode not allowed: {0}</value>
   </data>
+  <data name="NoScalesToGenerate" xml:space="preserve">
+    <value>Number of Scales to generate cannot be less than or equal to 0</value>
+  </data>
   <data name="icon_zoomselect_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_zoomselect_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="gear--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gear--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_zoomnext_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomnext_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SelectWidget" xml:space="preserve">
+    <value>Select widget</value>
   </data>
   <data name="TooManyValuesError" xml:space="preserve">
     <value>The selected column contains more than {0} different values, and thus cannot be used for theming</value>
     <comment>An error message that is displayed if the selected column has too many distinct values</comment>
   </data>
-  <data name="icon_null" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_null.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FiletypeMGP" xml:space="preserve">
+    <value>MapGuide Packages ({0})</value>
+    <comment>The text displayed when browsing for MGP files</comment>
   </data>
   <data name="icon_panleft_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_panleft_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -972,8 +1020,8 @@
   <data name="OdbcNoMarkedFile" xml:space="preserve">
     <value>Could not infer ODBC driver. No file specified</value>
   </data>
-  <data name="icon_zoomprev" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomprev.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoom.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -991,20 +1039,26 @@
   <data name="LoadProcedureVersionExecutionNotSupported" xml:space="preserve">
     <value>This connection does not support executing this type of Load Procedure</value>
   </data>
-  <data name="StandardQuery" xml:space="preserve">
-    <value>Standard Query</value>
+  <data name="IncompatibleConnection" xml:space="preserve">
+    <value>This connection is not compatible</value>
   </data>
-  <data name="TooMuchDataWarning" xml:space="preserve">
-    <value>The selected column contains more than {0} different values.
-The calculated averages only accounts for the first {0} distinct values.</value>
-    <comment>A warning message that is displayed if the dataset is too large</comment>
+  <data name="InvalidColorComponent" xml:space="preserve">
+    <value>Invalid {0} color component {1} in line {2}</value>
+    <comment>An error message that is displayed if a color component is outside the [0-255] range.
+{0} is the color component, eg. R, G or B
+{1} is the value read
+{2} is the line where the error was encountered</comment>
   </data>
-  <data name="globe--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="TooManyIndiviualValuesError" xml:space="preserve">
+    <value>The selected column contains more than {0} different values, and thus cannot be used for theming with individual values</value>
+    <comment>An error message that is displayed if the selected column has too many distinct values</comment>
   </data>
   <data name="OdbcDriverAccess" xml:space="preserve">
     <value>{Microsoft Access Driver (*.mdb)}</value>
   </data>
+  <data name="PreviewUrlNotAvailable" xml:space="preserve">
+    <value>The Preview URL is not currently available</value>
+  </data>
   <data name="NoRasterClasses" xml:space="preserve">
     <value>This feature source has no class definitions with raster properties</value>
   </data>
@@ -1014,6 +1068,9 @@
   <data name="FilterDwf" xml:space="preserve">
     <value>Autodesk DWF (*.dwf)|*.dwf</value>
   </data>
+  <data name="document" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="SearchCmdDescription" xml:space="preserve">
     <value>Search Command</value>
   </data>
@@ -1026,11 +1083,12 @@
   <data name="sql-join-inner" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql-join-inner.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_tasks" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_tasks.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PackageReadError" xml:space="preserve">
+    <value>Failed to read package. Error message was: {0}</value>
+    <comment>A message displayed when the package could not be read</comment>
   </data>
-  <data name="sql" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ColorBrewer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ColorBrewer.csv;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="LessThanLabel" xml:space="preserve">
     <value>Less than {0}</value>
@@ -1039,48 +1097,58 @@
   <data name="FsSqlServerSpatial" xml:space="preserve">
     <value>SQL Server Spatial Feature Source</value>
   </data>
-  <data name="NewFlyout" xml:space="preserve">
-    <value>New Flyout</value>
+  <data name="UnmanagedBrowserMultiSelectionNotAllowed" xml:space="preserve">
+    <value>Multiple selection is not allowed when SelectFoldersOnly is set to true</value>
   </data>
+  <data name="ExpressionItem" xml:space="preserve">
+    <value>Expression...</value>
+    <comment>A value displayed in the combobox to activate the expression builder</comment>
+  </data>
   <data name="layers-stack-arrange-back" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layers-stack-arrange-back.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FontPreviewError" xml:space="preserve">
-    <value>Cannot Preview Font "{0}"</value>
-    <comment>An error message that is displayed when the rendering fails, using the specified font</comment>
+  <data name="document--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="WmsLayersUpdated" xml:space="preserve">
+    <value>WMS layers updated</value>
+  </data>
   <data name="plus-circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\plus-circle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_popupscrolldown" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_popupscrolldown.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="NewFlyout" xml:space="preserve">
+    <value>New Flyout</value>
   </data>
   <data name="FolderMissingPrefix" xml:space="preserve">
     <value>The folder must start with \"Library://\", do you want the starting folder to become:\n {0} ?</value>
     <comment>A message that is displayed when the user has not entered a folder starting with Library://</comment>
   </data>
-  <data name="FilterAll" xml:space="preserve">
-    <value>All File Types (*.*)|*.*</value>
+  <data name="property" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\property.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ContentFileMissing" xml:space="preserve">
-    <value>The content file does not exist</value>
-    <comment>A message displayed when the user selects a non-existing file</comment>
+  <data name="TooMuchDataWarning" xml:space="preserve">
+    <value>The selected column contains more than {0} different values.
+The calculated averages only accounts for the first {0} distinct values.</value>
+    <comment>A warning message that is displayed if the dataset is too large</comment>
   </data>
-  <data name="icon_selectwithin" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_selectwithin.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SelectLayerFirst" xml:space="preserve">
+    <value>Please select the layer first</value>
   </data>
+  <data name="application-import" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\application-import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="sum" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sum.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SelectColumnPlaceholder" xml:space="preserve">
-    <value>&lt;Select column&gt;</value>
-    <comment>A placeholder message displayed when the user has not yet selected a column</comment>
+  <data name="InvalidValueError" xml:space="preserve">
+    <value>Invalid value</value>
+    <comment>An error message that is displayed when the entered value is invalid</comment>
   </data>
-  <data name="XmlDocIsValid" xml:space="preserve">
-    <value>Document is valid</value>
+  <data name="icon_tasks" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_tasks.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="InvalidResourceIdNotSpecifiedType" xml:space="preserve">
-    <value>Invalid Resource Identifier. Not the specified type</value>
+  <data name="icon_zoomnext_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomnext_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_select.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1088,20 +1156,21 @@
   <data name="icon_back" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_back.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="BetweenLabel" xml:space="preserve">
+    <value>Between {0} and {1}</value>
+    <comment>The label used for all "between" values in the graduated theme set</comment>
   </data>
-  <data name="arrow-090" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="InvokeScriptCmdDescription" xml:space="preserve">
+    <value>Invoke Script Command</value>
   </data>
-  <data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="CommandTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CommandTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
-  <data name="arrow-curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_selectradius_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_selectradius_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="edit-indent" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-indent.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1109,82 +1178,16 @@
   <data name="FindEmptyString" xml:space="preserve">
     <value>Cannot Find an Empty String</value>
   </data>
-  <data name="CoordinateTransformationFailed" xml:space="preserve">
-    <value>Failed to transform coordinates: {0}</value>
-  </data>
   <data name="FsMySql" xml:space="preserve">
     <value>MySQL Feature Source</value>
   </data>
   <data name="icon_forward_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_forward_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_zoomnext" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomnext.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="document" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\document.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ruler1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ruler1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ProcessedItem" xml:space="preserve">
-    <value>Processed: {0}</value>
-  </data>
-  <data name="UpdatingConfiguration" xml:space="preserve">
-    <value>Updating Configuration Document</value>
-  </data>
-  <data name="PromptDeleteWidgetAndReferences" xml:space="preserve">
-    <value>Delete this widget and all references to it?</value>
-  </data>
-  <data name="FieldRequired" xml:space="preserve">
-    <value>This field is required: {0}</value>
-  </data>
-  <data name="WidgetNameExists" xml:space="preserve">
-    <value>A widget named {0} already exists</value>
-  </data>
-  <data name="UnmanagedBrowserMultiSelectionNotAllowed" xml:space="preserve">
-    <value>Multiple selection is not allowed when SelectFoldersOnly is set to true</value>
-  </data>
-  <data name="ErrorLoadingWmsConfig" xml:space="preserve">
-    <value>Error loading WMS configuration document: {0}. A default document will be created</value>
-  </data>
-  <data name="WmsLayersUpdated" xml:space="preserve">
-    <value>WMS layers updated</value>
-  </data>
-  <data name="PromptName" xml:space="preserve">
-    <value>Enter the name</value>
-  </data>
-  <data name="TitleNewFeatureClass" xml:space="preserve">
-    <value>New Feature Class</value>
-  </data>
-  <data name="PreviewUrlNotAvailable" xml:space="preserve">
-    <value>The Preview URL is not currently available</value>
-  </data>
-  <data name="QuestionResetFsOverrideList" xml:space="preserve">
-    <value>Reset Feature Source override list?</value>
-  </data>
-  <data name="TitleQuestion" xml:space="preserve">
-    <value>Question</value>
-  </data>
-  <data name="document_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\document-task.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="InvalidConnection" xml:space="preserve">
-    <value>This is not a valid connection: {0}</value>
-  </data>
-  <data name="ErrorMapExtentCalculationFailed" xml:space="preserve">
-    <value>Could not transform extents of any layer in this Map Definition. You will have to specify the extents manually.</value>
-  </data>
-  <data name="TitleWarning" xml:space="preserve">
-    <value>Warning</value>
-  </data>
-  <data name="WarningMapExtentCalculation" xml:space="preserve">
-    <value>Could not transform extents of one or more layers in this Map Definition. These extents have not been factored into the computed result.</value>
-  </data>
-  <data name="SpatialContextsFound" xml:space="preserve">
-    <value>{0} spatial contexts found</value>
-  </data>
-  <data name="LayerGroupConvertedToBaseLayerGroup" xml:space="preserve">
-    <value>Layer Group ({0}) successfully converted to Base Layer Group ({1})</value>
-  </data>
-  <data name="NoScalesToGenerate" xml:space="preserve">
-    <value>Number of Scales to generate cannot be less than or equal to 0</value>
-  </data>
 </root>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro.Editors/Resources/ruler1.png
===================================================================
(Binary files differ)


Property changes on: trunk/Tools/Maestro/Maestro.Editors/Resources/ruler1.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs	2011-05-24 14:41:27 UTC (rev 5844)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs	2011-05-24 15:56:21 UTC (rev 5845)
@@ -521,6 +521,9 @@
     #endregion
 
     partial class AreaTypeStyleType : IAreaVectorStyle
+#if LDF_130
+        , IAreaVectorStyle2
+#endif
     {
         [XmlIgnore]
         IEnumerable<IAreaRule> IAreaVectorStyle.Rules
@@ -601,6 +604,9 @@
     }
 
     partial class PointTypeStyleType : IPointVectorStyle
+#if LDF_130
+        , IPointVectorStyle2
+#endif
     {
         [XmlIgnore]
         public IEnumerable<IPointRule> Rules
@@ -691,6 +697,9 @@
     }
 
     partial class LineTypeStyleType : ILineVectorStyle
+#if LDF_130
+        , ILineVectorStyle2
+#endif
     {
         [XmlIgnore]
         public IEnumerable<ILineRule> Rules



More information about the mapguide-commits mailing list