[mapguide-commits] r4454 - in trunk/Tools/Maestro: Localization Localization/da-DK/Maestro/FusionEditor Localization/da-DK/Maestro/FusionEditor/Properties Localization/da-DK/Maestro/FusionEditor/Resources Localization/da-DK/Maestro/ResourceEditors Localization/da-DK/Maestro/ResourceEditors/FeatureSourceEditors/ODBC Localization/da-DK/Maestro/ResourceEditors/Properties Localization/da-DK/Maestro/ResourceEditors/Resources Localization/es-ES/Maestro/FusionEditor Localization/es-ES/Maestro/FusionEditor/Properties Localization/es-ES/Maestro/FusionEditor/Resources Localization/es-ES/Maestro/ResourceEditors Localization/es-ES/Maestro/ResourceEditors/Properties Localization/es-ES/Maestro/ResourceEditors/Resources Localization/fr-FR/Maestro/FusionEditor Localization/fr-FR/Maestro/FusionEditor/Properties Localization/fr-FR/Maestro/FusionEditor/Resources Localization/fr-FR/Maestro/ResourceEditors Localization/fr-FR/Maestro/ResourceEditors/Properties Localization/fr-FR/Maestro/ResourceEditors/Resources Maestro/FusionEditor Maestro/FusionEditor/CustomizedEditors Maestro/FusionEditor/Properties Maestro/FusionEditor/Resources Maestro/ResourceEditors Maestro/ResourceEditors/GeometryStyleEditors Maestro/ResourceEditors/Properties Maestro/ResourceEditors/Resources

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Dec 21 15:40:25 EST 2009


Author: ksgeograf
Date: 2009-12-21 15:40:24 -0500 (Mon, 21 Dec 2009)
New Revision: 4454

Added:
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/Defaults.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/PositionTypesDataset.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/
   trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/Defaults.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/PositionTypesDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/
   trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
   trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/Defaults.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/PositionTypesDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
   trunk/Tools/Maestro/Maestro/FusionEditor/Resources/
   trunk/Tools/Maestro/Maestro/FusionEditor/Resources/Defaults.xml
   trunk/Tools/Maestro/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml
   trunk/Tools/Maestro/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml
   trunk/Tools/Maestro/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml
   trunk/Tools/Maestro/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml
   trunk/Tools/Maestro/Maestro/FusionEditor/Resources/PositionTypesDataset.xml
   trunk/Tools/Maestro/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml
   trunk/Tools/Maestro/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml
   trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/
   trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml
   trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
   trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
Removed:
   trunk/Tools/Maestro/Localization/missing.da-DK.txt
   trunk/Tools/Maestro/Maestro/FusionEditor/Defaults.xml
   trunk/Tools/Maestro/Maestro/ResourceEditors/CommandTypesDataset.xml
   trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaStyleComboDataset.xml
   trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleComboDataset.xml
   trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleComboDataset.xml
   trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointStyleComboDataset.xml
Modified:
   trunk/Tools/Maestro/Localization/Duplicati.Library.Core.dll
   trunk/Tools/Maestro/Localization/LocalizationTool.exe
   trunk/Tools/Maestro/Localization/configuration.xml
   trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Properties/Resources.da-DK.resx
   trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/FeatureSourceEditors/ODBC/FeatureSourceEditorODBC.da-DK.resx
   trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Properties/Resources.da-DK.resx
   trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Properties/Resources.es-ES.resx
   trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Properties/Resources.es-ES.resx
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Properties/Resources.fr-FR.resx
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Properties/Resources.fr-FR.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/ContainerEditor.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/ContainerEditor.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Buffer.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Buffer.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ExtentHistory.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ExtentHistory.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Measure.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Measure.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Select.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Select.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectPolygon.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectPolygon.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectRadius.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectRadius.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewOptions.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewOptions.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewSize.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewSize.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Zoom.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Zoom.resx
   trunk/Tools/Maestro/Maestro/FusionEditor/EditWidgets.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/FusionEditor.csproj
   trunk/Tools/Maestro/Maestro/FusionEditor/GenericWidgetExtensions.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/Properties/Resources.resx
   trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutEditor.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.resx
   trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj
Log:
Maestro:
More work on the localization

Modified: trunk/Tools/Maestro/Localization/Duplicati.Library.Core.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Localization/LocalizationTool.exe
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Localization/configuration.xml
===================================================================
--- trunk/Tools/Maestro/Localization/configuration.xml	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Localization/configuration.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,13 +1,12 @@
 <root>
 	<configuration name="OSGeo.MapGuide">
 		<assembly name="Maestro" folder="Maestro" namespace="OSGeo.MapGuide.Maestro">
-			<exclude>Localization</exclude>
-			<exclude>bin</exclude>
-			<exclude>FusionEditor</exclude>
-			<exclude>LoginForm</exclude>
-			<exclude>ResourceBrowser</exclude>
-			<exclude>ResourceEditors</exclude>
-			<exclude>ResourceValidators</exclude>
+			<exclude>Maestro\FusionEditor</exclude>
+			<exclude>Maestro\LoginForm</exclude>
+			<exclude>Maestro\ResourceBrowser</exclude>
+			<exclude>Maestro\ResourceEditors</exclude>
+			<exclude>Maestro\ResourceValidators</exclude>
+			<exclude>MgCooker</exclude>
 		</assembly>
 
 		<!-- <assembly name="OSGeo.MapGuide.MaestroAPI.PackageBuilder" folder="PackageBuilder" namespace="OSGeo.MapGuide.MaestroAPI.PackageBuilder" />
@@ -16,7 +15,7 @@
 		</assembly> -->
 
 		<assembly name="OSGeo.MapGuide.Maestro.FusionEditor" folder="Maestro\FusionEditor" namespace="OSGeo.MapGuide.Maestro.FusionEditor" />
-		<assembly name="OSGeo.MapGuide.MgCooker" folder="MgCooker" namespace="OSGeo.MapGuide.MgCooker" />
+		<assembly name="MgCooker" folder="MgCooker" namespace="OSGeo.MapGuide.MgCooker" />
 		<assembly name="OSGeo.MapGuide.Maestro.LoginForm" folder="Maestro\LoginForm" namespace="OSGeo.MapGuide.Maestro" />
 		<assembly name="OSGeo.MapGuide.Maestro.ResourceBrowser" folder="Maestro\ResourceBrowser" namespace="OSGeo.MapGuide.Maestro.ResourceBrowser" />
 		<assembly name="OSGeo.MapGuide.Maestro.ResourceEditors" folder="Maestro\ResourceEditors" namespace="OSGeo.MapGuide.Maestro.ResourceEditors" />

Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Properties/Resources.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Properties/Resources.da-DK.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Properties/Resources.da-DK.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,4 +117,28 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ZoomDirectionDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ZoomDirectionDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="TooltipTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TooltipTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="PositionTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PositionTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="MeasureUnitsDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MeasureUnitsDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="MeasureTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MeasureTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="GeometryOperationTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GeometryOperationTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="DirectionTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DirectionTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="Defaults" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Defaults.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/Defaults.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/Defaults.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/Defaults.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,975 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="ApplicationDefinition-1.0.0.xsd">
+  <TemplateUrl>fusion/templates/mapguide/aqua/index.html</TemplateUrl>
+  <MapSet>
+    <MapGroup id="MainMap">
+      <Map>
+        <Type>MapGuide</Type>
+        <SingleTile>true</SingleTile>
+        <Extension>
+          <ResourceId></ResourceId>
+        </Extension>
+      </Map>
+      <Extension />
+    </MapGroup>
+  </MapSet>
+  <WidgetSet>
+    <Container xsi:type="UiItemContainerType">
+      <Name>Toolbar</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Help</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>About</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ViewOptions</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Print</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectRadius</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectPolygon</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectWithin</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ClearSelection</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>RefreshMap</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>ToolbarSecondary</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Select</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Pan</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Zoom</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomIn</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOut</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>InitialMapView</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PreviousView</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>NextView</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomToSelection</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>ToolbarVertical</Name>
+      <Type>Toolbar</Type>
+      <Position>left</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PanNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomInNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOutNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>InitialMapViewNoabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PreviousViewNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>NextViewNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomToSelectionNoLabel</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>Statusbar</Name>
+      <Type>Toolbar</Type>
+      <Position>bottom</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>CursorPosition</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>EditableScale</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ViewSize</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>FileMenu</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>MapMenu</Widget>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>View</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowOverviewMap</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowTaskWindow</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowLegendWindow</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowSelectionWindow</Widget>
+        </Item>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>MapContextMenu</Name>
+      <Type>ContextMenu</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>RefreshMap</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Pan</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Zoom</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomIn</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOut</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>Zoom</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>InitialMapView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>PreviousView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>NextView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ZoomToSelection</Widget>
+        </Item>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Select</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ClearSelection</Widget>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>Select More</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectRadius</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectPolygon</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectWithin</Widget>
+        </Item>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Help</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>About</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>TaskMenu</Name>
+      <Type>ContextMenu</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+    </Container>
+    <MapWidget>
+      <Name>Map</Name>
+      <Type>Map</Type>
+      <Extension>
+        <MenuContainer>MapContextMenu</MenuContainer>
+      </Extension>
+      <MapId>MainMap</MapId>
+    </MapWidget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>About</Name>
+      <Type>About</Type>
+      <Location />
+      <Extension>
+        <AboutURL>/mapguide/mapadmin/about.php</AboutURL>
+      </Extension>
+      <ImageUrl>images/icons/about.png</ImageUrl>
+      <ImageClass />
+      <Label>About</Label>
+      <Tooltip>Click to show information about this application</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>ActivityIndicator</Name>
+      <Type>ActivityIndicator</Type>
+      <Location />
+      <Extension>
+        <ElementId />
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Buffer</Name>
+      <Type>Buffer</Type>
+      <Extension>
+        <BufferUnits>meters</BufferUnits>
+        <BorderColor>ff000000</BorderColor>
+        <BufferDistanceInput>BufferDistance</BufferDistanceInput>
+        <FillColor>33FF0000</FillColor>
+        <LayerName>Buffer</LayerName>
+        <FillColorInput>BufferFillColor</FillColorInput>
+        <BufferUnitsInput>BufferUnits</BufferUnitsInput>
+        <BorderColorInput>BufferBorderColor</BorderColorInput>
+        <LayerNameInput>BufferLayerName</LayerNameInput>
+        <BufferDistance>100</BufferDistance>
+      </Extension>
+      <ImageUrl>images/icons/buffer.png</ImageUrl>
+      <ImageClass />
+      <Label>Create a buffer</Label>
+      <Tooltip>Click to create a buffer</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>BufferPanel</Name>
+      <Type>BufferPanel</Type>
+      <Extension>
+        <Target />
+      </Extension>
+      <ImageUrl>images/icons/buffer.png</ImageUrl>
+      <ImageClass />
+      <Label>Create a buffer</Label>
+      <Tooltip>Click to create a buffer</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ClearSelection</Name>
+      <Type>ClearSelection</Type>
+      <Extension />
+      <ImageUrl>images/icons/select-clear.png</ImageUrl>
+      <ImageClass />
+      <Label>ClearSelection</Label>
+      <Tooltip>Click to clear the current selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>CursorPosition</Name>
+      <Type>CursorPosition</Type>
+      <Extension>
+        <Precision>4</Precision>
+        <Template>x: {x}, y: {y}</Template>
+        <Units>dd</Units>
+      </Extension>
+    </Widget>
+    <Widget>
+      <Name>EditableScale</Name>
+      <Type>EditableScale</Type>
+      <Extension>
+        <Precision>4</Precision>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PreviousView</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Previous</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-back.png</ImageUrl>
+      <ImageClass />
+      <Label>Previous View</Label>
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>NextView</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Next</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-forward.png</ImageUrl>
+      <ImageClass />
+      <Label>Next View</Label>
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Help</Name>
+      <Type>Help</Type>
+      <Location />
+      <Extension>
+        <Target>HelpWindow</Target>
+        <Url>fusion/widgets/Help/Help.html</Url>
+      </Extension>
+      <ImageUrl>images/icons/help.png</ImageUrl>
+      <ImageClass />
+      <Label>Help</Label>
+      <Tooltip>Click to get help</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>InitialMapView</Name>
+      <Type>InitialMapView</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
+      <ImageClass />
+      <Label>Full Extent</Label>
+      <Tooltip>Click to zoom to the full map extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>Legend</Name>
+      <Type>Legend</Type>
+      <Location />
+      <Extension>
+        <HideInvisibleLayers>false</HideInvisibleLayers>
+        <ShowRootFolder>false</ShowRootFolder>
+        <DisabledLayerIcon>images/icons/legend-layer.png</DisabledLayerIcon>
+        <RootFolderIcon>images/icons/legend-map.png</RootFolderIcon>
+        <LayerThemeIcon>images/icons/legend-theme.png</LayerThemeIcon>
+        <LayerRasterIcon>images/icons/legend-raster.png</LayerRasterIcon>
+        <LayerInfoIcon>images/icons/tree_layer_info.png</LayerInfoIcon>
+        <GroupInfoIcon>images/icons/tree_group_info.png</GroupInfoIcon>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>MapMenu</Name>
+      <Type>MapMenu</Type>
+      <Location />
+      <Extension>
+        <Folder>Library://</Folder>
+      </Extension>
+      <ImageUrl>images/icons/map-manager.png</ImageUrl>
+      <ImageClass />
+      <Label>Map Menu</Label>
+      <Tooltip>Choose a map theme</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Measure</Name>
+      <Type>Measure</Type>
+      <Location />
+      <Extension>
+        <DistancePrecision>2</DistancePrecision>
+        <MeasureTooltipContainer>MeasureContainerBox</MeasureTooltipContainer>
+        <MeasureTooltipType>static</MeasureTooltipType>
+        <MeasureTipPositionLeft>15</MeasureTipPositionLeft>
+        <Units>none</Units>
+        <LineStyleWidth>2</LineStyleWidth>
+        <MeasureTipPositionTop>100</MeasureTipPositionTop>
+        <LineStyleColor>rgba(0,0,255,0.3)</LineStyleColor>
+        <FillStyle>rgba(0,0,255, 0.3)</FillStyle>
+        <AreaPrecision>2</AreaPrecision>
+        <Type>Both</Type>
+      </Extension>
+      <ImageUrl>images/icons/measure.png</ImageUrl>
+      <ImageClass />
+      <Label>Measure</Label>
+      <Tooltip>Measure distances on the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>Navigator</Name>
+      <Type>Navigator</Type>
+      <Location />
+      <Extension />
+    </Widget>
+    <Widget>
+      <Name>OverviewMap</Name>
+      <Type>OverviewMap</Type>
+      <Location />
+      <Extension>
+        <MinRatio>32</MinRatio>
+        <MapId />
+        <MaxRatio>128</MaxRatio>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Pan</Name>
+      <Type>Pan</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/pan.png</ImageUrl>
+      <ImageClass />
+      <Label>Pan</Label>
+      <Tooltip>Click and drag to pan the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Print</Name>
+      <Type>Print</Type>
+      <Extension>
+        <ShowPrintUI>true</ShowPrintUI>
+        <ShowNorthArrow>false</ShowNorthArrow>
+        <PageTitle />
+        <ShowLegend>false</ShowLegend>
+        <ShowTitle>false</ShowTitle>
+      </Extension>
+      <ImageUrl>images/icons/file-print.png</ImageUrl>
+      <ImageClass />
+      <Label>Print</Label>
+      <Tooltip>Print the current map view</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>RefreshMap</Name>
+      <Type>RefreshMap</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/view-refresh.png</ImageUrl>
+      <ImageClass />
+      <Label>Refresh map</Label>
+      <Tooltip>Click to redraw the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SaveMap</Name>
+      <Type>SaveMap</Type>
+      <Extension>
+        <Format>png</Format>
+        <Scale />
+      </Extension>
+      <ImageUrl>images/icons/file-save.png</ImageUrl>
+      <ImageClass />
+      <Label>Save map</Label>
+      <Tooltip>Click to save the map as an image</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Select</Name>
+      <Type>Select</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+        <QueryActiveLayer>false</QueryActiveLayer>
+      </Extension>
+      <ImageUrl>images/icons/select.png</ImageUrl>
+      <ImageClass />
+      <Label>Select</Label>
+      <Tooltip>Click to select features</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>SelectionPanel</Name>
+      <Type>SelectionPanel</Type>
+      <Location />
+      <Extension />
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectPolygon</Name>
+      <Type>SelectPolygon</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+      </Extension>
+      <ImageUrl>images/icons/select-polygon.png</ImageUrl>
+      <ImageClass />
+      <Label>Select polygon</Label>
+      <Tooltip>Draw a polygon to perform a selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectRadius</Name>
+      <Type>SelectRadius</Type>
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <RadiusTooltipType>dynamic</RadiusTooltipType>
+        <RadiusTooltipContainer />
+        <SelectionType>INTERSECTS</SelectionType>
+        <DefaultRadius>20</DefaultRadius>
+      </Extension>
+      <ImageUrl>images/icons/select-radius.png</ImageUrl>
+      <ImageClass />
+      <Label>Select by radius</Label>
+      <Tooltip>Click to select within a radius</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectWithin</Name>
+      <Type>SelectWithin</Type>
+      <Location />
+      <Extension>
+        <AdditionalParameter />
+        <Target />
+        <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+      </Extension>
+      <ImageUrl>images/icons/select-features.png</ImageUrl>
+      <ImageClass />
+      <Label>Select within</Label>
+      <Tooltip>Click to select features within this selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>TaskPane</Name>
+      <Type>TaskPane</Type>
+      <Location />
+      <Extension>
+        <MenuContainer>TaskMenu</MenuContainer>
+        <InitialTask />
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ViewOptions</Name>
+      <Type>ViewOptions</Type>
+      <Location />
+      <Extension>
+        <DisplayUnits />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>ViewOptions</Label>
+      <Tooltip>Click to change the units displayed</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>ViewSize</Name>
+      <Type>ViewSize</Type>
+      <Location />
+      <Extension>
+        <Precision>-1</Precision>
+        <Template>x: {x}, y: {y}</Template>
+        <Units>none</Units>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Zoom</Name>
+      <Type>Zoom</Type>
+      <Extension>
+        <Tolerance>5</Tolerance>
+        <Factor>2</Factor>
+        <Direction>in</Direction>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom</Label>
+      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
+      <StatusText>Click or click and drag on the map to zoom in</StatusText>
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomOut</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>0.5</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom Out</Label>
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomIn</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>2.0</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom In</Label>
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomToSelection</Name>
+      <Type>ZoomToSelection</Type>
+      <Location />
+      <Extension>
+        <MaximumZoomDimension>-1</MaximumZoomDimension>
+        <ZoomFactor>2</ZoomFactor>
+      </Extension>
+      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom to selection</Label>
+      <Tooltip>Click to zoom to the selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>InitialMapViewNoabel</Name>
+      <Type>InitialMapView</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom to the full map extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>NextViewNoLabel</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Next</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-forward.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PanNoLabel</Name>
+      <Type>Pan</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/pan.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click and drag to pan the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PreviousViewNoLabel</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Previous</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-back.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectNoLabel</Name>
+      <Type>Select</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+        <QueryActiveLayer>false</QueryActiveLayer>
+      </Extension>
+      <ImageUrl>images/icons/select.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to select features</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomNoLabel</Name>
+      <Type>Zoom</Type>
+      <Extension>
+        <Tolerance>5</Tolerance>
+        <Factor>2</Factor>
+        <Direction>in</Direction>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
+      <StatusText>Click or click and drag on the map to zoom in</StatusText>
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomInNoLabel</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>2.0</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomOutNoLabel</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>0.5</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomToSelectionNoLabel</Name>
+      <Type>ZoomToSelection</Type>
+      <Location />
+      <Extension>
+        <MaximumZoomDimension>-1</MaximumZoomDimension>
+        <ZoomFactor>2</ZoomFactor>
+      </Extension>
+      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom to the selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>StatusOverviewMap</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showOverviewMapDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl>images/iconNavigator.gif</ImageUrl>
+      <ImageClass />
+      <Label>Invoke script</Label>
+      <Tooltip>Display the overview map window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowOverviewMap</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showOverviewMapDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Overview Map</Label>
+      <Tooltip>Display the overview map window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowTaskWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showTaskDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Task Pane</Label>
+      <Tooltip>Display the task pane window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowLegendWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showLegendDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Legend</Label>
+      <Tooltip>Display the legend window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowSelectionWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showSelectionDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Selection Window</Label>
+      <Tooltip>Display the selection window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+  </WidgetSet>
+  <Extension />
+</ApplicationDefinition>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<DirectionTypeDataset>
+	<DirectionUnit>
+		<Value>Previous</Value>
+		<Displayname>Forrige</Displayname>
+	</DirectionUnit>
+
+	<DirectionUnit>
+		<Value>Next</Value>
+		<Displayname>Næste</Displayname>
+	</DirectionUnit>
+
+</DirectionTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<GeometryOperationTypeDataset>
+	<GeometryOperationType>
+		<Value>CONTAINS</Value>
+		<Displayname>Contains</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>DISJOINT</Value>
+		<Displayname>Disjoint</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>INTERSECTS</Value>
+		<Displayname>Intersects</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>WITHIN</Value>
+		<Displayname>Within</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>INSIDE</Value>
+		<Displayname>Inside</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>ENVELOPEINTERSECTS</Value>
+		<Displayname>Envelope intersects</Displayname>
+	</GeometryOperationType>
+</GeometryOperationTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MeasureTypeDataset>
+	<MeasureType>
+		<Value>both</Value>
+		<Displayname>Begge</Displayname>
+	</MeasureType>
+</MeasureTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MeasureUnitsDataset>
+	<MeasureUnit>
+		<Value>meters</Value>
+		<Displayname>Meter</Displayname>
+	</MeasureUnit>
+
+	<MeasureUnit>
+		<Value>miles</Value>
+		<Displayname>Mil</Displayname>
+	</MeasureUnit>
+
+	<MeasureUnit>
+		<Value>none</Value>
+		<Displayname>Ingen</Displayname>
+	</MeasureUnit>
+
+  <MeasureUnit>
+    <Value>degrees</Value>
+    <Displayname>Grader</Displayname>
+  </MeasureUnit>
+</MeasureUnitsDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/PositionTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/PositionTypesDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/PositionTypesDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<PositionTypesDataset>
+	<Position>
+		<Value>top</Value>
+		<Displayname>Øverst</Displayname>
+	</Position>
+
+	<Position>
+		<Value>left</Value>
+		<Displayname>Venstre</Displayname>
+	</Position>
+
+	<Position>
+		<Value>right</Value>
+		<Displayname>Højre</Displayname>
+	</Position>
+
+	<Position>
+		<Value>bottom</Value>
+		<Displayname>Nederst</Displayname>
+	</Position>
+</PositionTypesDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<TooltipTypeDataset>
+	<TooltipType>
+		<Value>static</Value>
+		<Displayname>Statisk</Displayname>
+	</TooltipType>
+
+	<TooltipType>
+		<Value>dynamic</Value>
+		<Displayname>Dynamisk</Displayname>
+	</TooltipType>
+
+</TooltipTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ZoomDirectionDataset>
+	<ZoomDirection>
+		<Value>in</Value>
+		<Displayname>Ind</Displayname>
+	</ZoomDirection>
+
+	<ZoomDirection>
+		<Value>out</Value>
+		<Displayname>Ud</Displayname>
+	</ZoomDirection>
+
+</ZoomDirectionDataset>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/FeatureSourceEditors/ODBC/FeatureSourceEditorODBC.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/FeatureSourceEditors/ODBC/FeatureSourceEditorODBC.da-DK.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/FeatureSourceEditors/ODBC/FeatureSourceEditorODBC.da-DK.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,41 +117,49 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="label1.Text" type="System.String">
-    <value>Forbindelses type</value>
+  <data name="ConnectionType.Items3" xml:space="preserve">
+    <value>Kendt database type</value>
   </data>
-  <data name="ConnectionType.Items" type="System.String">
-    <value>
-    Intern fil (Managed)
-    Fil på serveren (Unmanaged)
-    DSN (Nanvgivne ODBC datakilde)
-    Kendt database type
-    Indtast forbindelse manuelt
-    </value>
+  <data name="ConnectionType.Items2" xml:space="preserve">
+    <value>DSN (Navngivet ODBC)</value>
   </data>
-  <data name="label2.Text" type="System.String">
+  <data name="ConnectionType.Items1" xml:space="preserve">
+    <value>Filer på serveren (Unmanaged)</value>
+  </data>
+  <data name="ConnectionString.Text" xml:space="preserve">
+    <value>Forbindelsesstreng</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
     <value>Connection string</value>
   </data>
-  <data name="RefreshButton.Text" type="System.String">
+  <data name="label1.Text" xml:space="preserve">
+    <value>Forbindelses type</value>
+  </data>
+  <data name="RefreshButton.Text" xml:space="preserve">
     <value>Genbyg skema</value>
   </data>
-  <data name="ConfigureButton.Text" type="System.String">
+  <data name="ConnectionType.Items4" xml:space="preserve">
+    <value>Brugertilpasset forbindelsesstreng</value>
+  </data>
+  <data name="ConnectionType.Items" xml:space="preserve">
+    <value>Intern fil (Managed)</value>
+  </data>
+  <data name="ConfigureButton.Text" xml:space="preserve">
     <value>Indstil kolonner</value>
   </data>
-  <data name="ConnectionType.Items1" xml:space="preserve">
-    <value>Filer på serveren (Unmanaged)</value>
+  <data name="ConnectionType.Items.Items3" xml:space="preserve">
+    <value>Known database type</value>
   </data>
-  <data name="ConnectionType.Items2" xml:space="preserve">
-    <value>DSN (Navngivet ODBC)</value>
+  <data name="ConnectionType.Items.Items" xml:space="preserve">
+    <value>Internal file (Managed)</value>
   </data>
-  <data name="ConnectionType.Items3" xml:space="preserve">
-    <value>Kendt database type</value>
+  <data name="ConnectionType.Items.Items1" xml:space="preserve">
+    <value>File on the server (Unmanaged)</value>
   </data>
-  <data name="ConnectionType.Items4" xml:space="preserve">
-    <value>Brugertilpasset forbindelsesstreng</value>
+  <data name="ConnectionType.Items.Items4" xml:space="preserve">
+    <value>Custom connectionstring</value>
   </data>
-  <data name="ConnectionString.Text" xml:space="preserve">
-    <value>Forbindelsesstreng</value>
+  <data name="ConnectionType.Items.Items2" xml:space="preserve">
+    <value>DSN (Named ODBC)</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Properties/Resources.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Properties/Resources.da-DK.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Properties/Resources.da-DK.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,4 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <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="FontStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FontStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</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>
 </root>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CommandTypesDataset>
+	<Command>
+		<Command>About</Command>
+		<Label>Om</Label>
+		<ToolTip>Om</ToolTip>
+		<Action>About</Action>
+		<Description>Viser information om programmet</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon></EnabledIcon>		
+		<DisabledIcon></DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Buffer</Command>
+		<Label>Buffer</Label>
+		<ToolTip>Buffer</ToolTip>
+		<Action>Buffer</Action>
+		<Description>Opretter en buffer omkring de valgte objekter</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_buffer.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_buffer_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Clear Selection</Command>
+		<Label>Vælg intet</Label>
+		<ToolTip>Fjern valg af objekter</ToolTip>
+		<Action>Clear Selection</Action>
+		<Description>Ryder markeringen af de valgte objekter</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_clearselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_clearselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Copy Map</Command>
+		<Label>Kopier</Label>
+		<ToolTip>Kopier</ToolTip>
+		<Action>Copy Map</Action>
+		<Description>Indsætter en kopi af kortet i klippebordet</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_copy.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_copy_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Help</Command>
+		<Label>Hjælp</Label>
+		<ToolTip>Hjælp</ToolTip>
+		<Action>Help</Action>
+		<Description>Viser hjælp for programmet</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_help.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_help_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Center and Scale</Command>
+		<Label>Zoom til startposition</Label>
+		<ToolTip>Zoom til startposition</ToolTip>
+		<Action>Restore View</Action>
+		<Description>Zoomer ud og viser kortet i startpositionen</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_restorecenter.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_restorecenter_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Map View</Command>
+		<Label>Initial Map View</Label>
+		<ToolTip>Initial map view</ToolTip>
+		<Action>Fit To Window</Action>
+		<Description>Fit the initial view of the map to the window</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_fitwindow.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_fitwindow_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke Script</Command>
+		<Label>Invoke Script</Label>
+		<ToolTip>Invoke script</ToolTip>
+		<Action>Invoke Script</Action>
+		<Description>Invoke a script command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokescript.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokescript_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke URL</Command>
+		<Label>Invoke URL</Label>
+		<ToolTip>Invoke a command by accessing a URL</ToolTip>
+		<Action>Invoke URL</Action>
+		<Description>Invoke a URL command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokeurl.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokeurl_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Measure</Command>
+		<Label>Measure</Label>
+		<ToolTip>Measure</ToolTip>
+		<Action>Measure</Action>
+		<Description>Measure distances on the map</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_measure.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_measure_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Next View</Command>
+		<Label>Next View</Label>
+		<ToolTip>Next View</ToolTip>
+		<Action>Next View</Action>
+		<Description>Buffer</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomnext.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomnext_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan</Command>
+		<Label>Pan</Label>
+		<ToolTip>Pan mode</ToolTip>
+		<Action>Pan</Action>
+		<Description>Drag the map to view areas out of range</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pan.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pan_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Down</Command>
+		<Label>Pan Down</Label>
+		<ToolTip>Pan down</ToolTip>
+		<Action>Pan Down</Action>
+		<Description>Pan down by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pandown.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pandown_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Left</Command>
+		<Label>Pan Left</Label>
+		<ToolTip>Pan left</ToolTip>
+		<Action>Pan Left</Action>
+		<Description>Pan left by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panleft.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panleft_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Right</Command>
+		<Label>Pan Right</Label>
+		<ToolTip>Pan right</ToolTip>
+		<Action>Pan Right</Action>
+		<Description>Pan right by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panright.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panright_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Up</Command>
+		<Label>Pan Up</Label>
+		<ToolTip>Pan up</ToolTip>
+		<Action>Pan Up</Action>
+		<Description>Pan up by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panup.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panup_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Previous View</Command>
+		<Label>Previous View</Label>
+		<ToolTip>Previous view</ToolTip>
+		<Action>Previous View</Action>
+		<Description>Go to previous view</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomprev.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomprev_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Print</Command>
+		<Label>Print</Label>
+		<ToolTip>Print</ToolTip>
+		<Action>Print</Action>
+		<Description>Print with optional layout</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_print.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_print_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Refresh Map</Command>
+		<Label>Refresh Map</Label>
+		<ToolTip>Refresh map</ToolTip>
+		<Action>Refresh</Action>
+		<Description>Refresh map and reload all layers keeping current center and scale</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_refreshmap.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_refreshmap_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Search</Command>
+		<Label>Search</Label>
+		<ToolTip>Search</ToolTip>
+		<Action>Search</Action>
+		<Description>Perform a search</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_search.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_search_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select</Command>
+		<Label>Select</Label>
+		<ToolTip>Select mode</ToolTip>
+		<Action>Select</Action>
+		<Description>Select features by clicking and dragging</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_select.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_select_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Polygon</Command>
+		<Label>Select Polygon</Label>
+		<ToolTip>Select polygon</ToolTip>
+		<Action>Select Polygon</Action>
+		<Description>Create a polygon to select all features that fall within</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectpolygon.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectpolygon_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Radius</Command>
+		<Label>Select Radius</Label>
+		<ToolTip>Select radius</ToolTip>
+		<Action>Select Radius</Action>
+		<Description>Click and drag to select all features inside the circle</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectradius.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectradius_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Within</Command>
+		<Label>Select Within</Label>
+		<ToolTip>Select within</ToolTip>
+		<Action>Select Within</Action>
+		<Description>Select features that fall within currently selected areas</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectwithin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectwithin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>View Options</Command>
+		<Label>View Options</Label>
+		<ToolTip>View options</ToolTip>
+		<Action>View Options</Action>
+		<Description>View Options</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_viewoptions.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_viewoptions_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom</Command>
+		<Label>Zoom Dynamic</Label>
+		<ToolTip>Zoom dynamic</ToolTip>
+		<Action>Zoom</Action>
+		<Description>Zoom dynamically by clicking and dragging</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoom.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoom_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom In</Command>
+		<Label>Zoom In</Label>
+		<ToolTip>Zoom in</ToolTip>
+		<Action>Zoom In</Action>
+		<Description>Zoom in by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Out</Command>
+		<Label>Zoom Out</Label>
+		<ToolTip>Zoom out</ToolTip>
+		<Action>Zoom Out</Action>
+		<Description>Zoom out by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomout.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomout_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Rectangle</Command>
+		<Label>Zoom Rectangle</Label>
+		<ToolTip>Zoom to rectangle</ToolTip>
+		<Action>Zoom Rectangle</Action>
+		<Description>Zoom in on an area</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomrect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomrect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Selection</Command>
+		<Label>Zoom Selection</Label>
+		<ToolTip>Zoom to selection</ToolTip>
+		<Action>Zoom To Selection</Action>
+		<Description>Zoom to extents of selected features</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Get Printable Page</Command>
+		<Label>Printable Page</Label>
+		<ToolTip>Get printable page</ToolTip>
+		<Action>Get Printable Page</Action>
+		<Description>Get printer-friendly page</Description>
+		<Viewers>AJAX</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_printablepage.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_printablepage_disabled.gif</DisabledIcon>
+	</Command>
+
+</CommandTypesDataset>

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<ComboBoxDataSet>
+
+	<Font>
+		<Display>Arial</Display>
+		<Value>Arial</Value>
+	</Font>
+	<Font>
+		<Display>Arial Black</Display>
+		<Value>Arial Black</Value>
+	</Font>
+	<Font>
+		<Display>Arial Narrow</Display>
+		<Value>Arial Narrow</Value>
+	</Font>
+	<Font>
+		<Display>BankGothic Lt BT</Display>
+		<Value>ankGothic Lt BT</Value>
+	</Font>
+	<Font>
+		<Display>BankGothic Md BT</Display>
+		<Value>BankGothic Md BT</Value>
+	</Font>
+	<Font>
+		<Display>Book Antiqua</Display>
+		<Value>Book Antiqua</Value>
+	</Font>
+	<Font>
+		<Display>Bookman Old Style</Display>
+		<Value>Bookman Old Style</Value>
+	</Font>
+	<Font>
+		<Display>Century Gothic</Display>
+		<Value>Century Gothic</Value>
+	</Font>
+	<Font>
+		<Display>CityBlueprint</Display>
+		<Value>CityBlueprint</Value>
+	</Font>
+	<Font>
+		<Display>Comic Sans MS</Display>
+		<Value>Comic Sans MS</Value>
+	</Font>
+	<Font>
+		<Display>CommercialPi BT</Display>
+		<Value>CommercialPi BT</Value>
+	</Font>
+	<Font>
+		<Display>CommercialScript BT</Display>
+		<Value>CommercialScript BT</Value>
+	</Font>
+	<Font>
+		<Display>Complex</Display>
+		<Value>Complex</Value>
+	</Font>
+	<Font>
+		<Display>CountryBlueprint</Display>
+		<Value>CountryBlueprint</Value>
+	</Font>
+	<Font>
+		<Display>Courier New</Display>
+		<Value>Courier New</Value>
+	</Font>
+	<Font>
+		<Display>Dutch801 Rm BT</Display>
+		<Value>Dutch801 Rm BT</Value>
+	</Font>
+	<Font>
+		<Display>Dutch801 XBd BT</Display>
+		<Value>Dutch801 XBd BT</Value>
+	</Font>
+	<Font>
+		<Display>Estrangelo Edessa</Display>
+		<Value>Estrangelo Edessa</Value>
+	</Font>
+	<Font>
+		<Display>EuroRoman</Display>
+		<Value>EuroRoman</Value>
+	</Font>
+	<Font>
+		<Display>Franklin Gothic Medium</Display>
+		<Value>Franklin Gothic Medium</Value>
+	</Font>
+	<Font>
+		<Display>Garamond</Display>
+		<Value>Garamond</Value>
+	</Font>
+	<Font>
+		<Display>Gautami</Display>
+		<Value>Gautami</Value>
+	</Font>
+	<Font>
+		<Display>GDT</Display>
+		<Value>GDT</Value>
+	</Font>
+	<Font>
+		<Display>Georgia</Display>
+		<Value>Georgia</Value>
+	</Font>
+	<Font>
+		<Display>GothicE</Display>
+		<Value>GothicE</Value>
+	</Font>
+	<Font>
+		<Display>GothicG</Display>
+		<Value>GothicG</Value>
+	</Font>
+	<Font>
+		<Display>Gothicl</Display>
+		<Value>Gothicl</Value>
+	</Font>
+	<Font>
+		<Display>GreekC</Display>
+		<Value>GreekC</Value>
+	</Font>
+	<Font>
+		<Display>GreekS</Display>
+		<Value>GreekS</Value>
+	</Font>
+	<Font>
+		<Display>Haettenschweiler</Display>
+		<Value>Haettenschweiler</Value>
+	</Font>
+	<Font>
+		<Display>Impact</Display>
+		<Value>Impact</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP</Display>
+		<Value>ISOCP</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP2</Display>
+		<Value>ISOCP2</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP3</Display>
+		<Value>ISOCP3</Value>
+	</Font>
+	<Font>
+		<Display>ISOCPEUR</Display>
+		<Value>Arial</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT</Display>
+		<Value>ISOCT</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT2</Display>
+		<Value>ISOCT2</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT3</Display>
+		<Value>ISOCT3</Value>
+	</Font>
+	<Font>
+		<Display>ISOCTEUR</Display>
+		<Value>ISOCTEUR</Value>
+	</Font>
+	<Font>
+		<Display>Italic</Display>
+		<Value>Italic</Value>
+	</Font>
+	<Font>
+		<Display>ItalicC</Display>
+		<Value>ItalicC</Value>
+	</Font>
+	<Font>
+		<Display>ItalicT</Display>
+		<Value>ItalicT</Value>
+	</Font>
+	<Font>
+		<Display>Kartika</Display>
+		<Value>Kartika</Value>
+	</Font>
+	<Font>
+		<Display>Latha</Display>
+		<Value>Latha</Value>
+	</Font>
+	<Font>
+		<Display>Lucida Console</Display>
+		<Value>Lucida Console</Value>
+	</Font>
+	<Font>
+		<Display>Lucida Sans Unicode</Display>
+		<Value>Lucida Sans Unicode</Value>
+	</Font>
+	<Font>
+		<Display>Mangal</Display>
+		<Value>Mangal</Value>
+	</Font>
+	<Font>
+		<Display>Map Symbols</Display>
+		<Value>Map Symbols</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Arrows</Display>
+		<Value>MapInfo Arrows</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Cartographic</Display>
+		<Value>MapInfo Cartographic</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Dispersed Groups</Display>
+		<Value>MapInfo Dispersed Groups</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Miscellaneous</Display>
+		<Value>MapInfo Miscellaneous</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Oil&amp;Gas</Display>
+		<Value>MapInfo Oil&amp;Gas</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Real Estate</Display>
+		<Value>MapInfo Real Estate</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Shields</Display>
+		<Value>MapInfo Shields</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Symbols</Display>
+		<Value>MapInfo Symbols</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Transportation</Display>
+		<Value>MapInfo Transportation</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Weather</Display>
+		<Value>MapInfo Weather</Value>
+	</Font>
+	<Font>
+		<Display>Marlett</Display>
+		<Value>Marlett</Value>
+	</Font>
+	<Font>
+		<Display>Microsoft Sans Serif</Display>
+		<Value>Microsoft Sans Serif</Value>
+	</Font>
+	<Font>
+		<Display>Monospac821 BT</Display>
+		<Value>Monospac821 BT</Value>
+	</Font>
+	<Font>
+		<Display>Monotxt</Display>
+		<Value>Monotxt</Value>
+	</Font>
+	<Font>
+		<Display>MV Boli</Display>
+		<Value>MV Boli</Value>
+	</Font>
+	<Font>
+		<Display>Nina</Display>
+		<Value>Nina</Value>
+	</Font>
+	<Font>
+		<Display>Palatino Linotype</Display>
+		<Value>Palatino Linotype</Value>
+	</Font>
+	<Font>
+		<Display>PanRoman</Display>
+		<Value>PanRoman</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 1</Display>
+		<Value>Proxy 1</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 2</Display>
+		<Value>Proxy 2</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 3</Display>
+		<Value>Proxy 3</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 4</Display>
+		<Value>Proxy 4</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 5</Display>
+		<Value>Proxy 5</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 6</Display>
+		<Value>Proxy 6</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 7</Display>
+		<Value>Proxy 7</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 8</Display>
+		<Value>Proxy 8</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 9</Display>
+		<Value>Proxy 9</Value>
+	</Font>
+	<Font>
+		<Display>Raavi</Display>
+		<Value>Raavi</Value>
+	</Font>
+	<Font>
+		<Display>RomanC</Display>
+		<Value>RomanC</Value>
+	</Font>
+	<Font>
+		<Display>RomanD</Display>
+		<Value>RomanD</Value>
+	</Font>
+	<Font>
+		<Display>RomanS</Display>
+		<Value>RomanS</Value>
+	</Font>
+	<Font>
+		<Display>RomanT</Display>
+		<Value>RomanT</Value>
+	</Font>
+	<Font>
+		<Display>Romantic</Display>
+		<Value>Romantic</Value>
+	</Font>
+	<Font>
+		<Display>SansSerif</Display>
+		<Value>SansSerif</Value>
+	</Font>
+	<Font>
+		<Display>ScriptC</Display>
+		<Value>ScriptC</Value>
+	</Font>
+	<Font>
+		<Display>ScriptS</Display>
+		<Value>ScriptS</Value>
+	</Font>
+	<Font>
+		<Display>Shruti</Display>
+		<Value>Shruti</Value>
+	</Font>
+	<Font>
+		<Display>Simplex</Display>
+		<Value>Simplex</Value>
+	</Font>
+	<Font>
+		<Display>Stylus BT</Display>
+		<Value>Stylus BT</Value>
+	</Font>
+	<Font>
+		<Display>SuperFrench</Display>
+		<Value>SuperFrench</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BdCnOul BT</Display>
+		<Value>Swis721 BdCnOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BdOul BT</Display>
+		<Value>Swis721 BdOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Blk BT</Display>
+		<Value>Swis721 Blk BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkCn BT</Display>
+		<Value>Swis721 BlkCn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkEx BT</Display>
+		<Value>Swis721 BlkEx BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkOul BT</Display>
+		<Value>Swis721 BlkOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BT</Display>
+		<Value>Swis721 BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Cn BT</Display>
+		<Value>Swis721 Cn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Ex BT</Display>
+		<Value>Swis721 Ex BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Lt BT</Display>
+		<Value>Swis721 Lt BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 LtCn BT</Display>
+		<Value>Swis721 LtCn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 LtEx BT</Display>
+		<Value>Swis721 LtEx BT</Value>
+	</Font>
+	<Font>
+		<Display>Syastro</Display>
+		<Value>Syastro</Value>
+	</Font>
+	<Font>
+		<Display>Sylfaen</Display>
+		<Value>Sylfaen</Value>
+	</Font>
+	<Font>
+		<Display>Symap</Display>
+		<Value>Symap</Value>
+	</Font>
+	<Font>
+		<Display>Symath</Display>
+		<Value>Symath</Value>
+	</Font>
+	<Font>
+		<Display>Symbol</Display>
+		<Value>Symbol</Value>
+	</Font>
+	<Font>
+		<Display>Symeteo</Display>
+		<Value>Symeteo</Value>
+	</Font>
+	<Font>
+		<Display>Symusic</Display>
+		<Value>Symusic</Value>
+	</Font>
+	<Font>
+		<Display>Tahoma</Display>
+		<Value>Tahoma</Value>
+	</Font>
+	<Font>
+		<Display>Technic</Display>
+		<Value>Technic</Value>
+	</Font>
+	<Font>
+		<Display>TechnicBold</Display>
+		<Value>TechnicBold</Value>
+	</Font>
+	<Font>
+		<Display>TechnicLite</Display>
+		<Value>TechnicLite</Value>
+	</Font>
+	<Font>
+		<Display>Times New Roman</Display>
+		<Value>Times New Roman</Value>
+	</Font>
+	<Font>
+		<Display>Trebuchet MS</Display>
+		<Value>Trebuchet MS</Value>
+	</Font>
+	<Font>
+		<Display>Tunga</Display>
+		<Value>Tunga</Value>
+	</Font>
+	<Font>
+		<Display>Txt</Display>
+		<Value>Txt</Value>
+	</Font>
+	<Font>
+		<Display>UniversalMath1 BT</Display>
+		<Value>UniversalMath1 BT</Value>
+	</Font>
+	<Font>
+		<Display>Verdana</Display>
+		<Value>Verdana</Value>
+	</Font>
+	<Font>
+		<Display>Vineta BT</Display>
+		<Value>Vineta BT</Value>
+	</Font>
+	<Font>
+		<Display>Vrinda</Display>
+		<Value>Vrinda</Value>
+	</Font>
+	<Font>
+		<Display>Webdings</Display>
+		<Value>Webdings</Value>
+	</Font>
+	<Font>
+		<Display>Windings</Display>
+		<Value>Windings</Value>
+	</Font>
+	<Font>
+		<Display>Windings 2</Display>
+		<Value>Windings 2</Value>
+	</Font>
+	<Font>
+		<Display>Windings 3</Display>
+		<Value>Windings 3</Value>
+	</Font>
+	
+	<BackgroundType>
+		<Display>Kantskygge</Display>
+		<Value>Ghosted</Value>
+	</BackgroundType>
+	<BackgroundType>
+		<Display>Udfyldt</Display>
+		<Value>Opaque</Value>
+	</BackgroundType>
+	<BackgroundType>
+		<Display>Gennemsigtig</Display>
+		<Value>Transparent</Value>
+	</BackgroundType>
+	
+	<Vertical>
+		<Display>Baseline</Display>
+		<Value>'Baseline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Bunden</Display>
+		<Value>'Bottom'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Capline</Display>
+		<Value>'Capline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Midten</Display>
+		<Value>'Halfline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Toppen</Display>
+		<Value>'Top'</Value>
+	</Vertical>
+
+	<Horizontal>
+		<Display>Center</Display>
+		<Value>'Center'</Value>
+	</Horizontal>
+
+	<SizeContext>
+		<Display>Skærm enheder</Display>
+		<Value>DeviceUnits</Value>
+	</SizeContext>
+	<SizeContext>
+		<Display>Kort enheder</Display>
+		<Value>MappingUnits</Value>
+	</SizeContext>
+	
+	<Units>
+		<Display>Punkter</Display>
+		<Value>Points</Value>
+	</Units>
+	<Units>
+		<Display>Tommer</Display>
+		<Value>Inches</Value>
+	</Units>
+	<Units>
+		<Display>Fod</Display>
+		<Value>Feet</Value>
+	</Units>
+	<Units>
+		<Display>Yards</Display>
+		<Value>Yards</Value>
+	</Units>
+	<Units>
+		<Display>Millimeter</Display>
+		<Value>Millimeters</Value>
+	</Units>
+	<Units>
+		<Display>Centimeter</Display>
+		<Value>Centimeters</Value>
+	</Units>
+	<Units>
+		<Display>Meter</Display>
+		<Value>Meters</Value>
+	</Units>
+	<Units>
+		<Display>Kilometer</Display>
+		<Value>Kilometers</Value>
+	</Units>
+
+	<Rotation>
+		<Display>0 grader</Display>
+		<Value>0</Value>
+	</Rotation>
+	<Rotation>
+		<Display>30 grader</Display>
+		<Value>30</Value>
+	</Rotation>
+	<Rotation>
+		<Display>45 grader</Display>
+		<Value>45</Value>
+	</Rotation>
+	<Rotation>
+		<Display>90 grader</Display>
+		<Value>90</Value>
+	</Rotation>	
+</ComboBoxDataSet>

Added: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,94 @@
+<?xml version="1.0" standalone="yes"?>
+<ComboBoxDataSet>
+	<SymbolMark>
+		<Display>Firkant</Display>
+		<Value>Square</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Cirkel</Display>
+		<Value>Circle</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Trekant</Display>
+		<Value>Triangle</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Stjerne</Display>
+		<Value>Star</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Kryds</Display>
+		<Value>Cross</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>X - Mærke</Display>
+		<Value>X</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Font...</Display>
+		<Value></Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Symbol...</Display>
+		<Value></Value>
+	</SymbolMark>
+	
+	<SizeContext>
+		<Display>Skærm enheder</Display>
+		<Value>DeviceUnits</Value>
+	</SizeContext>
+	<SizeContext>
+		<Display>Kort enheder</Display>
+		<Value>MappingUnits</Value>
+	</SizeContext>
+	
+	<Units>
+		<Display>Punkter</Display>
+		<Value>Points</Value>
+	</Units>
+	<Units>
+		<Display>Tommer</Display>
+		<Value>Inches</Value>
+	</Units>
+	<Units>
+		<Display>Fod</Display>
+		<Value>Feet</Value>
+	</Units>
+	<Units>
+		<Display>Yards</Display>
+		<Value>Yards</Value>
+	</Units>
+	<Units>
+		<Display>Millimeter</Display>
+		<Value>Millimeters</Value>
+	</Units>
+	<Units>
+		<Display>Centimeter</Display>
+		<Value>Centimeters</Value>
+	</Units>
+	<Units>
+		<Display>Meter</Display>
+		<Value>Meters</Value>
+	</Units>
+	<Units>
+		<Display>Kilometer</Display>
+		<Value>Kilometers</Value>
+	</Units>
+
+	<Rotation>
+		<Display>0 grader</Display>
+		<Value>0</Value>
+	</Rotation>
+	<Rotation>
+		<Display>30 grader</Display>
+		<Value>30</Value>
+	</Rotation>
+	<Rotation>
+		<Display>45 grader</Display>
+		<Value>45</Value>
+	</Rotation>
+	<Rotation>
+		<Display>90 grader</Display>
+		<Value>90</Value>
+	</Rotation>
+</ComboBoxDataSet>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Properties/Resources.es-ES.resx
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Properties/Resources.es-ES.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Properties/Resources.es-ES.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,4 +117,28 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Defaults" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Defaults.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="ZoomDirectionDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ZoomDirectionDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="TooltipTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TooltipTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="PositionTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PositionTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="MeasureUnitsDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MeasureUnitsDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="MeasureTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MeasureTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="GeometryOperationTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GeometryOperationTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="DirectionTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DirectionTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/Defaults.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/Defaults.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/Defaults.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,975 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="ApplicationDefinition-1.0.0.xsd">
+  <TemplateUrl>fusion/templates/mapguide/aqua/index.html</TemplateUrl>
+  <MapSet>
+    <MapGroup id="MainMap">
+      <Map>
+        <Type>MapGuide</Type>
+        <SingleTile>true</SingleTile>
+        <Extension>
+          <ResourceId></ResourceId>
+        </Extension>
+      </Map>
+      <Extension />
+    </MapGroup>
+  </MapSet>
+  <WidgetSet>
+    <Container xsi:type="UiItemContainerType">
+      <Name>Toolbar</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Help</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>About</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ViewOptions</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Print</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectRadius</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectPolygon</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectWithin</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ClearSelection</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>RefreshMap</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>ToolbarSecondary</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Select</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Pan</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Zoom</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomIn</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOut</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>InitialMapView</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PreviousView</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>NextView</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomToSelection</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>ToolbarVertical</Name>
+      <Type>Toolbar</Type>
+      <Position>left</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PanNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomInNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOutNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>InitialMapViewNoabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PreviousViewNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>NextViewNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomToSelectionNoLabel</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>Statusbar</Name>
+      <Type>Toolbar</Type>
+      <Position>bottom</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>CursorPosition</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>EditableScale</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ViewSize</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>FileMenu</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>MapMenu</Widget>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>View</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowOverviewMap</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowTaskWindow</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowLegendWindow</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowSelectionWindow</Widget>
+        </Item>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>MapContextMenu</Name>
+      <Type>ContextMenu</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>RefreshMap</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Pan</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Zoom</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomIn</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOut</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>Zoom</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>InitialMapView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>PreviousView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>NextView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ZoomToSelection</Widget>
+        </Item>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Select</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ClearSelection</Widget>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>Select More</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectRadius</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectPolygon</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectWithin</Widget>
+        </Item>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Help</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>About</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>TaskMenu</Name>
+      <Type>ContextMenu</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+    </Container>
+    <MapWidget>
+      <Name>Map</Name>
+      <Type>Map</Type>
+      <Extension>
+        <MenuContainer>MapContextMenu</MenuContainer>
+      </Extension>
+      <MapId>MainMap</MapId>
+    </MapWidget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>About</Name>
+      <Type>About</Type>
+      <Location />
+      <Extension>
+        <AboutURL>/mapguide/mapadmin/about.php</AboutURL>
+      </Extension>
+      <ImageUrl>images/icons/about.png</ImageUrl>
+      <ImageClass />
+      <Label>About</Label>
+      <Tooltip>Click to show information about this application</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>ActivityIndicator</Name>
+      <Type>ActivityIndicator</Type>
+      <Location />
+      <Extension>
+        <ElementId />
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Buffer</Name>
+      <Type>Buffer</Type>
+      <Extension>
+        <BufferUnits>meters</BufferUnits>
+        <BorderColor>ff000000</BorderColor>
+        <BufferDistanceInput>BufferDistance</BufferDistanceInput>
+        <FillColor>33FF0000</FillColor>
+        <LayerName>Buffer</LayerName>
+        <FillColorInput>BufferFillColor</FillColorInput>
+        <BufferUnitsInput>BufferUnits</BufferUnitsInput>
+        <BorderColorInput>BufferBorderColor</BorderColorInput>
+        <LayerNameInput>BufferLayerName</LayerNameInput>
+        <BufferDistance>100</BufferDistance>
+      </Extension>
+      <ImageUrl>images/icons/buffer.png</ImageUrl>
+      <ImageClass />
+      <Label>Create a buffer</Label>
+      <Tooltip>Click to create a buffer</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>BufferPanel</Name>
+      <Type>BufferPanel</Type>
+      <Extension>
+        <Target />
+      </Extension>
+      <ImageUrl>images/icons/buffer.png</ImageUrl>
+      <ImageClass />
+      <Label>Create a buffer</Label>
+      <Tooltip>Click to create a buffer</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ClearSelection</Name>
+      <Type>ClearSelection</Type>
+      <Extension />
+      <ImageUrl>images/icons/select-clear.png</ImageUrl>
+      <ImageClass />
+      <Label>ClearSelection</Label>
+      <Tooltip>Click to clear the current selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>CursorPosition</Name>
+      <Type>CursorPosition</Type>
+      <Extension>
+        <Precision>4</Precision>
+        <Template>x: {x}, y: {y}</Template>
+        <Units>dd</Units>
+      </Extension>
+    </Widget>
+    <Widget>
+      <Name>EditableScale</Name>
+      <Type>EditableScale</Type>
+      <Extension>
+        <Precision>4</Precision>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PreviousView</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Previous</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-back.png</ImageUrl>
+      <ImageClass />
+      <Label>Previous View</Label>
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>NextView</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Next</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-forward.png</ImageUrl>
+      <ImageClass />
+      <Label>Next View</Label>
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Help</Name>
+      <Type>Help</Type>
+      <Location />
+      <Extension>
+        <Target>HelpWindow</Target>
+        <Url>fusion/widgets/Help/Help.html</Url>
+      </Extension>
+      <ImageUrl>images/icons/help.png</ImageUrl>
+      <ImageClass />
+      <Label>Help</Label>
+      <Tooltip>Click to get help</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>InitialMapView</Name>
+      <Type>InitialMapView</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
+      <ImageClass />
+      <Label>Full Extent</Label>
+      <Tooltip>Click to zoom to the full map extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>Legend</Name>
+      <Type>Legend</Type>
+      <Location />
+      <Extension>
+        <HideInvisibleLayers>false</HideInvisibleLayers>
+        <ShowRootFolder>false</ShowRootFolder>
+        <DisabledLayerIcon>images/icons/legend-layer.png</DisabledLayerIcon>
+        <RootFolderIcon>images/icons/legend-map.png</RootFolderIcon>
+        <LayerThemeIcon>images/icons/legend-theme.png</LayerThemeIcon>
+        <LayerRasterIcon>images/icons/legend-raster.png</LayerRasterIcon>
+        <LayerInfoIcon>images/icons/tree_layer_info.png</LayerInfoIcon>
+        <GroupInfoIcon>images/icons/tree_group_info.png</GroupInfoIcon>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>MapMenu</Name>
+      <Type>MapMenu</Type>
+      <Location />
+      <Extension>
+        <Folder>Library://</Folder>
+      </Extension>
+      <ImageUrl>images/icons/map-manager.png</ImageUrl>
+      <ImageClass />
+      <Label>Map Menu</Label>
+      <Tooltip>Choose a map theme</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Measure</Name>
+      <Type>Measure</Type>
+      <Location />
+      <Extension>
+        <DistancePrecision>2</DistancePrecision>
+        <MeasureTooltipContainer>MeasureContainerBox</MeasureTooltipContainer>
+        <MeasureTooltipType>static</MeasureTooltipType>
+        <MeasureTipPositionLeft>15</MeasureTipPositionLeft>
+        <Units>none</Units>
+        <LineStyleWidth>2</LineStyleWidth>
+        <MeasureTipPositionTop>100</MeasureTipPositionTop>
+        <LineStyleColor>rgba(0,0,255,0.3)</LineStyleColor>
+        <FillStyle>rgba(0,0,255, 0.3)</FillStyle>
+        <AreaPrecision>2</AreaPrecision>
+        <Type>Both</Type>
+      </Extension>
+      <ImageUrl>images/icons/measure.png</ImageUrl>
+      <ImageClass />
+      <Label>Measure</Label>
+      <Tooltip>Measure distances on the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>Navigator</Name>
+      <Type>Navigator</Type>
+      <Location />
+      <Extension />
+    </Widget>
+    <Widget>
+      <Name>OverviewMap</Name>
+      <Type>OverviewMap</Type>
+      <Location />
+      <Extension>
+        <MinRatio>32</MinRatio>
+        <MapId />
+        <MaxRatio>128</MaxRatio>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Pan</Name>
+      <Type>Pan</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/pan.png</ImageUrl>
+      <ImageClass />
+      <Label>Pan</Label>
+      <Tooltip>Click and drag to pan the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Print</Name>
+      <Type>Print</Type>
+      <Extension>
+        <ShowPrintUI>true</ShowPrintUI>
+        <ShowNorthArrow>false</ShowNorthArrow>
+        <PageTitle />
+        <ShowLegend>false</ShowLegend>
+        <ShowTitle>false</ShowTitle>
+      </Extension>
+      <ImageUrl>images/icons/file-print.png</ImageUrl>
+      <ImageClass />
+      <Label>Print</Label>
+      <Tooltip>Print the current map view</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>RefreshMap</Name>
+      <Type>RefreshMap</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/view-refresh.png</ImageUrl>
+      <ImageClass />
+      <Label>Refresh map</Label>
+      <Tooltip>Click to redraw the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SaveMap</Name>
+      <Type>SaveMap</Type>
+      <Extension>
+        <Format>png</Format>
+        <Scale />
+      </Extension>
+      <ImageUrl>images/icons/file-save.png</ImageUrl>
+      <ImageClass />
+      <Label>Save map</Label>
+      <Tooltip>Click to save the map as an image</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Select</Name>
+      <Type>Select</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+        <QueryActiveLayer>false</QueryActiveLayer>
+      </Extension>
+      <ImageUrl>images/icons/select.png</ImageUrl>
+      <ImageClass />
+      <Label>Select</Label>
+      <Tooltip>Click to select features</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>SelectionPanel</Name>
+      <Type>SelectionPanel</Type>
+      <Location />
+      <Extension />
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectPolygon</Name>
+      <Type>SelectPolygon</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+      </Extension>
+      <ImageUrl>images/icons/select-polygon.png</ImageUrl>
+      <ImageClass />
+      <Label>Select polygon</Label>
+      <Tooltip>Draw a polygon to perform a selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectRadius</Name>
+      <Type>SelectRadius</Type>
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <RadiusTooltipType>dynamic</RadiusTooltipType>
+        <RadiusTooltipContainer />
+        <SelectionType>INTERSECTS</SelectionType>
+        <DefaultRadius>20</DefaultRadius>
+      </Extension>
+      <ImageUrl>images/icons/select-radius.png</ImageUrl>
+      <ImageClass />
+      <Label>Select by radius</Label>
+      <Tooltip>Click to select within a radius</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectWithin</Name>
+      <Type>SelectWithin</Type>
+      <Location />
+      <Extension>
+        <AdditionalParameter />
+        <Target />
+        <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+      </Extension>
+      <ImageUrl>images/icons/select-features.png</ImageUrl>
+      <ImageClass />
+      <Label>Select within</Label>
+      <Tooltip>Click to select features within this selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>TaskPane</Name>
+      <Type>TaskPane</Type>
+      <Location />
+      <Extension>
+        <MenuContainer>TaskMenu</MenuContainer>
+        <InitialTask />
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ViewOptions</Name>
+      <Type>ViewOptions</Type>
+      <Location />
+      <Extension>
+        <DisplayUnits />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>ViewOptions</Label>
+      <Tooltip>Click to change the units displayed</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>ViewSize</Name>
+      <Type>ViewSize</Type>
+      <Location />
+      <Extension>
+        <Precision>-1</Precision>
+        <Template>x: {x}, y: {y}</Template>
+        <Units>none</Units>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Zoom</Name>
+      <Type>Zoom</Type>
+      <Extension>
+        <Tolerance>5</Tolerance>
+        <Factor>2</Factor>
+        <Direction>in</Direction>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom</Label>
+      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
+      <StatusText>Click or click and drag on the map to zoom in</StatusText>
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomOut</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>0.5</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom Out</Label>
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomIn</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>2.0</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom In</Label>
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomToSelection</Name>
+      <Type>ZoomToSelection</Type>
+      <Location />
+      <Extension>
+        <MaximumZoomDimension>-1</MaximumZoomDimension>
+        <ZoomFactor>2</ZoomFactor>
+      </Extension>
+      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom to selection</Label>
+      <Tooltip>Click to zoom to the selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>InitialMapViewNoabel</Name>
+      <Type>InitialMapView</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom to the full map extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>NextViewNoLabel</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Next</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-forward.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PanNoLabel</Name>
+      <Type>Pan</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/pan.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click and drag to pan the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PreviousViewNoLabel</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Previous</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-back.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectNoLabel</Name>
+      <Type>Select</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+        <QueryActiveLayer>false</QueryActiveLayer>
+      </Extension>
+      <ImageUrl>images/icons/select.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to select features</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomNoLabel</Name>
+      <Type>Zoom</Type>
+      <Extension>
+        <Tolerance>5</Tolerance>
+        <Factor>2</Factor>
+        <Direction>in</Direction>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
+      <StatusText>Click or click and drag on the map to zoom in</StatusText>
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomInNoLabel</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>2.0</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomOutNoLabel</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>0.5</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomToSelectionNoLabel</Name>
+      <Type>ZoomToSelection</Type>
+      <Location />
+      <Extension>
+        <MaximumZoomDimension>-1</MaximumZoomDimension>
+        <ZoomFactor>2</ZoomFactor>
+      </Extension>
+      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom to the selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>StatusOverviewMap</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showOverviewMapDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl>images/iconNavigator.gif</ImageUrl>
+      <ImageClass />
+      <Label>Invoke script</Label>
+      <Tooltip>Display the overview map window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowOverviewMap</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showOverviewMapDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Overview Map</Label>
+      <Tooltip>Display the overview map window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowTaskWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showTaskDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Task Pane</Label>
+      <Tooltip>Display the task pane window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowLegendWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showLegendDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Legend</Label>
+      <Tooltip>Display the legend window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowSelectionWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showSelectionDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Selection Window</Label>
+      <Tooltip>Display the selection window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+  </WidgetSet>
+  <Extension />
+</ApplicationDefinition>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<DirectionTypeDataset>
+	<DirectionUnit>
+		<Value>Previous</Value>
+		<Displayname>Previous</Displayname>
+	</DirectionUnit>
+
+	<DirectionUnit>
+		<Value>Next</Value>
+		<Displayname>Next</Displayname>
+	</DirectionUnit>
+
+</DirectionTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<GeometryOperationTypeDataset>
+	<GeometryOperationType>
+		<Value>CONTAINS</Value>
+		<Displayname>Contains</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>DISJOINT</Value>
+		<Displayname>Disjoint</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>INTERSECTS</Value>
+		<Displayname>Intersects</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>WITHIN</Value>
+		<Displayname>Within</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>INSIDE</Value>
+		<Displayname>Inside</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>ENVELOPEINTERSECTS</Value>
+		<Displayname>Envelope intersects</Displayname>
+	</GeometryOperationType>
+</GeometryOperationTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MeasureTypeDataset>
+	<MeasureType>
+		<Value>both</Value>
+		<Displayname>Both</Displayname>
+	</MeasureType>
+</MeasureTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MeasureUnitsDataset>
+	<MeasureUnit>
+		<Value>meters</Value>
+		<Displayname>Meters</Displayname>
+	</MeasureUnit>
+
+	<MeasureUnit>
+		<Value>miles</Value>
+		<Displayname>Miles</Displayname>
+	</MeasureUnit>
+
+	<MeasureUnit>
+		<Value>none</Value>
+		<Displayname>None</Displayname>
+	</MeasureUnit>
+
+  <MeasureUnit>
+    <Value>degrees</Value>
+    <Displayname>Degrees</Displayname>
+  </MeasureUnit>
+</MeasureUnitsDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/PositionTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/PositionTypesDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/PositionTypesDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<PositionTypesDataset>
+	<Position>
+		<Value>top</Value>
+		<Displayname>Top</Displayname>
+	</Position>
+
+	<Position>
+		<Value>left</Value>
+		<Displayname>Left</Displayname>
+	</Position>
+
+	<Position>
+		<Value>right</Value>
+		<Displayname>Right</Displayname>
+	</Position>
+
+	<Position>
+		<Value>bottom</Value>
+		<Displayname>Bottom</Displayname>
+	</Position>
+</PositionTypesDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<TooltipTypeDataset>
+	<TooltipType>
+		<Value>static</Value>
+		<Displayname>Static</Displayname>
+	</TooltipType>
+
+	<TooltipType>
+		<Value>dynamic</Value>
+		<Displayname>Dynamic</Displayname>
+	</TooltipType>
+
+</TooltipTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ZoomDirectionDataset>
+	<ZoomDirection>
+		<Value>in</Value>
+		<Displayname>In</Displayname>
+	</ZoomDirection>
+
+	<ZoomDirection>
+		<Value>out</Value>
+		<Displayname>Out</Displayname>
+	</ZoomDirection>
+
+</ZoomDirectionDataset>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Properties/Resources.es-ES.resx
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Properties/Resources.es-ES.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Properties/Resources.es-ES.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,4 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <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="FontStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FontStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</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>
 </root>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CommandTypesDataset>
+	<Command>
+		<Command>About</Command>
+		<Label>About</Label>
+		<ToolTip>About</ToolTip>
+		<Action>About</Action>
+		<Description>Display information about this application</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon></EnabledIcon>		
+		<DisabledIcon></DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Buffer</Command>
+		<Label>Buffer</Label>
+		<ToolTip>Buffer</ToolTip>
+		<Action>Buffer</Action>
+		<Description>Create buffers around the selected features</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_buffer.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_buffer_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Clear Selection</Command>
+		<Label>Clear Selection</Label>
+		<ToolTip>Clear selection</ToolTip>
+		<Action>Clear Selection</Action>
+		<Description>Clear the current selections</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_clearselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_clearselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Copy Map</Command>
+		<Label>Copy</Label>
+		<ToolTip>Copy</ToolTip>
+		<Action>Copy Map</Action>
+		<Description>Copy current view of map to clipboard</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_copy.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_copy_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Help</Command>
+		<Label>Help</Label>
+		<ToolTip>Help</ToolTip>
+		<Action>Help</Action>
+		<Description>Launch help for this application</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_help.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_help_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Center and Scale</Command>
+		<Label>Initial Center and Scale</Label>
+		<ToolTip>Initial center and scale</ToolTip>
+		<Action>Restore View</Action>
+		<Description>Zoom to the initial center and scale of the map</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_restorecenter.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_restorecenter_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Map View</Command>
+		<Label>Initial Map View</Label>
+		<ToolTip>Initial map view</ToolTip>
+		<Action>Fit To Window</Action>
+		<Description>Fit the initial view of the map to the window</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_fitwindow.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_fitwindow_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke Script</Command>
+		<Label>Invoke Script</Label>
+		<ToolTip>Invoke script</ToolTip>
+		<Action>Invoke Script</Action>
+		<Description>Invoke a script command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokescript.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokescript_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke URL</Command>
+		<Label>Invoke URL</Label>
+		<ToolTip>Invoke a command by accessing a URL</ToolTip>
+		<Action>Invoke URL</Action>
+		<Description>Invoke a URL command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokeurl.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokeurl_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Measure</Command>
+		<Label>Measure</Label>
+		<ToolTip>Measure</ToolTip>
+		<Action>Measure</Action>
+		<Description>Measure distances on the map</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_measure.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_measure_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Next View</Command>
+		<Label>Next View</Label>
+		<ToolTip>Next View</ToolTip>
+		<Action>Next View</Action>
+		<Description>Buffer</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomnext.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomnext_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan</Command>
+		<Label>Pan</Label>
+		<ToolTip>Pan mode</ToolTip>
+		<Action>Pan</Action>
+		<Description>Drag the map to view areas out of range</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pan.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pan_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Down</Command>
+		<Label>Pan Down</Label>
+		<ToolTip>Pan down</ToolTip>
+		<Action>Pan Down</Action>
+		<Description>Pan down by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pandown.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pandown_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Left</Command>
+		<Label>Pan Left</Label>
+		<ToolTip>Pan left</ToolTip>
+		<Action>Pan Left</Action>
+		<Description>Pan left by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panleft.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panleft_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Right</Command>
+		<Label>Pan Right</Label>
+		<ToolTip>Pan right</ToolTip>
+		<Action>Pan Right</Action>
+		<Description>Pan right by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panright.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panright_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Up</Command>
+		<Label>Pan Up</Label>
+		<ToolTip>Pan up</ToolTip>
+		<Action>Pan Up</Action>
+		<Description>Pan up by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panup.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panup_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Previous View</Command>
+		<Label>Previous View</Label>
+		<ToolTip>Previous view</ToolTip>
+		<Action>Previous View</Action>
+		<Description>Go to previous view</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomprev.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomprev_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Print</Command>
+		<Label>Print</Label>
+		<ToolTip>Print</ToolTip>
+		<Action>Print</Action>
+		<Description>Print with optional layout</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_print.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_print_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Refresh Map</Command>
+		<Label>Refresh Map</Label>
+		<ToolTip>Refresh map</ToolTip>
+		<Action>Refresh</Action>
+		<Description>Refresh map and reload all layers keeping current center and scale</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_refreshmap.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_refreshmap_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Search</Command>
+		<Label>Search</Label>
+		<ToolTip>Search</ToolTip>
+		<Action>Search</Action>
+		<Description>Perform a search</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_search.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_search_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select</Command>
+		<Label>Select</Label>
+		<ToolTip>Select mode</ToolTip>
+		<Action>Select</Action>
+		<Description>Select features by clicking and dragging</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_select.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_select_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Polygon</Command>
+		<Label>Select Polygon</Label>
+		<ToolTip>Select polygon</ToolTip>
+		<Action>Select Polygon</Action>
+		<Description>Create a polygon to select all features that fall within</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectpolygon.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectpolygon_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Radius</Command>
+		<Label>Select Radius</Label>
+		<ToolTip>Select radius</ToolTip>
+		<Action>Select Radius</Action>
+		<Description>Click and drag to select all features inside the circle</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectradius.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectradius_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Within</Command>
+		<Label>Select Within</Label>
+		<ToolTip>Select within</ToolTip>
+		<Action>Select Within</Action>
+		<Description>Select features that fall within currently selected areas</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectwithin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectwithin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>View Options</Command>
+		<Label>View Options</Label>
+		<ToolTip>View options</ToolTip>
+		<Action>View Options</Action>
+		<Description>View Options</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_viewoptions.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_viewoptions_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom</Command>
+		<Label>Zoom Dynamic</Label>
+		<ToolTip>Zoom dynamic</ToolTip>
+		<Action>Zoom</Action>
+		<Description>Zoom dynamically by clicking and dragging</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoom.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoom_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom In</Command>
+		<Label>Zoom In</Label>
+		<ToolTip>Zoom in</ToolTip>
+		<Action>Zoom In</Action>
+		<Description>Zoom in by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Out</Command>
+		<Label>Zoom Out</Label>
+		<ToolTip>Zoom out</ToolTip>
+		<Action>Zoom Out</Action>
+		<Description>Zoom out by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomout.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomout_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Rectangle</Command>
+		<Label>Zoom Rectangle</Label>
+		<ToolTip>Zoom to rectangle</ToolTip>
+		<Action>Zoom Rectangle</Action>
+		<Description>Zoom in on an area</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomrect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomrect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Selection</Command>
+		<Label>Zoom Selection</Label>
+		<ToolTip>Zoom to selection</ToolTip>
+		<Action>Zoom To Selection</Action>
+		<Description>Zoom to extents of selected features</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Get Printable Page</Command>
+		<Label>Printable Page</Label>
+		<ToolTip>Get printable page</ToolTip>
+		<Action>Get Printable Page</Action>
+		<Description>Get printer-friendly page</Description>
+		<Viewers>AJAX</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_printablepage.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_printablepage_disabled.gif</DisabledIcon>
+	</Command>
+
+</CommandTypesDataset>

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<ComboBoxDataSet>
+
+	<Font>
+		<Display>Arial</Display>
+		<Value>Arial</Value>
+	</Font>
+	<Font>
+		<Display>Arial Black</Display>
+		<Value>Arial Black</Value>
+	</Font>
+	<Font>
+		<Display>Arial Narrow</Display>
+		<Value>Arial Narrow</Value>
+	</Font>
+	<Font>
+		<Display>BankGothic Lt BT</Display>
+		<Value>ankGothic Lt BT</Value>
+	</Font>
+	<Font>
+		<Display>BankGothic Md BT</Display>
+		<Value>BankGothic Md BT</Value>
+	</Font>
+	<Font>
+		<Display>Book Antiqua</Display>
+		<Value>Book Antiqua</Value>
+	</Font>
+	<Font>
+		<Display>Bookman Old Style</Display>
+		<Value>Bookman Old Style</Value>
+	</Font>
+	<Font>
+		<Display>Century Gothic</Display>
+		<Value>Century Gothic</Value>
+	</Font>
+	<Font>
+		<Display>CityBlueprint</Display>
+		<Value>CityBlueprint</Value>
+	</Font>
+	<Font>
+		<Display>Comic Sans MS</Display>
+		<Value>Comic Sans MS</Value>
+	</Font>
+	<Font>
+		<Display>CommercialPi BT</Display>
+		<Value>CommercialPi BT</Value>
+	</Font>
+	<Font>
+		<Display>CommercialScript BT</Display>
+		<Value>CommercialScript BT</Value>
+	</Font>
+	<Font>
+		<Display>Complex</Display>
+		<Value>Complex</Value>
+	</Font>
+	<Font>
+		<Display>CountryBlueprint</Display>
+		<Value>CountryBlueprint</Value>
+	</Font>
+	<Font>
+		<Display>Courier New</Display>
+		<Value>Courier New</Value>
+	</Font>
+	<Font>
+		<Display>Dutch801 Rm BT</Display>
+		<Value>Dutch801 Rm BT</Value>
+	</Font>
+	<Font>
+		<Display>Dutch801 XBd BT</Display>
+		<Value>Dutch801 XBd BT</Value>
+	</Font>
+	<Font>
+		<Display>Estrangelo Edessa</Display>
+		<Value>Estrangelo Edessa</Value>
+	</Font>
+	<Font>
+		<Display>EuroRoman</Display>
+		<Value>EuroRoman</Value>
+	</Font>
+	<Font>
+		<Display>Franklin Gothic Medium</Display>
+		<Value>Franklin Gothic Medium</Value>
+	</Font>
+	<Font>
+		<Display>Garamond</Display>
+		<Value>Garamond</Value>
+	</Font>
+	<Font>
+		<Display>Gautami</Display>
+		<Value>Gautami</Value>
+	</Font>
+	<Font>
+		<Display>GDT</Display>
+		<Value>GDT</Value>
+	</Font>
+	<Font>
+		<Display>Georgia</Display>
+		<Value>Georgia</Value>
+	</Font>
+	<Font>
+		<Display>GothicE</Display>
+		<Value>GothicE</Value>
+	</Font>
+	<Font>
+		<Display>GothicG</Display>
+		<Value>GothicG</Value>
+	</Font>
+	<Font>
+		<Display>Gothicl</Display>
+		<Value>Gothicl</Value>
+	</Font>
+	<Font>
+		<Display>GreekC</Display>
+		<Value>GreekC</Value>
+	</Font>
+	<Font>
+		<Display>GreekS</Display>
+		<Value>GreekS</Value>
+	</Font>
+	<Font>
+		<Display>Haettenschweiler</Display>
+		<Value>Haettenschweiler</Value>
+	</Font>
+	<Font>
+		<Display>Impact</Display>
+		<Value>Impact</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP</Display>
+		<Value>ISOCP</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP2</Display>
+		<Value>ISOCP2</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP3</Display>
+		<Value>ISOCP3</Value>
+	</Font>
+	<Font>
+		<Display>ISOCPEUR</Display>
+		<Value>Arial</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT</Display>
+		<Value>ISOCT</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT2</Display>
+		<Value>ISOCT2</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT3</Display>
+		<Value>ISOCT3</Value>
+	</Font>
+	<Font>
+		<Display>ISOCTEUR</Display>
+		<Value>ISOCTEUR</Value>
+	</Font>
+	<Font>
+		<Display>Italic</Display>
+		<Value>Italic</Value>
+	</Font>
+	<Font>
+		<Display>ItalicC</Display>
+		<Value>ItalicC</Value>
+	</Font>
+	<Font>
+		<Display>ItalicT</Display>
+		<Value>ItalicT</Value>
+	</Font>
+	<Font>
+		<Display>Kartika</Display>
+		<Value>Kartika</Value>
+	</Font>
+	<Font>
+		<Display>Latha</Display>
+		<Value>Latha</Value>
+	</Font>
+	<Font>
+		<Display>Lucida Console</Display>
+		<Value>Lucida Console</Value>
+	</Font>
+	<Font>
+		<Display>Lucida Sans Unicode</Display>
+		<Value>Lucida Sans Unicode</Value>
+	</Font>
+	<Font>
+		<Display>Mangal</Display>
+		<Value>Mangal</Value>
+	</Font>
+	<Font>
+		<Display>Map Symbols</Display>
+		<Value>Map Symbols</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Arrows</Display>
+		<Value>MapInfo Arrows</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Cartographic</Display>
+		<Value>MapInfo Cartographic</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Dispersed Groups</Display>
+		<Value>MapInfo Dispersed Groups</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Miscellaneous</Display>
+		<Value>MapInfo Miscellaneous</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Oil&amp;Gas</Display>
+		<Value>MapInfo Oil&amp;Gas</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Real Estate</Display>
+		<Value>MapInfo Real Estate</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Shields</Display>
+		<Value>MapInfo Shields</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Symbols</Display>
+		<Value>MapInfo Symbols</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Transportation</Display>
+		<Value>MapInfo Transportation</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Weather</Display>
+		<Value>MapInfo Weather</Value>
+	</Font>
+	<Font>
+		<Display>Marlett</Display>
+		<Value>Marlett</Value>
+	</Font>
+	<Font>
+		<Display>Microsoft Sans Serif</Display>
+		<Value>Microsoft Sans Serif</Value>
+	</Font>
+	<Font>
+		<Display>Monospac821 BT</Display>
+		<Value>Monospac821 BT</Value>
+	</Font>
+	<Font>
+		<Display>Monotxt</Display>
+		<Value>Monotxt</Value>
+	</Font>
+	<Font>
+		<Display>MV Boli</Display>
+		<Value>MV Boli</Value>
+	</Font>
+	<Font>
+		<Display>Nina</Display>
+		<Value>Nina</Value>
+	</Font>
+	<Font>
+		<Display>Palatino Linotype</Display>
+		<Value>Palatino Linotype</Value>
+	</Font>
+	<Font>
+		<Display>PanRoman</Display>
+		<Value>PanRoman</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 1</Display>
+		<Value>Proxy 1</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 2</Display>
+		<Value>Proxy 2</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 3</Display>
+		<Value>Proxy 3</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 4</Display>
+		<Value>Proxy 4</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 5</Display>
+		<Value>Proxy 5</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 6</Display>
+		<Value>Proxy 6</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 7</Display>
+		<Value>Proxy 7</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 8</Display>
+		<Value>Proxy 8</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 9</Display>
+		<Value>Proxy 9</Value>
+	</Font>
+	<Font>
+		<Display>Raavi</Display>
+		<Value>Raavi</Value>
+	</Font>
+	<Font>
+		<Display>RomanC</Display>
+		<Value>RomanC</Value>
+	</Font>
+	<Font>
+		<Display>RomanD</Display>
+		<Value>RomanD</Value>
+	</Font>
+	<Font>
+		<Display>RomanS</Display>
+		<Value>RomanS</Value>
+	</Font>
+	<Font>
+		<Display>RomanT</Display>
+		<Value>RomanT</Value>
+	</Font>
+	<Font>
+		<Display>Romantic</Display>
+		<Value>Romantic</Value>
+	</Font>
+	<Font>
+		<Display>SansSerif</Display>
+		<Value>SansSerif</Value>
+	</Font>
+	<Font>
+		<Display>ScriptC</Display>
+		<Value>ScriptC</Value>
+	</Font>
+	<Font>
+		<Display>ScriptS</Display>
+		<Value>ScriptS</Value>
+	</Font>
+	<Font>
+		<Display>Shruti</Display>
+		<Value>Shruti</Value>
+	</Font>
+	<Font>
+		<Display>Simplex</Display>
+		<Value>Simplex</Value>
+	</Font>
+	<Font>
+		<Display>Stylus BT</Display>
+		<Value>Stylus BT</Value>
+	</Font>
+	<Font>
+		<Display>SuperFrench</Display>
+		<Value>SuperFrench</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BdCnOul BT</Display>
+		<Value>Swis721 BdCnOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BdOul BT</Display>
+		<Value>Swis721 BdOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Blk BT</Display>
+		<Value>Swis721 Blk BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkCn BT</Display>
+		<Value>Swis721 BlkCn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkEx BT</Display>
+		<Value>Swis721 BlkEx BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkOul BT</Display>
+		<Value>Swis721 BlkOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BT</Display>
+		<Value>Swis721 BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Cn BT</Display>
+		<Value>Swis721 Cn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Ex BT</Display>
+		<Value>Swis721 Ex BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Lt BT</Display>
+		<Value>Swis721 Lt BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 LtCn BT</Display>
+		<Value>Swis721 LtCn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 LtEx BT</Display>
+		<Value>Swis721 LtEx BT</Value>
+	</Font>
+	<Font>
+		<Display>Syastro</Display>
+		<Value>Syastro</Value>
+	</Font>
+	<Font>
+		<Display>Sylfaen</Display>
+		<Value>Sylfaen</Value>
+	</Font>
+	<Font>
+		<Display>Symap</Display>
+		<Value>Symap</Value>
+	</Font>
+	<Font>
+		<Display>Symath</Display>
+		<Value>Symath</Value>
+	</Font>
+	<Font>
+		<Display>Symbol</Display>
+		<Value>Symbol</Value>
+	</Font>
+	<Font>
+		<Display>Symeteo</Display>
+		<Value>Symeteo</Value>
+	</Font>
+	<Font>
+		<Display>Symusic</Display>
+		<Value>Symusic</Value>
+	</Font>
+	<Font>
+		<Display>Tahoma</Display>
+		<Value>Tahoma</Value>
+	</Font>
+	<Font>
+		<Display>Technic</Display>
+		<Value>Technic</Value>
+	</Font>
+	<Font>
+		<Display>TechnicBold</Display>
+		<Value>TechnicBold</Value>
+	</Font>
+	<Font>
+		<Display>TechnicLite</Display>
+		<Value>TechnicLite</Value>
+	</Font>
+	<Font>
+		<Display>Times New Roman</Display>
+		<Value>Times New Roman</Value>
+	</Font>
+	<Font>
+		<Display>Trebuchet MS</Display>
+		<Value>Trebuchet MS</Value>
+	</Font>
+	<Font>
+		<Display>Tunga</Display>
+		<Value>Tunga</Value>
+	</Font>
+	<Font>
+		<Display>Txt</Display>
+		<Value>Txt</Value>
+	</Font>
+	<Font>
+		<Display>UniversalMath1 BT</Display>
+		<Value>UniversalMath1 BT</Value>
+	</Font>
+	<Font>
+		<Display>Verdana</Display>
+		<Value>Verdana</Value>
+	</Font>
+	<Font>
+		<Display>Vineta BT</Display>
+		<Value>Vineta BT</Value>
+	</Font>
+	<Font>
+		<Display>Vrinda</Display>
+		<Value>Vrinda</Value>
+	</Font>
+	<Font>
+		<Display>Webdings</Display>
+		<Value>Webdings</Value>
+	</Font>
+	<Font>
+		<Display>Windings</Display>
+		<Value>Windings</Value>
+	</Font>
+	<Font>
+		<Display>Windings 2</Display>
+		<Value>Windings 2</Value>
+	</Font>
+	<Font>
+		<Display>Windings 3</Display>
+		<Value>Windings 3</Value>
+	</Font>
+	
+	<BackgroundType>
+		<Display>Ghosted</Display>
+		<Value>Ghosted</Value>
+	</BackgroundType>
+	<BackgroundType>
+		<Display>Opaque</Display>
+		<Value>Opaque</Value>
+	</BackgroundType>
+	<BackgroundType>
+		<Display>Transparent</Display>
+		<Value>Transparent</Value>
+	</BackgroundType>
+	
+	<Vertical>
+		<Display>Baseline</Display>
+		<Value>'Baseline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Bottom</Display>
+		<Value>'Bottom'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Capline</Display>
+		<Value>'Capline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Halfline</Display>
+		<Value>'Halfline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Top</Display>
+		<Value>'Top'</Value>
+	</Vertical>
+
+	<Horizontal>
+		<Display>Center</Display>
+		<Value>'Center'</Value>
+	</Horizontal>
+
+	<SizeContext>
+		<Display>Device space</Display>
+		<Value>DeviceUnits</Value>
+	</SizeContext>
+	<SizeContext>
+		<Display>Map space</Display>
+		<Value>MappingUnits</Value>
+	</SizeContext>
+	
+	<Units>
+		<Display>Points</Display>
+		<Value>Points</Value>
+	</Units>
+	<Units>
+		<Display>Inches</Display>
+		<Value>Inches</Value>
+	</Units>
+	<Units>
+		<Display>Feet</Display>
+		<Value>Feet</Value>
+	</Units>
+	<Units>
+		<Display>Yards</Display>
+		<Value>Yards</Value>
+	</Units>
+	<Units>
+		<Display>Millimeters</Display>
+		<Value>Millimeters</Value>
+	</Units>
+	<Units>
+		<Display>Centimeters</Display>
+		<Value>Centimeters</Value>
+	</Units>
+	<Units>
+		<Display>Meters</Display>
+		<Value>Meters</Value>
+	</Units>
+	<Units>
+		<Display>Kilometers</Display>
+		<Value>Kilometers</Value>
+	</Units>
+
+	<Rotation>
+		<Display>0 degrees</Display>
+		<Value>0</Value>
+	</Rotation>
+	<Rotation>
+		<Display>30 degrees</Display>
+		<Value>30</Value>
+	</Rotation>
+	<Rotation>
+		<Display>45 degrees</Display>
+		<Value>45</Value>
+	</Rotation>
+	<Rotation>
+		<Display>90 degrees</Display>
+		<Value>90</Value>
+	</Rotation>	
+</ComboBoxDataSet>

Added: trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,94 @@
+<?xml version="1.0" standalone="yes"?>
+<ComboBoxDataSet>
+	<SymbolMark>
+		<Display>Square</Display>
+		<Value>Square</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Circle</Display>
+		<Value>Circle</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Triangle</Display>
+		<Value>Triangle</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Star</Display>
+		<Value>Star</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Cross</Display>
+		<Value>Cross</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>X - Mark</Display>
+		<Value>X</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Font...</Display>
+		<Value></Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Symbol...</Display>
+		<Value></Value>
+	</SymbolMark>
+	
+	<SizeContext>
+		<Display>Device space</Display>
+		<Value>DeviceUnits</Value>
+	</SizeContext>
+	<SizeContext>
+		<Display>Map space</Display>
+		<Value>MappingUnits</Value>
+	</SizeContext>
+	
+	<Units>
+		<Display>Points</Display>
+		<Value>Points</Value>
+	</Units>
+	<Units>
+		<Display>Inches</Display>
+		<Value>Inches</Value>
+	</Units>
+	<Units>
+		<Display>Feet</Display>
+		<Value>Feet</Value>
+	</Units>
+	<Units>
+		<Display>Yards</Display>
+		<Value>Yards</Value>
+	</Units>
+	<Units>
+		<Display>Millimeters</Display>
+		<Value>Millimeters</Value>
+	</Units>
+	<Units>
+		<Display>Centimeters</Display>
+		<Value>Centimeters</Value>
+	</Units>
+	<Units>
+		<Display>Meters</Display>
+		<Value>Meters</Value>
+	</Units>
+	<Units>
+		<Display>Kilometers</Display>
+		<Value>Kilometers</Value>
+	</Units>
+
+	<Rotation>
+		<Display>0 degrees</Display>
+		<Value>0</Value>
+	</Rotation>
+	<Rotation>
+		<Display>30 degrees</Display>
+		<Value>30</Value>
+	</Rotation>
+	<Rotation>
+		<Display>45 degrees</Display>
+		<Value>45</Value>
+	</Rotation>
+	<Rotation>
+		<Display>90 degrees</Display>
+		<Value>90</Value>
+	</Rotation>
+</ComboBoxDataSet>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Properties/Resources.fr-FR.resx
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Properties/Resources.fr-FR.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Properties/Resources.fr-FR.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,4 +117,28 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Defaults" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Defaults.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="ZoomDirectionDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ZoomDirectionDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="TooltipTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TooltipTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="PositionTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PositionTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="MeasureUnitsDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MeasureUnitsDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="MeasureTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MeasureTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="GeometryOperationTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GeometryOperationTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="DirectionTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DirectionTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/Defaults.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/Defaults.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/Defaults.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,975 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="ApplicationDefinition-1.0.0.xsd">
+  <TemplateUrl>fusion/templates/mapguide/aqua/index.html</TemplateUrl>
+  <MapSet>
+    <MapGroup id="MainMap">
+      <Map>
+        <Type>MapGuide</Type>
+        <SingleTile>true</SingleTile>
+        <Extension>
+          <ResourceId></ResourceId>
+        </Extension>
+      </Map>
+      <Extension />
+    </MapGroup>
+  </MapSet>
+  <WidgetSet>
+    <Container xsi:type="UiItemContainerType">
+      <Name>Toolbar</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Help</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>About</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ViewOptions</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Print</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectRadius</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectPolygon</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectWithin</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ClearSelection</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>RefreshMap</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>ToolbarSecondary</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Select</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Pan</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Zoom</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomIn</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOut</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>InitialMapView</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PreviousView</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>NextView</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomToSelection</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>ToolbarVertical</Name>
+      <Type>Toolbar</Type>
+      <Position>left</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PanNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomInNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOutNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>InitialMapViewNoabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PreviousViewNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>NextViewNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomToSelectionNoLabel</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>Statusbar</Name>
+      <Type>Toolbar</Type>
+      <Position>bottom</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>CursorPosition</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>EditableScale</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ViewSize</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>FileMenu</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>MapMenu</Widget>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>View</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowOverviewMap</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowTaskWindow</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowLegendWindow</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowSelectionWindow</Widget>
+        </Item>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>MapContextMenu</Name>
+      <Type>ContextMenu</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>RefreshMap</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Pan</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Zoom</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomIn</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOut</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>Zoom</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>InitialMapView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>PreviousView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>NextView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ZoomToSelection</Widget>
+        </Item>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Select</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ClearSelection</Widget>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>Select More</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectRadius</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectPolygon</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectWithin</Widget>
+        </Item>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Help</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>About</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>TaskMenu</Name>
+      <Type>ContextMenu</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+    </Container>
+    <MapWidget>
+      <Name>Map</Name>
+      <Type>Map</Type>
+      <Extension>
+        <MenuContainer>MapContextMenu</MenuContainer>
+      </Extension>
+      <MapId>MainMap</MapId>
+    </MapWidget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>About</Name>
+      <Type>About</Type>
+      <Location />
+      <Extension>
+        <AboutURL>/mapguide/mapadmin/about.php</AboutURL>
+      </Extension>
+      <ImageUrl>images/icons/about.png</ImageUrl>
+      <ImageClass />
+      <Label>About</Label>
+      <Tooltip>Click to show information about this application</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>ActivityIndicator</Name>
+      <Type>ActivityIndicator</Type>
+      <Location />
+      <Extension>
+        <ElementId />
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Buffer</Name>
+      <Type>Buffer</Type>
+      <Extension>
+        <BufferUnits>meters</BufferUnits>
+        <BorderColor>ff000000</BorderColor>
+        <BufferDistanceInput>BufferDistance</BufferDistanceInput>
+        <FillColor>33FF0000</FillColor>
+        <LayerName>Buffer</LayerName>
+        <FillColorInput>BufferFillColor</FillColorInput>
+        <BufferUnitsInput>BufferUnits</BufferUnitsInput>
+        <BorderColorInput>BufferBorderColor</BorderColorInput>
+        <LayerNameInput>BufferLayerName</LayerNameInput>
+        <BufferDistance>100</BufferDistance>
+      </Extension>
+      <ImageUrl>images/icons/buffer.png</ImageUrl>
+      <ImageClass />
+      <Label>Create a buffer</Label>
+      <Tooltip>Click to create a buffer</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>BufferPanel</Name>
+      <Type>BufferPanel</Type>
+      <Extension>
+        <Target />
+      </Extension>
+      <ImageUrl>images/icons/buffer.png</ImageUrl>
+      <ImageClass />
+      <Label>Create a buffer</Label>
+      <Tooltip>Click to create a buffer</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ClearSelection</Name>
+      <Type>ClearSelection</Type>
+      <Extension />
+      <ImageUrl>images/icons/select-clear.png</ImageUrl>
+      <ImageClass />
+      <Label>ClearSelection</Label>
+      <Tooltip>Click to clear the current selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>CursorPosition</Name>
+      <Type>CursorPosition</Type>
+      <Extension>
+        <Precision>4</Precision>
+        <Template>x: {x}, y: {y}</Template>
+        <Units>dd</Units>
+      </Extension>
+    </Widget>
+    <Widget>
+      <Name>EditableScale</Name>
+      <Type>EditableScale</Type>
+      <Extension>
+        <Precision>4</Precision>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PreviousView</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Previous</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-back.png</ImageUrl>
+      <ImageClass />
+      <Label>Previous View</Label>
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>NextView</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Next</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-forward.png</ImageUrl>
+      <ImageClass />
+      <Label>Next View</Label>
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Help</Name>
+      <Type>Help</Type>
+      <Location />
+      <Extension>
+        <Target>HelpWindow</Target>
+        <Url>fusion/widgets/Help/Help.html</Url>
+      </Extension>
+      <ImageUrl>images/icons/help.png</ImageUrl>
+      <ImageClass />
+      <Label>Help</Label>
+      <Tooltip>Click to get help</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>InitialMapView</Name>
+      <Type>InitialMapView</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
+      <ImageClass />
+      <Label>Full Extent</Label>
+      <Tooltip>Click to zoom to the full map extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>Legend</Name>
+      <Type>Legend</Type>
+      <Location />
+      <Extension>
+        <HideInvisibleLayers>false</HideInvisibleLayers>
+        <ShowRootFolder>false</ShowRootFolder>
+        <DisabledLayerIcon>images/icons/legend-layer.png</DisabledLayerIcon>
+        <RootFolderIcon>images/icons/legend-map.png</RootFolderIcon>
+        <LayerThemeIcon>images/icons/legend-theme.png</LayerThemeIcon>
+        <LayerRasterIcon>images/icons/legend-raster.png</LayerRasterIcon>
+        <LayerInfoIcon>images/icons/tree_layer_info.png</LayerInfoIcon>
+        <GroupInfoIcon>images/icons/tree_group_info.png</GroupInfoIcon>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>MapMenu</Name>
+      <Type>MapMenu</Type>
+      <Location />
+      <Extension>
+        <Folder>Library://</Folder>
+      </Extension>
+      <ImageUrl>images/icons/map-manager.png</ImageUrl>
+      <ImageClass />
+      <Label>Map Menu</Label>
+      <Tooltip>Choose a map theme</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Measure</Name>
+      <Type>Measure</Type>
+      <Location />
+      <Extension>
+        <DistancePrecision>2</DistancePrecision>
+        <MeasureTooltipContainer>MeasureContainerBox</MeasureTooltipContainer>
+        <MeasureTooltipType>static</MeasureTooltipType>
+        <MeasureTipPositionLeft>15</MeasureTipPositionLeft>
+        <Units>none</Units>
+        <LineStyleWidth>2</LineStyleWidth>
+        <MeasureTipPositionTop>100</MeasureTipPositionTop>
+        <LineStyleColor>rgba(0,0,255,0.3)</LineStyleColor>
+        <FillStyle>rgba(0,0,255, 0.3)</FillStyle>
+        <AreaPrecision>2</AreaPrecision>
+        <Type>Both</Type>
+      </Extension>
+      <ImageUrl>images/icons/measure.png</ImageUrl>
+      <ImageClass />
+      <Label>Measure</Label>
+      <Tooltip>Measure distances on the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>Navigator</Name>
+      <Type>Navigator</Type>
+      <Location />
+      <Extension />
+    </Widget>
+    <Widget>
+      <Name>OverviewMap</Name>
+      <Type>OverviewMap</Type>
+      <Location />
+      <Extension>
+        <MinRatio>32</MinRatio>
+        <MapId />
+        <MaxRatio>128</MaxRatio>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Pan</Name>
+      <Type>Pan</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/pan.png</ImageUrl>
+      <ImageClass />
+      <Label>Pan</Label>
+      <Tooltip>Click and drag to pan the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Print</Name>
+      <Type>Print</Type>
+      <Extension>
+        <ShowPrintUI>true</ShowPrintUI>
+        <ShowNorthArrow>false</ShowNorthArrow>
+        <PageTitle />
+        <ShowLegend>false</ShowLegend>
+        <ShowTitle>false</ShowTitle>
+      </Extension>
+      <ImageUrl>images/icons/file-print.png</ImageUrl>
+      <ImageClass />
+      <Label>Print</Label>
+      <Tooltip>Print the current map view</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>RefreshMap</Name>
+      <Type>RefreshMap</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/view-refresh.png</ImageUrl>
+      <ImageClass />
+      <Label>Refresh map</Label>
+      <Tooltip>Click to redraw the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SaveMap</Name>
+      <Type>SaveMap</Type>
+      <Extension>
+        <Format>png</Format>
+        <Scale />
+      </Extension>
+      <ImageUrl>images/icons/file-save.png</ImageUrl>
+      <ImageClass />
+      <Label>Save map</Label>
+      <Tooltip>Click to save the map as an image</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Select</Name>
+      <Type>Select</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+        <QueryActiveLayer>false</QueryActiveLayer>
+      </Extension>
+      <ImageUrl>images/icons/select.png</ImageUrl>
+      <ImageClass />
+      <Label>Select</Label>
+      <Tooltip>Click to select features</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>SelectionPanel</Name>
+      <Type>SelectionPanel</Type>
+      <Location />
+      <Extension />
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectPolygon</Name>
+      <Type>SelectPolygon</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+      </Extension>
+      <ImageUrl>images/icons/select-polygon.png</ImageUrl>
+      <ImageClass />
+      <Label>Select polygon</Label>
+      <Tooltip>Draw a polygon to perform a selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectRadius</Name>
+      <Type>SelectRadius</Type>
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <RadiusTooltipType>dynamic</RadiusTooltipType>
+        <RadiusTooltipContainer />
+        <SelectionType>INTERSECTS</SelectionType>
+        <DefaultRadius>20</DefaultRadius>
+      </Extension>
+      <ImageUrl>images/icons/select-radius.png</ImageUrl>
+      <ImageClass />
+      <Label>Select by radius</Label>
+      <Tooltip>Click to select within a radius</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectWithin</Name>
+      <Type>SelectWithin</Type>
+      <Location />
+      <Extension>
+        <AdditionalParameter />
+        <Target />
+        <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+      </Extension>
+      <ImageUrl>images/icons/select-features.png</ImageUrl>
+      <ImageClass />
+      <Label>Select within</Label>
+      <Tooltip>Click to select features within this selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>TaskPane</Name>
+      <Type>TaskPane</Type>
+      <Location />
+      <Extension>
+        <MenuContainer>TaskMenu</MenuContainer>
+        <InitialTask />
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ViewOptions</Name>
+      <Type>ViewOptions</Type>
+      <Location />
+      <Extension>
+        <DisplayUnits />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>ViewOptions</Label>
+      <Tooltip>Click to change the units displayed</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>ViewSize</Name>
+      <Type>ViewSize</Type>
+      <Location />
+      <Extension>
+        <Precision>-1</Precision>
+        <Template>x: {x}, y: {y}</Template>
+        <Units>none</Units>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Zoom</Name>
+      <Type>Zoom</Type>
+      <Extension>
+        <Tolerance>5</Tolerance>
+        <Factor>2</Factor>
+        <Direction>in</Direction>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom</Label>
+      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
+      <StatusText>Click or click and drag on the map to zoom in</StatusText>
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomOut</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>0.5</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom Out</Label>
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomIn</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>2.0</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom In</Label>
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomToSelection</Name>
+      <Type>ZoomToSelection</Type>
+      <Location />
+      <Extension>
+        <MaximumZoomDimension>-1</MaximumZoomDimension>
+        <ZoomFactor>2</ZoomFactor>
+      </Extension>
+      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom to selection</Label>
+      <Tooltip>Click to zoom to the selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>InitialMapViewNoabel</Name>
+      <Type>InitialMapView</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom to the full map extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>NextViewNoLabel</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Next</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-forward.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PanNoLabel</Name>
+      <Type>Pan</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/pan.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click and drag to pan the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PreviousViewNoLabel</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Previous</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-back.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectNoLabel</Name>
+      <Type>Select</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+        <QueryActiveLayer>false</QueryActiveLayer>
+      </Extension>
+      <ImageUrl>images/icons/select.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to select features</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomNoLabel</Name>
+      <Type>Zoom</Type>
+      <Extension>
+        <Tolerance>5</Tolerance>
+        <Factor>2</Factor>
+        <Direction>in</Direction>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
+      <StatusText>Click or click and drag on the map to zoom in</StatusText>
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomInNoLabel</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>2.0</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomOutNoLabel</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>0.5</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomToSelectionNoLabel</Name>
+      <Type>ZoomToSelection</Type>
+      <Location />
+      <Extension>
+        <MaximumZoomDimension>-1</MaximumZoomDimension>
+        <ZoomFactor>2</ZoomFactor>
+      </Extension>
+      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom to the selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>StatusOverviewMap</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showOverviewMapDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl>images/iconNavigator.gif</ImageUrl>
+      <ImageClass />
+      <Label>Invoke script</Label>
+      <Tooltip>Display the overview map window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowOverviewMap</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showOverviewMapDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Overview Map</Label>
+      <Tooltip>Display the overview map window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowTaskWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showTaskDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Task Pane</Label>
+      <Tooltip>Display the task pane window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowLegendWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showLegendDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Legend</Label>
+      <Tooltip>Display the legend window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowSelectionWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showSelectionDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Selection Window</Label>
+      <Tooltip>Display the selection window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+  </WidgetSet>
+  <Extension />
+</ApplicationDefinition>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<DirectionTypeDataset>
+	<DirectionUnit>
+		<Value>Previous</Value>
+		<Displayname>Previous</Displayname>
+	</DirectionUnit>
+
+	<DirectionUnit>
+		<Value>Next</Value>
+		<Displayname>Next</Displayname>
+	</DirectionUnit>
+
+</DirectionTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<GeometryOperationTypeDataset>
+	<GeometryOperationType>
+		<Value>CONTAINS</Value>
+		<Displayname>Contains</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>DISJOINT</Value>
+		<Displayname>Disjoint</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>INTERSECTS</Value>
+		<Displayname>Intersects</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>WITHIN</Value>
+		<Displayname>Within</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>INSIDE</Value>
+		<Displayname>Inside</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>ENVELOPEINTERSECTS</Value>
+		<Displayname>Envelope intersects</Displayname>
+	</GeometryOperationType>
+</GeometryOperationTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MeasureTypeDataset>
+	<MeasureType>
+		<Value>both</Value>
+		<Displayname>Both</Displayname>
+	</MeasureType>
+</MeasureTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MeasureUnitsDataset>
+	<MeasureUnit>
+		<Value>meters</Value>
+		<Displayname>Meters</Displayname>
+	</MeasureUnit>
+
+	<MeasureUnit>
+		<Value>miles</Value>
+		<Displayname>Miles</Displayname>
+	</MeasureUnit>
+
+	<MeasureUnit>
+		<Value>none</Value>
+		<Displayname>None</Displayname>
+	</MeasureUnit>
+
+  <MeasureUnit>
+    <Value>degrees</Value>
+    <Displayname>Degrees</Displayname>
+  </MeasureUnit>
+</MeasureUnitsDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/PositionTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/PositionTypesDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/PositionTypesDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<PositionTypesDataset>
+	<Position>
+		<Value>top</Value>
+		<Displayname>Top</Displayname>
+	</Position>
+
+	<Position>
+		<Value>left</Value>
+		<Displayname>Left</Displayname>
+	</Position>
+
+	<Position>
+		<Value>right</Value>
+		<Displayname>Right</Displayname>
+	</Position>
+
+	<Position>
+		<Value>bottom</Value>
+		<Displayname>Bottom</Displayname>
+	</Position>
+</PositionTypesDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<TooltipTypeDataset>
+	<TooltipType>
+		<Value>static</Value>
+		<Displayname>Static</Displayname>
+	</TooltipType>
+
+	<TooltipType>
+		<Value>dynamic</Value>
+		<Displayname>Dynamic</Displayname>
+	</TooltipType>
+
+</TooltipTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ZoomDirectionDataset>
+	<ZoomDirection>
+		<Value>in</Value>
+		<Displayname>In</Displayname>
+	</ZoomDirection>
+
+	<ZoomDirection>
+		<Value>out</Value>
+		<Displayname>Out</Displayname>
+	</ZoomDirection>
+
+</ZoomDirectionDataset>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Properties/Resources.fr-FR.resx
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Properties/Resources.fr-FR.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Properties/Resources.fr-FR.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,4 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <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="FontStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FontStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</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>
 </root>
\ No newline at end of file

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CommandTypesDataset>
+	<Command>
+		<Command>About</Command>
+		<Label>About</Label>
+		<ToolTip>About</ToolTip>
+		<Action>About</Action>
+		<Description>Display information about this application</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon></EnabledIcon>		
+		<DisabledIcon></DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Buffer</Command>
+		<Label>Buffer</Label>
+		<ToolTip>Buffer</ToolTip>
+		<Action>Buffer</Action>
+		<Description>Create buffers around the selected features</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_buffer.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_buffer_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Clear Selection</Command>
+		<Label>Clear Selection</Label>
+		<ToolTip>Clear selection</ToolTip>
+		<Action>Clear Selection</Action>
+		<Description>Clear the current selections</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_clearselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_clearselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Copy Map</Command>
+		<Label>Copy</Label>
+		<ToolTip>Copy</ToolTip>
+		<Action>Copy Map</Action>
+		<Description>Copy current view of map to clipboard</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_copy.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_copy_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Help</Command>
+		<Label>Help</Label>
+		<ToolTip>Help</ToolTip>
+		<Action>Help</Action>
+		<Description>Launch help for this application</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_help.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_help_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Center and Scale</Command>
+		<Label>Initial Center and Scale</Label>
+		<ToolTip>Initial center and scale</ToolTip>
+		<Action>Restore View</Action>
+		<Description>Zoom to the initial center and scale of the map</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_restorecenter.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_restorecenter_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Map View</Command>
+		<Label>Initial Map View</Label>
+		<ToolTip>Initial map view</ToolTip>
+		<Action>Fit To Window</Action>
+		<Description>Fit the initial view of the map to the window</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_fitwindow.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_fitwindow_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke Script</Command>
+		<Label>Invoke Script</Label>
+		<ToolTip>Invoke script</ToolTip>
+		<Action>Invoke Script</Action>
+		<Description>Invoke a script command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokescript.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokescript_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke URL</Command>
+		<Label>Invoke URL</Label>
+		<ToolTip>Invoke a command by accessing a URL</ToolTip>
+		<Action>Invoke URL</Action>
+		<Description>Invoke a URL command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokeurl.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokeurl_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Measure</Command>
+		<Label>Measure</Label>
+		<ToolTip>Measure</ToolTip>
+		<Action>Measure</Action>
+		<Description>Measure distances on the map</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_measure.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_measure_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Next View</Command>
+		<Label>Next View</Label>
+		<ToolTip>Next View</ToolTip>
+		<Action>Next View</Action>
+		<Description>Buffer</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomnext.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomnext_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan</Command>
+		<Label>Pan</Label>
+		<ToolTip>Pan mode</ToolTip>
+		<Action>Pan</Action>
+		<Description>Drag the map to view areas out of range</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pan.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pan_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Down</Command>
+		<Label>Pan Down</Label>
+		<ToolTip>Pan down</ToolTip>
+		<Action>Pan Down</Action>
+		<Description>Pan down by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pandown.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pandown_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Left</Command>
+		<Label>Pan Left</Label>
+		<ToolTip>Pan left</ToolTip>
+		<Action>Pan Left</Action>
+		<Description>Pan left by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panleft.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panleft_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Right</Command>
+		<Label>Pan Right</Label>
+		<ToolTip>Pan right</ToolTip>
+		<Action>Pan Right</Action>
+		<Description>Pan right by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panright.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panright_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Up</Command>
+		<Label>Pan Up</Label>
+		<ToolTip>Pan up</ToolTip>
+		<Action>Pan Up</Action>
+		<Description>Pan up by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panup.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panup_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Previous View</Command>
+		<Label>Previous View</Label>
+		<ToolTip>Previous view</ToolTip>
+		<Action>Previous View</Action>
+		<Description>Go to previous view</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomprev.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomprev_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Print</Command>
+		<Label>Print</Label>
+		<ToolTip>Print</ToolTip>
+		<Action>Print</Action>
+		<Description>Print with optional layout</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_print.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_print_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Refresh Map</Command>
+		<Label>Refresh Map</Label>
+		<ToolTip>Refresh map</ToolTip>
+		<Action>Refresh</Action>
+		<Description>Refresh map and reload all layers keeping current center and scale</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_refreshmap.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_refreshmap_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Search</Command>
+		<Label>Search</Label>
+		<ToolTip>Search</ToolTip>
+		<Action>Search</Action>
+		<Description>Perform a search</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_search.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_search_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select</Command>
+		<Label>Select</Label>
+		<ToolTip>Select mode</ToolTip>
+		<Action>Select</Action>
+		<Description>Select features by clicking and dragging</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_select.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_select_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Polygon</Command>
+		<Label>Select Polygon</Label>
+		<ToolTip>Select polygon</ToolTip>
+		<Action>Select Polygon</Action>
+		<Description>Create a polygon to select all features that fall within</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectpolygon.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectpolygon_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Radius</Command>
+		<Label>Select Radius</Label>
+		<ToolTip>Select radius</ToolTip>
+		<Action>Select Radius</Action>
+		<Description>Click and drag to select all features inside the circle</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectradius.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectradius_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Within</Command>
+		<Label>Select Within</Label>
+		<ToolTip>Select within</ToolTip>
+		<Action>Select Within</Action>
+		<Description>Select features that fall within currently selected areas</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectwithin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectwithin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>View Options</Command>
+		<Label>View Options</Label>
+		<ToolTip>View options</ToolTip>
+		<Action>View Options</Action>
+		<Description>View Options</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_viewoptions.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_viewoptions_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom</Command>
+		<Label>Zoom Dynamic</Label>
+		<ToolTip>Zoom dynamic</ToolTip>
+		<Action>Zoom</Action>
+		<Description>Zoom dynamically by clicking and dragging</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoom.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoom_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom In</Command>
+		<Label>Zoom In</Label>
+		<ToolTip>Zoom in</ToolTip>
+		<Action>Zoom In</Action>
+		<Description>Zoom in by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Out</Command>
+		<Label>Zoom Out</Label>
+		<ToolTip>Zoom out</ToolTip>
+		<Action>Zoom Out</Action>
+		<Description>Zoom out by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomout.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomout_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Rectangle</Command>
+		<Label>Zoom Rectangle</Label>
+		<ToolTip>Zoom to rectangle</ToolTip>
+		<Action>Zoom Rectangle</Action>
+		<Description>Zoom in on an area</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomrect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomrect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Selection</Command>
+		<Label>Zoom Selection</Label>
+		<ToolTip>Zoom to selection</ToolTip>
+		<Action>Zoom To Selection</Action>
+		<Description>Zoom to extents of selected features</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Get Printable Page</Command>
+		<Label>Printable Page</Label>
+		<ToolTip>Get printable page</ToolTip>
+		<Action>Get Printable Page</Action>
+		<Description>Get printer-friendly page</Description>
+		<Viewers>AJAX</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_printablepage.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_printablepage_disabled.gif</DisabledIcon>
+	</Command>
+
+</CommandTypesDataset>

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<ComboBoxDataSet>
+
+	<Font>
+		<Display>Arial</Display>
+		<Value>Arial</Value>
+	</Font>
+	<Font>
+		<Display>Arial Black</Display>
+		<Value>Arial Black</Value>
+	</Font>
+	<Font>
+		<Display>Arial Narrow</Display>
+		<Value>Arial Narrow</Value>
+	</Font>
+	<Font>
+		<Display>BankGothic Lt BT</Display>
+		<Value>ankGothic Lt BT</Value>
+	</Font>
+	<Font>
+		<Display>BankGothic Md BT</Display>
+		<Value>BankGothic Md BT</Value>
+	</Font>
+	<Font>
+		<Display>Book Antiqua</Display>
+		<Value>Book Antiqua</Value>
+	</Font>
+	<Font>
+		<Display>Bookman Old Style</Display>
+		<Value>Bookman Old Style</Value>
+	</Font>
+	<Font>
+		<Display>Century Gothic</Display>
+		<Value>Century Gothic</Value>
+	</Font>
+	<Font>
+		<Display>CityBlueprint</Display>
+		<Value>CityBlueprint</Value>
+	</Font>
+	<Font>
+		<Display>Comic Sans MS</Display>
+		<Value>Comic Sans MS</Value>
+	</Font>
+	<Font>
+		<Display>CommercialPi BT</Display>
+		<Value>CommercialPi BT</Value>
+	</Font>
+	<Font>
+		<Display>CommercialScript BT</Display>
+		<Value>CommercialScript BT</Value>
+	</Font>
+	<Font>
+		<Display>Complex</Display>
+		<Value>Complex</Value>
+	</Font>
+	<Font>
+		<Display>CountryBlueprint</Display>
+		<Value>CountryBlueprint</Value>
+	</Font>
+	<Font>
+		<Display>Courier New</Display>
+		<Value>Courier New</Value>
+	</Font>
+	<Font>
+		<Display>Dutch801 Rm BT</Display>
+		<Value>Dutch801 Rm BT</Value>
+	</Font>
+	<Font>
+		<Display>Dutch801 XBd BT</Display>
+		<Value>Dutch801 XBd BT</Value>
+	</Font>
+	<Font>
+		<Display>Estrangelo Edessa</Display>
+		<Value>Estrangelo Edessa</Value>
+	</Font>
+	<Font>
+		<Display>EuroRoman</Display>
+		<Value>EuroRoman</Value>
+	</Font>
+	<Font>
+		<Display>Franklin Gothic Medium</Display>
+		<Value>Franklin Gothic Medium</Value>
+	</Font>
+	<Font>
+		<Display>Garamond</Display>
+		<Value>Garamond</Value>
+	</Font>
+	<Font>
+		<Display>Gautami</Display>
+		<Value>Gautami</Value>
+	</Font>
+	<Font>
+		<Display>GDT</Display>
+		<Value>GDT</Value>
+	</Font>
+	<Font>
+		<Display>Georgia</Display>
+		<Value>Georgia</Value>
+	</Font>
+	<Font>
+		<Display>GothicE</Display>
+		<Value>GothicE</Value>
+	</Font>
+	<Font>
+		<Display>GothicG</Display>
+		<Value>GothicG</Value>
+	</Font>
+	<Font>
+		<Display>Gothicl</Display>
+		<Value>Gothicl</Value>
+	</Font>
+	<Font>
+		<Display>GreekC</Display>
+		<Value>GreekC</Value>
+	</Font>
+	<Font>
+		<Display>GreekS</Display>
+		<Value>GreekS</Value>
+	</Font>
+	<Font>
+		<Display>Haettenschweiler</Display>
+		<Value>Haettenschweiler</Value>
+	</Font>
+	<Font>
+		<Display>Impact</Display>
+		<Value>Impact</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP</Display>
+		<Value>ISOCP</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP2</Display>
+		<Value>ISOCP2</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP3</Display>
+		<Value>ISOCP3</Value>
+	</Font>
+	<Font>
+		<Display>ISOCPEUR</Display>
+		<Value>Arial</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT</Display>
+		<Value>ISOCT</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT2</Display>
+		<Value>ISOCT2</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT3</Display>
+		<Value>ISOCT3</Value>
+	</Font>
+	<Font>
+		<Display>ISOCTEUR</Display>
+		<Value>ISOCTEUR</Value>
+	</Font>
+	<Font>
+		<Display>Italic</Display>
+		<Value>Italic</Value>
+	</Font>
+	<Font>
+		<Display>ItalicC</Display>
+		<Value>ItalicC</Value>
+	</Font>
+	<Font>
+		<Display>ItalicT</Display>
+		<Value>ItalicT</Value>
+	</Font>
+	<Font>
+		<Display>Kartika</Display>
+		<Value>Kartika</Value>
+	</Font>
+	<Font>
+		<Display>Latha</Display>
+		<Value>Latha</Value>
+	</Font>
+	<Font>
+		<Display>Lucida Console</Display>
+		<Value>Lucida Console</Value>
+	</Font>
+	<Font>
+		<Display>Lucida Sans Unicode</Display>
+		<Value>Lucida Sans Unicode</Value>
+	</Font>
+	<Font>
+		<Display>Mangal</Display>
+		<Value>Mangal</Value>
+	</Font>
+	<Font>
+		<Display>Map Symbols</Display>
+		<Value>Map Symbols</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Arrows</Display>
+		<Value>MapInfo Arrows</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Cartographic</Display>
+		<Value>MapInfo Cartographic</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Dispersed Groups</Display>
+		<Value>MapInfo Dispersed Groups</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Miscellaneous</Display>
+		<Value>MapInfo Miscellaneous</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Oil&amp;Gas</Display>
+		<Value>MapInfo Oil&amp;Gas</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Real Estate</Display>
+		<Value>MapInfo Real Estate</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Shields</Display>
+		<Value>MapInfo Shields</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Symbols</Display>
+		<Value>MapInfo Symbols</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Transportation</Display>
+		<Value>MapInfo Transportation</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Weather</Display>
+		<Value>MapInfo Weather</Value>
+	</Font>
+	<Font>
+		<Display>Marlett</Display>
+		<Value>Marlett</Value>
+	</Font>
+	<Font>
+		<Display>Microsoft Sans Serif</Display>
+		<Value>Microsoft Sans Serif</Value>
+	</Font>
+	<Font>
+		<Display>Monospac821 BT</Display>
+		<Value>Monospac821 BT</Value>
+	</Font>
+	<Font>
+		<Display>Monotxt</Display>
+		<Value>Monotxt</Value>
+	</Font>
+	<Font>
+		<Display>MV Boli</Display>
+		<Value>MV Boli</Value>
+	</Font>
+	<Font>
+		<Display>Nina</Display>
+		<Value>Nina</Value>
+	</Font>
+	<Font>
+		<Display>Palatino Linotype</Display>
+		<Value>Palatino Linotype</Value>
+	</Font>
+	<Font>
+		<Display>PanRoman</Display>
+		<Value>PanRoman</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 1</Display>
+		<Value>Proxy 1</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 2</Display>
+		<Value>Proxy 2</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 3</Display>
+		<Value>Proxy 3</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 4</Display>
+		<Value>Proxy 4</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 5</Display>
+		<Value>Proxy 5</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 6</Display>
+		<Value>Proxy 6</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 7</Display>
+		<Value>Proxy 7</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 8</Display>
+		<Value>Proxy 8</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 9</Display>
+		<Value>Proxy 9</Value>
+	</Font>
+	<Font>
+		<Display>Raavi</Display>
+		<Value>Raavi</Value>
+	</Font>
+	<Font>
+		<Display>RomanC</Display>
+		<Value>RomanC</Value>
+	</Font>
+	<Font>
+		<Display>RomanD</Display>
+		<Value>RomanD</Value>
+	</Font>
+	<Font>
+		<Display>RomanS</Display>
+		<Value>RomanS</Value>
+	</Font>
+	<Font>
+		<Display>RomanT</Display>
+		<Value>RomanT</Value>
+	</Font>
+	<Font>
+		<Display>Romantic</Display>
+		<Value>Romantic</Value>
+	</Font>
+	<Font>
+		<Display>SansSerif</Display>
+		<Value>SansSerif</Value>
+	</Font>
+	<Font>
+		<Display>ScriptC</Display>
+		<Value>ScriptC</Value>
+	</Font>
+	<Font>
+		<Display>ScriptS</Display>
+		<Value>ScriptS</Value>
+	</Font>
+	<Font>
+		<Display>Shruti</Display>
+		<Value>Shruti</Value>
+	</Font>
+	<Font>
+		<Display>Simplex</Display>
+		<Value>Simplex</Value>
+	</Font>
+	<Font>
+		<Display>Stylus BT</Display>
+		<Value>Stylus BT</Value>
+	</Font>
+	<Font>
+		<Display>SuperFrench</Display>
+		<Value>SuperFrench</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BdCnOul BT</Display>
+		<Value>Swis721 BdCnOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BdOul BT</Display>
+		<Value>Swis721 BdOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Blk BT</Display>
+		<Value>Swis721 Blk BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkCn BT</Display>
+		<Value>Swis721 BlkCn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkEx BT</Display>
+		<Value>Swis721 BlkEx BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkOul BT</Display>
+		<Value>Swis721 BlkOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BT</Display>
+		<Value>Swis721 BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Cn BT</Display>
+		<Value>Swis721 Cn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Ex BT</Display>
+		<Value>Swis721 Ex BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Lt BT</Display>
+		<Value>Swis721 Lt BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 LtCn BT</Display>
+		<Value>Swis721 LtCn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 LtEx BT</Display>
+		<Value>Swis721 LtEx BT</Value>
+	</Font>
+	<Font>
+		<Display>Syastro</Display>
+		<Value>Syastro</Value>
+	</Font>
+	<Font>
+		<Display>Sylfaen</Display>
+		<Value>Sylfaen</Value>
+	</Font>
+	<Font>
+		<Display>Symap</Display>
+		<Value>Symap</Value>
+	</Font>
+	<Font>
+		<Display>Symath</Display>
+		<Value>Symath</Value>
+	</Font>
+	<Font>
+		<Display>Symbol</Display>
+		<Value>Symbol</Value>
+	</Font>
+	<Font>
+		<Display>Symeteo</Display>
+		<Value>Symeteo</Value>
+	</Font>
+	<Font>
+		<Display>Symusic</Display>
+		<Value>Symusic</Value>
+	</Font>
+	<Font>
+		<Display>Tahoma</Display>
+		<Value>Tahoma</Value>
+	</Font>
+	<Font>
+		<Display>Technic</Display>
+		<Value>Technic</Value>
+	</Font>
+	<Font>
+		<Display>TechnicBold</Display>
+		<Value>TechnicBold</Value>
+	</Font>
+	<Font>
+		<Display>TechnicLite</Display>
+		<Value>TechnicLite</Value>
+	</Font>
+	<Font>
+		<Display>Times New Roman</Display>
+		<Value>Times New Roman</Value>
+	</Font>
+	<Font>
+		<Display>Trebuchet MS</Display>
+		<Value>Trebuchet MS</Value>
+	</Font>
+	<Font>
+		<Display>Tunga</Display>
+		<Value>Tunga</Value>
+	</Font>
+	<Font>
+		<Display>Txt</Display>
+		<Value>Txt</Value>
+	</Font>
+	<Font>
+		<Display>UniversalMath1 BT</Display>
+		<Value>UniversalMath1 BT</Value>
+	</Font>
+	<Font>
+		<Display>Verdana</Display>
+		<Value>Verdana</Value>
+	</Font>
+	<Font>
+		<Display>Vineta BT</Display>
+		<Value>Vineta BT</Value>
+	</Font>
+	<Font>
+		<Display>Vrinda</Display>
+		<Value>Vrinda</Value>
+	</Font>
+	<Font>
+		<Display>Webdings</Display>
+		<Value>Webdings</Value>
+	</Font>
+	<Font>
+		<Display>Windings</Display>
+		<Value>Windings</Value>
+	</Font>
+	<Font>
+		<Display>Windings 2</Display>
+		<Value>Windings 2</Value>
+	</Font>
+	<Font>
+		<Display>Windings 3</Display>
+		<Value>Windings 3</Value>
+	</Font>
+	
+	<BackgroundType>
+		<Display>Ghosted</Display>
+		<Value>Ghosted</Value>
+	</BackgroundType>
+	<BackgroundType>
+		<Display>Opaque</Display>
+		<Value>Opaque</Value>
+	</BackgroundType>
+	<BackgroundType>
+		<Display>Transparent</Display>
+		<Value>Transparent</Value>
+	</BackgroundType>
+	
+	<Vertical>
+		<Display>Baseline</Display>
+		<Value>'Baseline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Bottom</Display>
+		<Value>'Bottom'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Capline</Display>
+		<Value>'Capline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Halfline</Display>
+		<Value>'Halfline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Top</Display>
+		<Value>'Top'</Value>
+	</Vertical>
+
+	<Horizontal>
+		<Display>Center</Display>
+		<Value>'Center'</Value>
+	</Horizontal>
+
+	<SizeContext>
+		<Display>Device space</Display>
+		<Value>DeviceUnits</Value>
+	</SizeContext>
+	<SizeContext>
+		<Display>Map space</Display>
+		<Value>MappingUnits</Value>
+	</SizeContext>
+	
+	<Units>
+		<Display>Points</Display>
+		<Value>Points</Value>
+	</Units>
+	<Units>
+		<Display>Inches</Display>
+		<Value>Inches</Value>
+	</Units>
+	<Units>
+		<Display>Feet</Display>
+		<Value>Feet</Value>
+	</Units>
+	<Units>
+		<Display>Yards</Display>
+		<Value>Yards</Value>
+	</Units>
+	<Units>
+		<Display>Millimeters</Display>
+		<Value>Millimeters</Value>
+	</Units>
+	<Units>
+		<Display>Centimeters</Display>
+		<Value>Centimeters</Value>
+	</Units>
+	<Units>
+		<Display>Meters</Display>
+		<Value>Meters</Value>
+	</Units>
+	<Units>
+		<Display>Kilometers</Display>
+		<Value>Kilometers</Value>
+	</Units>
+
+	<Rotation>
+		<Display>0 degrees</Display>
+		<Value>0</Value>
+	</Rotation>
+	<Rotation>
+		<Display>30 degrees</Display>
+		<Value>30</Value>
+	</Rotation>
+	<Rotation>
+		<Display>45 degrees</Display>
+		<Value>45</Value>
+	</Rotation>
+	<Rotation>
+		<Display>90 degrees</Display>
+		<Value>90</Value>
+	</Rotation>	
+</ComboBoxDataSet>

Added: trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,94 @@
+<?xml version="1.0" standalone="yes"?>
+<ComboBoxDataSet>
+	<SymbolMark>
+		<Display>Square</Display>
+		<Value>Square</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Circle</Display>
+		<Value>Circle</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Triangle</Display>
+		<Value>Triangle</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Star</Display>
+		<Value>Star</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Cross</Display>
+		<Value>Cross</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>X - Mark</Display>
+		<Value>X</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Font...</Display>
+		<Value></Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Symbol...</Display>
+		<Value></Value>
+	</SymbolMark>
+	
+	<SizeContext>
+		<Display>Device space</Display>
+		<Value>DeviceUnits</Value>
+	</SizeContext>
+	<SizeContext>
+		<Display>Map space</Display>
+		<Value>MappingUnits</Value>
+	</SizeContext>
+	
+	<Units>
+		<Display>Points</Display>
+		<Value>Points</Value>
+	</Units>
+	<Units>
+		<Display>Inches</Display>
+		<Value>Inches</Value>
+	</Units>
+	<Units>
+		<Display>Feet</Display>
+		<Value>Feet</Value>
+	</Units>
+	<Units>
+		<Display>Yards</Display>
+		<Value>Yards</Value>
+	</Units>
+	<Units>
+		<Display>Millimeters</Display>
+		<Value>Millimeters</Value>
+	</Units>
+	<Units>
+		<Display>Centimeters</Display>
+		<Value>Centimeters</Value>
+	</Units>
+	<Units>
+		<Display>Meters</Display>
+		<Value>Meters</Value>
+	</Units>
+	<Units>
+		<Display>Kilometers</Display>
+		<Value>Kilometers</Value>
+	</Units>
+
+	<Rotation>
+		<Display>0 degrees</Display>
+		<Value>0</Value>
+	</Rotation>
+	<Rotation>
+		<Display>30 degrees</Display>
+		<Value>30</Value>
+	</Rotation>
+	<Rotation>
+		<Display>45 degrees</Display>
+		<Value>45</Value>
+	</Rotation>
+	<Rotation>
+		<Display>90 degrees</Display>
+		<Value>90</Value>
+	</Rotation>
+</ComboBoxDataSet>
\ No newline at end of file

Deleted: trunk/Tools/Maestro/Localization/missing.da-DK.txt
===================================================================
--- trunk/Tools/Maestro/Localization/missing.da-DK.txt	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Localization/missing.da-DK.txt	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,120 +0,0 @@
-Document: ..\Maestro\Localization\da-DK\Maestro.FormMain.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.FormMain.AddFolderButton.ToolTipText
-Translated key: OSGeo.MapGuide.Maestro.FormMain.AddFolderButton.ToolTipText
-Value: Opretter en ny mappe
-
-Document: ..\Maestro\Localization\da-DK\Maestro.PackageManager.PackageEditor.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.PackageManager.PackageEditor.LoaderGroup.Text
-Translated key: Reading package contents ...
-Value: Læser indholdet af pakke, vent venligst
-
-Document: ..\Maestro\Localization\da-DK\Maestro.PackageManager.PackageProgress.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.PackageManager.PackageProgress.Text
-Translated key: OSGeo.MapGuide.MaestroAPI.PackageBuilder.PackageProgress.Text
-Value: Bygger pakke
-
-Document: ..\Maestro\Localization\da-DK\Maestro.PackageManager.PackageProgress.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.PackageManager.PackageProgress.label1.Text
-Translated key: OSGeo.MapGuide.MaestroAPI.PackageBuilder.PackageProgress.label1.Text
-Value: Fil
-
-Document: ..\Maestro\Localization\da-DK\Maestro.PackageManager.PackageProgress.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.PackageManager.PackageProgress.TotalLabel.Text
-Translated key: OSGeo.MapGuide.MaestroAPI.PackageBuilder.PackageProgress.TotalLabel.Text
-Value: Total
-
-Document: ..\Maestro\Localization\da-DK\Maestro.PackageManager.PackageProgress.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.PackageManager.PackageProgress.label3.Text
-Translated key: OSGeo.MapGuide.MaestroAPI.PackageBuilder.PackageProgress.label3.Text
-Value: Operation
-
-Document: ..\Maestro\Localization\da-DK\Maestro.PackageManager.PackageProgress.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.PackageManager.PackageProgress.CancelBtn.Text
-Translated key: OSGeo.MapGuide.MaestroAPI.PackageBuilder.PackageProgress.CancelBtn.Text
-Value: Annuller
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.FeatureSourceEditorBase.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditorBase.label2.Text
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditorBase.label2.Text
-Value: En datakilde kan sammenkædes med andre datakilder og indeholde værdier der beregnes løbende.
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.FeatureSourceEditorMySQL.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditorMySQL.label2.Text
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditors.MySQL.FeatureSourceEditorMySQL.label2.Text
-Value: Port
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.FeatureSourceEditorODBC.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditorODBC.wizard.msSQL.label5.Text
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditors.ODBC.Wizard.msSQL.label5.Text
-Value: Database
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.FeatureSourceEditorODBC.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditorODBC.wizard.msSQL.label2.Text
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditors.ODBC.Wizard.msSQL.label2.Text
-Value: Server
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.FeatureSourceEditorOGR.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditorOGR.managed.UseFolderButton.ToolTipText
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditors.ManageFileControl.UseFolderButton.ToolTipText
-Value: Benyt mappen som datakilde
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.FeatureSourceEditorSHP.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditorSHP.unmanaged.label2.Text
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditors.SHP.FeatureSourceEditorSHP.label2.Text
-Value: Temp sti
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.FeatureSourceEditorSHP.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditorSHP.managed.label2.Text
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditors.ManagedFileControl.label2.Text
-Value: Temp sti
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.FeatureSourceEditorSHP.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditorSHP.managed.UseFolderButton.ToolTipText
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.FeatureSourceEditors.ManagedFileControl.UseFolderButton.ToolTipText
-Value: Brug alle filer i mappen som datakilde
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.GeometryStyleEditors.PointFeatureStyleEditor.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.PointFeatureStyleEditor.WidthText.Text
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.PointFeatureStyleEditor.WidthText.Text
-Value: Bredde
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.GeometryStyleEditors.PointFeatureStyleEditor.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.PointFeatureStyleEditor.ReferenceX.Text
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.PointFeatureStyleEditor.ReferenceX.Text
-Value: ReferenceX
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.GeometryStyleEditors.PointFeatureStyleEditor.da-DK.resx
-Original key: OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.PointFeatureStyleEditor.ReferenceY.Text
-Translated key: OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.PointFeatureStyleEditor.ReferenceY.Text
-Value: ReferenceY
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.LayerEditor.da-DK.resx
-Original key: Line
-Translated key: Line
-Value: Linie
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.LayerEditor.da-DK.resx
-Original key: Feature
-Translated key: Feature
-Value: Geometri
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.LayerEditor.da-DK.resx
-Original key: Point
-Translated key: Point
-Value: Punkt
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.LayerEditor.da-DK.resx
-Original key: Could not open feature source: {0}, because {1}
-Translated key: Could not open feature source: {0}, because {1}
-Value: Kunne ikke åbne elementet: {0}, fordi {1}
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.LayerEditor.da-DK.resx
-Original key: <default>
-Translated key: <default>
-Value: <standard>
-
-Document: ..\Maestro\Localization\da-DK\Maestro.ResourceEditors.ResourceDataEditor.da-DK.resx
-Original key: Download of resource "{0}" failed.\nReason: {1}\nHow do you want to continue?
-Translated key: Download of file "{0}" failed.\nReason: {1}\nHow do you want to continue?
-Value: Download af filen \"{0}\" fejlede.\nÅrsag: {1}\nHvordan vil du fortsætte?
-

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/ContainerEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/ContainerEditor.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/ContainerEditor.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -44,6 +44,10 @@
 
 		private bool m_isUpdating = false;
 		private ContainerType m_ct;
+        private DataSet PositionTypesDataset;
+        private DataTable PositionTable;
+        private DataColumn dataColumn1;
+        private DataColumn dataColumn2;
 		public event ValueChangedDelegate ValueChanged;
 
 		/// <summary> 
@@ -55,6 +59,10 @@
 		{
 			// This call is required by the Windows.Forms Form Designer.
 			InitializeComponent();
+
+            //Fill dataset
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.PositionTypesDataset))
+                PositionTypesDataset.ReadXml(sr);
 		}
 
 		public void SetItem(ContainerType ct)
@@ -64,7 +72,7 @@
 				m_isUpdating = true;
 				m_ct = ct;
 				NameBox.Text = ct.Name;
-				PositionCombo.SelectedIndex = PositionCombo.FindString(ct.Position);
+				PositionCombo.SelectedValue = ct.Position;
 				TypeCombo.SelectedIndex = TypeCombo.FindString(ct.Type);
 			}
 			finally
@@ -110,7 +118,13 @@
             this.label3 = new System.Windows.Forms.Label();
             this.NameBox = new System.Windows.Forms.TextBox();
             this.PositionCombo = new System.Windows.Forms.ComboBox();
+            this.PositionTable = new System.Data.DataTable();
+            this.dataColumn1 = new System.Data.DataColumn();
+            this.dataColumn2 = new System.Data.DataColumn();
             this.TypeCombo = new System.Windows.Forms.ComboBox();
+            this.PositionTypesDataset = new System.Data.DataSet();
+            ((System.ComponentModel.ISupportInitialize)(this.PositionTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PositionTypesDataset)).BeginInit();
             this.SuspendLayout();
             // 
             // label1
@@ -136,17 +150,31 @@
             // 
             // PositionCombo
             // 
+            this.PositionCombo.DataSource = this.PositionTable;
+            this.PositionCombo.DisplayMember = "Displayname";
             this.PositionCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.PositionCombo.Items.AddRange(new object[] {
-            resources.GetString("PositionCombo.Items"),
-            resources.GetString("PositionCombo.Items1"),
-            resources.GetString("PositionCombo.Items2"),
-            resources.GetString("PositionCombo.Items3"),
-            resources.GetString("PositionCombo.Items4")});
             resources.ApplyResources(this.PositionCombo, "PositionCombo");
             this.PositionCombo.Name = "PositionCombo";
+            this.PositionCombo.ValueMember = "Value";
             this.PositionCombo.SelectedIndexChanged += new System.EventHandler(this.PositionCombo_SelectedIndexChanged);
             // 
+            // PositionTable
+            // 
+            this.PositionTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn1,
+            this.dataColumn2});
+            this.PositionTable.TableName = "Position";
+            // 
+            // dataColumn1
+            // 
+            this.dataColumn1.Caption = "Value";
+            this.dataColumn1.ColumnName = "Value";
+            // 
+            // dataColumn2
+            // 
+            this.dataColumn2.Caption = "DisplayName";
+            this.dataColumn2.ColumnName = "Displayname";
+            // 
             // TypeCombo
             // 
             this.TypeCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -154,6 +182,13 @@
             this.TypeCombo.Name = "TypeCombo";
             this.TypeCombo.SelectedIndexChanged += new System.EventHandler(this.TypeCombo_SelectedIndexChanged);
             // 
+            // PositionTypesDataset
+            // 
+            this.PositionTypesDataset.DataSetName = "NewDataSet";
+            this.PositionTypesDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.PositionTypesDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.PositionTable});
+            // 
             // ContainerEditor
             // 
             this.Controls.Add(this.TypeCombo);
@@ -164,6 +199,8 @@
             this.Controls.Add(this.label1);
             this.Name = "ContainerEditor";
             resources.ApplyResources(this, "$this");
+            ((System.ComponentModel.ISupportInitialize)(this.PositionTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PositionTypesDataset)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -185,7 +222,7 @@
 			if (m_isUpdating || m_ct == null)
 				return;
 
-			m_ct.Position = PositionCombo.Text;
+			m_ct.Position = (string)PositionCombo.SelectedValue;
 			if (ValueChanged != null)
 				ValueChanged(this, m_ct);
 		}

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/ContainerEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/ContainerEditor.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/ContainerEditor.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -200,9 +200,6 @@
   <data name="NameBox.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
-  <data name="NameBox.Text" xml:space="preserve">
-    <value></value>
-  </data>
   <data name="&gt;&gt;NameBox.Name" xml:space="preserve">
     <value>NameBox</value>
   </data>
@@ -215,21 +212,6 @@
   <data name="&gt;&gt;NameBox.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="PositionCombo.Items" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PositionCombo.Items1" xml:space="preserve">
-    <value>top</value>
-  </data>
-  <data name="PositionCombo.Items2" xml:space="preserve">
-    <value>left</value>
-  </data>
-  <data name="PositionCombo.Items3" xml:space="preserve">
-    <value>bottom</value>
-  </data>
-  <data name="PositionCombo.Items4" xml:space="preserve">
-    <value>right</value>
-  </data>
   <data name="PositionCombo.Location" type="System.Drawing.Point, System.Drawing">
     <value>104, 32</value>
   </data>
@@ -272,12 +254,39 @@
   <data name="&gt;&gt;TypeCombo.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="PositionTypesDataset.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.Size" type="System.Drawing.Size, System.Drawing">
     <value>392, 88</value>
   </data>
+  <data name="&gt;&gt;PositionTable.Name" xml:space="preserve">
+    <value>PositionTable</value>
+  </data>
+  <data name="&gt;&gt;PositionTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Name" xml:space="preserve">
+    <value>dataColumn1</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Name" xml:space="preserve">
+    <value>dataColumn2</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;PositionTypesDataset.Name" xml:space="preserve">
+    <value>PositionTypesDataset</value>
+  </data>
+  <data name="&gt;&gt;PositionTypesDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>ContainerEditor</value>
   </data>

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Buffer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Buffer.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Buffer.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -54,6 +54,10 @@
 		private System.Windows.Forms.TextBox BufferDistance;
 		private System.Windows.Forms.Label label10;
 		private System.Windows.Forms.TextBox BufferDistanceInput;
+        private DataSet MeasureUnitsDataset;
+        private DataTable MeasureUnitTable;
+        private DataColumn dataColumn3;
+        private DataColumn dataColumn4;
 		/// <summary> 
 		/// Required designer variable.
 		/// </summary>
@@ -65,6 +69,10 @@
 			InitializeComponent();
             BorderColor.ResetColors();
             FillColor.ResetColors();
+
+            //Fill dataset
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.MeasureUnitsDataset))
+                MeasureUnitTable.ReadXml(sr);
 		}
 
 		/// <summary> 
@@ -94,7 +102,6 @@
 				catch { }
 				try	{ FillColor.CurrentColor = OSGeo.MapGuide.MaestroAPI.Utility.ParseHTMLColor(GetSettingValue("FillColor")); }
 				catch { }
-				BufferUnits.Text = GetSettingValue("BufferUnits");
 				BufferDistanceInput.Text = GetSettingValue("BufferDistanceInput");
 				LayerName.Text = GetSettingValue("LayerName");
 				FillColorInput.Text = GetSettingValue("FillColorInput");
@@ -102,8 +109,13 @@
 				BorderColorInput.Text = GetSettingValue("BorderColorInput"); 
 				LayerNameInput.Text = GetSettingValue("LayerNameInput");
 				BufferDistance.Text = GetSettingValue("BufferDistance");
-					
-			}
+
+                BufferUnits.SelectedIndex = -1;
+                BufferUnits.SelectedValue = GetSettingValue("BufferUnits");
+
+                if (BufferUnits.SelectedIndex == -1)
+                    BufferUnits.Text = GetSettingValue("BufferUnits");
+            }
 			finally
 			{
 				m_isUpdating = false;
@@ -122,6 +134,9 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Buffer));
             this.label1 = new System.Windows.Forms.Label();
             this.BufferUnits = new System.Windows.Forms.ComboBox();
+            this.MeasureUnitTable = new System.Data.DataTable();
+            this.dataColumn3 = new System.Data.DataColumn();
+            this.dataColumn4 = new System.Data.DataColumn();
             this.BorderColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
             this.label2 = new System.Windows.Forms.Label();
             this.BufferDistanceInput = new System.Windows.Forms.TextBox();
@@ -140,6 +155,9 @@
             this.label9 = new System.Windows.Forms.Label();
             this.BufferDistance = new System.Windows.Forms.TextBox();
             this.label10 = new System.Windows.Forms.Label();
+            this.MeasureUnitsDataset = new System.Data.DataSet();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitsDataset)).BeginInit();
             this.SuspendLayout();
             // 
             // label1
@@ -150,12 +168,30 @@
             // BufferUnits
             // 
             resources.ApplyResources(this.BufferUnits, "BufferUnits");
-            this.BufferUnits.Items.AddRange(new object[] {
-            resources.GetString("BufferUnits.Items"),
-            resources.GetString("BufferUnits.Items1")});
+            this.BufferUnits.DataSource = this.MeasureUnitTable;
+            this.BufferUnits.DisplayMember = "Displayname";
             this.BufferUnits.Name = "BufferUnits";
+            this.BufferUnits.ValueMember = "Value";
+            this.BufferUnits.SelectedIndexChanged += new System.EventHandler(this.BufferUnits_TextChanged);
             this.BufferUnits.TextChanged += new System.EventHandler(this.BufferUnits_TextChanged);
             // 
+            // MeasureUnitTable
+            // 
+            this.MeasureUnitTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn3,
+            this.dataColumn4});
+            this.MeasureUnitTable.TableName = "MeasureUnit";
+            // 
+            // dataColumn3
+            // 
+            this.dataColumn3.Caption = "Value";
+            this.dataColumn3.ColumnName = "Value";
+            // 
+            // dataColumn4
+            // 
+            this.dataColumn4.Caption = "DisplayName";
+            this.dataColumn4.ColumnName = "Displayname";
+            // 
             // BorderColor
             // 
             resources.ApplyResources(this.BorderColor, "BorderColor");
@@ -255,6 +291,13 @@
             resources.ApplyResources(this.label10, "label10");
             this.label10.Name = "label10";
             // 
+            // MeasureUnitsDataset
+            // 
+            this.MeasureUnitsDataset.DataSetName = "NewDataSet";
+            this.MeasureUnitsDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.MeasureUnitsDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.MeasureUnitTable});
+            // 
             // Buffer
             // 
             this.Controls.Add(this.BufferDistance);
@@ -279,6 +322,8 @@
             this.Controls.Add(this.label1);
             this.Name = "Buffer";
             resources.ApplyResources(this, "$this");
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitsDataset)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -290,7 +335,19 @@
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("BufferUnits", BufferUnits.Text);
+            if (BufferUnits.SelectedValue != null)
+                SetSettingValue("BufferUnits", (string)BufferUnits.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in MeasureUnitTable.Rows)
+                    if (string.Equals((string)r["Displayname"], BufferUnits.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("BufferUnits", (string)r["Value"]);
+                        return;
+                    }
+
+                SetSettingValue("BufferUnits", BufferUnits.Text);
+            }
 		}
 
 		private void BufferDistance_TextChanged(object sender, System.EventArgs e)

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Buffer.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Buffer.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Buffer.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -147,12 +147,6 @@
   <data name="BufferUnits.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="BufferUnits.Items" xml:space="preserve">
-    <value>meters</value>
-  </data>
-  <data name="BufferUnits.Items1" xml:space="preserve">
-    <value>miles</value>
-  </data>
   <data name="BufferUnits.Location" type="System.Drawing.Point, System.Drawing">
     <value>136, 8</value>
   </data>
@@ -190,7 +184,7 @@
     <value>BorderColor</value>
   </data>
   <data name="&gt;&gt;BorderColor.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;BorderColor.Parent" xml:space="preserve">
     <value>$this</value>
@@ -286,7 +280,7 @@
     <value>FillColor</value>
   </data>
   <data name="&gt;&gt;FillColor.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;FillColor.Parent" xml:space="preserve">
     <value>$this</value>
@@ -606,16 +600,43 @@
   <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <metadata name="MeasureUnitsDataset.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.Size" type="System.Drawing.Size, System.Drawing">
     <value>568, 248</value>
   </data>
+  <data name="&gt;&gt;MeasureUnitTable.Name" xml:space="preserve">
+    <value>MeasureUnitTable</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn3.Name" xml:space="preserve">
+    <value>dataColumn3</value>
+  </data>
+  <data name="&gt;&gt;dataColumn3.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn4.Name" xml:space="preserve">
+    <value>dataColumn4</value>
+  </data>
+  <data name="&gt;&gt;dataColumn4.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitsDataset.Name" xml:space="preserve">
+    <value>MeasureUnitsDataset</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitsDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Buffer</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ExtentHistory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ExtentHistory.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ExtentHistory.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -17,42 +17,50 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 #endregion
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.ApplicationDefinition;
-
-namespace OSGeo.MapGuide.Maestro.FusionEditor.CustomizedEditors
-{
-	public class ExtentHistory : FusionEditor.BasisWidgetEditor
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using OSGeo.MapGuide.MaestroAPI.ApplicationDefinition;
+
+namespace OSGeo.MapGuide.Maestro.FusionEditor.CustomizedEditors
+{
+	public class ExtentHistory : FusionEditor.BasisWidgetEditor
 	{
 		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.ComboBox Direction;
-		private System.ComponentModel.IContainer components = null;
-
-		public ExtentHistory()
-		{
-			// This call is required by the Windows Form Designer.
-			InitializeComponent();
-		}
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if (components != null) 
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
+		private System.Windows.Forms.ComboBox Direction;
+        private System.Data.DataSet DirectionTypesDataset;
+        private System.Data.DataTable DirectionUnitTable;
+        private System.Data.DataColumn dataColumn1;
+        private System.Data.DataColumn dataColumn2;
+		private System.ComponentModel.IContainer components = null;
+
+		public ExtentHistory()
+		{
+			// This call is required by the Windows Form Designer.
+			InitializeComponent();
+
+            //Fill dataset
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.DirectionTypeDataset))
+                DirectionTypesDataset.ReadXml(sr);
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if (components != null) 
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
 		public override void SetItem(WidgetType w)
 		{
 			try
@@ -61,24 +69,34 @@
 				m_w = w;
 				this.Enabled = m_w != null;
 
-				Direction.Text = GetSettingValue("Direction");
-			}
+                Direction.SelectedIndex = -1;
+                Direction.SelectedValue = GetSettingValue("Direction");
+
+                if (Direction.SelectedIndex == -1)
+                    Direction.Text = GetSettingValue("Direction");
+            }
 			finally
 			{
 				m_isUpdating = false;
 			}
 		}
-
-		#region 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()
+
+		#region 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()
 		{
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ExtentHistory));
             this.label1 = new System.Windows.Forms.Label();
             this.Direction = new System.Windows.Forms.ComboBox();
+            this.DirectionUnitTable = new System.Data.DataTable();
+            this.dataColumn1 = new System.Data.DataColumn();
+            this.dataColumn2 = new System.Data.DataColumn();
+            this.DirectionTypesDataset = new System.Data.DataSet();
+            ((System.ComponentModel.ISupportInitialize)(this.DirectionUnitTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DirectionTypesDataset)).BeginInit();
             this.SuspendLayout();
             // 
             // label1
@@ -88,22 +106,49 @@
             // 
             // Direction
             // 
-            this.Direction.Items.AddRange(new object[] {
-            resources.GetString("Direction.Items"),
-            resources.GetString("Direction.Items1")});
             resources.ApplyResources(this.Direction, "Direction");
+            this.Direction.DataSource = this.DirectionUnitTable;
+            this.Direction.DisplayMember = "DisplayName";
             this.Direction.Name = "Direction";
+            this.Direction.ValueMember = "Value";
+            this.Direction.SelectedValueChanged += new System.EventHandler(this.Direction_TextChanged);
             this.Direction.TextChanged += new System.EventHandler(this.Direction_TextChanged);
             // 
+            // DirectionUnitTable
+            // 
+            this.DirectionUnitTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn1,
+            this.dataColumn2});
+            this.DirectionUnitTable.TableName = "DirectionUnit";
+            // 
+            // dataColumn1
+            // 
+            this.dataColumn1.Caption = "Value";
+            this.dataColumn1.ColumnName = "Value";
+            // 
+            // dataColumn2
+            // 
+            this.dataColumn2.Caption = "DisplayName";
+            this.dataColumn2.ColumnName = "Displayname";
+            // 
+            // DirectionTypesDataset
+            // 
+            this.DirectionTypesDataset.DataSetName = "NewDataSet";
+            this.DirectionTypesDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.DirectionTypesDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.DirectionUnitTable});
+            // 
             // ExtentHistory
             // 
             this.Controls.Add(this.Direction);
             this.Controls.Add(this.label1);
             this.Name = "ExtentHistory";
             resources.ApplyResources(this, "$this");
+            ((System.ComponentModel.ISupportInitialize)(this.DirectionUnitTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DirectionTypesDataset)).EndInit();
             this.ResumeLayout(false);
 
-		}
+		}
 		#endregion
 
 
@@ -112,8 +157,20 @@
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("Direction", Direction.Text);
-		}
-	}
-}
-
+            if (Direction.SelectedValue != null)
+                SetSettingValue("Direction", (string)Direction.SelectedValue);
+            else
+            {
+                foreach(System.Data.DataRow r in DirectionUnitTable.Rows)
+                    if (string.Equals((string)r["Displayname"], Direction.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("Direction", (string)r["Value"]);
+                        return;
+                    }
+
+                SetSettingValue("Direction", Direction.Text);
+            }
+        }
+	}
+}
+

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ExtentHistory.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ExtentHistory.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ExtentHistory.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -143,12 +143,10 @@
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="Direction.Items" xml:space="preserve">
-    <value>Previous</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Direction.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
-  <data name="Direction.Items1" xml:space="preserve">
-    <value>Next</value>
-  </data>
   <data name="Direction.Location" type="System.Drawing.Point, System.Drawing">
     <value>104, 8</value>
   </data>
@@ -170,16 +168,43 @@
   <data name="&gt;&gt;Direction.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="DirectionTypesDataset.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.Size" type="System.Drawing.Size, System.Drawing">
     <value>616, 40</value>
   </data>
+  <data name="&gt;&gt;DirectionUnitTable.Name" xml:space="preserve">
+    <value>DirectionUnitTable</value>
+  </data>
+  <data name="&gt;&gt;DirectionUnitTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Name" xml:space="preserve">
+    <value>dataColumn1</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Name" xml:space="preserve">
+    <value>dataColumn2</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;DirectionTypesDataset.Name" xml:space="preserve">
+    <value>DirectionTypesDataset</value>
+  </data>
+  <data name="&gt;&gt;DirectionTypesDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>ExtentHistory</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Measure.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Measure.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Measure.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -49,17 +49,35 @@
 		private System.Windows.Forms.ComboBox LineStyleColor;
 		private System.Windows.Forms.ComboBox Type;
 		private System.Windows.Forms.ComboBox MeasureTooltipType;
-		private System.Windows.Forms.ComboBox Units;
+		private System.Windows.Forms.ComboBox Units;
+        private System.Data.DataSet MeasureTypeDataset;
+        private System.Data.DataTable MeasureTypeTable;
+        private System.Data.DataColumn dataColumn1;
+        private System.Data.DataColumn dataColumn2;
+        private System.Data.DataSet MeasureUnitsDataset;
+        private System.Data.DataTable MeasureUnitTable;
+        private System.Data.DataColumn dataColumn3;
+        private System.Data.DataColumn dataColumn4;
+        private System.Data.DataSet TooltipTypeDataset;
+        private System.Data.DataTable TooltipTypeTable;
+        private System.Data.DataColumn dataColumn5;
+        private System.Data.DataColumn dataColumn6;
 		private System.ComponentModel.IContainer components = null;
 
 		public Measure()
 		{
 			// This call is required by the Windows Form Designer.
-			InitializeComponent();
+			InitializeComponent();
+
+            //Fill datasets
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.MeasureTypeDataset))
+                MeasureTypeDataset.ReadXml(sr);
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.MeasureUnitsDataset))
+                MeasureUnitTable.ReadXml(sr);
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.TooltipTypeDataset))
+                TooltipTypeDataset.ReadXml(sr);
+        }
 
-			// TODO: Add any initialization after the InitializeComponent call
-		}
-
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
@@ -91,10 +109,26 @@
 				MeasureTipPositionLeft.Text = GetSettingValue("MeasureTipPositionLeft");
 				MeasureTipPositionTop.Text = GetSettingValue("MeasureTipPositionTop");
 				MeasureTooltipContainer.Text = GetSettingValue("MeasureTooltipContainer");
-				MeasureTooltipType.Text = GetSettingValue("MeasureTooltipType");
-				Type.Text = GetSettingValue("Type");
 				Units.Text = GetSettingValue("Units");
-			}
+
+                Type.SelectedIndex = -1;
+                Type.SelectedValue = GetSettingValue("Type");
+
+                if (Type.SelectedIndex == -1)
+                    Type.Text = GetSettingValue("Type");
+
+                Units.SelectedIndex = -1;
+                Units.SelectedValue = GetSettingValue("Units");
+
+                if (Units.SelectedIndex == -1)
+                    Units.Text = GetSettingValue("Units");
+
+                MeasureTooltipType.SelectedIndex = -1;
+                MeasureTooltipType.SelectedValue = GetSettingValue("MeasureTooltipType");
+
+                if (MeasureTooltipType.SelectedIndex == -1)
+                    MeasureTooltipType.Text = GetSettingValue("MeasureTooltipType");
+            }
 			finally
 			{
 				m_isUpdating = false;
@@ -129,8 +163,26 @@
             this.FillStyle = new System.Windows.Forms.ComboBox();
             this.LineStyleColor = new System.Windows.Forms.ComboBox();
             this.Type = new System.Windows.Forms.ComboBox();
+            this.MeasureTypeTable = new System.Data.DataTable();
+            this.dataColumn1 = new System.Data.DataColumn();
+            this.dataColumn2 = new System.Data.DataColumn();
             this.MeasureTooltipType = new System.Windows.Forms.ComboBox();
+            this.TooltipTypeTable = new System.Data.DataTable();
+            this.dataColumn5 = new System.Data.DataColumn();
+            this.dataColumn6 = new System.Data.DataColumn();
             this.Units = new System.Windows.Forms.ComboBox();
+            this.MeasureUnitTable = new System.Data.DataTable();
+            this.dataColumn3 = new System.Data.DataColumn();
+            this.dataColumn4 = new System.Data.DataColumn();
+            this.MeasureTypeDataset = new System.Data.DataSet();
+            this.MeasureUnitsDataset = new System.Data.DataSet();
+            this.TooltipTypeDataset = new System.Data.DataSet();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureTypeTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TooltipTypeTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureTypeDataset)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitsDataset)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TooltipTypeDataset)).BeginInit();
             this.SuspendLayout();
             // 
             // DistancePrecision
@@ -239,30 +291,105 @@
             // Type
             // 
             resources.ApplyResources(this.Type, "Type");
-            this.Type.Items.AddRange(new object[] {
-            resources.GetString("Type.Items")});
+            this.Type.DataSource = this.MeasureTypeTable;
+            this.Type.DisplayMember = "Displayname";
             this.Type.Name = "Type";
+            this.Type.ValueMember = "Value";
+            this.Type.SelectedIndexChanged += new System.EventHandler(this.Type_TextChanged);
             this.Type.TextChanged += new System.EventHandler(this.Type_TextChanged);
             // 
+            // MeasureTypeTable
+            // 
+            this.MeasureTypeTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn1,
+            this.dataColumn2});
+            this.MeasureTypeTable.TableName = "MeasureType";
+            // 
+            // dataColumn1
+            // 
+            this.dataColumn1.Caption = "Value";
+            this.dataColumn1.ColumnName = "Value";
+            // 
+            // dataColumn2
+            // 
+            this.dataColumn2.Caption = "DisplayName";
+            this.dataColumn2.ColumnName = "Displayname";
+            // 
             // MeasureTooltipType
             // 
             resources.ApplyResources(this.MeasureTooltipType, "MeasureTooltipType");
-            this.MeasureTooltipType.Items.AddRange(new object[] {
-            resources.GetString("MeasureTooltipType.Items"),
-            resources.GetString("MeasureTooltipType.Items1")});
+            this.MeasureTooltipType.DataSource = this.TooltipTypeTable;
+            this.MeasureTooltipType.DisplayMember = "Displayname";
             this.MeasureTooltipType.Name = "MeasureTooltipType";
+            this.MeasureTooltipType.ValueMember = "Value";
+            this.MeasureTooltipType.SelectedIndexChanged += new System.EventHandler(this.MeasureTooltipType_TextChanged);
             this.MeasureTooltipType.TextChanged += new System.EventHandler(this.MeasureTooltipType_TextChanged);
             // 
+            // TooltipTypeTable
+            // 
+            this.TooltipTypeTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn5,
+            this.dataColumn6});
+            this.TooltipTypeTable.TableName = "TooltipType";
+            // 
+            // dataColumn5
+            // 
+            this.dataColumn5.Caption = "Value";
+            this.dataColumn5.ColumnName = "Value";
+            // 
+            // dataColumn6
+            // 
+            this.dataColumn6.Caption = "DisplayName";
+            this.dataColumn6.ColumnName = "Displayname";
+            // 
             // Units
             // 
             resources.ApplyResources(this.Units, "Units");
-            this.Units.Items.AddRange(new object[] {
-            resources.GetString("Units.Items"),
-            resources.GetString("Units.Items1"),
-            resources.GetString("Units.Items2")});
+            this.Units.DataSource = this.MeasureUnitTable;
+            this.Units.DisplayMember = "Displayname";
             this.Units.Name = "Units";
+            this.Units.ValueMember = "Value";
+            this.Units.SelectedIndexChanged += new System.EventHandler(this.Units_TextChanged);
             this.Units.TextChanged += new System.EventHandler(this.Units_TextChanged);
             // 
+            // MeasureUnitTable
+            // 
+            this.MeasureUnitTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn3,
+            this.dataColumn4});
+            this.MeasureUnitTable.TableName = "MeasureUnit";
+            // 
+            // dataColumn3
+            // 
+            this.dataColumn3.Caption = "Value";
+            this.dataColumn3.ColumnName = "Value";
+            // 
+            // dataColumn4
+            // 
+            this.dataColumn4.Caption = "DisplayName";
+            this.dataColumn4.ColumnName = "Displayname";
+            // 
+            // MeasureTypeDataset
+            // 
+            this.MeasureTypeDataset.DataSetName = "NewDataSet";
+            this.MeasureTypeDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.MeasureTypeDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.MeasureTypeTable});
+            // 
+            // MeasureUnitsDataset
+            // 
+            this.MeasureUnitsDataset.DataSetName = "NewDataSet";
+            this.MeasureUnitsDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.MeasureUnitsDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.MeasureUnitTable});
+            // 
+            // TooltipTypeDataset
+            // 
+            this.TooltipTypeDataset.DataSetName = "NewDataSet";
+            this.TooltipTypeDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.TooltipTypeDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.TooltipTypeTable});
+            // 
             // Measure
             // 
             this.Controls.Add(this.Units);
@@ -289,6 +416,12 @@
             this.Controls.Add(this.label1);
             this.Name = "Measure";
             resources.ApplyResources(this, "$this");
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureTypeTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TooltipTypeTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureTypeDataset)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitsDataset)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TooltipTypeDataset)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -364,7 +497,19 @@
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("MeasureTooltipType", MeasureTooltipType.Text);
+            if (MeasureTooltipType.SelectedValue != null)
+                SetSettingValue("MeasureTooltipType", (string)MeasureTooltipType.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in TooltipTypeTable.Rows)
+                    if (string.Equals((string)r["Displayname"], MeasureTooltipType.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("MeasureTooltipType", (string)r["Value"]);
+                        return;
+                    }
+
+                SetSettingValue("MeasureTooltipType", MeasureTooltipType.Text);
+            }
 		}
 
 		private void Type_TextChanged(object sender, System.EventArgs e)
@@ -372,15 +517,39 @@
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("Type", Type.Text);
-		}
+            if (Type.SelectedValue != null)
+                SetSettingValue("Type", (string)Type.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in MeasureTypeTable.Rows)
+                    if (string.Equals((string)r["Displayname"], Type.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("Type", (string)r["Value"]);
+                        return;
+                    }
 
+                SetSettingValue("Type", Type.Text);
+            }
+        }
+
 		private void Units_TextChanged(object sender, System.EventArgs e)
 		{
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("Units", Units.Text);
+            if (Units.SelectedValue != null)
+                SetSettingValue("Units", (string)Units.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in MeasureUnitTable.Rows)
+                    if (string.Equals((string)r["Displayname"], Units.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("Units", (string)r["Value"]);
+                        return;
+                    }
+
+                SetSettingValue("Units", Units.Text);
+            }
 		}
 	}
 }

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Measure.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Measure.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Measure.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -579,9 +579,6 @@
   <data name="Type.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="Type.Items" xml:space="preserve">
-    <value>both</value>
-  </data>
   <data name="Type.Location" type="System.Drawing.Point, System.Drawing">
     <value>136, 224</value>
   </data>
@@ -606,12 +603,6 @@
   <data name="MeasureTooltipType.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="MeasureTooltipType.Items" xml:space="preserve">
-    <value>static</value>
-  </data>
-  <data name="MeasureTooltipType.Items1" xml:space="preserve">
-    <value>dynamic</value>
-  </data>
   <data name="MeasureTooltipType.Location" type="System.Drawing.Point, System.Drawing">
     <value>136, 200</value>
   </data>
@@ -636,15 +627,6 @@
   <data name="Units.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="Units.Items" xml:space="preserve">
-    <value>meters</value>
-  </data>
-  <data name="Units.Items1" xml:space="preserve">
-    <value>miles</value>
-  </data>
-  <data name="Units.Items2" xml:space="preserve">
-    <value>none</value>
-  </data>
   <data name="Units.Location" type="System.Drawing.Point, System.Drawing">
     <value>136, 248</value>
   </data>
@@ -666,16 +648,97 @@
   <data name="&gt;&gt;Units.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="MeasureTypeDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="MeasureUnitsDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>183, 17</value>
+  </metadata>
+  <metadata name="TooltipTypeDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>351, 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.Size" type="System.Drawing.Size, System.Drawing">
     <value>616, 280</value>
   </data>
+  <data name="&gt;&gt;MeasureTypeTable.Name" xml:space="preserve">
+    <value>MeasureTypeTable</value>
+  </data>
+  <data name="&gt;&gt;MeasureTypeTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Name" xml:space="preserve">
+    <value>dataColumn1</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Name" xml:space="preserve">
+    <value>dataColumn2</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TooltipTypeTable.Name" xml:space="preserve">
+    <value>TooltipTypeTable</value>
+  </data>
+  <data name="&gt;&gt;TooltipTypeTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn5.Name" xml:space="preserve">
+    <value>dataColumn5</value>
+  </data>
+  <data name="&gt;&gt;dataColumn5.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn6.Name" xml:space="preserve">
+    <value>dataColumn6</value>
+  </data>
+  <data name="&gt;&gt;dataColumn6.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitTable.Name" xml:space="preserve">
+    <value>MeasureUnitTable</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn3.Name" xml:space="preserve">
+    <value>dataColumn3</value>
+  </data>
+  <data name="&gt;&gt;dataColumn3.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn4.Name" xml:space="preserve">
+    <value>dataColumn4</value>
+  </data>
+  <data name="&gt;&gt;dataColumn4.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MeasureTypeDataset.Name" xml:space="preserve">
+    <value>MeasureTypeDataset</value>
+  </data>
+  <data name="&gt;&gt;MeasureTypeDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitsDataset.Name" xml:space="preserve">
+    <value>MeasureUnitsDataset</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitsDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TooltipTypeDataset.Name" xml:space="preserve">
+    <value>TooltipTypeDataset</value>
+  </data>
+  <data name="&gt;&gt;TooltipTypeDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Measure</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Select.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Select.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Select.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -17,47 +17,53 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 #endregion
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.ApplicationDefinition;
-
-namespace OSGeo.MapGuide.Maestro.FusionEditor.CustomizedEditors
-{
-	public class Select : FusionEditor.BasisWidgetEditor
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using OSGeo.MapGuide.MaestroAPI.ApplicationDefinition;
+
+namespace OSGeo.MapGuide.Maestro.FusionEditor.CustomizedEditors
+{
+	public class Select : FusionEditor.BasisWidgetEditor
 	{
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.CheckBox QueryActiveLayer;
 		private System.Windows.Forms.TextBox Tolerance;
 		private System.Windows.Forms.ComboBox SelectionType;
-		private System.Windows.Forms.Label label2;
-		private System.ComponentModel.IContainer components = null;
-
-		public Select()
-		{
-			// This call is required by the Windows Form Designer.
-			InitializeComponent();
-
-			// TODO: Add any initialization after the InitializeComponent call
-		}
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if (components != null) 
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
+		private System.Windows.Forms.Label label2;
+        private System.Data.DataSet GeometryOperationTypeDataset;
+        private System.Data.DataTable GeometryOperationTypeTable;
+        private System.Data.DataColumn dataColumn1;
+        private System.Data.DataColumn dataColumn2;
+		private System.ComponentModel.IContainer components = null;
+
+		public Select()
+		{
+			// This call is required by the Windows Form Designer.
+			InitializeComponent();
+
+            //Fill dataset
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.GeometryOperationTypeDataset))
+                GeometryOperationTypeDataset.ReadXml(sr);
+        }
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if (components != null) 
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
 		public override void SetItem(WidgetType w)
 		{
 			try
@@ -68,28 +74,39 @@
 
 				try { QueryActiveLayer.Checked = bool.Parse(GetSettingValue("QueryActiveLayer")); }
 				catch {}
-				Tolerance.Text = GetSettingValue("Tolerance"); 
-				SelectionType.Text = GetSettingValue("SelectionType"); 
+				Tolerance.Text = GetSettingValue("Tolerance");
+
+                SelectionType.SelectedIndex = -1;
+                SelectionType.SelectedValue = GetSettingValue("SelectionType");
+
+                if (SelectionType.SelectedIndex == -1)
+                    SelectionType.Text = GetSettingValue("SelectionType");
 			}
 			finally
 			{
 				m_isUpdating = false;
 			}
 		}
-
-		#region 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()
+
+		#region 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()
 		{
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Select));
             this.QueryActiveLayer = new System.Windows.Forms.CheckBox();
             this.Tolerance = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
             this.SelectionType = new System.Windows.Forms.ComboBox();
+            this.GeometryOperationTypeTable = new System.Data.DataTable();
+            this.dataColumn1 = new System.Data.DataColumn();
+            this.dataColumn2 = new System.Data.DataColumn();
             this.label2 = new System.Windows.Forms.Label();
+            this.GeometryOperationTypeDataset = new System.Data.DataSet();
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeDataset)).BeginInit();
             this.SuspendLayout();
             // 
             // QueryActiveLayer
@@ -112,21 +129,42 @@
             // SelectionType
             // 
             resources.ApplyResources(this.SelectionType, "SelectionType");
-            this.SelectionType.Items.AddRange(new object[] {
-            resources.GetString("SelectionType.Items"),
-            resources.GetString("SelectionType.Items1"),
-            resources.GetString("SelectionType.Items2"),
-            resources.GetString("SelectionType.Items3"),
-            resources.GetString("SelectionType.Items4"),
-            resources.GetString("SelectionType.Items5")});
+            this.SelectionType.DataSource = this.GeometryOperationTypeTable;
+            this.SelectionType.DisplayMember = "Displayname";
             this.SelectionType.Name = "SelectionType";
+            this.SelectionType.ValueMember = "Value";
+            this.SelectionType.SelectedIndexChanged += new System.EventHandler(this.SelectionType_TextChanged);
             this.SelectionType.TextChanged += new System.EventHandler(this.SelectionType_TextChanged);
             // 
+            // GeometryOperationTypeTable
+            // 
+            this.GeometryOperationTypeTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn1,
+            this.dataColumn2});
+            this.GeometryOperationTypeTable.TableName = "GeometryOperationType";
+            // 
+            // dataColumn1
+            // 
+            this.dataColumn1.Caption = "Value";
+            this.dataColumn1.ColumnName = "Value";
+            // 
+            // dataColumn2
+            // 
+            this.dataColumn2.Caption = "DisplayName";
+            this.dataColumn2.ColumnName = "Displayname";
+            // 
             // label2
             // 
             resources.ApplyResources(this.label2, "label2");
             this.label2.Name = "label2";
             // 
+            // GeometryOperationTypeDataset
+            // 
+            this.GeometryOperationTypeDataset.DataSetName = "NewDataSet";
+            this.GeometryOperationTypeDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.GeometryOperationTypeDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.GeometryOperationTypeTable});
+            // 
             // Select
             // 
             this.Controls.Add(this.SelectionType);
@@ -136,10 +174,12 @@
             this.Controls.Add(this.label1);
             this.Name = "Select";
             resources.ApplyResources(this, "$this");
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeDataset)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
-		}
+		}
 		#endregion
 
 		private void QueryActiveLayer_CheckedChanged(object sender, System.EventArgs e)
@@ -163,8 +203,20 @@
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("SelectionType", SelectionType.Text);
-		}
-	}
-}
-
+            if (SelectionType.SelectedValue != null)
+                SetSettingValue("SelectionType", (string)SelectionType.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in GeometryOperationTypeTable.Rows)
+                    if (string.Equals((string)r["Displayname"], SelectionType.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("SelectionType", (string)r["Value"]);
+                        return;
+                    }
+
+                SetSettingValue("SelectionType", SelectionType.Text);
+            }
+		}
+	}
+}
+

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Select.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Select.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Select.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -198,24 +198,6 @@
   <data name="SelectionType.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="SelectionType.Items" xml:space="preserve">
-    <value>CONTAINS</value>
-  </data>
-  <data name="SelectionType.Items1" xml:space="preserve">
-    <value>DISJOINT</value>
-  </data>
-  <data name="SelectionType.Items2" xml:space="preserve">
-    <value>INTERSECTS</value>
-  </data>
-  <data name="SelectionType.Items3" xml:space="preserve">
-    <value>WITHIN</value>
-  </data>
-  <data name="SelectionType.Items4" xml:space="preserve">
-    <value>INSIDE</value>
-  </data>
-  <data name="SelectionType.Items5" xml:space="preserve">
-    <value>ENVELOPEINTERSECTS</value>
-  </data>
   <data name="SelectionType.Location" type="System.Drawing.Point, System.Drawing">
     <value>144, 56</value>
   </data>
@@ -261,16 +243,43 @@
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <metadata name="GeometryOperationTypeDataset.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.Size" type="System.Drawing.Size, System.Drawing">
     <value>616, 96</value>
   </data>
+  <data name="&gt;&gt;GeometryOperationTypeTable.Name" xml:space="preserve">
+    <value>GeometryOperationTypeTable</value>
+  </data>
+  <data name="&gt;&gt;GeometryOperationTypeTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Name" xml:space="preserve">
+    <value>dataColumn1</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Name" xml:space="preserve">
+    <value>dataColumn2</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GeometryOperationTypeDataset.Name" xml:space="preserve">
+    <value>GeometryOperationTypeDataset</value>
+  </data>
+  <data name="&gt;&gt;GeometryOperationTypeDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Select</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectPolygon.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectPolygon.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectPolygon.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -31,17 +31,23 @@
 		private System.Windows.Forms.ComboBox SelectionType;
 		private System.Windows.Forms.Label label2;
 		private System.Windows.Forms.TextBox Tolerance;
-		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label1;
+        private System.Data.DataSet GeometryOperationTypeDataset;
+        private System.Data.DataTable GeometryOperationTypeTable;
+        private System.Data.DataColumn dataColumn1;
+        private System.Data.DataColumn dataColumn2;
 		private System.ComponentModel.IContainer components = null;
 
 		public SelectPolygon()
 		{
 			// This call is required by the Windows Form Designer.
-			InitializeComponent();
+			InitializeComponent();
+
+            //Fill dataset
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.GeometryOperationTypeDataset))
+                GeometryOperationTypeDataset.ReadXml(sr);
+        }
 
-			// TODO: Add any initialization after the InitializeComponent call
-		}
-
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
@@ -65,9 +71,14 @@
 				m_w = w;
 				this.Enabled = m_w != null;
 
-				Tolerance.Text = GetSettingValue("Tolerance"); 
-				SelectionType.Text = GetSettingValue("SelectionType"); 
-			}
+				Tolerance.Text = GetSettingValue("Tolerance");
+
+                SelectionType.SelectedIndex = -1;
+                SelectionType.SelectedValue = GetSettingValue("SelectionType");
+
+                if (SelectionType.SelectedIndex == -1)
+                    SelectionType.Text = GetSettingValue("SelectionType");
+            }
 			finally
 			{
 				m_isUpdating = false;
@@ -83,24 +94,44 @@
 		{
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SelectPolygon));
             this.SelectionType = new System.Windows.Forms.ComboBox();
+            this.GeometryOperationTypeTable = new System.Data.DataTable();
+            this.dataColumn1 = new System.Data.DataColumn();
+            this.dataColumn2 = new System.Data.DataColumn();
             this.label2 = new System.Windows.Forms.Label();
             this.Tolerance = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
+            this.GeometryOperationTypeDataset = new System.Data.DataSet();
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeDataset)).BeginInit();
             this.SuspendLayout();
             // 
             // SelectionType
             // 
             resources.ApplyResources(this.SelectionType, "SelectionType");
-            this.SelectionType.Items.AddRange(new object[] {
-            resources.GetString("SelectionType.Items"),
-            resources.GetString("SelectionType.Items1"),
-            resources.GetString("SelectionType.Items2"),
-            resources.GetString("SelectionType.Items3"),
-            resources.GetString("SelectionType.Items4"),
-            resources.GetString("SelectionType.Items5")});
+            this.SelectionType.DataSource = this.GeometryOperationTypeTable;
+            this.SelectionType.DisplayMember = "Displayname";
             this.SelectionType.Name = "SelectionType";
+            this.SelectionType.ValueMember = "Value";
+            this.SelectionType.SelectedIndexChanged += new System.EventHandler(this.SelectionType_TextChanged);
             this.SelectionType.TextChanged += new System.EventHandler(this.SelectionType_TextChanged);
             // 
+            // GeometryOperationTypeTable
+            // 
+            this.GeometryOperationTypeTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn1,
+            this.dataColumn2});
+            this.GeometryOperationTypeTable.TableName = "GeometryOperationType";
+            // 
+            // dataColumn1
+            // 
+            this.dataColumn1.Caption = "Value";
+            this.dataColumn1.ColumnName = "Value";
+            // 
+            // dataColumn2
+            // 
+            this.dataColumn2.Caption = "DisplayName";
+            this.dataColumn2.ColumnName = "Displayname";
+            // 
             // label2
             // 
             resources.ApplyResources(this.label2, "label2");
@@ -117,6 +148,13 @@
             resources.ApplyResources(this.label1, "label1");
             this.label1.Name = "label1";
             // 
+            // GeometryOperationTypeDataset
+            // 
+            this.GeometryOperationTypeDataset.DataSetName = "NewDataSet";
+            this.GeometryOperationTypeDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.GeometryOperationTypeDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.GeometryOperationTypeTable});
+            // 
             // SelectPolygon
             // 
             this.Controls.Add(this.SelectionType);
@@ -125,6 +163,8 @@
             this.Controls.Add(this.label1);
             this.Name = "SelectPolygon";
             resources.ApplyResources(this, "$this");
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeDataset)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -144,8 +184,20 @@
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("SelectionType", SelectionType.Text);
-		}
+            if (SelectionType.SelectedValue != null)
+                SetSettingValue("SelectionType", (string)SelectionType.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in GeometryOperationTypeTable.Rows)
+                    if (string.Equals((string)r["Displayname"], SelectionType.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("SelectionType", (string)r["Value"]);
+                        return;
+                    }
+
+                SetSettingValue("SelectionType", SelectionType.Text);
+            }
+        }
 	}
 }
 

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectPolygon.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectPolygon.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectPolygon.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -121,24 +121,6 @@
   <data name="SelectionType.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="SelectionType.Items" xml:space="preserve">
-    <value>CONTAINS</value>
-  </data>
-  <data name="SelectionType.Items1" xml:space="preserve">
-    <value>DISJOINT</value>
-  </data>
-  <data name="SelectionType.Items2" xml:space="preserve">
-    <value>INTERSECTS</value>
-  </data>
-  <data name="SelectionType.Items3" xml:space="preserve">
-    <value>WITHIN</value>
-  </data>
-  <data name="SelectionType.Items4" xml:space="preserve">
-    <value>INSIDE</value>
-  </data>
-  <data name="SelectionType.Items5" xml:space="preserve">
-    <value>ENVELOPEINTERSECTS</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="SelectionType.Location" type="System.Drawing.Point, System.Drawing">
     <value>144, 30</value>
@@ -234,16 +216,43 @@
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <metadata name="GeometryOperationTypeDataset.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.Size" type="System.Drawing.Size, System.Drawing">
     <value>616, 56</value>
   </data>
+  <data name="&gt;&gt;GeometryOperationTypeTable.Name" xml:space="preserve">
+    <value>GeometryOperationTypeTable</value>
+  </data>
+  <data name="&gt;&gt;GeometryOperationTypeTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Name" xml:space="preserve">
+    <value>dataColumn1</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Name" xml:space="preserve">
+    <value>dataColumn2</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GeometryOperationTypeDataset.Name" xml:space="preserve">
+    <value>GeometryOperationTypeDataset</value>
+  </data>
+  <data name="&gt;&gt;GeometryOperationTypeDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>SelectPolygon</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectRadius.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectRadius.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectRadius.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -37,17 +37,29 @@
 		private System.Windows.Forms.TextBox DefaultRadius;
 		private System.Windows.Forms.Label label9;
 		private System.Windows.Forms.TextBox RadiusTooltipContainer;
-		private System.Windows.Forms.Label label10;
+		private System.Windows.Forms.Label label10;
+        private System.Data.DataSet GeometryOperationTypeDataset;
+        private System.Data.DataTable GeometryOperationTypeTable;
+        private System.Data.DataColumn dataColumn1;
+        private System.Data.DataColumn dataColumn2;
+        private System.Data.DataSet TooltipTypeDataset;
+        private System.Data.DataTable TooltipTypeTable;
+        private System.Data.DataColumn dataColumn5;
+        private System.Data.DataColumn dataColumn6;
 		private System.ComponentModel.IContainer components = null;
 
 		public SelectRadius()
 		{
 			// This call is required by the Windows Form Designer.
-			InitializeComponent();
+			InitializeComponent();
+
+            //Fill datasets
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.GeometryOperationTypeDataset))
+                GeometryOperationTypeDataset.ReadXml(sr);
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.TooltipTypeDataset))
+                TooltipTypeDataset.ReadXml(sr);
+        }
 
-			// TODO: Add any initialization after the InitializeComponent call
-		}
-
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
@@ -72,11 +84,21 @@
 				this.Enabled = m_w != null;
 
 				Tolerance.Text = GetSettingValue("Tolerance"); 
-				SelectionType.Text = GetSettingValue("SelectionType"); 
-				RadiusTooltipType.Text = GetSettingValue("RadiusTooltipType"); 
 				RadiusTooltipContainer.Text = GetSettingValue("RadiusTooltipContainer"); 
-				DefaultRadius.Text = GetSettingValue("DefaultRadius"); 
-			}
+				DefaultRadius.Text = GetSettingValue("DefaultRadius");
+
+                SelectionType.SelectedIndex = -1;
+                SelectionType.SelectedValue = GetSettingValue("SelectionType");
+
+                if (SelectionType.SelectedIndex == -1)
+                    SelectionType.Text = GetSettingValue("SelectionType");
+
+                RadiusTooltipType.SelectedIndex = -1;
+                RadiusTooltipType.SelectedValue = GetSettingValue("RadiusTooltipType");
+
+                if (RadiusTooltipType.SelectedIndex == -1)
+                    RadiusTooltipType.Text = GetSettingValue("RadiusTooltipType");
+            }
 			finally
 			{
 				m_isUpdating = false;
@@ -92,30 +114,56 @@
 		{
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SelectRadius));
             this.SelectionType = new System.Windows.Forms.ComboBox();
+            this.GeometryOperationTypeTable = new System.Data.DataTable();
+            this.dataColumn1 = new System.Data.DataColumn();
+            this.dataColumn2 = new System.Data.DataColumn();
             this.label2 = new System.Windows.Forms.Label();
             this.Tolerance = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
             this.RadiusTooltipType = new System.Windows.Forms.ComboBox();
+            this.TooltipTypeTable = new System.Data.DataTable();
+            this.dataColumn5 = new System.Data.DataColumn();
+            this.dataColumn6 = new System.Data.DataColumn();
             this.label7 = new System.Windows.Forms.Label();
             this.DefaultRadius = new System.Windows.Forms.TextBox();
             this.label9 = new System.Windows.Forms.Label();
             this.RadiusTooltipContainer = new System.Windows.Forms.TextBox();
             this.label10 = new System.Windows.Forms.Label();
+            this.GeometryOperationTypeDataset = new System.Data.DataSet();
+            this.TooltipTypeDataset = new System.Data.DataSet();
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TooltipTypeTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeDataset)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TooltipTypeDataset)).BeginInit();
             this.SuspendLayout();
             // 
             // SelectionType
             // 
             resources.ApplyResources(this.SelectionType, "SelectionType");
-            this.SelectionType.Items.AddRange(new object[] {
-            resources.GetString("SelectionType.Items"),
-            resources.GetString("SelectionType.Items1"),
-            resources.GetString("SelectionType.Items2"),
-            resources.GetString("SelectionType.Items3"),
-            resources.GetString("SelectionType.Items4"),
-            resources.GetString("SelectionType.Items5")});
+            this.SelectionType.DataSource = this.GeometryOperationTypeTable;
+            this.SelectionType.DisplayMember = "Displayname";
             this.SelectionType.Name = "SelectionType";
+            this.SelectionType.ValueMember = "Value";
+            this.SelectionType.SelectedIndexChanged += new System.EventHandler(this.SelectionType_TextChanged);
             this.SelectionType.TextChanged += new System.EventHandler(this.SelectionType_TextChanged);
             // 
+            // GeometryOperationTypeTable
+            // 
+            this.GeometryOperationTypeTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn1,
+            this.dataColumn2});
+            this.GeometryOperationTypeTable.TableName = "GeometryOperationType";
+            // 
+            // dataColumn1
+            // 
+            this.dataColumn1.Caption = "Value";
+            this.dataColumn1.ColumnName = "Value";
+            // 
+            // dataColumn2
+            // 
+            this.dataColumn2.Caption = "DisplayName";
+            this.dataColumn2.ColumnName = "Displayname";
+            // 
             // label2
             // 
             resources.ApplyResources(this.label2, "label2");
@@ -135,12 +183,30 @@
             // RadiusTooltipType
             // 
             resources.ApplyResources(this.RadiusTooltipType, "RadiusTooltipType");
-            this.RadiusTooltipType.Items.AddRange(new object[] {
-            resources.GetString("RadiusTooltipType.Items"),
-            resources.GetString("RadiusTooltipType.Items1")});
+            this.RadiusTooltipType.DataSource = this.TooltipTypeTable;
+            this.RadiusTooltipType.DisplayMember = "Displayname";
             this.RadiusTooltipType.Name = "RadiusTooltipType";
+            this.RadiusTooltipType.ValueMember = "Value";
+            this.RadiusTooltipType.SelectedIndexChanged += new System.EventHandler(this.RadiusTooltipType_TextChanged);
             this.RadiusTooltipType.TextChanged += new System.EventHandler(this.RadiusTooltipType_TextChanged);
             // 
+            // TooltipTypeTable
+            // 
+            this.TooltipTypeTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn5,
+            this.dataColumn6});
+            this.TooltipTypeTable.TableName = "TooltipType";
+            // 
+            // dataColumn5
+            // 
+            this.dataColumn5.Caption = "Value";
+            this.dataColumn5.ColumnName = "Value";
+            // 
+            // dataColumn6
+            // 
+            this.dataColumn6.Caption = "DisplayName";
+            this.dataColumn6.ColumnName = "Displayname";
+            // 
             // label7
             // 
             resources.ApplyResources(this.label7, "label7");
@@ -168,6 +234,20 @@
             resources.ApplyResources(this.label10, "label10");
             this.label10.Name = "label10";
             // 
+            // GeometryOperationTypeDataset
+            // 
+            this.GeometryOperationTypeDataset.DataSetName = "NewDataSet";
+            this.GeometryOperationTypeDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.GeometryOperationTypeDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.GeometryOperationTypeTable});
+            // 
+            // TooltipTypeDataset
+            // 
+            this.TooltipTypeDataset.DataSetName = "NewDataSet";
+            this.TooltipTypeDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.TooltipTypeDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.TooltipTypeTable});
+            // 
             // SelectRadius
             // 
             this.Controls.Add(this.DefaultRadius);
@@ -182,6 +262,10 @@
             this.Controls.Add(this.label1);
             this.Name = "SelectRadius";
             resources.ApplyResources(this, "$this");
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TooltipTypeTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GeometryOperationTypeDataset)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TooltipTypeDataset)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -201,15 +285,39 @@
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("SelectionType", SelectionType.Text);
-		}
+            if (SelectionType.SelectedValue != null)
+                SetSettingValue("SelectionType", (string)SelectionType.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in GeometryOperationTypeTable.Rows)
+                    if (string.Equals((string)r["Displayname"], SelectionType.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("SelectionType", (string)r["Value"]);
+                        return;
+                    }
 
+                SetSettingValue("SelectionType", SelectionType.Text);
+            }
+        }
+
 		private void RadiusTooltipType_TextChanged(object sender, System.EventArgs e)
 		{
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("RadiusTooltipType", RadiusTooltipType.Text);
+            if (RadiusTooltipType.SelectedValue != null)
+                SetSettingValue("RadiusTooltipType", (string)RadiusTooltipType.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in TooltipTypeTable.Rows)
+                    if (string.Equals((string)r["Displayname"], RadiusTooltipType.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("RadiusTooltipType", (string)r["Value"]);
+                        return;
+                    }
+
+                SetSettingValue("RadiusTooltipType", RadiusTooltipType.Text);
+            }
 		}
 
 		private void RadiusTooltipContainer_TextChanged(object sender, System.EventArgs e)

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectRadius.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectRadius.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/SelectRadius.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -121,24 +121,6 @@
   <data name="SelectionType.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="SelectionType.Items" xml:space="preserve">
-    <value>CONTAINS</value>
-  </data>
-  <data name="SelectionType.Items1" xml:space="preserve">
-    <value>DISJOINT</value>
-  </data>
-  <data name="SelectionType.Items2" xml:space="preserve">
-    <value>INTERSECTS</value>
-  </data>
-  <data name="SelectionType.Items3" xml:space="preserve">
-    <value>WITHIN</value>
-  </data>
-  <data name="SelectionType.Items4" xml:space="preserve">
-    <value>INSIDE</value>
-  </data>
-  <data name="SelectionType.Items5" xml:space="preserve">
-    <value>ENVELOPEINTERSECTS</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="SelectionType.Location" type="System.Drawing.Point, System.Drawing">
     <value>144, 32</value>
@@ -237,12 +219,6 @@
   <data name="RadiusTooltipType.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="RadiusTooltipType.Items" xml:space="preserve">
-    <value>static</value>
-  </data>
-  <data name="RadiusTooltipType.Items1" xml:space="preserve">
-    <value>dynamic</value>
-  </data>
   <data name="RadiusTooltipType.Location" type="System.Drawing.Point, System.Drawing">
     <value>144, 56</value>
   </data>
@@ -384,16 +360,70 @@
   <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <metadata name="GeometryOperationTypeDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="TooltipTypeDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>245, 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.Size" type="System.Drawing.Size, System.Drawing">
     <value>616, 128</value>
   </data>
+  <data name="&gt;&gt;GeometryOperationTypeTable.Name" xml:space="preserve">
+    <value>GeometryOperationTypeTable</value>
+  </data>
+  <data name="&gt;&gt;GeometryOperationTypeTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Name" xml:space="preserve">
+    <value>dataColumn1</value>
+  </data>
+  <data name="&gt;&gt;dataColumn1.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Name" xml:space="preserve">
+    <value>dataColumn2</value>
+  </data>
+  <data name="&gt;&gt;dataColumn2.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TooltipTypeTable.Name" xml:space="preserve">
+    <value>TooltipTypeTable</value>
+  </data>
+  <data name="&gt;&gt;TooltipTypeTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn5.Name" xml:space="preserve">
+    <value>dataColumn5</value>
+  </data>
+  <data name="&gt;&gt;dataColumn5.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn6.Name" xml:space="preserve">
+    <value>dataColumn6</value>
+  </data>
+  <data name="&gt;&gt;dataColumn6.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GeometryOperationTypeDataset.Name" xml:space="preserve">
+    <value>GeometryOperationTypeDataset</value>
+  </data>
+  <data name="&gt;&gt;GeometryOperationTypeDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TooltipTypeDataset.Name" xml:space="preserve">
+    <value>TooltipTypeDataset</value>
+  </data>
+  <data name="&gt;&gt;TooltipTypeDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>SelectRadius</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewOptions.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewOptions.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewOptions.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -26,20 +26,17 @@
 
 namespace OSGeo.MapGuide.Maestro.FusionEditor.CustomizedEditors
 {
-	public class ViewOptions : FusionEditor.BasisWidgetEditor
-	{
-		private System.Windows.Forms.ComboBox DisplayUnits;
-		private System.Windows.Forms.Label label1;
+	public class ViewOptions : FusionEditor.BasisWidgetEditor
+    {
+        private CheckBox DisplayUnits;
 		private System.ComponentModel.IContainer components = null;
 
 		public ViewOptions()
 		{
 			// This call is required by the Windows Form Designer.
-			InitializeComponent();
+			InitializeComponent();
+        }
 
-			// TODO: Add any initialization after the InitializeComponent call
-		}
-
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
@@ -63,7 +60,7 @@
 				m_w = w;
 				this.Enabled = m_w != null;
 
-				DisplayUnits.Text = GetSettingValue("DisplayUnits"); 
+                DisplayUnits.Checked = GetSettingValue("DisplayUnits") == null || GetSettingValue("DisplayUnits").Trim().ToLower() == "true";
 			}
 			finally
 			{
@@ -79,42 +76,34 @@
 		private void InitializeComponent()
 		{
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ViewOptions));
-            this.DisplayUnits = new System.Windows.Forms.ComboBox();
-            this.label1 = new System.Windows.Forms.Label();
+            this.DisplayUnits = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // DisplayUnits
             // 
-            this.DisplayUnits.Items.AddRange(new object[] {
-            resources.GetString("DisplayUnits.Items"),
-            resources.GetString("DisplayUnits.Items1")});
             resources.ApplyResources(this.DisplayUnits, "DisplayUnits");
             this.DisplayUnits.Name = "DisplayUnits";
-            this.DisplayUnits.TextChanged += new System.EventHandler(this.DisplayUnits_TextChanged);
+            this.DisplayUnits.UseVisualStyleBackColor = true;
+            this.DisplayUnits.CheckedChanged += new System.EventHandler(this.DisplayUnits_CheckedChanged);
             // 
-            // label1
-            // 
-            resources.ApplyResources(this.label1, "label1");
-            this.label1.Name = "label1";
-            // 
             // ViewOptions
             // 
             this.Controls.Add(this.DisplayUnits);
-            this.Controls.Add(this.label1);
             this.Name = "ViewOptions";
             resources.ApplyResources(this, "$this");
             this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 		#endregion
 
-		private void DisplayUnits_TextChanged(object sender, System.EventArgs e)
-		{
-			if (m_isUpdating || m_w == null)
-				return;
+        private void DisplayUnits_CheckedChanged(object sender, EventArgs e)
+        {
+            if (m_isUpdating || m_w == null)
+                return;
 
-			SetSettingValue("DisplayUnits", DisplayUnits.Text);
-		}
+            SetSettingValue("DisplayUnits", DisplayUnits.Checked ? "true" : "false");
+        }
 	}
 }
 

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewOptions.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewOptions.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewOptions.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,28 +117,28 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="DisplayUnits.Items" xml:space="preserve">
-    <value>meters</value>
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="DisplayUnits.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="DisplayUnits.Items1" xml:space="preserve">
-    <value>miles</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="DisplayUnits.Location" type="System.Drawing.Point, System.Drawing">
-    <value>104, 10</value>
+    <value>8, 8</value>
   </data>
   <data name="DisplayUnits.Size" type="System.Drawing.Size, System.Drawing">
-    <value>504, 21</value>
+    <value>87, 17</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="DisplayUnits.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
+    <value>0</value>
   </data>
+  <data name="DisplayUnits.Text" xml:space="preserve">
+    <value>Display Units</value>
+  </data>
   <data name="&gt;&gt;DisplayUnits.Name" xml:space="preserve">
     <value>DisplayUnits</value>
   </data>
   <data name="&gt;&gt;DisplayUnits.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;DisplayUnits.Parent" xml:space="preserve">
     <value>$this</value>
@@ -146,40 +146,16 @@
   <data name="&gt;&gt;DisplayUnits.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 12</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>88, 16</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>Display units</value>
-  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>616, 40</value>
+    <value>107, 40</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>ViewOptions</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewSize.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewSize.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewSize.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -33,17 +33,23 @@
 		private System.Windows.Forms.TextBox Precision;
 		private System.Windows.Forms.Label label3;
 		private System.Windows.Forms.TextBox Template;
-		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label2;
+        private System.Data.DataSet MeasureUnitsDataset;
+        private System.Data.DataTable MeasureUnitTable;
+        private System.Data.DataColumn dataColumn3;
+        private System.Data.DataColumn dataColumn4;
 		private System.ComponentModel.IContainer components = null;
 
 		public ViewSize()
 		{
 			// This call is required by the Windows Form Designer.
-			InitializeComponent();
+			InitializeComponent();
+
+            //Fill dataset
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.MeasureUnitsDataset))
+                MeasureUnitTable.ReadXml(sr);
+        }
 
-			// TODO: Add any initialization after the InitializeComponent call
-		}
-
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
@@ -68,9 +74,13 @@
 				this.Enabled = m_w != null;
 
 				Precision.Text = GetSettingValue("Precision"); 
-				Template.Text = GetSettingValue("Template"); 
-				Units.Text = GetSettingValue("Units"); 
-			}
+				Template.Text = GetSettingValue("Template");
+                Units.SelectedIndex = -1;
+                Units.SelectedValue = GetSettingValue("Units");
+
+                if (Units.SelectedIndex == -1)
+                    Units.Text = GetSettingValue("Units");
+            }
 			finally
 			{
 				m_isUpdating = false;
@@ -86,23 +96,46 @@
 		{
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ViewSize));
             this.Units = new System.Windows.Forms.ComboBox();
+            this.MeasureUnitTable = new System.Data.DataTable();
+            this.dataColumn3 = new System.Data.DataColumn();
+            this.dataColumn4 = new System.Data.DataColumn();
             this.label1 = new System.Windows.Forms.Label();
             this.Precision = new System.Windows.Forms.TextBox();
             this.label3 = new System.Windows.Forms.Label();
             this.Template = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
+            this.MeasureUnitsDataset = new System.Data.DataSet();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitsDataset)).BeginInit();
             this.SuspendLayout();
             // 
             // Units
             // 
-            this.Units.Items.AddRange(new object[] {
-            resources.GetString("Units.Items"),
-            resources.GetString("Units.Items1"),
-            resources.GetString("Units.Items2")});
             resources.ApplyResources(this.Units, "Units");
+            this.Units.DataSource = this.MeasureUnitTable;
+            this.Units.DisplayMember = "Displayname";
             this.Units.Name = "Units";
+            this.Units.ValueMember = "Value";
+            this.Units.SelectedIndexChanged += new System.EventHandler(this.Units_TextChanged);
             this.Units.TextChanged += new System.EventHandler(this.Units_TextChanged);
             // 
+            // MeasureUnitTable
+            // 
+            this.MeasureUnitTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn3,
+            this.dataColumn4});
+            this.MeasureUnitTable.TableName = "MeasureUnit";
+            // 
+            // dataColumn3
+            // 
+            this.dataColumn3.Caption = "Value";
+            this.dataColumn3.ColumnName = "Value";
+            // 
+            // dataColumn4
+            // 
+            this.dataColumn4.Caption = "DisplayName";
+            this.dataColumn4.ColumnName = "Displayname";
+            // 
             // label1
             // 
             resources.ApplyResources(this.label1, "label1");
@@ -130,6 +163,13 @@
             resources.ApplyResources(this.label2, "label2");
             this.label2.Name = "label2";
             // 
+            // MeasureUnitsDataset
+            // 
+            this.MeasureUnitsDataset.DataSetName = "NewDataSet";
+            this.MeasureUnitsDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.MeasureUnitsDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.MeasureUnitTable});
+            // 
             // ViewSize
             // 
             this.Controls.Add(this.Precision);
@@ -140,6 +180,8 @@
             this.Controls.Add(this.label1);
             this.Name = "ViewSize";
             resources.ApplyResources(this, "$this");
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.MeasureUnitsDataset)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -167,7 +209,19 @@
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("Units", Units.Text);
+            if (Units.SelectedValue != null)
+                SetSettingValue("Units", (string)Units.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in MeasureUnitTable.Rows)
+                    if (string.Equals((string)r["Displayname"], Units.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("Units", (string)r["Value"]);
+                        return;
+                    }
+
+                SetSettingValue("Units", Units.Text);
+            }
 		}
 	}
 }

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewSize.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewSize.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/ViewSize.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,15 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Units.Items" xml:space="preserve">
-    <value>meters</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Units.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
-  <data name="Units.Items1" xml:space="preserve">
-    <value>miles</value>
-  </data>
-  <data name="Units.Items2" xml:space="preserve">
-    <value>none</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Units.Location" type="System.Drawing.Point, System.Drawing">
     <value>104, 56</value>
@@ -173,7 +168,6 @@
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Precision.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
@@ -270,16 +264,43 @@
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <metadata name="MeasureUnitsDataset.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.Size" type="System.Drawing.Size, System.Drawing">
     <value>616, 96</value>
   </data>
+  <data name="&gt;&gt;MeasureUnitTable.Name" xml:space="preserve">
+    <value>MeasureUnitTable</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn3.Name" xml:space="preserve">
+    <value>dataColumn3</value>
+  </data>
+  <data name="&gt;&gt;dataColumn3.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn4.Name" xml:space="preserve">
+    <value>dataColumn4</value>
+  </data>
+  <data name="&gt;&gt;dataColumn4.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitsDataset.Name" xml:space="preserve">
+    <value>MeasureUnitsDataset</value>
+  </data>
+  <data name="&gt;&gt;MeasureUnitsDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>ViewSize</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Zoom.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Zoom.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Zoom.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -33,17 +33,23 @@
 		private System.Windows.Forms.TextBox Factor;
 		private System.Windows.Forms.Label label2;
 		private System.Windows.Forms.ComboBox Direction;
-		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label1;
+        private System.Data.DataSet ZoomDirectionDataset;
+        private System.Data.DataTable ZoomDirectionTable;
+        private System.Data.DataColumn dataColumn5;
+        private System.Data.DataColumn dataColumn6;
 		private System.ComponentModel.IContainer components = null;
 
 		public Zoom()
 		{
 			// This call is required by the Windows Form Designer.
-			InitializeComponent();
+			InitializeComponent();
+
+            //Fill dataset
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.ZoomDirectionDataset))
+                ZoomDirectionDataset.ReadXml(sr);
+        }
 
-			// TODO: Add any initialization after the InitializeComponent call
-		}
-
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
@@ -68,8 +74,13 @@
 				this.Enabled = m_w != null;
 
 				Tolerance.Text = GetSettingValue("Tolerance"); 
-				Factor.Text = GetSettingValue("Factor"); 
-				Direction.Text = GetSettingValue("Direction"); 
+				Factor.Text = GetSettingValue("Factor");
+
+                Direction.SelectedIndex = -1;
+                Direction.SelectedValue = GetSettingValue("Direction");
+
+                if (Direction.SelectedIndex == -1)
+                    Direction.Text = GetSettingValue("Direction");
 			}
 			finally
 			{
@@ -90,7 +101,13 @@
             this.Factor = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.Direction = new System.Windows.Forms.ComboBox();
+            this.ZoomDirectionTable = new System.Data.DataTable();
+            this.dataColumn5 = new System.Data.DataColumn();
+            this.dataColumn6 = new System.Data.DataColumn();
             this.label1 = new System.Windows.Forms.Label();
+            this.ZoomDirectionDataset = new System.Data.DataSet();
+            ((System.ComponentModel.ISupportInitialize)(this.ZoomDirectionTable)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ZoomDirectionDataset)).BeginInit();
             this.SuspendLayout();
             // 
             // Tolerance
@@ -117,18 +134,43 @@
             // 
             // Direction
             // 
-            this.Direction.Items.AddRange(new object[] {
-            resources.GetString("Direction.Items"),
-            resources.GetString("Direction.Items1")});
             resources.ApplyResources(this.Direction, "Direction");
+            this.Direction.DataSource = this.ZoomDirectionTable;
+            this.Direction.DisplayMember = "Displayname";
             this.Direction.Name = "Direction";
+            this.Direction.ValueMember = "Value";
+            this.Direction.SelectedIndexChanged += new System.EventHandler(this.Direction_TextChanged);
             this.Direction.TextChanged += new System.EventHandler(this.Direction_TextChanged);
             // 
+            // ZoomDirectionTable
+            // 
+            this.ZoomDirectionTable.Columns.AddRange(new System.Data.DataColumn[] {
+            this.dataColumn5,
+            this.dataColumn6});
+            this.ZoomDirectionTable.TableName = "ZoomDirection";
+            // 
+            // dataColumn5
+            // 
+            this.dataColumn5.Caption = "Value";
+            this.dataColumn5.ColumnName = "Value";
+            // 
+            // dataColumn6
+            // 
+            this.dataColumn6.Caption = "DisplayName";
+            this.dataColumn6.ColumnName = "Displayname";
+            // 
             // label1
             // 
             resources.ApplyResources(this.label1, "label1");
             this.label1.Name = "label1";
             // 
+            // ZoomDirectionDataset
+            // 
+            this.ZoomDirectionDataset.DataSetName = "NewDataSet";
+            this.ZoomDirectionDataset.Locale = new System.Globalization.CultureInfo("da-DK");
+            this.ZoomDirectionDataset.Tables.AddRange(new System.Data.DataTable[] {
+            this.ZoomDirectionTable});
+            // 
             // Zoom
             // 
             this.Controls.Add(this.Tolerance);
@@ -139,6 +181,8 @@
             this.Controls.Add(this.label1);
             this.Name = "Zoom";
             resources.ApplyResources(this, "$this");
+            ((System.ComponentModel.ISupportInitialize)(this.ZoomDirectionTable)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ZoomDirectionDataset)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -166,7 +210,19 @@
 			if (m_isUpdating || m_w == null)
 				return;
 
-			SetSettingValue("Direction", Direction.Text);
+            if (Direction.SelectedValue != null)
+                SetSettingValue("Direction", (string)Direction.SelectedValue);
+            else
+            {
+                foreach (System.Data.DataRow r in ZoomDirectionTable.Rows)
+                    if (string.Equals((string)r["Displayname"], Direction.Text, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        SetSettingValue("Direction", (string)r["Value"]);
+                        return;
+                    }
+
+                SetSettingValue("Direction", Direction.Text);
+            }
 		}
 	}
 }

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Zoom.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Zoom.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/CustomizedEditors/Zoom.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -216,12 +216,9 @@
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="Direction.Items" xml:space="preserve">
-    <value>in</value>
+  <data name="Direction.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
-  <data name="Direction.Items1" xml:space="preserve">
-    <value>out</value>
-  </data>
   <data name="Direction.Location" type="System.Drawing.Point, System.Drawing">
     <value>104, 56</value>
   </data>
@@ -267,16 +264,43 @@
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
+  <metadata name="ZoomDirectionDataset.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.Size" type="System.Drawing.Size, System.Drawing">
     <value>616, 88</value>
   </data>
+  <data name="&gt;&gt;ZoomDirectionTable.Name" xml:space="preserve">
+    <value>ZoomDirectionTable</value>
+  </data>
+  <data name="&gt;&gt;ZoomDirectionTable.Type" xml:space="preserve">
+    <value>System.Data.DataTable, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn5.Name" xml:space="preserve">
+    <value>dataColumn5</value>
+  </data>
+  <data name="&gt;&gt;dataColumn5.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;dataColumn6.Name" xml:space="preserve">
+    <value>dataColumn6</value>
+  </data>
+  <data name="&gt;&gt;dataColumn6.Type" xml:space="preserve">
+    <value>System.Data.DataColumn, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ZoomDirectionDataset.Name" xml:space="preserve">
+    <value>ZoomDirectionDataset</value>
+  </data>
+  <data name="&gt;&gt;ZoomDirectionDataset.Type" xml:space="preserve">
+    <value>System.Data.DataSet, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Zoom</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4326, Culture=neutral, PublicKeyToken=null</value>
+    <value>OSGeo.MapGuide.Maestro.FusionEditor.BasisWidgetEditor, OSGeo.MapGuide.Maestro.FusionEditor, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Deleted: trunk/Tools/Maestro/Maestro/FusionEditor/Defaults.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Defaults.xml	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Defaults.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,975 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ApplicationDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="ApplicationDefinition-1.0.0.xsd">
-  <TemplateUrl>fusion/templates/mapguide/aqua/index.html</TemplateUrl>
-  <MapSet>
-    <MapGroup id="MainMap">
-      <Map>
-        <Type>MapGuide</Type>
-        <SingleTile>true</SingleTile>
-        <Extension>
-          <ResourceId></ResourceId>
-        </Extension>
-      </Map>
-      <Extension />
-    </MapGroup>
-  </MapSet>
-  <WidgetSet>
-    <Container xsi:type="UiItemContainerType">
-      <Name>Toolbar</Name>
-      <Type>Toolbar</Type>
-      <Position>top</Position>
-      <Extension />
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Help</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>About</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ViewOptions</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Print</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>SelectRadius</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>SelectPolygon</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>SelectWithin</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ClearSelection</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>BufferPanel</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Measure</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>RefreshMap</Widget>
-      </Item>
-    </Container>
-    <Container xsi:type="UiItemContainerType">
-      <Name>ToolbarSecondary</Name>
-      <Type>Toolbar</Type>
-      <Position>top</Position>
-      <Extension />
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Select</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Pan</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Zoom</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ZoomIn</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ZoomOut</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>InitialMapView</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>PreviousView</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>NextView</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ZoomToSelection</Widget>
-      </Item>
-    </Container>
-    <Container xsi:type="UiItemContainerType">
-      <Name>ToolbarVertical</Name>
-      <Type>Toolbar</Type>
-      <Position>left</Position>
-      <Extension />
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>SelectNoLabel</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>PanNoLabel</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ZoomNoLabel</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ZoomInNoLabel</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ZoomOutNoLabel</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>InitialMapViewNoabel</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>PreviousViewNoLabel</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>NextViewNoLabel</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ZoomToSelectionNoLabel</Widget>
-      </Item>
-    </Container>
-    <Container xsi:type="UiItemContainerType">
-      <Name>Statusbar</Name>
-      <Type>Toolbar</Type>
-      <Position>bottom</Position>
-      <Extension />
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>CursorPosition</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>EditableScale</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ViewSize</Widget>
-      </Item>
-    </Container>
-    <Container xsi:type="UiItemContainerType">
-      <Name>FileMenu</Name>
-      <Type>Toolbar</Type>
-      <Position>top</Position>
-      <Extension />
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>MapMenu</Widget>
-      </Item>
-      <Item xsi:type="FlyoutItemType">
-        <Function>Flyout</Function>
-        <Label>View</Label>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>ShowOverviewMap</Widget>
-        </Item>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>ShowTaskWindow</Widget>
-        </Item>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>ShowLegendWindow</Widget>
-        </Item>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>ShowSelectionWindow</Widget>
-        </Item>
-      </Item>
-    </Container>
-    <Container xsi:type="UiItemContainerType">
-      <Name>MapContextMenu</Name>
-      <Type>ContextMenu</Type>
-      <Position>top</Position>
-      <Extension />
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>RefreshMap</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Pan</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Zoom</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ZoomIn</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ZoomOut</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="FlyoutItemType">
-        <Function>Flyout</Function>
-        <Label>Zoom</Label>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>InitialMapView</Widget>
-        </Item>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>PreviousView</Widget>
-        </Item>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>NextView</Widget>
-        </Item>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>ZoomToSelection</Widget>
-        </Item>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Select</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>ClearSelection</Widget>
-      </Item>
-      <Item xsi:type="FlyoutItemType">
-        <Function>Flyout</Function>
-        <Label>Select More</Label>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>SelectRadius</Widget>
-        </Item>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>SelectPolygon</Widget>
-        </Item>
-        <Item xsi:type="WidgetItemType">
-          <Function>Widget</Function>
-          <Widget>SelectWithin</Widget>
-        </Item>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>BufferPanel</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Measure</Widget>
-      </Item>
-      <Item xsi:type="SeparatorItemType">
-        <Function>Separator</Function>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Help</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>About</Widget>
-      </Item>
-    </Container>
-    <Container xsi:type="UiItemContainerType">
-      <Name>TaskMenu</Name>
-      <Type>ContextMenu</Type>
-      <Position>top</Position>
-      <Extension />
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>BufferPanel</Widget>
-      </Item>
-      <Item xsi:type="WidgetItemType">
-        <Function>Widget</Function>
-        <Widget>Measure</Widget>
-      </Item>
-    </Container>
-    <MapWidget>
-      <Name>Map</Name>
-      <Type>Map</Type>
-      <Extension>
-        <MenuContainer>MapContextMenu</MenuContainer>
-      </Extension>
-      <MapId>MainMap</MapId>
-    </MapWidget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>About</Name>
-      <Type>About</Type>
-      <Location />
-      <Extension>
-        <AboutURL>/mapguide/mapadmin/about.php</AboutURL>
-      </Extension>
-      <ImageUrl>images/icons/about.png</ImageUrl>
-      <ImageClass />
-      <Label>About</Label>
-      <Tooltip>Click to show information about this application</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget>
-      <Name>ActivityIndicator</Name>
-      <Type>ActivityIndicator</Type>
-      <Location />
-      <Extension>
-        <ElementId />
-      </Extension>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>Buffer</Name>
-      <Type>Buffer</Type>
-      <Extension>
-        <BufferUnits>meters</BufferUnits>
-        <BorderColor>ff000000</BorderColor>
-        <BufferDistanceInput>BufferDistance</BufferDistanceInput>
-        <FillColor>33FF0000</FillColor>
-        <LayerName>Buffer</LayerName>
-        <FillColorInput>BufferFillColor</FillColorInput>
-        <BufferUnitsInput>BufferUnits</BufferUnitsInput>
-        <BorderColorInput>BufferBorderColor</BorderColorInput>
-        <LayerNameInput>BufferLayerName</LayerNameInput>
-        <BufferDistance>100</BufferDistance>
-      </Extension>
-      <ImageUrl>images/icons/buffer.png</ImageUrl>
-      <ImageClass />
-      <Label>Create a buffer</Label>
-      <Tooltip>Click to create a buffer</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>BufferPanel</Name>
-      <Type>BufferPanel</Type>
-      <Extension>
-        <Target />
-      </Extension>
-      <ImageUrl>images/icons/buffer.png</ImageUrl>
-      <ImageClass />
-      <Label>Create a buffer</Label>
-      <Tooltip>Click to create a buffer</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ClearSelection</Name>
-      <Type>ClearSelection</Type>
-      <Extension />
-      <ImageUrl>images/icons/select-clear.png</ImageUrl>
-      <ImageClass />
-      <Label>ClearSelection</Label>
-      <Tooltip>Click to clear the current selection</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget>
-      <Name>CursorPosition</Name>
-      <Type>CursorPosition</Type>
-      <Extension>
-        <Precision>4</Precision>
-        <Template>x: {x}, y: {y}</Template>
-        <Units>dd</Units>
-      </Extension>
-    </Widget>
-    <Widget>
-      <Name>EditableScale</Name>
-      <Type>EditableScale</Type>
-      <Extension>
-        <Precision>4</Precision>
-      </Extension>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>PreviousView</Name>
-      <Type>ExtentHistory</Type>
-      <Extension>
-        <Direction>Previous</Direction>
-      </Extension>
-      <ImageUrl>images/icons/view-back.png</ImageUrl>
-      <ImageClass />
-      <Label>Previous View</Label>
-      <Tooltip>Navigate to the previous extents</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>NextView</Name>
-      <Type>ExtentHistory</Type>
-      <Extension>
-        <Direction>Next</Direction>
-      </Extension>
-      <ImageUrl>images/icons/view-forward.png</ImageUrl>
-      <ImageClass />
-      <Label>Next View</Label>
-      <Tooltip>Navigate to the previous extents</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>Help</Name>
-      <Type>Help</Type>
-      <Location />
-      <Extension>
-        <Target>HelpWindow</Target>
-        <Url>fusion/widgets/Help/Help.html</Url>
-      </Extension>
-      <ImageUrl>images/icons/help.png</ImageUrl>
-      <ImageClass />
-      <Label>Help</Label>
-      <Tooltip>Click to get help</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>InitialMapView</Name>
-      <Type>InitialMapView</Type>
-      <Location />
-      <Extension />
-      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
-      <ImageClass />
-      <Label>Full Extent</Label>
-      <Tooltip>Click to zoom to the full map extents</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget>
-      <Name>Legend</Name>
-      <Type>Legend</Type>
-      <Location />
-      <Extension>
-        <HideInvisibleLayers>false</HideInvisibleLayers>
-        <ShowRootFolder>false</ShowRootFolder>
-        <DisabledLayerIcon>images/icons/legend-layer.png</DisabledLayerIcon>
-        <RootFolderIcon>images/icons/legend-map.png</RootFolderIcon>
-        <LayerThemeIcon>images/icons/legend-theme.png</LayerThemeIcon>
-        <LayerRasterIcon>images/icons/legend-raster.png</LayerRasterIcon>
-        <LayerInfoIcon>images/icons/tree_layer_info.png</LayerInfoIcon>
-        <GroupInfoIcon>images/icons/tree_group_info.png</GroupInfoIcon>
-      </Extension>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>MapMenu</Name>
-      <Type>MapMenu</Type>
-      <Location />
-      <Extension>
-        <Folder>Library://</Folder>
-      </Extension>
-      <ImageUrl>images/icons/map-manager.png</ImageUrl>
-      <ImageClass />
-      <Label>Map Menu</Label>
-      <Tooltip>Choose a map theme</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>Measure</Name>
-      <Type>Measure</Type>
-      <Location />
-      <Extension>
-        <DistancePrecision>2</DistancePrecision>
-        <MeasureTooltipContainer>MeasureContainerBox</MeasureTooltipContainer>
-        <MeasureTooltipType>static</MeasureTooltipType>
-        <MeasureTipPositionLeft>15</MeasureTipPositionLeft>
-        <Units>none</Units>
-        <LineStyleWidth>2</LineStyleWidth>
-        <MeasureTipPositionTop>100</MeasureTipPositionTop>
-        <LineStyleColor>rgba(0,0,255,0.3)</LineStyleColor>
-        <FillStyle>rgba(0,0,255, 0.3)</FillStyle>
-        <AreaPrecision>2</AreaPrecision>
-        <Type>Both</Type>
-      </Extension>
-      <ImageUrl>images/icons/measure.png</ImageUrl>
-      <ImageClass />
-      <Label>Measure</Label>
-      <Tooltip>Measure distances on the map</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget>
-      <Name>Navigator</Name>
-      <Type>Navigator</Type>
-      <Location />
-      <Extension />
-    </Widget>
-    <Widget>
-      <Name>OverviewMap</Name>
-      <Type>OverviewMap</Type>
-      <Location />
-      <Extension>
-        <MinRatio>32</MinRatio>
-        <MapId />
-        <MaxRatio>128</MaxRatio>
-      </Extension>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>Pan</Name>
-      <Type>Pan</Type>
-      <Location />
-      <Extension />
-      <ImageUrl>images/icons/pan.png</ImageUrl>
-      <ImageClass />
-      <Label>Pan</Label>
-      <Tooltip>Click and drag to pan the map</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>Print</Name>
-      <Type>Print</Type>
-      <Extension>
-        <ShowPrintUI>true</ShowPrintUI>
-        <ShowNorthArrow>false</ShowNorthArrow>
-        <PageTitle />
-        <ShowLegend>false</ShowLegend>
-        <ShowTitle>false</ShowTitle>
-      </Extension>
-      <ImageUrl>images/icons/file-print.png</ImageUrl>
-      <ImageClass />
-      <Label>Print</Label>
-      <Tooltip>Print the current map view</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>RefreshMap</Name>
-      <Type>RefreshMap</Type>
-      <Location />
-      <Extension />
-      <ImageUrl>images/icons/view-refresh.png</ImageUrl>
-      <ImageClass />
-      <Label>Refresh map</Label>
-      <Tooltip>Click to redraw the map</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>SaveMap</Name>
-      <Type>SaveMap</Type>
-      <Extension>
-        <Format>png</Format>
-        <Scale />
-      </Extension>
-      <ImageUrl>images/icons/file-save.png</ImageUrl>
-      <ImageClass />
-      <Label>Save map</Label>
-      <Tooltip>Click to save the map as an image</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>Select</Name>
-      <Type>Select</Type>
-      <Location />
-      <Extension>
-        <Tolerance>3</Tolerance>
-        <SelectionType>INTERSECTS</SelectionType>
-        <QueryActiveLayer>false</QueryActiveLayer>
-      </Extension>
-      <ImageUrl>images/icons/select.png</ImageUrl>
-      <ImageClass />
-      <Label>Select</Label>
-      <Tooltip>Click to select features</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget>
-      <Name>SelectionPanel</Name>
-      <Type>SelectionPanel</Type>
-      <Location />
-      <Extension />
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>SelectPolygon</Name>
-      <Type>SelectPolygon</Type>
-      <Location />
-      <Extension>
-        <Tolerance>3</Tolerance>
-        <SelectionType>INTERSECTS</SelectionType>
-      </Extension>
-      <ImageUrl>images/icons/select-polygon.png</ImageUrl>
-      <ImageClass />
-      <Label>Select polygon</Label>
-      <Tooltip>Draw a polygon to perform a selection</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>SelectRadius</Name>
-      <Type>SelectRadius</Type>
-      <Extension>
-        <Tolerance>3</Tolerance>
-        <RadiusTooltipType>dynamic</RadiusTooltipType>
-        <RadiusTooltipContainer />
-        <SelectionType>INTERSECTS</SelectionType>
-        <DefaultRadius>20</DefaultRadius>
-      </Extension>
-      <ImageUrl>images/icons/select-radius.png</ImageUrl>
-      <ImageClass />
-      <Label>Select by radius</Label>
-      <Tooltip>Click to select within a radius</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>SelectWithin</Name>
-      <Type>SelectWithin</Type>
-      <Location />
-      <Extension>
-        <AdditionalParameter />
-        <Target />
-        <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
-      </Extension>
-      <ImageUrl>images/icons/select-features.png</ImageUrl>
-      <ImageClass />
-      <Label>Select within</Label>
-      <Tooltip>Click to select features within this selection</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget>
-      <Name>TaskPane</Name>
-      <Type>TaskPane</Type>
-      <Location />
-      <Extension>
-        <MenuContainer>TaskMenu</MenuContainer>
-        <InitialTask />
-      </Extension>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ViewOptions</Name>
-      <Type>ViewOptions</Type>
-      <Location />
-      <Extension>
-        <DisplayUnits />
-      </Extension>
-      <ImageUrl />
-      <ImageClass />
-      <Label>ViewOptions</Label>
-      <Tooltip>Click to change the units displayed</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget>
-      <Name>ViewSize</Name>
-      <Type>ViewSize</Type>
-      <Location />
-      <Extension>
-        <Precision>-1</Precision>
-        <Template>x: {x}, y: {y}</Template>
-        <Units>none</Units>
-      </Extension>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>Zoom</Name>
-      <Type>Zoom</Type>
-      <Extension>
-        <Tolerance>5</Tolerance>
-        <Factor>2</Factor>
-        <Direction>in</Direction>
-      </Extension>
-      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
-      <ImageClass />
-      <Label>Zoom</Label>
-      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
-      <StatusText>Click or click and drag on the map to zoom in</StatusText>
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ZoomOut</Name>
-      <Type>ZoomOnClick</Type>
-      <Location />
-      <Extension>
-        <Factor>0.5</Factor>
-      </Extension>
-      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
-      <ImageClass />
-      <Label>Zoom Out</Label>
-      <Tooltip>Click to zoom in</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ZoomIn</Name>
-      <Type>ZoomOnClick</Type>
-      <Location />
-      <Extension>
-        <Factor>2.0</Factor>
-      </Extension>
-      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
-      <ImageClass />
-      <Label>Zoom In</Label>
-      <Tooltip>Click to zoom in</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ZoomToSelection</Name>
-      <Type>ZoomToSelection</Type>
-      <Location />
-      <Extension>
-        <MaximumZoomDimension>-1</MaximumZoomDimension>
-        <ZoomFactor>2</ZoomFactor>
-      </Extension>
-      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
-      <ImageClass />
-      <Label>Zoom to selection</Label>
-      <Tooltip>Click to zoom to the selection</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>InitialMapViewNoabel</Name>
-      <Type>InitialMapView</Type>
-      <Location />
-      <Extension />
-      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
-      <ImageClass />
-      <Label />
-      <Tooltip>Click to zoom to the full map extents</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>NextViewNoLabel</Name>
-      <Type>ExtentHistory</Type>
-      <Extension>
-        <Direction>Next</Direction>
-      </Extension>
-      <ImageUrl>images/icons/view-forward.png</ImageUrl>
-      <ImageClass />
-      <Label />
-      <Tooltip>Navigate to the previous extents</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>PanNoLabel</Name>
-      <Type>Pan</Type>
-      <Location />
-      <Extension />
-      <ImageUrl>images/icons/pan.png</ImageUrl>
-      <ImageClass />
-      <Label />
-      <Tooltip>Click and drag to pan the map</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>PreviousViewNoLabel</Name>
-      <Type>ExtentHistory</Type>
-      <Extension>
-        <Direction>Previous</Direction>
-      </Extension>
-      <ImageUrl>images/icons/view-back.png</ImageUrl>
-      <ImageClass />
-      <Label />
-      <Tooltip>Navigate to the previous extents</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>SelectNoLabel</Name>
-      <Type>Select</Type>
-      <Location />
-      <Extension>
-        <Tolerance>3</Tolerance>
-        <SelectionType>INTERSECTS</SelectionType>
-        <QueryActiveLayer>false</QueryActiveLayer>
-      </Extension>
-      <ImageUrl>images/icons/select.png</ImageUrl>
-      <ImageClass />
-      <Label />
-      <Tooltip>Click to select features</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ZoomNoLabel</Name>
-      <Type>Zoom</Type>
-      <Extension>
-        <Tolerance>5</Tolerance>
-        <Factor>2</Factor>
-        <Direction>in</Direction>
-      </Extension>
-      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
-      <ImageClass />
-      <Label />
-      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
-      <StatusText>Click or click and drag on the map to zoom in</StatusText>
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ZoomInNoLabel</Name>
-      <Type>ZoomOnClick</Type>
-      <Location />
-      <Extension>
-        <Factor>2.0</Factor>
-      </Extension>
-      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
-      <ImageClass />
-      <Label />
-      <Tooltip>Click to zoom in</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ZoomOutNoLabel</Name>
-      <Type>ZoomOnClick</Type>
-      <Location />
-      <Extension>
-        <Factor>0.5</Factor>
-      </Extension>
-      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
-      <ImageClass />
-      <Label />
-      <Tooltip>Click to zoom in</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ZoomToSelectionNoLabel</Name>
-      <Type>ZoomToSelection</Type>
-      <Location />
-      <Extension>
-        <MaximumZoomDimension>-1</MaximumZoomDimension>
-        <ZoomFactor>2</ZoomFactor>
-      </Extension>
-      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
-      <ImageClass />
-      <Label />
-      <Tooltip>Click to zoom to the selection</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>StatusOverviewMap</Name>
-      <Type>InvokeScript</Type>
-      <Location />
-      <Extension>
-        <Script>showOverviewMapDialog()</Script>
-        <Target />
-      </Extension>
-      <ImageUrl>images/iconNavigator.gif</ImageUrl>
-      <ImageClass />
-      <Label>Invoke script</Label>
-      <Tooltip>Display the overview map window</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ShowOverviewMap</Name>
-      <Type>InvokeScript</Type>
-      <Location />
-      <Extension>
-        <Script>showOverviewMapDialog()</Script>
-        <Target />
-      </Extension>
-      <ImageUrl />
-      <ImageClass />
-      <Label>Show Overview Map</Label>
-      <Tooltip>Display the overview map window</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ShowTaskWindow</Name>
-      <Type>InvokeScript</Type>
-      <Location />
-      <Extension>
-        <Script>showTaskDialog()</Script>
-        <Target />
-      </Extension>
-      <ImageUrl />
-      <ImageClass />
-      <Label>Show Task Pane</Label>
-      <Tooltip>Display the task pane window</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ShowLegendWindow</Name>
-      <Type>InvokeScript</Type>
-      <Location />
-      <Extension>
-        <Script>showLegendDialog()</Script>
-        <Target />
-      </Extension>
-      <ImageUrl />
-      <ImageClass />
-      <Label>Show Legend</Label>
-      <Tooltip>Display the legend window</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-    <Widget xsi:type="UiWidgetType">
-      <Name>ShowSelectionWindow</Name>
-      <Type>InvokeScript</Type>
-      <Location />
-      <Extension>
-        <Script>showSelectionDialog()</Script>
-        <Target />
-      </Extension>
-      <ImageUrl />
-      <ImageClass />
-      <Label>Show Selection Window</Label>
-      <Tooltip>Display the selection window</Tooltip>
-      <StatusText />
-      <Disabled>false</Disabled>
-    </Widget>
-  </WidgetSet>
-  <Extension />
-</ApplicationDefinition>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/EditWidgets.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/EditWidgets.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/EditWidgets.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -93,7 +93,8 @@
 			//
 			InitializeComponent();
 			System.Xml.Serialization.XmlSerializer sr = new System.Xml.Serialization.XmlSerializer(typeof(OSGeo.MapGuide.MaestroAPI.ApplicationDefinition.ApplicationDefinitionType));
-			m_defaultWidgets = ((OSGeo.MapGuide.MaestroAPI.ApplicationDefinition.ApplicationDefinitionType)sr.Deserialize(System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(this.GetType(), "Defaults.xml"))).WidgetSet[0].Widget;
+            using(System.IO.StringReader rd = new System.IO.StringReader(Properties.Resources.Defaults)) 
+			    m_defaultWidgets = ((OSGeo.MapGuide.MaestroAPI.ApplicationDefinition.ApplicationDefinitionType)sr.Deserialize(rd)).WidgetSet[0].Widget;
 			widgetEditor.DefaultWidgets = m_defaultWidgets;
 			widgetEditorUI.DefaultWidgets = m_defaultWidgets;
 
@@ -629,8 +630,10 @@
 				{
 					if (c.Name == wt.Type)
 					{
-						c.Dock = DockStyle.Fill;
-						c.Visible = true;
+                        //HACK: Setting the width cures a bug where the colorpickers have length 0 until resized
+                        c.Width = this.Width;
+                        c.Dock = DockStyle.Fill;
+                        c.Visible = true;
 						c.SetItem(wt);
 					}
 					else

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/FusionEditor.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/FusionEditor.csproj	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/FusionEditor.csproj	2009-12-21 20:40:24 UTC (rev 4454)
@@ -244,7 +244,6 @@
       <DependentUpon>CustomPropertiesEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Defaults.xml" />
     <EmbeddedResource Include="EditWidgets.resx">
       <DependentUpon>EditWidgets.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -443,6 +442,30 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Defaults.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\DirectionTypeDataset.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GeometryOperationTypeDataset.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\MeasureTypeDataset.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\MeasureUnitsDataset.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\PositionTypesDataset.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TooltipTypeDataset.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ZoomDirectionDataset.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/GenericWidgetExtensions.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/GenericWidgetExtensions.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/GenericWidgetExtensions.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -87,6 +87,8 @@
 					r["Value"] = n.InnerXml;
 					ExtensionTable.Rows.Add(r);
 				}
+
+                this.DataSource = ExtensionTable;
 			}
 			finally
 			{

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Properties/Resources.Designer.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Properties/Resources.Designer.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3082
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -59,5 +59,186 @@
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;ApplicationDefinition xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xmlns:xsd=&quot;http://www.w3.org/2001/XMLSchema&quot; xsi:noNamespaceSchemaLocation=&quot;ApplicationDefinition-1.0.0.xsd&quot;&gt;
+        ///  &lt;TemplateUrl&gt;fusion/templates/mapguide/aqua/index.html&lt;/TemplateUrl&gt;
+        ///  &lt;MapSet&gt;
+        ///    &lt;MapGroup id=&quot;MainMap&quot;&gt;
+        ///      &lt;Map&gt;
+        ///        &lt;Type&gt;MapGuide&lt;/Type&gt;
+        ///        &lt;SingleTile&gt;true&lt;/SingleTile&gt;
+        ///        &lt;Extension&gt;
+        ///          &lt;ResourceId&gt;&lt;/ResourceId&gt;
+        ///        &lt;/Extension&gt;
+        ///      &lt;/ [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string Defaults {
+            get {
+                return ResourceManager.GetString("Defaults", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
+        ///&lt;DirectionTypeDataset&gt;
+        ///	&lt;DirectionUnit&gt;
+        ///		&lt;Value&gt;Previous&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Previous&lt;/Displayname&gt;
+        ///	&lt;/DirectionUnit&gt;
+        ///
+        ///	&lt;DirectionUnit&gt;
+        ///		&lt;Value&gt;Next&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Next&lt;/Displayname&gt;
+        ///	&lt;/DirectionUnit&gt;
+        ///
+        ///&lt;/DirectionTypeDataset&gt;.
+        /// </summary>
+        internal static string DirectionTypeDataset {
+            get {
+                return ResourceManager.GetString("DirectionTypeDataset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
+        ///&lt;GeometryOperationTypeDataset&gt;
+        ///	&lt;GeometryOperationType&gt;
+        ///		&lt;Value&gt;CONTAINS&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Contains&lt;/Displayname&gt;
+        ///	&lt;/GeometryOperationType&gt;
+        ///
+        ///	&lt;GeometryOperationType&gt;
+        ///		&lt;Value&gt;DISJOINT&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Disjoint&lt;/Displayname&gt;
+        ///	&lt;/GeometryOperationType&gt;
+        ///
+        ///	&lt;GeometryOperationType&gt;
+        ///		&lt;Value&gt;INTERSECTS&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Intersects&lt;/Displayname&gt;
+        ///	&lt;/GeometryOperationType&gt;
+        ///
+        ///	&lt;GeometryOperationType&gt;
+        ///		&lt;Value&gt;WITHIN&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Within [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string GeometryOperationTypeDataset {
+            get {
+                return ResourceManager.GetString("GeometryOperationTypeDataset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
+        ///&lt;MeasureTypeDataset&gt;
+        ///	&lt;MeasureType&gt;
+        ///		&lt;Value&gt;both&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Both&lt;/Displayname&gt;
+        ///	&lt;/MeasureType&gt;
+        ///&lt;/MeasureTypeDataset&gt;.
+        /// </summary>
+        internal static string MeasureTypeDataset {
+            get {
+                return ResourceManager.GetString("MeasureTypeDataset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
+        ///&lt;MeasureUnitsDataset&gt;
+        ///	&lt;MeasureUnit&gt;
+        ///		&lt;Value&gt;meters&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Meters&lt;/Displayname&gt;
+        ///	&lt;/MeasureUnit&gt;
+        ///
+        ///	&lt;MeasureUnit&gt;
+        ///		&lt;Value&gt;miles&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Miles&lt;/Displayname&gt;
+        ///	&lt;/MeasureUnit&gt;
+        ///
+        ///	&lt;MeasureUnit&gt;
+        ///		&lt;Value&gt;none&lt;/Value&gt;
+        ///		&lt;Displayname&gt;None&lt;/Displayname&gt;
+        ///	&lt;/MeasureUnit&gt;
+        ///&lt;/MeasureUnitsDataset&gt;.
+        /// </summary>
+        internal static string MeasureUnitsDataset {
+            get {
+                return ResourceManager.GetString("MeasureUnitsDataset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
+        ///&lt;PositionTypesDataset&gt;
+        ///	&lt;Position&gt;
+        ///		&lt;Value&gt;top&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Top&lt;/Displayname&gt;
+        ///	&lt;/Position&gt;
+        ///
+        ///	&lt;Position&gt;
+        ///		&lt;Value&gt;left&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Left&lt;/Displayname&gt;
+        ///	&lt;/Position&gt;
+        ///
+        ///	&lt;Position&gt;
+        ///		&lt;Value&gt;right&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Right&lt;/Displayname&gt;
+        ///	&lt;/Position&gt;
+        ///
+        ///	&lt;Position&gt;
+        ///		&lt;Value&gt;bottom&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Bottom&lt;/Displayname&gt;
+        ///	&lt;/Position&gt;
+        ///&lt;/PositionTypesDataset&gt;.
+        /// </summary>
+        internal static string PositionTypesDataset {
+            get {
+                return ResourceManager.GetString("PositionTypesDataset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
+        ///&lt;TooltipTypeDataset&gt;
+        ///	&lt;TooltipType&gt;
+        ///		&lt;Value&gt;static&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Static&lt;/Displayname&gt;
+        ///	&lt;/TooltipType&gt;
+        ///
+        ///	&lt;TooltipType&gt;
+        ///		&lt;Value&gt;dynamic&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Dynamic&lt;/Displayname&gt;
+        ///	&lt;/TooltipType&gt;
+        ///
+        ///&lt;/TooltipTypeDataset&gt;.
+        /// </summary>
+        internal static string TooltipTypeDataset {
+            get {
+                return ResourceManager.GetString("TooltipTypeDataset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
+        ///&lt;ZoomDirectionDataset&gt;
+        ///	&lt;ZoomDirection&gt;
+        ///		&lt;Value&gt;in&lt;/Value&gt;
+        ///		&lt;Displayname&gt;In&lt;/Displayname&gt;
+        ///	&lt;/ZoomDirection&gt;
+        ///
+        ///	&lt;ZoomDirection&gt;
+        ///		&lt;Value&gt;out&lt;/Value&gt;
+        ///		&lt;Displayname&gt;Out&lt;/Displayname&gt;
+        ///	&lt;/ZoomDirection&gt;
+        ///
+        ///&lt;/ZoomDirectionDataset&gt;.
+        /// </summary>
+        internal static string ZoomDirectionDataset {
+            get {
+                return ResourceManager.GetString("ZoomDirectionDataset", resourceCulture);
+            }
+        }
     }
 }

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Properties/Resources.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Properties/Resources.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,4 +117,29 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Defaults" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Defaults.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="DirectionTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DirectionTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="GeometryOperationTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GeometryOperationTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="MeasureTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MeasureTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="MeasureUnitsDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MeasureUnitsDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="PositionTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PositionTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="TooltipTypeDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TooltipTypeDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="ZoomDirectionDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ZoomDirectionDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro/FusionEditor/Resources/Defaults.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Resources/Defaults.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Resources/Defaults.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,975 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="ApplicationDefinition-1.0.0.xsd">
+  <TemplateUrl>fusion/templates/mapguide/aqua/index.html</TemplateUrl>
+  <MapSet>
+    <MapGroup id="MainMap">
+      <Map>
+        <Type>MapGuide</Type>
+        <SingleTile>true</SingleTile>
+        <Extension>
+          <ResourceId></ResourceId>
+        </Extension>
+      </Map>
+      <Extension />
+    </MapGroup>
+  </MapSet>
+  <WidgetSet>
+    <Container xsi:type="UiItemContainerType">
+      <Name>Toolbar</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Help</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>About</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ViewOptions</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Print</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectRadius</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectPolygon</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectWithin</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ClearSelection</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>RefreshMap</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>ToolbarSecondary</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Select</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Pan</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Zoom</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomIn</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOut</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>InitialMapView</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PreviousView</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>NextView</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomToSelection</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>ToolbarVertical</Name>
+      <Type>Toolbar</Type>
+      <Position>left</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>SelectNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PanNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomInNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOutNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>InitialMapViewNoabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>PreviousViewNoLabel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>NextViewNoLabel</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomToSelectionNoLabel</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>Statusbar</Name>
+      <Type>Toolbar</Type>
+      <Position>bottom</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>CursorPosition</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>EditableScale</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ViewSize</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>FileMenu</Name>
+      <Type>Toolbar</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>MapMenu</Widget>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>View</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowOverviewMap</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowTaskWindow</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowLegendWindow</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ShowSelectionWindow</Widget>
+        </Item>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>MapContextMenu</Name>
+      <Type>ContextMenu</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>RefreshMap</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Pan</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Zoom</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomIn</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ZoomOut</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>Zoom</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>InitialMapView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>PreviousView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>NextView</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>ZoomToSelection</Widget>
+        </Item>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Select</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>ClearSelection</Widget>
+      </Item>
+      <Item xsi:type="FlyoutItemType">
+        <Function>Flyout</Function>
+        <Label>Select More</Label>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectRadius</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectPolygon</Widget>
+        </Item>
+        <Item xsi:type="WidgetItemType">
+          <Function>Widget</Function>
+          <Widget>SelectWithin</Widget>
+        </Item>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+      <Item xsi:type="SeparatorItemType">
+        <Function>Separator</Function>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Help</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>About</Widget>
+      </Item>
+    </Container>
+    <Container xsi:type="UiItemContainerType">
+      <Name>TaskMenu</Name>
+      <Type>ContextMenu</Type>
+      <Position>top</Position>
+      <Extension />
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>BufferPanel</Widget>
+      </Item>
+      <Item xsi:type="WidgetItemType">
+        <Function>Widget</Function>
+        <Widget>Measure</Widget>
+      </Item>
+    </Container>
+    <MapWidget>
+      <Name>Map</Name>
+      <Type>Map</Type>
+      <Extension>
+        <MenuContainer>MapContextMenu</MenuContainer>
+      </Extension>
+      <MapId>MainMap</MapId>
+    </MapWidget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>About</Name>
+      <Type>About</Type>
+      <Location />
+      <Extension>
+        <AboutURL>/mapguide/mapadmin/about.php</AboutURL>
+      </Extension>
+      <ImageUrl>images/icons/about.png</ImageUrl>
+      <ImageClass />
+      <Label>About</Label>
+      <Tooltip>Click to show information about this application</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>ActivityIndicator</Name>
+      <Type>ActivityIndicator</Type>
+      <Location />
+      <Extension>
+        <ElementId />
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Buffer</Name>
+      <Type>Buffer</Type>
+      <Extension>
+        <BufferUnits>meters</BufferUnits>
+        <BorderColor>ff000000</BorderColor>
+        <BufferDistanceInput>BufferDistance</BufferDistanceInput>
+        <FillColor>33FF0000</FillColor>
+        <LayerName>Buffer</LayerName>
+        <FillColorInput>BufferFillColor</FillColorInput>
+        <BufferUnitsInput>BufferUnits</BufferUnitsInput>
+        <BorderColorInput>BufferBorderColor</BorderColorInput>
+        <LayerNameInput>BufferLayerName</LayerNameInput>
+        <BufferDistance>100</BufferDistance>
+      </Extension>
+      <ImageUrl>images/icons/buffer.png</ImageUrl>
+      <ImageClass />
+      <Label>Create a buffer</Label>
+      <Tooltip>Click to create a buffer</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>BufferPanel</Name>
+      <Type>BufferPanel</Type>
+      <Extension>
+        <Target />
+      </Extension>
+      <ImageUrl>images/icons/buffer.png</ImageUrl>
+      <ImageClass />
+      <Label>Create a buffer</Label>
+      <Tooltip>Click to create a buffer</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ClearSelection</Name>
+      <Type>ClearSelection</Type>
+      <Extension />
+      <ImageUrl>images/icons/select-clear.png</ImageUrl>
+      <ImageClass />
+      <Label>ClearSelection</Label>
+      <Tooltip>Click to clear the current selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>CursorPosition</Name>
+      <Type>CursorPosition</Type>
+      <Extension>
+        <Precision>4</Precision>
+        <Template>x: {x}, y: {y}</Template>
+        <Units>dd</Units>
+      </Extension>
+    </Widget>
+    <Widget>
+      <Name>EditableScale</Name>
+      <Type>EditableScale</Type>
+      <Extension>
+        <Precision>4</Precision>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PreviousView</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Previous</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-back.png</ImageUrl>
+      <ImageClass />
+      <Label>Previous View</Label>
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>NextView</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Next</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-forward.png</ImageUrl>
+      <ImageClass />
+      <Label>Next View</Label>
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Help</Name>
+      <Type>Help</Type>
+      <Location />
+      <Extension>
+        <Target>HelpWindow</Target>
+        <Url>fusion/widgets/Help/Help.html</Url>
+      </Extension>
+      <ImageUrl>images/icons/help.png</ImageUrl>
+      <ImageClass />
+      <Label>Help</Label>
+      <Tooltip>Click to get help</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>InitialMapView</Name>
+      <Type>InitialMapView</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
+      <ImageClass />
+      <Label>Full Extent</Label>
+      <Tooltip>Click to zoom to the full map extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>Legend</Name>
+      <Type>Legend</Type>
+      <Location />
+      <Extension>
+        <HideInvisibleLayers>false</HideInvisibleLayers>
+        <ShowRootFolder>false</ShowRootFolder>
+        <DisabledLayerIcon>images/icons/legend-layer.png</DisabledLayerIcon>
+        <RootFolderIcon>images/icons/legend-map.png</RootFolderIcon>
+        <LayerThemeIcon>images/icons/legend-theme.png</LayerThemeIcon>
+        <LayerRasterIcon>images/icons/legend-raster.png</LayerRasterIcon>
+        <LayerInfoIcon>images/icons/tree_layer_info.png</LayerInfoIcon>
+        <GroupInfoIcon>images/icons/tree_group_info.png</GroupInfoIcon>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>MapMenu</Name>
+      <Type>MapMenu</Type>
+      <Location />
+      <Extension>
+        <Folder>Library://</Folder>
+      </Extension>
+      <ImageUrl>images/icons/map-manager.png</ImageUrl>
+      <ImageClass />
+      <Label>Map Menu</Label>
+      <Tooltip>Choose a map theme</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Measure</Name>
+      <Type>Measure</Type>
+      <Location />
+      <Extension>
+        <DistancePrecision>2</DistancePrecision>
+        <MeasureTooltipContainer>MeasureContainerBox</MeasureTooltipContainer>
+        <MeasureTooltipType>static</MeasureTooltipType>
+        <MeasureTipPositionLeft>15</MeasureTipPositionLeft>
+        <Units>none</Units>
+        <LineStyleWidth>2</LineStyleWidth>
+        <MeasureTipPositionTop>100</MeasureTipPositionTop>
+        <LineStyleColor>rgba(0,0,255,0.3)</LineStyleColor>
+        <FillStyle>rgba(0,0,255, 0.3)</FillStyle>
+        <AreaPrecision>2</AreaPrecision>
+        <Type>Both</Type>
+      </Extension>
+      <ImageUrl>images/icons/measure.png</ImageUrl>
+      <ImageClass />
+      <Label>Measure</Label>
+      <Tooltip>Measure distances on the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>Navigator</Name>
+      <Type>Navigator</Type>
+      <Location />
+      <Extension />
+    </Widget>
+    <Widget>
+      <Name>OverviewMap</Name>
+      <Type>OverviewMap</Type>
+      <Location />
+      <Extension>
+        <MinRatio>32</MinRatio>
+        <MapId />
+        <MaxRatio>128</MaxRatio>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Pan</Name>
+      <Type>Pan</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/pan.png</ImageUrl>
+      <ImageClass />
+      <Label>Pan</Label>
+      <Tooltip>Click and drag to pan the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Print</Name>
+      <Type>Print</Type>
+      <Extension>
+        <ShowPrintUI>true</ShowPrintUI>
+        <ShowNorthArrow>false</ShowNorthArrow>
+        <PageTitle />
+        <ShowLegend>false</ShowLegend>
+        <ShowTitle>false</ShowTitle>
+      </Extension>
+      <ImageUrl>images/icons/file-print.png</ImageUrl>
+      <ImageClass />
+      <Label>Print</Label>
+      <Tooltip>Print the current map view</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>RefreshMap</Name>
+      <Type>RefreshMap</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/view-refresh.png</ImageUrl>
+      <ImageClass />
+      <Label>Refresh map</Label>
+      <Tooltip>Click to redraw the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SaveMap</Name>
+      <Type>SaveMap</Type>
+      <Extension>
+        <Format>png</Format>
+        <Scale />
+      </Extension>
+      <ImageUrl>images/icons/file-save.png</ImageUrl>
+      <ImageClass />
+      <Label>Save map</Label>
+      <Tooltip>Click to save the map as an image</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Select</Name>
+      <Type>Select</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+        <QueryActiveLayer>false</QueryActiveLayer>
+      </Extension>
+      <ImageUrl>images/icons/select.png</ImageUrl>
+      <ImageClass />
+      <Label>Select</Label>
+      <Tooltip>Click to select features</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>SelectionPanel</Name>
+      <Type>SelectionPanel</Type>
+      <Location />
+      <Extension />
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectPolygon</Name>
+      <Type>SelectPolygon</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+      </Extension>
+      <ImageUrl>images/icons/select-polygon.png</ImageUrl>
+      <ImageClass />
+      <Label>Select polygon</Label>
+      <Tooltip>Draw a polygon to perform a selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectRadius</Name>
+      <Type>SelectRadius</Type>
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <RadiusTooltipType>dynamic</RadiusTooltipType>
+        <RadiusTooltipContainer />
+        <SelectionType>INTERSECTS</SelectionType>
+        <DefaultRadius>20</DefaultRadius>
+      </Extension>
+      <ImageUrl>images/icons/select-radius.png</ImageUrl>
+      <ImageClass />
+      <Label>Select by radius</Label>
+      <Tooltip>Click to select within a radius</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectWithin</Name>
+      <Type>SelectWithin</Type>
+      <Location />
+      <Extension>
+        <AdditionalParameter />
+        <Target />
+        <DisableIfSelectionEmpty>false</DisableIfSelectionEmpty>
+      </Extension>
+      <ImageUrl>images/icons/select-features.png</ImageUrl>
+      <ImageClass />
+      <Label>Select within</Label>
+      <Tooltip>Click to select features within this selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>TaskPane</Name>
+      <Type>TaskPane</Type>
+      <Location />
+      <Extension>
+        <MenuContainer>TaskMenu</MenuContainer>
+        <InitialTask />
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ViewOptions</Name>
+      <Type>ViewOptions</Type>
+      <Location />
+      <Extension>
+        <DisplayUnits />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>ViewOptions</Label>
+      <Tooltip>Click to change the units displayed</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget>
+      <Name>ViewSize</Name>
+      <Type>ViewSize</Type>
+      <Location />
+      <Extension>
+        <Precision>-1</Precision>
+        <Template>x: {x}, y: {y}</Template>
+        <Units>none</Units>
+      </Extension>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>Zoom</Name>
+      <Type>Zoom</Type>
+      <Extension>
+        <Tolerance>5</Tolerance>
+        <Factor>2</Factor>
+        <Direction>in</Direction>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom</Label>
+      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
+      <StatusText>Click or click and drag on the map to zoom in</StatusText>
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomOut</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>0.5</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom Out</Label>
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomIn</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>2.0</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom In</Label>
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomToSelection</Name>
+      <Type>ZoomToSelection</Type>
+      <Location />
+      <Extension>
+        <MaximumZoomDimension>-1</MaximumZoomDimension>
+        <ZoomFactor>2</ZoomFactor>
+      </Extension>
+      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
+      <ImageClass />
+      <Label>Zoom to selection</Label>
+      <Tooltip>Click to zoom to the selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>InitialMapViewNoabel</Name>
+      <Type>InitialMapView</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/zoom-full.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom to the full map extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>NextViewNoLabel</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Next</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-forward.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PanNoLabel</Name>
+      <Type>Pan</Type>
+      <Location />
+      <Extension />
+      <ImageUrl>images/icons/pan.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click and drag to pan the map</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>PreviousViewNoLabel</Name>
+      <Type>ExtentHistory</Type>
+      <Extension>
+        <Direction>Previous</Direction>
+      </Extension>
+      <ImageUrl>images/icons/view-back.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Navigate to the previous extents</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>SelectNoLabel</Name>
+      <Type>Select</Type>
+      <Location />
+      <Extension>
+        <Tolerance>3</Tolerance>
+        <SelectionType>INTERSECTS</SelectionType>
+        <QueryActiveLayer>false</QueryActiveLayer>
+      </Extension>
+      <ImageUrl>images/icons/select.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to select features</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomNoLabel</Name>
+      <Type>Zoom</Type>
+      <Extension>
+        <Tolerance>5</Tolerance>
+        <Factor>2</Factor>
+        <Direction>in</Direction>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click or click and drag on the map to zoom in</Tooltip>
+      <StatusText>Click or click and drag on the map to zoom in</StatusText>
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomInNoLabel</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>2.0</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-in-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomOutNoLabel</Name>
+      <Type>ZoomOnClick</Type>
+      <Location />
+      <Extension>
+        <Factor>0.5</Factor>
+      </Extension>
+      <ImageUrl>images/icons/zoom-out-fixed.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom in</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ZoomToSelectionNoLabel</Name>
+      <Type>ZoomToSelection</Type>
+      <Location />
+      <Extension>
+        <MaximumZoomDimension>-1</MaximumZoomDimension>
+        <ZoomFactor>2</ZoomFactor>
+      </Extension>
+      <ImageUrl>images/icons/select-zoom.png</ImageUrl>
+      <ImageClass />
+      <Label />
+      <Tooltip>Click to zoom to the selection</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>StatusOverviewMap</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showOverviewMapDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl>images/iconNavigator.gif</ImageUrl>
+      <ImageClass />
+      <Label>Invoke script</Label>
+      <Tooltip>Display the overview map window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowOverviewMap</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showOverviewMapDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Overview Map</Label>
+      <Tooltip>Display the overview map window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowTaskWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showTaskDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Task Pane</Label>
+      <Tooltip>Display the task pane window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowLegendWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showLegendDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Legend</Label>
+      <Tooltip>Display the legend window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+    <Widget xsi:type="UiWidgetType">
+      <Name>ShowSelectionWindow</Name>
+      <Type>InvokeScript</Type>
+      <Location />
+      <Extension>
+        <Script>showSelectionDialog()</Script>
+        <Target />
+      </Extension>
+      <ImageUrl />
+      <ImageClass />
+      <Label>Show Selection Window</Label>
+      <Tooltip>Display the selection window</Tooltip>
+      <StatusText />
+      <Disabled>false</Disabled>
+    </Widget>
+  </WidgetSet>
+  <Extension />
+</ApplicationDefinition>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Resources/DirectionTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<DirectionTypeDataset>
+	<DirectionUnit>
+		<Value>Previous</Value>
+		<Displayname>Previous</Displayname>
+	</DirectionUnit>
+
+	<DirectionUnit>
+		<Value>Next</Value>
+		<Displayname>Next</Displayname>
+	</DirectionUnit>
+
+</DirectionTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Resources/GeometryOperationTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<GeometryOperationTypeDataset>
+	<GeometryOperationType>
+		<Value>CONTAINS</Value>
+		<Displayname>Contains</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>DISJOINT</Value>
+		<Displayname>Disjoint</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>INTERSECTS</Value>
+		<Displayname>Intersects</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>WITHIN</Value>
+		<Displayname>Within</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>INSIDE</Value>
+		<Displayname>Inside</Displayname>
+	</GeometryOperationType>
+
+	<GeometryOperationType>
+		<Value>ENVELOPEINTERSECTS</Value>
+		<Displayname>Envelope intersects</Displayname>
+	</GeometryOperationType>
+</GeometryOperationTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Resources/MeasureTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MeasureTypeDataset>
+	<MeasureType>
+		<Value>both</Value>
+		<Displayname>Both</Displayname>
+	</MeasureType>
+</MeasureTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Resources/MeasureUnitsDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MeasureUnitsDataset>
+	<MeasureUnit>
+		<Value>meters</Value>
+		<Displayname>Meters</Displayname>
+	</MeasureUnit>
+
+	<MeasureUnit>
+		<Value>miles</Value>
+		<Displayname>Miles</Displayname>
+	</MeasureUnit>
+
+	<MeasureUnit>
+		<Value>none</Value>
+		<Displayname>None</Displayname>
+	</MeasureUnit>
+
+  <MeasureUnit>
+    <Value>degrees</Value>
+    <Displayname>Degrees</Displayname>
+  </MeasureUnit>
+</MeasureUnitsDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro/FusionEditor/Resources/PositionTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Resources/PositionTypesDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Resources/PositionTypesDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<PositionTypesDataset>
+	<Position>
+		<Value>top</Value>
+		<Displayname>Top</Displayname>
+	</Position>
+
+	<Position>
+		<Value>left</Value>
+		<Displayname>Left</Displayname>
+	</Position>
+
+	<Position>
+		<Value>right</Value>
+		<Displayname>Right</Displayname>
+	</Position>
+
+	<Position>
+		<Value>bottom</Value>
+		<Displayname>Bottom</Displayname>
+	</Position>
+</PositionTypesDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Resources/TooltipTypeDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<TooltipTypeDataset>
+	<TooltipType>
+		<Value>static</Value>
+		<Displayname>Static</Displayname>
+	</TooltipType>
+
+	<TooltipType>
+		<Value>dynamic</Value>
+		<Displayname>Dynamic</Displayname>
+	</TooltipType>
+
+</TooltipTypeDataset>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/Resources/ZoomDirectionDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ZoomDirectionDataset>
+	<ZoomDirection>
+		<Value>in</Value>
+		<Displayname>In</Displayname>
+	</ZoomDirection>
+
+	<ZoomDirection>
+		<Value>out</Value>
+		<Displayname>Out</Displayname>
+	</ZoomDirection>
+
+</ZoomDirectionDataset>
\ No newline at end of file

Deleted: trunk/Tools/Maestro/Maestro/ResourceEditors/CommandTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/CommandTypesDataset.xml	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/CommandTypesDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CommandTypesDataset>
-	<Command>
-		<Command>About</Command>
-		<Label>About</Label>
-		<ToolTip>About</ToolTip>
-		<Action>About</Action>
-		<Description>Display information about this application</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon></EnabledIcon>		
-		<DisabledIcon></DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Buffer</Command>
-		<Label>Buffer</Label>
-		<ToolTip>Buffer</ToolTip>
-		<Action>Buffer</Action>
-		<Description>Create buffers around the selected features</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_buffer.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_buffer_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Clear Selection</Command>
-		<Label>Clear Selection</Label>
-		<ToolTip>Clear selection</ToolTip>
-		<Action>Clear Selection</Action>
-		<Description>Clear the current selections</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_clearselect.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_clearselect_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Copy Map</Command>
-		<Label>Copy</Label>
-		<ToolTip>Copy</ToolTip>
-		<Action>Copy Map</Action>
-		<Description>Copy current view of map to clipboard</Description>
-		<Viewers>DWF</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_copy.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_copy_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Help</Command>
-		<Label>Help</Label>
-		<ToolTip>Help</ToolTip>
-		<Action>Help</Action>
-		<Description>Launch help for this application</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_help.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_help_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Initial Center and Scale</Command>
-		<Label>Initial Center and Scale</Label>
-		<ToolTip>Initial center and scale</ToolTip>
-		<Action>Restore View</Action>
-		<Description>Zoom to the initial center and scale of the map</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_restorecenter.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_restorecenter_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Initial Map View</Command>
-		<Label>Initial Map View</Label>
-		<ToolTip>Initial map view</ToolTip>
-		<Action>Fit To Window</Action>
-		<Description>Fit the initial view of the map to the window</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_fitwindow.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_fitwindow_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Invoke Script</Command>
-		<Label>Invoke Script</Label>
-		<ToolTip>Invoke script</ToolTip>
-		<Action>Invoke Script</Action>
-		<Description>Invoke a script command</Description>
-		<Viewers>All</Viewers>
-		<Type>Custom</Type>
-		<EnabledIcon>../stdicons/icon_invokescript.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_invokescript_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Invoke URL</Command>
-		<Label>Invoke URL</Label>
-		<ToolTip>Invoke a command by accessing a URL</ToolTip>
-		<Action>Invoke URL</Action>
-		<Description>Invoke a URL command</Description>
-		<Viewers>All</Viewers>
-		<Type>Custom</Type>
-		<EnabledIcon>../stdicons/icon_invokeurl.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_invokeurl_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Measure</Command>
-		<Label>Measure</Label>
-		<ToolTip>Measure</ToolTip>
-		<Action>Measure</Action>
-		<Description>Measure distances on the map</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_measure.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_measure_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Next View</Command>
-		<Label>Next View</Label>
-		<ToolTip>Next View</ToolTip>
-		<Action>Next View</Action>
-		<Description>Buffer</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomnext.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomnext_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan</Command>
-		<Label>Pan</Label>
-		<ToolTip>Pan mode</ToolTip>
-		<Action>Pan</Action>
-		<Description>Drag the map to view areas out of range</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_pan.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_pan_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan Down</Command>
-		<Label>Pan Down</Label>
-		<ToolTip>Pan down</ToolTip>
-		<Action>Pan Down</Action>
-		<Description>Pan down by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_pandown.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_pandown_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan Left</Command>
-		<Label>Pan Left</Label>
-		<ToolTip>Pan left</ToolTip>
-		<Action>Pan Left</Action>
-		<Description>Pan left by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_panleft.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_panleft_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan Right</Command>
-		<Label>Pan Right</Label>
-		<ToolTip>Pan right</ToolTip>
-		<Action>Pan Right</Action>
-		<Description>Pan right by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_panright.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_panright_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan Up</Command>
-		<Label>Pan Up</Label>
-		<ToolTip>Pan up</ToolTip>
-		<Action>Pan Up</Action>
-		<Description>Pan up by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_panup.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_panup_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Previous View</Command>
-		<Label>Previous View</Label>
-		<ToolTip>Previous view</ToolTip>
-		<Action>Previous View</Action>
-		<Description>Go to previous view</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomprev.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomprev_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Print</Command>
-		<Label>Print</Label>
-		<ToolTip>Print</ToolTip>
-		<Action>Print</Action>
-		<Description>Print with optional layout</Description>
-		<Viewers>DWF</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_print.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_print_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Refresh Map</Command>
-		<Label>Refresh Map</Label>
-		<ToolTip>Refresh map</ToolTip>
-		<Action>Refresh</Action>
-		<Description>Refresh map and reload all layers keeping current center and scale</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_refreshmap.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_refreshmap_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Search</Command>
-		<Label>Search</Label>
-		<ToolTip>Search</ToolTip>
-		<Action>Search</Action>
-		<Description>Perform a search</Description>
-		<Viewers>All</Viewers>
-		<Type>Custom</Type>
-		<EnabledIcon>../stdicons/icon_search.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_search_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Select</Command>
-		<Label>Select</Label>
-		<ToolTip>Select mode</ToolTip>
-		<Action>Select</Action>
-		<Description>Select features by clicking and dragging</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_select.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_select_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Select Polygon</Command>
-		<Label>Select Polygon</Label>
-		<ToolTip>Select polygon</ToolTip>
-		<Action>Select Polygon</Action>
-		<Description>Create a polygon to select all features that fall within</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_selectpolygon.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_selectpolygon_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Select Radius</Command>
-		<Label>Select Radius</Label>
-		<ToolTip>Select radius</ToolTip>
-		<Action>Select Radius</Action>
-		<Description>Click and drag to select all features inside the circle</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_selectradius.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_selectradius_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Select Within</Command>
-		<Label>Select Within</Label>
-		<ToolTip>Select within</ToolTip>
-		<Action>Select Within</Action>
-		<Description>Select features that fall within currently selected areas</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_selectwithin.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_selectwithin_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>View Options</Command>
-		<Label>View Options</Label>
-		<ToolTip>View options</ToolTip>
-		<Action>View Options</Action>
-		<Description>View Options</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_viewoptions.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_viewoptions_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom</Command>
-		<Label>Zoom Dynamic</Label>
-		<ToolTip>Zoom dynamic</ToolTip>
-		<Action>Zoom</Action>
-		<Description>Zoom dynamically by clicking and dragging</Description>
-		<Viewers>DWF</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoom.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoom_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom In</Command>
-		<Label>Zoom In</Label>
-		<ToolTip>Zoom in</ToolTip>
-		<Action>Zoom In</Action>
-		<Description>Zoom in by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomin.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomin_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom Out</Command>
-		<Label>Zoom Out</Label>
-		<ToolTip>Zoom out</ToolTip>
-		<Action>Zoom Out</Action>
-		<Description>Zoom out by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomout.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomout_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom Rectangle</Command>
-		<Label>Zoom Rectangle</Label>
-		<ToolTip>Zoom to rectangle</ToolTip>
-		<Action>Zoom Rectangle</Action>
-		<Description>Zoom in on an area</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomrect.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomrect_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom Selection</Command>
-		<Label>Zoom Selection</Label>
-		<ToolTip>Zoom to selection</ToolTip>
-		<Action>Zoom To Selection</Action>
-		<Description>Zoom to extents of selected features</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomselect.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomselect_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Get Printable Page</Command>
-		<Label>Printable Page</Label>
-		<ToolTip>Get printable page</ToolTip>
-		<Action>Get Printable Page</Action>
-		<Description>Get printer-friendly page</Description>
-		<Viewers>AJAX</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_printablepage.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_printablepage_disabled.gif</DisabledIcon>
-	</Command>
-
-</CommandTypesDataset>

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -30,7 +30,6 @@
 	/// </summary>
 	public class AreaFeatureStyleEditor : System.Windows.Forms.UserControl
 	{
-		private static byte[] SharedComboDataSet = null;
 		private System.Windows.Forms.ComboBox sizeContextCombo;
 		private System.Windows.Forms.Label label4;
 		private System.Windows.Forms.Label label3;
@@ -63,21 +62,12 @@
 
         public AreaFeatureStyleEditor()
         {
-            if (SharedComboDataSet == null)
-            {
-                System.IO.Stream s = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(this.GetType(), "PointStyleComboDataset.xml");
-                byte[] buf = new byte[s.Length];
-                if (s.Read(buf, 0, (int)s.Length) != s.Length)
-                    throw new Exception(OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.AssemblyDataInternalError);
-                SharedComboDataSet = buf;
-            }
-
             //
             // Required for Windows Form Designer support
             //
             InitializeComponent();
-            using (System.IO.MemoryStream ms = new System.IO.MemoryStream(SharedComboDataSet))
-                ComboBoxDataSet.ReadXml(ms);
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.GeometryStyleComboDataset))
+                ComboBoxDataSet.ReadXml(sr);
 
             fillStyleEditor.displayFill.CheckedChanged += new EventHandler(displayFill_CheckedChanged);
             fillStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_SelectedIndexChanged);

Deleted: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaStyleComboDataset.xml	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?> 
-<ComboBoxDataSet>
-	<SizeContext>
-		<Display>Device space</Display>
-		<Value>DeviceUnits</Value>
-	</SizeContext>
-	<SizeContext>
-		<Display>Map space</Display>
-		<Value>MappingUnits</Value>
-	</SizeContext>
-	
-	<Units>
-		<Display>Points</Display>
-		<Value>Points</Value>
-	</Units>
-	<Units>
-		<Display>Inches</Display>
-		<Value>Inches</Value>
-	</Units>
-	<Units>
-		<Display>Feet</Display>
-		<Value>Feet</Value>
-	</Units>
-	<Units>
-		<Display>Yards</Display>
-		<Value>Yards</Value>
-	</Units>
-	<Units>
-		<Display>Millimeters</Display>
-		<Value>Millimeters</Value>
-	</Units>
-	<Units>
-		<Display>Centimeters</Display>
-		<Value>Centimeters</Value>
-	</Units>
-	<Units>
-		<Display>Meters</Display>
-		<Value>Meters</Value>
-	</Units>
-	<Units>
-		<Display>Kilometers</Display>
-		<Value>Kilometers</Value>
-	</Units>
-
-</ComboBoxDataSet>
\ No newline at end of file

Deleted: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleComboDataset.xml	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,594 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?> 
-<ComboBoxDataSet>
-
-	<Font>
-		<Display>Arial</Display>
-		<Value>Arial</Value>
-	</Font>
-	<Font>
-		<Display>Arial Black</Display>
-		<Value>Arial Black</Value>
-	</Font>
-	<Font>
-		<Display>Arial Narrow</Display>
-		<Value>Arial Narrow</Value>
-	</Font>
-	<Font>
-		<Display>BankGothic Lt BT</Display>
-		<Value>ankGothic Lt BT</Value>
-	</Font>
-	<Font>
-		<Display>BankGothic Md BT</Display>
-		<Value>BankGothic Md BT</Value>
-	</Font>
-	<Font>
-		<Display>Book Antiqua</Display>
-		<Value>Book Antiqua</Value>
-	</Font>
-	<Font>
-		<Display>Bookman Old Style</Display>
-		<Value>Bookman Old Style</Value>
-	</Font>
-	<Font>
-		<Display>Century Gothic</Display>
-		<Value>Century Gothic</Value>
-	</Font>
-	<Font>
-		<Display>CityBlueprint</Display>
-		<Value>CityBlueprint</Value>
-	</Font>
-	<Font>
-		<Display>Comic Sans MS</Display>
-		<Value>Comic Sans MS</Value>
-	</Font>
-	<Font>
-		<Display>CommercialPi BT</Display>
-		<Value>CommercialPi BT</Value>
-	</Font>
-	<Font>
-		<Display>CommercialScript BT</Display>
-		<Value>CommercialScript BT</Value>
-	</Font>
-	<Font>
-		<Display>Complex</Display>
-		<Value>Complex</Value>
-	</Font>
-	<Font>
-		<Display>CountryBlueprint</Display>
-		<Value>CountryBlueprint</Value>
-	</Font>
-	<Font>
-		<Display>Courier New</Display>
-		<Value>Courier New</Value>
-	</Font>
-	<Font>
-		<Display>Dutch801 Rm BT</Display>
-		<Value>Dutch801 Rm BT</Value>
-	</Font>
-	<Font>
-		<Display>Dutch801 XBd BT</Display>
-		<Value>Dutch801 XBd BT</Value>
-	</Font>
-	<Font>
-		<Display>Estrangelo Edessa</Display>
-		<Value>Estrangelo Edessa</Value>
-	</Font>
-	<Font>
-		<Display>EuroRoman</Display>
-		<Value>EuroRoman</Value>
-	</Font>
-	<Font>
-		<Display>Franklin Gothic Medium</Display>
-		<Value>Franklin Gothic Medium</Value>
-	</Font>
-	<Font>
-		<Display>Garamond</Display>
-		<Value>Garamond</Value>
-	</Font>
-	<Font>
-		<Display>Gautami</Display>
-		<Value>Gautami</Value>
-	</Font>
-	<Font>
-		<Display>GDT</Display>
-		<Value>GDT</Value>
-	</Font>
-	<Font>
-		<Display>Georgia</Display>
-		<Value>Georgia</Value>
-	</Font>
-	<Font>
-		<Display>GothicE</Display>
-		<Value>GothicE</Value>
-	</Font>
-	<Font>
-		<Display>GothicG</Display>
-		<Value>GothicG</Value>
-	</Font>
-	<Font>
-		<Display>Gothicl</Display>
-		<Value>Gothicl</Value>
-	</Font>
-	<Font>
-		<Display>GreekC</Display>
-		<Value>GreekC</Value>
-	</Font>
-	<Font>
-		<Display>GreekS</Display>
-		<Value>GreekS</Value>
-	</Font>
-	<Font>
-		<Display>Haettenschweiler</Display>
-		<Value>Haettenschweiler</Value>
-	</Font>
-	<Font>
-		<Display>Impact</Display>
-		<Value>Impact</Value>
-	</Font>
-	<Font>
-		<Display>ISOCP</Display>
-		<Value>ISOCP</Value>
-	</Font>
-	<Font>
-		<Display>ISOCP2</Display>
-		<Value>ISOCP2</Value>
-	</Font>
-	<Font>
-		<Display>ISOCP3</Display>
-		<Value>ISOCP3</Value>
-	</Font>
-	<Font>
-		<Display>ISOCPEUR</Display>
-		<Value>Arial</Value>
-	</Font>
-	<Font>
-		<Display>ISOCT</Display>
-		<Value>ISOCT</Value>
-	</Font>
-	<Font>
-		<Display>ISOCT2</Display>
-		<Value>ISOCT2</Value>
-	</Font>
-	<Font>
-		<Display>ISOCT3</Display>
-		<Value>ISOCT3</Value>
-	</Font>
-	<Font>
-		<Display>ISOCTEUR</Display>
-		<Value>ISOCTEUR</Value>
-	</Font>
-	<Font>
-		<Display>Italic</Display>
-		<Value>Italic</Value>
-	</Font>
-	<Font>
-		<Display>ItalicC</Display>
-		<Value>ItalicC</Value>
-	</Font>
-	<Font>
-		<Display>ItalicT</Display>
-		<Value>ItalicT</Value>
-	</Font>
-	<Font>
-		<Display>Kartika</Display>
-		<Value>Kartika</Value>
-	</Font>
-	<Font>
-		<Display>Latha</Display>
-		<Value>Latha</Value>
-	</Font>
-	<Font>
-		<Display>Lucida Console</Display>
-		<Value>Lucida Console</Value>
-	</Font>
-	<Font>
-		<Display>Lucida Sans Unicode</Display>
-		<Value>Lucida Sans Unicode</Value>
-	</Font>
-	<Font>
-		<Display>Mangal</Display>
-		<Value>Mangal</Value>
-	</Font>
-	<Font>
-		<Display>Map Symbols</Display>
-		<Value>Map Symbols</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Arrows</Display>
-		<Value>MapInfo Arrows</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Cartographic</Display>
-		<Value>MapInfo Cartographic</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Dispersed Groups</Display>
-		<Value>MapInfo Dispersed Groups</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Miscellaneous</Display>
-		<Value>MapInfo Miscellaneous</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Oil&amp;Gas</Display>
-		<Value>MapInfo Oil&amp;Gas</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Real Estate</Display>
-		<Value>MapInfo Real Estate</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Shields</Display>
-		<Value>MapInfo Shields</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Symbols</Display>
-		<Value>MapInfo Symbols</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Transportation</Display>
-		<Value>MapInfo Transportation</Value>
-	</Font>
-	<Font>
-		<Display>MapInfo Weather</Display>
-		<Value>MapInfo Weather</Value>
-	</Font>
-	<Font>
-		<Display>Marlett</Display>
-		<Value>Marlett</Value>
-	</Font>
-	<Font>
-		<Display>Microsoft Sans Serif</Display>
-		<Value>Microsoft Sans Serif</Value>
-	</Font>
-	<Font>
-		<Display>Monospac821 BT</Display>
-		<Value>Monospac821 BT</Value>
-	</Font>
-	<Font>
-		<Display>Monotxt</Display>
-		<Value>Monotxt</Value>
-	</Font>
-	<Font>
-		<Display>MV Boli</Display>
-		<Value>MV Boli</Value>
-	</Font>
-	<Font>
-		<Display>Nina</Display>
-		<Value>Nina</Value>
-	</Font>
-	<Font>
-		<Display>Palatino Linotype</Display>
-		<Value>Palatino Linotype</Value>
-	</Font>
-	<Font>
-		<Display>PanRoman</Display>
-		<Value>PanRoman</Value>
-	</Font>
-	<Font>
-		<Display>Proxy 1</Display>
-		<Value>Proxy 1</Value>
-	</Font>
-	<Font>
-		<Display>Proxy 2</Display>
-		<Value>Proxy 2</Value>
-	</Font>
-	<Font>
-		<Display>Proxy 3</Display>
-		<Value>Proxy 3</Value>
-	</Font>
-	<Font>
-		<Display>Proxy 4</Display>
-		<Value>Proxy 4</Value>
-	</Font>
-	<Font>
-		<Display>Proxy 5</Display>
-		<Value>Proxy 5</Value>
-	</Font>
-	<Font>
-		<Display>Proxy 6</Display>
-		<Value>Proxy 6</Value>
-	</Font>
-	<Font>
-		<Display>Proxy 7</Display>
-		<Value>Proxy 7</Value>
-	</Font>
-	<Font>
-		<Display>Proxy 8</Display>
-		<Value>Proxy 8</Value>
-	</Font>
-	<Font>
-		<Display>Proxy 9</Display>
-		<Value>Proxy 9</Value>
-	</Font>
-	<Font>
-		<Display>Raavi</Display>
-		<Value>Raavi</Value>
-	</Font>
-	<Font>
-		<Display>RomanC</Display>
-		<Value>RomanC</Value>
-	</Font>
-	<Font>
-		<Display>RomanD</Display>
-		<Value>RomanD</Value>
-	</Font>
-	<Font>
-		<Display>RomanS</Display>
-		<Value>RomanS</Value>
-	</Font>
-	<Font>
-		<Display>RomanT</Display>
-		<Value>RomanT</Value>
-	</Font>
-	<Font>
-		<Display>Romantic</Display>
-		<Value>Romantic</Value>
-	</Font>
-	<Font>
-		<Display>SansSerif</Display>
-		<Value>SansSerif</Value>
-	</Font>
-	<Font>
-		<Display>ScriptC</Display>
-		<Value>ScriptC</Value>
-	</Font>
-	<Font>
-		<Display>ScriptS</Display>
-		<Value>ScriptS</Value>
-	</Font>
-	<Font>
-		<Display>Shruti</Display>
-		<Value>Shruti</Value>
-	</Font>
-	<Font>
-		<Display>Simplex</Display>
-		<Value>Simplex</Value>
-	</Font>
-	<Font>
-		<Display>Stylus BT</Display>
-		<Value>Stylus BT</Value>
-	</Font>
-	<Font>
-		<Display>SuperFrench</Display>
-		<Value>SuperFrench</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 BdCnOul BT</Display>
-		<Value>Swis721 BdCnOul BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 BdOul BT</Display>
-		<Value>Swis721 BdOul BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 Blk BT</Display>
-		<Value>Swis721 Blk BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 BlkCn BT</Display>
-		<Value>Swis721 BlkCn BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 BlkEx BT</Display>
-		<Value>Swis721 BlkEx BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 BlkOul BT</Display>
-		<Value>Swis721 BlkOul BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 BT</Display>
-		<Value>Swis721 BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 Cn BT</Display>
-		<Value>Swis721 Cn BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 Ex BT</Display>
-		<Value>Swis721 Ex BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 Lt BT</Display>
-		<Value>Swis721 Lt BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 LtCn BT</Display>
-		<Value>Swis721 LtCn BT</Value>
-	</Font>
-	<Font>
-		<Display>Swis721 LtEx BT</Display>
-		<Value>Swis721 LtEx BT</Value>
-	</Font>
-	<Font>
-		<Display>Syastro</Display>
-		<Value>Syastro</Value>
-	</Font>
-	<Font>
-		<Display>Sylfaen</Display>
-		<Value>Sylfaen</Value>
-	</Font>
-	<Font>
-		<Display>Symap</Display>
-		<Value>Symap</Value>
-	</Font>
-	<Font>
-		<Display>Symath</Display>
-		<Value>Symath</Value>
-	</Font>
-	<Font>
-		<Display>Symbol</Display>
-		<Value>Symbol</Value>
-	</Font>
-	<Font>
-		<Display>Symeteo</Display>
-		<Value>Symeteo</Value>
-	</Font>
-	<Font>
-		<Display>Symusic</Display>
-		<Value>Symusic</Value>
-	</Font>
-	<Font>
-		<Display>Tahoma</Display>
-		<Value>Tahoma</Value>
-	</Font>
-	<Font>
-		<Display>Technic</Display>
-		<Value>Technic</Value>
-	</Font>
-	<Font>
-		<Display>TechnicBold</Display>
-		<Value>TechnicBold</Value>
-	</Font>
-	<Font>
-		<Display>TechnicLite</Display>
-		<Value>TechnicLite</Value>
-	</Font>
-	<Font>
-		<Display>Times New Roman</Display>
-		<Value>Times New Roman</Value>
-	</Font>
-	<Font>
-		<Display>Trebuchet MS</Display>
-		<Value>Trebuchet MS</Value>
-	</Font>
-	<Font>
-		<Display>Tunga</Display>
-		<Value>Tunga</Value>
-	</Font>
-	<Font>
-		<Display>Txt</Display>
-		<Value>Txt</Value>
-	</Font>
-	<Font>
-		<Display>UniversalMath1 BT</Display>
-		<Value>UniversalMath1 BT</Value>
-	</Font>
-	<Font>
-		<Display>Verdana</Display>
-		<Value>Verdana</Value>
-	</Font>
-	<Font>
-		<Display>Vineta BT</Display>
-		<Value>Vineta BT</Value>
-	</Font>
-	<Font>
-		<Display>Vrinda</Display>
-		<Value>Vrinda</Value>
-	</Font>
-	<Font>
-		<Display>Webdings</Display>
-		<Value>Webdings</Value>
-	</Font>
-	<Font>
-		<Display>Windings</Display>
-		<Value>Windings</Value>
-	</Font>
-	<Font>
-		<Display>Windings 2</Display>
-		<Value>Windings 2</Value>
-	</Font>
-	<Font>
-		<Display>Windings 3</Display>
-		<Value>Windings 3</Value>
-	</Font>
-	
-	<BackgroundType>
-		<Display>Ghosted</Display>
-		<Value>Ghosted</Value>
-	</BackgroundType>
-	<BackgroundType>
-		<Display>Opaque</Display>
-		<Value>Opaque</Value>
-	</BackgroundType>
-	<BackgroundType>
-		<Display>Transparent</Display>
-		<Value>Transparent</Value>
-	</BackgroundType>
-	
-	<Vertical>
-		<Display>Baseline</Display>
-		<Value>'Baseline'</Value>
-	</Vertical>
-	<Vertical>
-		<Display>Bottom</Display>
-		<Value>'Bottom'</Value>
-	</Vertical>
-	<Vertical>
-		<Display>Capline</Display>
-		<Value>'Capline'</Value>
-	</Vertical>
-	<Vertical>
-		<Display>Halfline</Display>
-		<Value>'Halfline'</Value>
-	</Vertical>
-	<Vertical>
-		<Display>Top</Display>
-		<Value>'Top'</Value>
-	</Vertical>
-
-	<Horizontal>
-		<Display>Center</Display>
-		<Value>'Center'</Value>
-	</Horizontal>
-
-	<SizeContext>
-		<Display>Device space</Display>
-		<Value>DeviceUnits</Value>
-	</SizeContext>
-	<SizeContext>
-		<Display>Map space</Display>
-		<Value>MappingUnits</Value>
-	</SizeContext>
-	
-	<Units>
-		<Display>Points</Display>
-		<Value>Points</Value>
-	</Units>
-	<Units>
-		<Display>Inches</Display>
-		<Value>Inches</Value>
-	</Units>
-	<Units>
-		<Display>Feet</Display>
-		<Value>Feet</Value>
-	</Units>
-	<Units>
-		<Display>Yards</Display>
-		<Value>Yards</Value>
-	</Units>
-	<Units>
-		<Display>Millimeters</Display>
-		<Value>Millimeters</Value>
-	</Units>
-	<Units>
-		<Display>Centimeters</Display>
-		<Value>Centimeters</Value>
-	</Units>
-	<Units>
-		<Display>Meters</Display>
-		<Value>Meters</Value>
-	</Units>
-	<Units>
-		<Display>Kilometers</Display>
-		<Value>Kilometers</Value>
-	</Units>
-
-	<Rotation>
-		<Display>0 degrees</Display>
-		<Value>0</Value>
-	</Rotation>
-	<Rotation>
-		<Display>30 degrees</Display>
-		<Value>30</Value>
-	</Rotation>
-	<Rotation>
-		<Display>45 degrees</Display>
-		<Value>45</Value>
-	</Rotation>
-	<Rotation>
-		<Display>90 degrees</Display>
-		<Value>90</Value>
-	</Rotation>	
-</ComboBoxDataSet>

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -30,7 +30,6 @@
 	/// </summary>
 	public class FontStyleEditor : System.Windows.Forms.UserControl
 	{
-		private static byte[] SharedComboDataSet = null;
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.Label label2;
 		private System.Windows.Forms.Label label3;
@@ -100,22 +99,13 @@
 
 		public FontStyleEditor()
 		{
-			if (SharedComboDataSet == null)
-			{
-				System.IO.Stream s = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(this.GetType(), "FontStyleComboDataset.xml");
-				byte[] buf = new byte[s.Length];
-				if (s.Read(buf, 0, (int)s.Length) != s.Length)
-					throw new Exception(OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.AssemblyDataInternalError);
-				SharedComboDataSet = buf;
-			}
-
 			//
 			// Required for Windows Form Designer support
 			//
 			InitializeComponent();
 
-			using(System.IO.MemoryStream ms = new System.IO.MemoryStream(SharedComboDataSet))
-				ComboBoxDataSet.ReadXml(ms);
+            using(System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.FontStyleComboDataset))
+				ComboBoxDataSet.ReadXml(sr);
 		}
 
 		public void SetAvalibleColumns(string[] items)

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -30,8 +30,6 @@
 	/// </summary>
 	public class LineFeatureStyleEditor : System.Windows.Forms.UserControl
 	{
-		private static byte[] SharedComboDataSet = null;
-
 		/// <summary>
 		/// Required designer variable.
 		/// </summary>
@@ -70,21 +68,12 @@
 
 		public LineFeatureStyleEditor()
 		{
-			if (SharedComboDataSet == null)
-			{
-				System.IO.Stream s = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(this.GetType(), "LineStyleComboDataset.xml");
-				byte[] buf = new byte[s.Length];
-				if (s.Read(buf, 0, (int)s.Length) != s.Length)
-					throw new Exception(OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.AssemblyDataInternalError);
-				SharedComboDataSet = buf;
-			}
-
 			//
 			// Required for Windows Form Designer support
 			//
 			InitializeComponent();
-			using(System.IO.MemoryStream ms = new System.IO.MemoryStream(SharedComboDataSet))
-				ComboBoxDataSet.ReadXml(ms);
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.GeometryStyleComboDataset))
+                ComboBoxDataSet.ReadXml(sr);
 
 			lineStyleEditor.displayLine.Visible = false;
 			lineStyleEditor.thicknessUpDown.ValueChanged +=new EventHandler(thicknessCombo_SelectedIndexChanged);

Deleted: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleComboDataset.xml	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?> 
-<ComboBoxDataSet>
-	<SizeContext>
-		<Display>Device space</Display>
-		<Value>DeviceUnits</Value>
-	</SizeContext>
-	<SizeContext>
-		<Display>Map space</Display>
-		<Value>MappingUnits</Value>
-	</SizeContext>
-	
-	<Units>
-		<Display>Points</Display>
-		<Value>Points</Value>
-	</Units>
-	<Units>
-		<Display>Inches</Display>
-		<Value>Inches</Value>
-	</Units>
-	<Units>
-		<Display>Feet</Display>
-		<Value>Feet</Value>
-	</Units>
-	<Units>
-		<Display>Yards</Display>
-		<Value>Yards</Value>
-	</Units>
-	<Units>
-		<Display>Millimeters</Display>
-		<Value>Millimeters</Value>
-	</Units>
-	<Units>
-		<Display>Centimeters</Display>
-		<Value>Centimeters</Value>
-	</Units>
-	<Units>
-		<Display>Meters</Display>
-		<Value>Meters</Value>
-	</Units>
-	<Units>
-		<Display>Kilometers</Display>
-		<Value>Kilometers</Value>
-	</Units>
-</ComboBoxDataSet>
-

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -31,8 +31,6 @@
 	/// </summary>
 	public class PointFeatureStyleEditor : System.Windows.Forms.UserControl
 	{
-		private static byte[] SharedComboDataSet = null;
-
 		private System.Windows.Forms.GroupBox groupBox1;
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.Label label2;
@@ -104,21 +102,12 @@
 
 		public PointFeatureStyleEditor()
 		{
-			if (SharedComboDataSet == null)
-			{
-				System.IO.Stream s = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(this.GetType(), "PointStyleComboDataset.xml");
-				byte[] buf = new byte[s.Length];
-				if (s.Read(buf, 0, (int)s.Length) != s.Length)
-					throw new Exception(OSGeo.MapGuide.Maestro.ResourceEditors.Strings.Common.AssemblyDataInternalError);
-				SharedComboDataSet = buf;
-			}
-
 			//
 			// Required for Windows Form Designer support
 			//
 			InitializeComponent();
-			using(System.IO.MemoryStream ms = new System.IO.MemoryStream(SharedComboDataSet))
-				ComboBoxDataSet.ReadXml(ms);
+            using(System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.GeometryStyleComboDataset))
+				ComboBoxDataSet.ReadXml(sr);
 
 			fontCombo.Items.Clear();
             foreach (FontFamily f in new System.Drawing.Text.InstalledFontCollection().Families)

Deleted: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointStyleComboDataset.xml	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,94 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<ComboBoxDataSet>
-	<SymbolMark>
-		<Display>Square</Display>
-		<Value>Square</Value>
-	</SymbolMark>
-	<SymbolMark>
-		<Display>Circle</Display>
-		<Value>Circle</Value>
-	</SymbolMark>
-	<SymbolMark>
-		<Display>Triangle</Display>
-		<Value>Triangle</Value>
-	</SymbolMark>
-	<SymbolMark>
-		<Display>Star</Display>
-		<Value>Star</Value>
-	</SymbolMark>
-	<SymbolMark>
-		<Display>Cross</Display>
-		<Value>Cross</Value>
-	</SymbolMark>
-	<SymbolMark>
-		<Display>X - Mark</Display>
-		<Value>X</Value>
-	</SymbolMark>
-	<SymbolMark>
-		<Display>Font...</Display>
-		<Value></Value>
-	</SymbolMark>
-	<SymbolMark>
-		<Display>Symbol...</Display>
-		<Value></Value>
-	</SymbolMark>
-	
-	<SizeContext>
-		<Display>Device space</Display>
-		<Value>DeviceUnits</Value>
-	</SizeContext>
-	<SizeContext>
-		<Display>Map space</Display>
-		<Value>MappingUnits</Value>
-	</SizeContext>
-	
-	<Units>
-		<Display>Points</Display>
-		<Value>Points</Value>
-	</Units>
-	<Units>
-		<Display>Inches</Display>
-		<Value>Inches</Value>
-	</Units>
-	<Units>
-		<Display>Feet</Display>
-		<Value>Feet</Value>
-	</Units>
-	<Units>
-		<Display>Yards</Display>
-		<Value>Yards</Value>
-	</Units>
-	<Units>
-		<Display>Millimeters</Display>
-		<Value>Millimeters</Value>
-	</Units>
-	<Units>
-		<Display>Centimeters</Display>
-		<Value>Centimeters</Value>
-	</Units>
-	<Units>
-		<Display>Meters</Display>
-		<Value>Meters</Value>
-	</Units>
-	<Units>
-		<Display>Kilometers</Display>
-		<Value>Kilometers</Value>
-	</Units>
-
-	<Rotation>
-		<Display>0 degrees</Display>
-		<Value>0</Value>
-	</Rotation>
-	<Rotation>
-		<Display>30 degrees</Display>
-		<Value>30</Value>
-	</Rotation>
-	<Rotation>
-		<Display>45 degrees</Display>
-		<Value>45</Value>
-	</Rotation>
-	<Rotation>
-		<Display>90 degrees</Display>
-		<Value>90</Value>
-	</Rotation>
-</ComboBoxDataSet>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutEditor.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutEditor.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -31,7 +31,6 @@
 	/// </summary>
 	public class LayoutEditor : System.Windows.Forms.UserControl, IResourceEditorControl
 	{
-		private static byte[] SharedComboDataSet = null;
 		private static Hashtable LoadedImages = null; 
 		public static ImageList LoadedImageList = null;
 		
@@ -1483,15 +1482,6 @@
 
 		private void LoadMenuItems()
 		{
-			if (SharedComboDataSet == null)
-			{
-				System.IO.Stream s = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(this.GetType(), "CommandTypesDataset.xml");
-				byte[] buf = new byte[s.Length];
-				if (s.Read(buf, 0, (int)s.Length) != s.Length)
-					throw new Exception(Strings.LayoutEditor.AssemblyReadError);
-				SharedComboDataSet = buf;
-			}
-
 			if (LoadedImages == null)
 			{
 				LoadedImages = new Hashtable();
@@ -1512,12 +1502,10 @@
 						LoadedImageList.Images.Add(Image.FromFile(s));
 						LoadedImages.Add("../stdicons/" + System.IO.Path.GetFileName(s), LoadedImageList.Images.Count - 1);
 					}
-
-
 			}
 
-			using(System.IO.MemoryStream ms = new System.IO.MemoryStream(SharedComboDataSet))
-				CommandTypesDataset.ReadXml(ms);
+            using (System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.CommandTypesDataset))
+                CommandTypesDataset.ReadXml(sr);
 
 			BuiltInCommands = new Hashtable();
 			foreach(System.Data.DataRow dr in CommandTypesDataset.Tables[0].Rows)

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.Designer.cs	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.Designer.cs	2009-12-21 20:40:24 UTC (rev 4454)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3082
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -59,5 +59,98 @@
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
+        ///&lt;CommandTypesDataset&gt;
+        ///	&lt;Command&gt;
+        ///		&lt;Command&gt;About&lt;/Command&gt;
+        ///		&lt;Label&gt;About&lt;/Label&gt;
+        ///		&lt;ToolTip&gt;About&lt;/ToolTip&gt;
+        ///		&lt;Action&gt;About&lt;/Action&gt;
+        ///		&lt;Description&gt;Display information about this application&lt;/Description&gt;
+        ///		&lt;Viewers&gt;All&lt;/Viewers&gt;
+        ///		&lt;Type&gt;Built-In&lt;/Type&gt;
+        ///		&lt;EnabledIcon&gt;&lt;/EnabledIcon&gt;		
+        ///		&lt;DisabledIcon&gt;&lt;/DisabledIcon&gt;
+        ///	&lt;/Command&gt;
+        ///
+        ///	&lt;Command&gt;
+        ///		&lt;Command&gt;Buffer&lt;/Command&gt;
+        ///		&lt;Label&gt;Buffer&lt;/Label&gt;
+        ///		&lt;ToolTip&gt;Buffer&lt;/ToolTip&gt;
+        ///		&lt;Action&gt;Buffer&lt;/Action&gt;
+        ///		&lt; [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string CommandTypesDataset {
+            get {
+                return ResourceManager.GetString("CommandTypesDataset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt; 
+        ///&lt;ComboBoxDataSet&gt;
+        ///
+        ///	&lt;Font&gt;
+        ///		&lt;Display&gt;Arial&lt;/Display&gt;
+        ///		&lt;Value&gt;Arial&lt;/Value&gt;
+        ///	&lt;/Font&gt;
+        ///	&lt;Font&gt;
+        ///		&lt;Display&gt;Arial Black&lt;/Display&gt;
+        ///		&lt;Value&gt;Arial Black&lt;/Value&gt;
+        ///	&lt;/Font&gt;
+        ///	&lt;Font&gt;
+        ///		&lt;Display&gt;Arial Narrow&lt;/Display&gt;
+        ///		&lt;Value&gt;Arial Narrow&lt;/Value&gt;
+        ///	&lt;/Font&gt;
+        ///	&lt;Font&gt;
+        ///		&lt;Display&gt;BankGothic Lt BT&lt;/Display&gt;
+        ///		&lt;Value&gt;ankGothic Lt BT&lt;/Value&gt;
+        ///	&lt;/Font&gt;
+        ///	&lt;Font&gt;
+        ///		&lt;Display&gt;BankGothic Md BT&lt;/Display&gt;
+        ///		&lt;Value&gt;BankGothic Md BT&lt;/Value&gt;
+        ///	&lt;/Font&gt;
+        ///	&lt;Font&gt;
+        ///		&lt;Display&gt;Book  [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string FontStyleComboDataset {
+            get {
+                return ResourceManager.GetString("FontStyleComboDataset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; standalone=&quot;yes&quot;?&gt;
+        ///&lt;ComboBoxDataSet&gt;
+        ///	&lt;SymbolMark&gt;
+        ///		&lt;Display&gt;Square&lt;/Display&gt;
+        ///		&lt;Value&gt;Square&lt;/Value&gt;
+        ///	&lt;/SymbolMark&gt;
+        ///	&lt;SymbolMark&gt;
+        ///		&lt;Display&gt;Circle&lt;/Display&gt;
+        ///		&lt;Value&gt;Circle&lt;/Value&gt;
+        ///	&lt;/SymbolMark&gt;
+        ///	&lt;SymbolMark&gt;
+        ///		&lt;Display&gt;Triangle&lt;/Display&gt;
+        ///		&lt;Value&gt;Triangle&lt;/Value&gt;
+        ///	&lt;/SymbolMark&gt;
+        ///	&lt;SymbolMark&gt;
+        ///		&lt;Display&gt;Star&lt;/Display&gt;
+        ///		&lt;Value&gt;Star&lt;/Value&gt;
+        ///	&lt;/SymbolMark&gt;
+        ///	&lt;SymbolMark&gt;
+        ///		&lt;Display&gt;Cross&lt;/Display&gt;
+        ///		&lt;Value&gt;Cross&lt;/Value&gt;
+        ///	&lt;/SymbolMark&gt;
+        ///	&lt;SymbolMark&gt;
+        ///		&lt;Display&gt;X -  [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string GeometryStyleComboDataset {
+            get {
+                return ResourceManager.GetString("GeometryStyleComboDataset", resourceCulture);
+            }
+        }
     }
 }

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.resx	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.resx	2009-12-21 20:40:24 UTC (rev 4454)
@@ -117,4 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <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="FontStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FontStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</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>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj	2009-12-21 09:15:33 UTC (rev 4453)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj	2009-12-21 20:40:24 UTC (rev 4454)
@@ -659,7 +659,6 @@
       <SubType>UserControl</SubType>
     </Compile>
     <EmbeddedResource Include="blank_icon.gif" />
-    <EmbeddedResource Include="CommandTypesDataset.xml" />
     <EmbeddedResource Include="CoordinateSystemOverride.resx">
       <DependentUpon>CoordinateSystemOverride.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -868,7 +867,6 @@
       <DependentUpon>AreaFeatureStyleEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="GeometryStyleEditors\AreaStyleComboDataset.xml" />
     <EmbeddedResource Include="GeometryStyleEditors\CustomCombo.resx">
       <DependentUpon>CustomCombo.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -877,7 +875,6 @@
       <DependentUpon>FillStyleEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="GeometryStyleEditors\FontStyleComboDataset.xml" />
     <EmbeddedResource Include="GeometryStyleEditors\FontStyleEditor.resx">
       <DependentUpon>FontStyleEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -886,7 +883,6 @@
       <DependentUpon>LineFeatureStyleEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="GeometryStyleEditors\LineStyleComboDataset.xml" />
     <EmbeddedResource Include="GeometryStyleEditors\LineStyleEditor.resx">
       <DependentUpon>LineStyleEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -895,7 +891,6 @@
       <DependentUpon>PointFeatureStyleEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="GeometryStyleEditors\PointStyleComboDataset.xml" />
     <EmbeddedResource Include="GeometryStyleEditors\ScaleRangeEditor.resx">
       <DependentUpon>ScaleRangeEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -1236,6 +1231,15 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\CommandTypesDataset.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\FontStyleComboDataset.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GeometryStyleComboDataset.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

Added: trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/CommandTypesDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CommandTypesDataset>
+	<Command>
+		<Command>About</Command>
+		<Label>About</Label>
+		<ToolTip>About</ToolTip>
+		<Action>About</Action>
+		<Description>Display information about this application</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon></EnabledIcon>		
+		<DisabledIcon></DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Buffer</Command>
+		<Label>Buffer</Label>
+		<ToolTip>Buffer</ToolTip>
+		<Action>Buffer</Action>
+		<Description>Create buffers around the selected features</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_buffer.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_buffer_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Clear Selection</Command>
+		<Label>Clear Selection</Label>
+		<ToolTip>Clear selection</ToolTip>
+		<Action>Clear Selection</Action>
+		<Description>Clear the current selections</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_clearselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_clearselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Copy Map</Command>
+		<Label>Copy</Label>
+		<ToolTip>Copy</ToolTip>
+		<Action>Copy Map</Action>
+		<Description>Copy current view of map to clipboard</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_copy.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_copy_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Help</Command>
+		<Label>Help</Label>
+		<ToolTip>Help</ToolTip>
+		<Action>Help</Action>
+		<Description>Launch help for this application</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_help.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_help_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Center and Scale</Command>
+		<Label>Initial Center and Scale</Label>
+		<ToolTip>Initial center and scale</ToolTip>
+		<Action>Restore View</Action>
+		<Description>Zoom to the initial center and scale of the map</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_restorecenter.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_restorecenter_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Map View</Command>
+		<Label>Initial Map View</Label>
+		<ToolTip>Initial map view</ToolTip>
+		<Action>Fit To Window</Action>
+		<Description>Fit the initial view of the map to the window</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_fitwindow.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_fitwindow_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke Script</Command>
+		<Label>Invoke Script</Label>
+		<ToolTip>Invoke script</ToolTip>
+		<Action>Invoke Script</Action>
+		<Description>Invoke a script command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokescript.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokescript_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke URL</Command>
+		<Label>Invoke URL</Label>
+		<ToolTip>Invoke a command by accessing a URL</ToolTip>
+		<Action>Invoke URL</Action>
+		<Description>Invoke a URL command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokeurl.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokeurl_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Measure</Command>
+		<Label>Measure</Label>
+		<ToolTip>Measure</ToolTip>
+		<Action>Measure</Action>
+		<Description>Measure distances on the map</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_measure.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_measure_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Next View</Command>
+		<Label>Next View</Label>
+		<ToolTip>Next View</ToolTip>
+		<Action>Next View</Action>
+		<Description>Buffer</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomnext.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomnext_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan</Command>
+		<Label>Pan</Label>
+		<ToolTip>Pan mode</ToolTip>
+		<Action>Pan</Action>
+		<Description>Drag the map to view areas out of range</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pan.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pan_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Down</Command>
+		<Label>Pan Down</Label>
+		<ToolTip>Pan down</ToolTip>
+		<Action>Pan Down</Action>
+		<Description>Pan down by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pandown.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pandown_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Left</Command>
+		<Label>Pan Left</Label>
+		<ToolTip>Pan left</ToolTip>
+		<Action>Pan Left</Action>
+		<Description>Pan left by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panleft.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panleft_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Right</Command>
+		<Label>Pan Right</Label>
+		<ToolTip>Pan right</ToolTip>
+		<Action>Pan Right</Action>
+		<Description>Pan right by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panright.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panright_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Up</Command>
+		<Label>Pan Up</Label>
+		<ToolTip>Pan up</ToolTip>
+		<Action>Pan Up</Action>
+		<Description>Pan up by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panup.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panup_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Previous View</Command>
+		<Label>Previous View</Label>
+		<ToolTip>Previous view</ToolTip>
+		<Action>Previous View</Action>
+		<Description>Go to previous view</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomprev.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomprev_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Print</Command>
+		<Label>Print</Label>
+		<ToolTip>Print</ToolTip>
+		<Action>Print</Action>
+		<Description>Print with optional layout</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_print.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_print_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Refresh Map</Command>
+		<Label>Refresh Map</Label>
+		<ToolTip>Refresh map</ToolTip>
+		<Action>Refresh</Action>
+		<Description>Refresh map and reload all layers keeping current center and scale</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_refreshmap.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_refreshmap_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Search</Command>
+		<Label>Search</Label>
+		<ToolTip>Search</ToolTip>
+		<Action>Search</Action>
+		<Description>Perform a search</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_search.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_search_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select</Command>
+		<Label>Select</Label>
+		<ToolTip>Select mode</ToolTip>
+		<Action>Select</Action>
+		<Description>Select features by clicking and dragging</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_select.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_select_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Polygon</Command>
+		<Label>Select Polygon</Label>
+		<ToolTip>Select polygon</ToolTip>
+		<Action>Select Polygon</Action>
+		<Description>Create a polygon to select all features that fall within</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectpolygon.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectpolygon_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Radius</Command>
+		<Label>Select Radius</Label>
+		<ToolTip>Select radius</ToolTip>
+		<Action>Select Radius</Action>
+		<Description>Click and drag to select all features inside the circle</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectradius.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectradius_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Within</Command>
+		<Label>Select Within</Label>
+		<ToolTip>Select within</ToolTip>
+		<Action>Select Within</Action>
+		<Description>Select features that fall within currently selected areas</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectwithin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectwithin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>View Options</Command>
+		<Label>View Options</Label>
+		<ToolTip>View options</ToolTip>
+		<Action>View Options</Action>
+		<Description>View Options</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_viewoptions.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_viewoptions_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom</Command>
+		<Label>Zoom Dynamic</Label>
+		<ToolTip>Zoom dynamic</ToolTip>
+		<Action>Zoom</Action>
+		<Description>Zoom dynamically by clicking and dragging</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoom.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoom_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom In</Command>
+		<Label>Zoom In</Label>
+		<ToolTip>Zoom in</ToolTip>
+		<Action>Zoom In</Action>
+		<Description>Zoom in by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Out</Command>
+		<Label>Zoom Out</Label>
+		<ToolTip>Zoom out</ToolTip>
+		<Action>Zoom Out</Action>
+		<Description>Zoom out by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomout.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomout_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Rectangle</Command>
+		<Label>Zoom Rectangle</Label>
+		<ToolTip>Zoom to rectangle</ToolTip>
+		<Action>Zoom Rectangle</Action>
+		<Description>Zoom in on an area</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomrect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomrect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Selection</Command>
+		<Label>Zoom Selection</Label>
+		<ToolTip>Zoom to selection</ToolTip>
+		<Action>Zoom To Selection</Action>
+		<Description>Zoom to extents of selected features</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Get Printable Page</Command>
+		<Label>Printable Page</Label>
+		<ToolTip>Get printable page</ToolTip>
+		<Action>Get Printable Page</Action>
+		<Description>Get printer-friendly page</Description>
+		<Viewers>AJAX</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_printablepage.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_printablepage_disabled.gif</DisabledIcon>
+	</Command>
+
+</CommandTypesDataset>

Added: trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<ComboBoxDataSet>
+
+	<Font>
+		<Display>Arial</Display>
+		<Value>Arial</Value>
+	</Font>
+	<Font>
+		<Display>Arial Black</Display>
+		<Value>Arial Black</Value>
+	</Font>
+	<Font>
+		<Display>Arial Narrow</Display>
+		<Value>Arial Narrow</Value>
+	</Font>
+	<Font>
+		<Display>BankGothic Lt BT</Display>
+		<Value>ankGothic Lt BT</Value>
+	</Font>
+	<Font>
+		<Display>BankGothic Md BT</Display>
+		<Value>BankGothic Md BT</Value>
+	</Font>
+	<Font>
+		<Display>Book Antiqua</Display>
+		<Value>Book Antiqua</Value>
+	</Font>
+	<Font>
+		<Display>Bookman Old Style</Display>
+		<Value>Bookman Old Style</Value>
+	</Font>
+	<Font>
+		<Display>Century Gothic</Display>
+		<Value>Century Gothic</Value>
+	</Font>
+	<Font>
+		<Display>CityBlueprint</Display>
+		<Value>CityBlueprint</Value>
+	</Font>
+	<Font>
+		<Display>Comic Sans MS</Display>
+		<Value>Comic Sans MS</Value>
+	</Font>
+	<Font>
+		<Display>CommercialPi BT</Display>
+		<Value>CommercialPi BT</Value>
+	</Font>
+	<Font>
+		<Display>CommercialScript BT</Display>
+		<Value>CommercialScript BT</Value>
+	</Font>
+	<Font>
+		<Display>Complex</Display>
+		<Value>Complex</Value>
+	</Font>
+	<Font>
+		<Display>CountryBlueprint</Display>
+		<Value>CountryBlueprint</Value>
+	</Font>
+	<Font>
+		<Display>Courier New</Display>
+		<Value>Courier New</Value>
+	</Font>
+	<Font>
+		<Display>Dutch801 Rm BT</Display>
+		<Value>Dutch801 Rm BT</Value>
+	</Font>
+	<Font>
+		<Display>Dutch801 XBd BT</Display>
+		<Value>Dutch801 XBd BT</Value>
+	</Font>
+	<Font>
+		<Display>Estrangelo Edessa</Display>
+		<Value>Estrangelo Edessa</Value>
+	</Font>
+	<Font>
+		<Display>EuroRoman</Display>
+		<Value>EuroRoman</Value>
+	</Font>
+	<Font>
+		<Display>Franklin Gothic Medium</Display>
+		<Value>Franklin Gothic Medium</Value>
+	</Font>
+	<Font>
+		<Display>Garamond</Display>
+		<Value>Garamond</Value>
+	</Font>
+	<Font>
+		<Display>Gautami</Display>
+		<Value>Gautami</Value>
+	</Font>
+	<Font>
+		<Display>GDT</Display>
+		<Value>GDT</Value>
+	</Font>
+	<Font>
+		<Display>Georgia</Display>
+		<Value>Georgia</Value>
+	</Font>
+	<Font>
+		<Display>GothicE</Display>
+		<Value>GothicE</Value>
+	</Font>
+	<Font>
+		<Display>GothicG</Display>
+		<Value>GothicG</Value>
+	</Font>
+	<Font>
+		<Display>Gothicl</Display>
+		<Value>Gothicl</Value>
+	</Font>
+	<Font>
+		<Display>GreekC</Display>
+		<Value>GreekC</Value>
+	</Font>
+	<Font>
+		<Display>GreekS</Display>
+		<Value>GreekS</Value>
+	</Font>
+	<Font>
+		<Display>Haettenschweiler</Display>
+		<Value>Haettenschweiler</Value>
+	</Font>
+	<Font>
+		<Display>Impact</Display>
+		<Value>Impact</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP</Display>
+		<Value>ISOCP</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP2</Display>
+		<Value>ISOCP2</Value>
+	</Font>
+	<Font>
+		<Display>ISOCP3</Display>
+		<Value>ISOCP3</Value>
+	</Font>
+	<Font>
+		<Display>ISOCPEUR</Display>
+		<Value>Arial</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT</Display>
+		<Value>ISOCT</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT2</Display>
+		<Value>ISOCT2</Value>
+	</Font>
+	<Font>
+		<Display>ISOCT3</Display>
+		<Value>ISOCT3</Value>
+	</Font>
+	<Font>
+		<Display>ISOCTEUR</Display>
+		<Value>ISOCTEUR</Value>
+	</Font>
+	<Font>
+		<Display>Italic</Display>
+		<Value>Italic</Value>
+	</Font>
+	<Font>
+		<Display>ItalicC</Display>
+		<Value>ItalicC</Value>
+	</Font>
+	<Font>
+		<Display>ItalicT</Display>
+		<Value>ItalicT</Value>
+	</Font>
+	<Font>
+		<Display>Kartika</Display>
+		<Value>Kartika</Value>
+	</Font>
+	<Font>
+		<Display>Latha</Display>
+		<Value>Latha</Value>
+	</Font>
+	<Font>
+		<Display>Lucida Console</Display>
+		<Value>Lucida Console</Value>
+	</Font>
+	<Font>
+		<Display>Lucida Sans Unicode</Display>
+		<Value>Lucida Sans Unicode</Value>
+	</Font>
+	<Font>
+		<Display>Mangal</Display>
+		<Value>Mangal</Value>
+	</Font>
+	<Font>
+		<Display>Map Symbols</Display>
+		<Value>Map Symbols</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Arrows</Display>
+		<Value>MapInfo Arrows</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Cartographic</Display>
+		<Value>MapInfo Cartographic</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Dispersed Groups</Display>
+		<Value>MapInfo Dispersed Groups</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Miscellaneous</Display>
+		<Value>MapInfo Miscellaneous</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Oil&amp;Gas</Display>
+		<Value>MapInfo Oil&amp;Gas</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Real Estate</Display>
+		<Value>MapInfo Real Estate</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Shields</Display>
+		<Value>MapInfo Shields</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Symbols</Display>
+		<Value>MapInfo Symbols</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Transportation</Display>
+		<Value>MapInfo Transportation</Value>
+	</Font>
+	<Font>
+		<Display>MapInfo Weather</Display>
+		<Value>MapInfo Weather</Value>
+	</Font>
+	<Font>
+		<Display>Marlett</Display>
+		<Value>Marlett</Value>
+	</Font>
+	<Font>
+		<Display>Microsoft Sans Serif</Display>
+		<Value>Microsoft Sans Serif</Value>
+	</Font>
+	<Font>
+		<Display>Monospac821 BT</Display>
+		<Value>Monospac821 BT</Value>
+	</Font>
+	<Font>
+		<Display>Monotxt</Display>
+		<Value>Monotxt</Value>
+	</Font>
+	<Font>
+		<Display>MV Boli</Display>
+		<Value>MV Boli</Value>
+	</Font>
+	<Font>
+		<Display>Nina</Display>
+		<Value>Nina</Value>
+	</Font>
+	<Font>
+		<Display>Palatino Linotype</Display>
+		<Value>Palatino Linotype</Value>
+	</Font>
+	<Font>
+		<Display>PanRoman</Display>
+		<Value>PanRoman</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 1</Display>
+		<Value>Proxy 1</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 2</Display>
+		<Value>Proxy 2</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 3</Display>
+		<Value>Proxy 3</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 4</Display>
+		<Value>Proxy 4</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 5</Display>
+		<Value>Proxy 5</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 6</Display>
+		<Value>Proxy 6</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 7</Display>
+		<Value>Proxy 7</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 8</Display>
+		<Value>Proxy 8</Value>
+	</Font>
+	<Font>
+		<Display>Proxy 9</Display>
+		<Value>Proxy 9</Value>
+	</Font>
+	<Font>
+		<Display>Raavi</Display>
+		<Value>Raavi</Value>
+	</Font>
+	<Font>
+		<Display>RomanC</Display>
+		<Value>RomanC</Value>
+	</Font>
+	<Font>
+		<Display>RomanD</Display>
+		<Value>RomanD</Value>
+	</Font>
+	<Font>
+		<Display>RomanS</Display>
+		<Value>RomanS</Value>
+	</Font>
+	<Font>
+		<Display>RomanT</Display>
+		<Value>RomanT</Value>
+	</Font>
+	<Font>
+		<Display>Romantic</Display>
+		<Value>Romantic</Value>
+	</Font>
+	<Font>
+		<Display>SansSerif</Display>
+		<Value>SansSerif</Value>
+	</Font>
+	<Font>
+		<Display>ScriptC</Display>
+		<Value>ScriptC</Value>
+	</Font>
+	<Font>
+		<Display>ScriptS</Display>
+		<Value>ScriptS</Value>
+	</Font>
+	<Font>
+		<Display>Shruti</Display>
+		<Value>Shruti</Value>
+	</Font>
+	<Font>
+		<Display>Simplex</Display>
+		<Value>Simplex</Value>
+	</Font>
+	<Font>
+		<Display>Stylus BT</Display>
+		<Value>Stylus BT</Value>
+	</Font>
+	<Font>
+		<Display>SuperFrench</Display>
+		<Value>SuperFrench</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BdCnOul BT</Display>
+		<Value>Swis721 BdCnOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BdOul BT</Display>
+		<Value>Swis721 BdOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Blk BT</Display>
+		<Value>Swis721 Blk BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkCn BT</Display>
+		<Value>Swis721 BlkCn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkEx BT</Display>
+		<Value>Swis721 BlkEx BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BlkOul BT</Display>
+		<Value>Swis721 BlkOul BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 BT</Display>
+		<Value>Swis721 BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Cn BT</Display>
+		<Value>Swis721 Cn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Ex BT</Display>
+		<Value>Swis721 Ex BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 Lt BT</Display>
+		<Value>Swis721 Lt BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 LtCn BT</Display>
+		<Value>Swis721 LtCn BT</Value>
+	</Font>
+	<Font>
+		<Display>Swis721 LtEx BT</Display>
+		<Value>Swis721 LtEx BT</Value>
+	</Font>
+	<Font>
+		<Display>Syastro</Display>
+		<Value>Syastro</Value>
+	</Font>
+	<Font>
+		<Display>Sylfaen</Display>
+		<Value>Sylfaen</Value>
+	</Font>
+	<Font>
+		<Display>Symap</Display>
+		<Value>Symap</Value>
+	</Font>
+	<Font>
+		<Display>Symath</Display>
+		<Value>Symath</Value>
+	</Font>
+	<Font>
+		<Display>Symbol</Display>
+		<Value>Symbol</Value>
+	</Font>
+	<Font>
+		<Display>Symeteo</Display>
+		<Value>Symeteo</Value>
+	</Font>
+	<Font>
+		<Display>Symusic</Display>
+		<Value>Symusic</Value>
+	</Font>
+	<Font>
+		<Display>Tahoma</Display>
+		<Value>Tahoma</Value>
+	</Font>
+	<Font>
+		<Display>Technic</Display>
+		<Value>Technic</Value>
+	</Font>
+	<Font>
+		<Display>TechnicBold</Display>
+		<Value>TechnicBold</Value>
+	</Font>
+	<Font>
+		<Display>TechnicLite</Display>
+		<Value>TechnicLite</Value>
+	</Font>
+	<Font>
+		<Display>Times New Roman</Display>
+		<Value>Times New Roman</Value>
+	</Font>
+	<Font>
+		<Display>Trebuchet MS</Display>
+		<Value>Trebuchet MS</Value>
+	</Font>
+	<Font>
+		<Display>Tunga</Display>
+		<Value>Tunga</Value>
+	</Font>
+	<Font>
+		<Display>Txt</Display>
+		<Value>Txt</Value>
+	</Font>
+	<Font>
+		<Display>UniversalMath1 BT</Display>
+		<Value>UniversalMath1 BT</Value>
+	</Font>
+	<Font>
+		<Display>Verdana</Display>
+		<Value>Verdana</Value>
+	</Font>
+	<Font>
+		<Display>Vineta BT</Display>
+		<Value>Vineta BT</Value>
+	</Font>
+	<Font>
+		<Display>Vrinda</Display>
+		<Value>Vrinda</Value>
+	</Font>
+	<Font>
+		<Display>Webdings</Display>
+		<Value>Webdings</Value>
+	</Font>
+	<Font>
+		<Display>Windings</Display>
+		<Value>Windings</Value>
+	</Font>
+	<Font>
+		<Display>Windings 2</Display>
+		<Value>Windings 2</Value>
+	</Font>
+	<Font>
+		<Display>Windings 3</Display>
+		<Value>Windings 3</Value>
+	</Font>
+	
+	<BackgroundType>
+		<Display>Ghosted</Display>
+		<Value>Ghosted</Value>
+	</BackgroundType>
+	<BackgroundType>
+		<Display>Opaque</Display>
+		<Value>Opaque</Value>
+	</BackgroundType>
+	<BackgroundType>
+		<Display>Transparent</Display>
+		<Value>Transparent</Value>
+	</BackgroundType>
+	
+	<Vertical>
+		<Display>Baseline</Display>
+		<Value>'Baseline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Bottom</Display>
+		<Value>'Bottom'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Capline</Display>
+		<Value>'Capline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Halfline</Display>
+		<Value>'Halfline'</Value>
+	</Vertical>
+	<Vertical>
+		<Display>Top</Display>
+		<Value>'Top'</Value>
+	</Vertical>
+
+	<Horizontal>
+		<Display>Center</Display>
+		<Value>'Center'</Value>
+	</Horizontal>
+
+	<SizeContext>
+		<Display>Device space</Display>
+		<Value>DeviceUnits</Value>
+	</SizeContext>
+	<SizeContext>
+		<Display>Map space</Display>
+		<Value>MappingUnits</Value>
+	</SizeContext>
+	
+	<Units>
+		<Display>Points</Display>
+		<Value>Points</Value>
+	</Units>
+	<Units>
+		<Display>Inches</Display>
+		<Value>Inches</Value>
+	</Units>
+	<Units>
+		<Display>Feet</Display>
+		<Value>Feet</Value>
+	</Units>
+	<Units>
+		<Display>Yards</Display>
+		<Value>Yards</Value>
+	</Units>
+	<Units>
+		<Display>Millimeters</Display>
+		<Value>Millimeters</Value>
+	</Units>
+	<Units>
+		<Display>Centimeters</Display>
+		<Value>Centimeters</Value>
+	</Units>
+	<Units>
+		<Display>Meters</Display>
+		<Value>Meters</Value>
+	</Units>
+	<Units>
+		<Display>Kilometers</Display>
+		<Value>Kilometers</Value>
+	</Units>
+
+	<Rotation>
+		<Display>0 degrees</Display>
+		<Value>0</Value>
+	</Rotation>
+	<Rotation>
+		<Display>30 degrees</Display>
+		<Value>30</Value>
+	</Rotation>
+	<Rotation>
+		<Display>45 degrees</Display>
+		<Value>45</Value>
+	</Rotation>
+	<Rotation>
+		<Display>90 degrees</Display>
+		<Value>90</Value>
+	</Rotation>	
+</ComboBoxDataSet>

Added: trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml	2009-12-21 20:40:24 UTC (rev 4454)
@@ -0,0 +1,94 @@
+<?xml version="1.0" standalone="yes"?>
+<ComboBoxDataSet>
+	<SymbolMark>
+		<Display>Square</Display>
+		<Value>Square</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Circle</Display>
+		<Value>Circle</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Triangle</Display>
+		<Value>Triangle</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Star</Display>
+		<Value>Star</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Cross</Display>
+		<Value>Cross</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>X - Mark</Display>
+		<Value>X</Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Font...</Display>
+		<Value></Value>
+	</SymbolMark>
+	<SymbolMark>
+		<Display>Symbol...</Display>
+		<Value></Value>
+	</SymbolMark>
+	
+	<SizeContext>
+		<Display>Device space</Display>
+		<Value>DeviceUnits</Value>
+	</SizeContext>
+	<SizeContext>
+		<Display>Map space</Display>
+		<Value>MappingUnits</Value>
+	</SizeContext>
+	
+	<Units>
+		<Display>Points</Display>
+		<Value>Points</Value>
+	</Units>
+	<Units>
+		<Display>Inches</Display>
+		<Value>Inches</Value>
+	</Units>
+	<Units>
+		<Display>Feet</Display>
+		<Value>Feet</Value>
+	</Units>
+	<Units>
+		<Display>Yards</Display>
+		<Value>Yards</Value>
+	</Units>
+	<Units>
+		<Display>Millimeters</Display>
+		<Value>Millimeters</Value>
+	</Units>
+	<Units>
+		<Display>Centimeters</Display>
+		<Value>Centimeters</Value>
+	</Units>
+	<Units>
+		<Display>Meters</Display>
+		<Value>Meters</Value>
+	</Units>
+	<Units>
+		<Display>Kilometers</Display>
+		<Value>Kilometers</Value>
+	</Units>
+
+	<Rotation>
+		<Display>0 degrees</Display>
+		<Value>0</Value>
+	</Rotation>
+	<Rotation>
+		<Display>30 degrees</Display>
+		<Value>30</Value>
+	</Rotation>
+	<Rotation>
+		<Display>45 degrees</Display>
+		<Value>45</Value>
+	</Rotation>
+	<Rotation>
+		<Display>90 degrees</Display>
+		<Value>90</Value>
+	</Rotation>
+</ComboBoxDataSet>
\ No newline at end of file



More information about the mapguide-commits mailing list