[mapguide-commits] r6652 - in trunk/MgDev/Desktop: MapViewer MapViewer.Desktop MapViewerTest MapViewerTest/Properties MapViewerTest/Resources MgDesktop/MapLayer

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-05-15 06:41:04 -0700 (Tue, 15 May 2012)
New Revision: 6652

Added:
   trunk/MgDev/Desktop/MapViewer/MgLoadMapComponent.cs
   trunk/MgDev/Desktop/MapViewerTest/Resources/map--arrow.png
Modified:
   trunk/MgDev/Desktop/MapViewer.Desktop/MgDesktopMapViewerProvider.cs
   trunk/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj
   trunk/MgDev/Desktop/MapViewer/MapViewer.csproj
   trunk/MgDev/Desktop/MapViewer/MgLoadPackageComponent.cs
   trunk/MgDev/Desktop/MapViewer/MgMapViewer.cs
   trunk/MgDev/Desktop/MapViewer/MgMapViewerProvider.cs
   trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj
   trunk/MgDev/Desktop/MapViewerTest/MgAppWindow.Designer.cs
   trunk/MgDev/Desktop/MapViewerTest/MgAppWindow.resx
   trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs
   trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.resx
   trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp
   trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
Log:
Merge in r6650 and r6651

Modified: trunk/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj	2012-05-15 13:41:04 UTC (rev 6652)
@@ -126,6 +126,9 @@
     <Compile Include="MgLineMeasureControlImpl.Designer.cs">
       <DependentUpon>MgLineMeasureControlImpl.cs</DependentUpon>
     </Compile>
+    <Compile Include="MgLoadMapComponent.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="MgLoadPackageComponent.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -463,7 +466,6 @@
     <None Include="Resources\AreaLayerDef.txt" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="MapViewer.csproj" />
     <Content Include="Resources\icon_home.gif" />
     <Content Include="Resources\icon_tasks.gif" />
     <Content Include="Resources\load_package.gif" />

Modified: trunk/MgDev/Desktop/MapViewer/MapViewer.csproj
===================================================================
--- trunk/MgDev/Desktop/MapViewer/MapViewer.csproj	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewer/MapViewer.csproj	2012-05-15 13:41:04 UTC (rev 6652)
@@ -106,6 +106,9 @@
     <Compile Include="MgLoadPackageComponent.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="MgLoadMapComponent.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="MgMapViewer.cs">
       <SubType>Component</SubType>
     </Compile>

Copied: trunk/MgDev/Desktop/MapViewer/MgLoadMapComponent.cs (from rev 6651, branches/2.4/MgDev/Desktop/MapViewer/MgLoadMapComponent.cs)
===================================================================
--- trunk/MgDev/Desktop/MapViewer/MgLoadMapComponent.cs	                        (rev 0)
+++ trunk/MgDev/Desktop/MapViewer/MgLoadMapComponent.cs	2012-05-15 13:41:04 UTC (rev 6652)
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace OSGeo.MapGuide.Viewer
+{
+    [ToolboxItem(true)]
+    public class MgLoadMapComponent : MgComponent
+    {
+        [Description("The map definition to load")]
+        public string MapDefinition
+        {
+            get;
+            set;
+        }
+
+        protected override bool RequiresLoadedMap
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public override void Invoke()
+        {
+            var provider = this.Viewer.GetProvider();
+            var mdfId = new MgResourceIdentifier(this.MapDefinition);
+            var map = provider.CreateMap(mdfId, mdfId.GetName());
+            provider.LoadMap(map);
+        }
+    }
+}

Modified: trunk/MgDev/Desktop/MapViewer/MgLoadPackageComponent.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewer/MgLoadPackageComponent.cs	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewer/MgLoadPackageComponent.cs	2012-05-15 13:41:04 UTC (rev 6652)
@@ -23,6 +23,13 @@
             }
         }
 
+        [Description("The LoadMap component to invoke once the package has been loaded")]
+        public MgLoadMapComponent InvokeOnPackageLoad
+        {
+            get;
+            set;
+        }
+
         public override void Invoke()
         {
             using (var open = new OpenFileDialog())
@@ -39,6 +46,8 @@
 
                     resSvc.ApplyResourcePackage(br);
                     MessageBox.Show(Properties.Resources.TextPackageLoaded);
+                    if (this.InvokeOnPackageLoad != null)
+                        this.InvokeOnPackageLoad.Invoke();
                 }
             }
         }

Modified: trunk/MgDev/Desktop/MapViewer/MgMapViewer.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewer/MgMapViewer.cs	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewer/MgMapViewer.cs	2012-05-15 13:41:04 UTC (rev 6652)
@@ -31,6 +31,7 @@
         private MgWktReaderWriter _wktRW;
         private MgAgfReaderWriter _agfRW;
         private MgGeometryFactory _geomFact;
+        private MgCoordinateSystemFactory _csFact;
         private MgMeasure _mapMeasure;
 
         private Color _mapBgColor;
@@ -259,6 +260,12 @@
                     renderWorker.RunWorkerCompleted -= renderWorker_RunWorkerCompleted;
                 }
 
+                if (_csFact != null)
+                {
+                    _csFact.Dispose();
+                    _csFact = null;
+                }
+
                 if (_resSvc != null)
                 {
                     _resSvc.Dispose();
@@ -1847,10 +1854,31 @@
                 if (!_provider.HasTooltips(ldfId))
                     continue;
 
+                //Make sure geometry property checks out
+                var geomName = _provider.GetGeometryProperty(objId);
+                var clsDef = layer.GetClassDefinition();
+                var props = clsDef.GetProperties();
+                if (props.IndexOf(geomName) < 0)
+                    continue;
+
+                var geomProp = props.GetItem(geomName) as MgGeometricPropertyDefinition;
+                if (geomProp == null)
+                    continue;
+
+                var trans = _provider.GetMapToLayerTransform(layer, geomProp);
+
                 string propName = "QUERYTOOLTIP";
                 MgFeatureQueryOptions query = new MgFeatureQueryOptions();
                 query.AddComputedProperty(propName, _provider.GetTooltipExpression(ldfId));
-                query.SetSpatialFilter(_provider.GetGeometryProperty(objId), poly, MgFeatureSpatialOperations.Intersects);
+                if (trans != null)
+                {
+                    var txPoly = (MgGeometry)poly.Transform(trans);
+                    query.SetSpatialFilter(geomName, txPoly, MgFeatureSpatialOperations.Intersects);
+                }
+                else
+                {
+                    query.SetSpatialFilter(geomName, poly, MgFeatureSpatialOperations.Intersects);
+                }
 
                 MgFeatureReader reader = null;
                 reader = layer.SelectFeatures(query);
@@ -1956,6 +1984,7 @@
             sw.Start();
 #endif
 
+            string mapCsWkt = _map.GetMapSRS();
             var layers = _map.GetLayers();
 
             if (ModifierKeys != Keys.Control)
@@ -1979,12 +2008,34 @@
                 _provider.CheckAndCacheGeometryProperty(layer);
 
                 var objId = layer.GetObjectId();
+                string geomName = _provider.GetGeometryProperty(objId);
+
+                //Make sure geometry property checks out
+                var clsDef = layer.GetClassDefinition();
+                var props = clsDef.GetProperties();
+                if (props.IndexOf(geomName) < 0)
+                    continue;
+
+                var geomProp = props.GetItem(geomName) as MgGeometricPropertyDefinition;
+                if (geomProp == null)
+                    continue;
+
                 MgFeatureQueryOptions query = new MgFeatureQueryOptions();
                 string filter = layer.GetFilter();
                 if (!string.IsNullOrEmpty(filter))
                     query.SetFilter(filter);
-                query.SetSpatialFilter(_provider.GetGeometryProperty(objId), geom, MgFeatureSpatialOperations.Intersects);
 
+                var trans = _provider.GetMapToLayerTransform(layer, geomProp);
+                if (trans != null)
+                {
+                    var txGeom = (MgGeometry)geom.Transform(trans);
+                    query.SetSpatialFilter(geomName, txGeom, MgFeatureSpatialOperations.Intersects);
+                }
+                else
+                {
+                    query.SetSpatialFilter(geomName, geom, MgFeatureSpatialOperations.Intersects);
+                }
+
                 MgFeatureReader reader = layer.SelectFeatures(query);
                 try
                 {

Modified: trunk/MgDev/Desktop/MapViewer/MgMapViewerProvider.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewer/MgMapViewerProvider.cs	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewer/MgMapViewerProvider.cs	2012-05-15 13:41:04 UTC (rev 6652)
@@ -78,11 +78,14 @@
             _map = map;
             RebuildLayerInfoCache();
             CacheGeometryProperties(_map.GetLayers());
+            OnNewMapLoaded(map);
             var h = this.MapLoaded;
             if (h != null)
                 h(this, EventArgs.Empty);
         }
 
+        protected virtual void OnNewMapLoaded(MgMapBase map) { }
+
         internal event EventHandler MapLoaded;
 
         /// <summary>
@@ -153,6 +156,7 @@
             }
         }
 
+        private Dictionary<string, MgCoordinateSystemTransform> _mapToLayerTransforms = new Dictionary<string, MgCoordinateSystemTransform>();
         private Dictionary<string, NameValueCollection> _propertyMappings = new Dictionary<string, NameValueCollection>();
 
         internal Dictionary<string, NameValueCollection> AllPropertyMappings { get { return _propertyMappings; } }
@@ -165,6 +169,14 @@
             _cachedLayerDefinitions.Clear();
             _tooltipExpressions.Clear();
             _propertyMappings.Clear();
+
+            foreach (var trans in _mapToLayerTransforms.Values)
+            {
+                if (trans != null)
+                    trans.Dispose();
+            }
+            _mapToLayerTransforms.Clear();
+
             if (_resSvc == null)
                 _resSvc = (MgResourceService)CreateService(MgServiceType.ResourceService);
 
@@ -176,6 +188,19 @@
                 var layer = layers.GetItem(i);
                 var ldf = layer.GetLayerDefinition();
                 resIds.Add(ldf.ToString());
+
+                //Make sure geometry property checks out
+                var clsDef = layer.GetClassDefinition();
+                var geomName = clsDef.DefaultGeometryPropertyName;
+                var props = clsDef.GetProperties();
+                if (props.IndexOf(geomName) < 0)
+                    continue;
+
+                var geomProp = props.GetItem(geomName) as MgGeometricPropertyDefinition;
+                if (geomProp == null)
+                    continue;
+
+                var trans = GetMapToLayerTransform(layer, geomProp);
             }
             MgStringCollection contents = _resSvc.GetResourceContents(resIds, null);
             for (int i = 0; i < contents.GetCount(); i++)
@@ -201,6 +226,49 @@
             }
         }
 
+        internal MgCoordinateSystemTransform GetMapToLayerTransform(MgLayerBase layer, MgGeometricPropertyDefinition geomProp)
+        {
+            string objId = layer.GetObjectId();
+            string mapCsWkt = _map.GetMapSRS();
+            bool bChecked = false;
+            MgCoordinateSystemTransform trans = this.GetLayerTransform(objId, out bChecked);
+            if (trans == null && !bChecked)
+            {
+                MgSpatialContextReader scReader = GetSpatialContexts(layer, false);
+                try
+                {
+                    while (scReader.ReadNext())
+                    {
+                        if (scReader.GetName() == geomProp.SpatialContextAssociation)
+                        {
+                            //Only need to set up transform if layer and map wkts do not match
+                            if (!string.IsNullOrEmpty(mapCsWkt) && !string.IsNullOrEmpty(scReader.GetCoordinateSystemWkt()))
+                            {
+                                if (mapCsWkt != scReader.GetCoordinateSystemWkt())
+                                {
+                                    var csFact = this.CoordSysFactory;
+                                    var layerCs = csFact.Create(scReader.GetCoordinateSystemWkt());
+                                    trans = csFact.GetTransform(this.GetMapCoordinateSystem(), layerCs);
+                                    this.CacheLayerTransform(objId, trans);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                finally
+                {
+                    scReader.Close();
+                }
+                if (trans == null)
+                    this.CacheLayerTransform(objId, null);
+            }
+            return trans;
+        }
+
+        protected abstract MgSpatialContextReader GetSpatialContexts(MgLayerBase layer, bool activeOnly);
+
+        public abstract MgMapBase CreateMap(MgResourceIdentifier mapDefinitionId, string name);
         public abstract MgByteReader RenderDynamicOverlay(MgSelectionBase selection, MgViewerRenderingOptions args);
         public abstract void SetDisplaySize(int width, int height);
         public abstract MgSelectionBase CreateSelectionForMap();
@@ -236,5 +304,21 @@
         {
             return _tooltipExpressions.ContainsKey(ldfId.ToString());
         }
+
+        internal MgCoordinateSystemTransform GetLayerTransform(string objId, out bool bAlreadyChecked)
+        {
+            bAlreadyChecked = false;
+            if (_mapToLayerTransforms.ContainsKey(objId))
+            {
+                bAlreadyChecked = true;
+                return _mapToLayerTransforms[objId];
+            }
+            return null;
+        }
+
+        internal void CacheLayerTransform(string objId, MgCoordinateSystemTransform trans)
+        {
+            _mapToLayerTransforms[objId] = trans;
+        }
     }
 }

Modified: trunk/MgDev/Desktop/MapViewer.Desktop/MgDesktopMapViewerProvider.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewer.Desktop/MgDesktopMapViewerProvider.cs	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewer.Desktop/MgDesktopMapViewerProvider.cs	2012-05-15 13:41:04 UTC (rev 6652)
@@ -17,6 +17,11 @@
             _implMap = map;
         }
 
+        protected override void OnNewMapLoaded(MgMapBase map)
+        {
+            _implMap = (MgdMap)map;
+        }
+
         protected override void SubInit()
         {
             _fact = new MgServiceFactory();
@@ -131,5 +136,16 @@
         {
             return new MgdLayer(layerDefId, _resSvc);
         }
+
+        public override MgMapBase CreateMap(MgResourceIdentifier mapDefinitionId, string name)
+        {
+            var map = new MgdMap(mapDefinitionId, name);
+            return map;
+        }
+
+        protected override MgSpatialContextReader GetSpatialContexts(MgLayerBase layer, bool activeOnly)
+        {
+            return ((MgdLayer)layer).GetSpatialContexts(activeOnly);
+        }
     }
 }

Modified: trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj	2012-05-15 13:41:04 UTC (rev 6652)
@@ -207,6 +207,9 @@
   <ItemGroup>
     <None Include="Resources\icon_tasks.gif" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\map--arrow.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Modified: trunk/MgDev/Desktop/MapViewerTest/MgAppWindow.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/MgAppWindow.Designer.cs	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewerTest/MgAppWindow.Designer.cs	2012-05-15 13:41:04 UTC (rev 6652)
@@ -86,6 +86,7 @@
             this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem27 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripButton13 = new System.Windows.Forms.ToolStripButton();
             this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem25 = new System.Windows.Forms.ToolStripMenuItem();
@@ -94,10 +95,13 @@
             this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem29 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem30 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem28 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem13 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem14 = new System.Windows.Forms.ToolStripMenuItem();
@@ -129,16 +133,14 @@
             this.mgViewerOptionsComponent1 = new OSGeo.MapGuide.Viewer.MgViewerOptionsComponent();
             this.plotToDwfComponent = new OSGeo.MapGuide.Viewer.MgGenericInvokeComponent();
             this.mgLoadPackageComponent1 = new OSGeo.MapGuide.Viewer.MgLoadPackageComponent();
+            this.mgLoadMapComponent1 = new OSGeo.MapGuide.Viewer.MgLoadMapComponent();
             this.mgZoomToSelectionComponent1 = new OSGeo.MapGuide.Viewer.MgZoomToSelectionComponent();
             this.mgMenuItemComponentInvoker1 = new OSGeo.MapGuide.Viewer.MgMenuItemComponentInvoker();
+            this.mgThemeComponent1 = new OSGeo.MapGuide.Viewer.MgThemeComponent();
             this.loadCompactViewerComponent = new OSGeo.MapGuide.Viewer.MgGenericInvokeComponent();
             this.profileComponent = new OSGeo.MapGuide.Viewer.MgGenericInvokeComponent();
             this.mgToolButtonComponentInvoker1 = new OSGeo.MapGuide.Viewer.MgToolButtonComponentInvoker();
             this.mgLayerSelectionHandler1 = new OSGeo.MapGuide.Viewer.MgLayerSelectionHandler();
-            this.mgThemeComponent1 = new OSGeo.MapGuide.Viewer.MgThemeComponent();
-            this.toolStripMenuItem27 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem28 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem29 = new System.Windows.Forms.ToolStripMenuItem();
             this.appMenu.SuspendLayout();
             this.appContextMenu.SuspendLayout();
             this.appContainer.Panel1.SuspendLayout();
@@ -182,6 +184,7 @@
             // fileToolStripMenuItem
             // 
             this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem30,
             this.toolStripMenuItem1});
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
             this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
@@ -730,7 +733,7 @@
             this.toolStripMenuItem9.Enabled = false;
             this.toolStripMenuItem9.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem9.Image")));
             this.toolStripMenuItem9.Name = "toolStripMenuItem9";
-            this.toolStripMenuItem9.Size = new System.Drawing.Size(152, 22);
+            this.toolStripMenuItem9.Size = new System.Drawing.Size(119, 22);
             this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem9, this.mgBufferComponent1);
             this.toolStripMenuItem9.Text = "Buffer";
             // 
@@ -739,7 +742,7 @@
             this.toolStripMenuItem10.Enabled = false;
             this.toolStripMenuItem10.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem10.Image")));
             this.toolStripMenuItem10.Name = "toolStripMenuItem10";
-            this.toolStripMenuItem10.Size = new System.Drawing.Size(152, 22);
+            this.toolStripMenuItem10.Size = new System.Drawing.Size(119, 22);
             this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem10, this.mgMeasureComponent1);
             this.toolStripMenuItem10.Text = "Measure";
             // 
@@ -748,10 +751,20 @@
             this.toolStripMenuItem11.Enabled = false;
             this.toolStripMenuItem11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem11.Image")));
             this.toolStripMenuItem11.Name = "toolStripMenuItem11";
-            this.toolStripMenuItem11.Size = new System.Drawing.Size(152, 22);
+            this.toolStripMenuItem11.Size = new System.Drawing.Size(119, 22);
             this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem11, this.mgQueryComponent1);
             this.toolStripMenuItem11.Text = "Query";
             // 
+            // toolStripMenuItem27
+            // 
+            this.toolStripMenuItem27.Enabled = false;
+            this.toolStripMenuItem27.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem27.Image")));
+            this.toolStripMenuItem27.Name = "toolStripMenuItem27";
+            this.toolStripMenuItem27.Size = new System.Drawing.Size(119, 22);
+            this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem27, this.mgThemeComponent1);
+            this.toolStripMenuItem27.Text = "Theme";
+            this.toolStripMenuItem27.ToolTipText = "Theme";
+            // 
             // toolStripButton13
             // 
             this.toolStripButton13.Enabled = false;
@@ -806,7 +819,7 @@
             this.toolStripMenuItem5.Enabled = false;
             this.toolStripMenuItem5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem5.Image")));
             this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-            this.toolStripMenuItem5.Size = new System.Drawing.Size(152, 22);
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(119, 22);
             this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem5, this.mgBufferComponent1);
             this.toolStripMenuItem5.Text = "Buffer";
             // 
@@ -815,7 +828,7 @@
             this.toolStripMenuItem6.Enabled = false;
             this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
             this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-            this.toolStripMenuItem6.Size = new System.Drawing.Size(152, 22);
+            this.toolStripMenuItem6.Size = new System.Drawing.Size(119, 22);
             this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem6, this.mgMeasureComponent1);
             this.toolStripMenuItem6.Text = "Measure";
             // 
@@ -824,15 +837,34 @@
             this.toolStripMenuItem7.Enabled = false;
             this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image")));
             this.toolStripMenuItem7.Name = "toolStripMenuItem7";
-            this.toolStripMenuItem7.Size = new System.Drawing.Size(152, 22);
+            this.toolStripMenuItem7.Size = new System.Drawing.Size(119, 22);
             this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem7, this.mgQueryComponent1);
             this.toolStripMenuItem7.Text = "Query";
             // 
+            // toolStripMenuItem29
+            // 
+            this.toolStripMenuItem29.Enabled = false;
+            this.toolStripMenuItem29.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem29.Image")));
+            this.toolStripMenuItem29.Name = "toolStripMenuItem29";
+            this.toolStripMenuItem29.Size = new System.Drawing.Size(119, 22);
+            this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem29, this.mgThemeComponent1);
+            this.toolStripMenuItem29.Text = "Theme";
+            this.toolStripMenuItem29.ToolTipText = "Theme";
+            // 
+            // toolStripMenuItem30
+            // 
+            this.toolStripMenuItem30.Image = global::MapViewerTest.Properties.Resources.map__arrow;
+            this.toolStripMenuItem30.Name = "toolStripMenuItem30";
+            this.toolStripMenuItem30.Size = new System.Drawing.Size(189, 22);
+            this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem30, this.mgLoadMapComponent1);
+            this.toolStripMenuItem30.Text = "Load Sheboygan Map";
+            this.toolStripMenuItem30.ToolTipText = "Load the Sheboygan Map";
+            // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem1.Image")));
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(147, 22);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(189, 22);
             this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem1, this.mgLoadPackageComponent1);
             this.toolStripMenuItem1.Text = "Load Package";
             this.toolStripMenuItem1.ToolTipText = "Load Package";
@@ -864,6 +896,16 @@
             this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem4, this.mgQueryComponent1);
             this.toolStripMenuItem4.Text = "Query";
             // 
+            // toolStripMenuItem28
+            // 
+            this.toolStripMenuItem28.Enabled = false;
+            this.toolStripMenuItem28.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem28.Image")));
+            this.toolStripMenuItem28.Name = "toolStripMenuItem28";
+            this.toolStripMenuItem28.Size = new System.Drawing.Size(154, 22);
+            this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem28, this.mgThemeComponent1);
+            this.toolStripMenuItem28.Text = "Theme";
+            this.toolStripMenuItem28.ToolTipText = "Theme";
+            // 
             // toolStripMenuItem12
             // 
             this.toolStripMenuItem12.Enabled = false;
@@ -1129,10 +1171,19 @@
             // mgLoadPackageComponent1
             // 
             this.mgLoadPackageComponent1.Icon = ((System.Drawing.Image)(resources.GetObject("mgLoadPackageComponent1.Icon")));
+            this.mgLoadPackageComponent1.InvokeOnPackageLoad = this.mgLoadMapComponent1;
             this.mgLoadPackageComponent1.Label = "Load Package";
             this.mgLoadPackageComponent1.ToolTipText = "Load Package";
             this.mgLoadPackageComponent1.Viewer = this.mapViewer;
             // 
+            // mgLoadMapComponent1
+            // 
+            this.mgLoadMapComponent1.Icon = global::MapViewerTest.Properties.Resources.map__arrow;
+            this.mgLoadMapComponent1.Label = "Load Sheboygan Map";
+            this.mgLoadMapComponent1.MapDefinition = "Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition";
+            this.mgLoadMapComponent1.ToolTipText = "Load the Sheboygan Map";
+            this.mgLoadMapComponent1.Viewer = this.mapViewer;
+            // 
             // mgZoomToSelectionComponent1
             // 
             this.mgZoomToSelectionComponent1.Icon = ((System.Drawing.Image)(resources.GetObject("mgZoomToSelectionComponent1.Icon")));
@@ -1140,6 +1191,15 @@
             this.mgZoomToSelectionComponent1.ToolTipText = "Zoom to Selection";
             this.mgZoomToSelectionComponent1.Viewer = this.mapViewer;
             // 
+            // mgThemeComponent1
+            // 
+            this.mgThemeComponent1.Icon = ((System.Drawing.Image)(resources.GetObject("mgThemeComponent1.Icon")));
+            this.mgThemeComponent1.Label = "Theme";
+            this.mgThemeComponent1.Target = OSGeo.MapGuide.Viewer.MgViewerTarget.TaskPane;
+            this.mgThemeComponent1.TaskPane = this.taskPane;
+            this.mgThemeComponent1.ToolTipText = "Theme";
+            this.mgThemeComponent1.Viewer = this.mapViewer;
+            // 
             // loadCompactViewerComponent
             // 
             this.loadCompactViewerComponent.CanInvokeWithoutLoadedMap = false;
@@ -1165,45 +1225,6 @@
             this.mgLayerSelectionHandler1.Viewer = this.mapViewer;
             this.mgLayerSelectionHandler1.SelectionMade += new OSGeo.MapGuide.Viewer.MgLayerSelectionEventHandler(this.mgLayerSelectionHandler1_SelectionMade);
             // 
-            // mgThemeComponent1
-            // 
-            this.mgThemeComponent1.Icon = ((System.Drawing.Image)(resources.GetObject("mgThemeComponent1.Icon")));
-            this.mgThemeComponent1.Label = "Theme";
-            this.mgThemeComponent1.Target = OSGeo.MapGuide.Viewer.MgViewerTarget.TaskPane;
-            this.mgThemeComponent1.TaskPane = this.taskPane;
-            this.mgThemeComponent1.ToolTipText = "Theme";
-            this.mgThemeComponent1.Viewer = this.mapViewer;
-            // 
-            // toolStripMenuItem27
-            // 
-            this.toolStripMenuItem27.Enabled = false;
-            this.toolStripMenuItem27.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem27.Image")));
-            this.toolStripMenuItem27.Name = "toolStripMenuItem27";
-            this.toolStripMenuItem27.Size = new System.Drawing.Size(152, 22);
-            this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem27, this.mgThemeComponent1);
-            this.toolStripMenuItem27.Text = "Theme";
-            this.toolStripMenuItem27.ToolTipText = "Theme";
-            // 
-            // toolStripMenuItem28
-            // 
-            this.toolStripMenuItem28.Enabled = false;
-            this.toolStripMenuItem28.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem28.Image")));
-            this.toolStripMenuItem28.Name = "toolStripMenuItem28";
-            this.toolStripMenuItem28.Size = new System.Drawing.Size(154, 22);
-            this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem28, this.mgThemeComponent1);
-            this.toolStripMenuItem28.Text = "Theme";
-            this.toolStripMenuItem28.ToolTipText = "Theme";
-            // 
-            // toolStripMenuItem29
-            // 
-            this.toolStripMenuItem29.Enabled = false;
-            this.toolStripMenuItem29.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem29.Image")));
-            this.toolStripMenuItem29.Name = "toolStripMenuItem29";
-            this.toolStripMenuItem29.Size = new System.Drawing.Size(152, 22);
-            this.mgMenuItemComponentInvoker1.SetTargetComponent(this.toolStripMenuItem29, this.mgThemeComponent1);
-            this.toolStripMenuItem29.Text = "Theme";
-            this.toolStripMenuItem29.ToolTipText = "Theme";
-            // 
             // MgAppWindow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1365,6 +1386,8 @@
         private OSGeo.MapGuide.Viewer.MgThemeComponent mgThemeComponent1;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem27;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem29;
+        private OSGeo.MapGuide.Viewer.MgLoadMapComponent mgLoadMapComponent1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem30;
 
     }
 }
\ No newline at end of file

Modified: trunk/MgDev/Desktop/MapViewerTest/MgAppWindow.resx
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/MgAppWindow.resx	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewerTest/MgAppWindow.resx	2012-05-15 13:41:04 UTC (rev 6652)
@@ -120,10 +120,249 @@
   <metadata name="appMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="mgMenuItemComponentInvoker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>168, 173</value>
+  </metadata>
+  <metadata name="mgLoadMapComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>498, 329</value>
+  </metadata>
+  <metadata name="appContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>338, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="toolStripMenuItem2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripMenuItem13.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPY2AAAifP4P+4MEieKAAy4Oev3ygYJAbSHJOc
+        /K2itnX/lClz5PEaBtLw6MlLOIYZYGnvATY4Pq3gT0Nr72yshoAkcktq/99/+AyrARu37jkPksvMr/yP
+        YQjIaSDTQQqAhqyHuQTmAnt/fwEnr5A1IG/ce/AM7BIU79Q0dh3fsmP//zUbdhx28gpeihywyM519Aye
+        D3LJlu37/oMMg8uBAglkclB48iUXl1B+mATMBTC+jXeUoH9owjmQWpAeuAHO3mFgfzt5hYJDHR/Q0tL6
+        A1IL0gNXB9JIkQEwL4Cch+wFWFjAbHJzCxECefPeg6eoXiiva9+3def+/xu27r7g6BW8AtkLsBQKMSx0
+        1frNu44AA/I/KODh6nqmzpMFRQ0ocEChC/TSQpBtMBeAEhHIIFAUw6IRpAclrBrb+mZlFVT9BynYuG3P
+        eVDqgxkAS50gp2fkV/wHqcWZGkEuAWnAZgA4oKH5A2dMgZwG8gYsntHzB1GGYAtEbNkdpA4A8r5nBCK/
+        IMoAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="mgRefreshMapComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>405, 173</value>
+  </metadata>
+  <data name="mgRefreshMapComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPY2AAAifP4P+4MEieKAAy4Oev3ygYJAbSHJOc
+        /K2itnX/lClz5PEaBtLw6MlLOIYZYGnvATY4Pq3gT0Nr72yshoAkcktq/99/+AyrARu37jkPksvMr/yP
+        YQjIaSDTQQqAhqyHuQTmAnt/fwEnr5A1IG/ce/AM7BIU79Q0dh3fsmP//zUbdhx28gpeihywyM519Aye
+        D3LJlu37/oMMg8uBAglkclB48iUXl1B+mATMBTC+jXeUoH9owjmQWpAeuAHO3mFgfzt5hYJDHR/Q0tL6
+        A1IL0gNXB9JIkQEwL4Cch+wFWFjAbHJzCxECefPeg6eoXiiva9+3def+/xu27r7g6BW8AtkLsBQKMSx0
+        1frNu44AA/I/KODh6nqmzpMFRQ0ocEChC/TSQpBtMBeAEhHIIFAUw6IRpAclrBrb+mZlFVT9BynYuG3P
+        eVDqgxkAS50gp2fkV/wHqcWZGkEuAWnAZgA4oKH5A2dMgZwG8gYsntHzB1GGYAtEbNkdpA4A8r5nBCK/
+        IMoAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripMenuItem14.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIESURBVDhPnZPNSxtRFMX9T2ppN7axH2SjqaGpsU0TjJJi
+        RhsZm0WaUqVRBCmIMX9BV3Xl0pWgpFAsFNS46aJQsRRqxQkx5sPPmIzGmRhJMsd3B6ZkTCPFgcN9783h
+        9+6cyzQ0VD2vR0aHHS5X9E7zA6Xx5m00Ge4rtKfzat8/1509nGB5+hzTc2GsrG/gWzSm1un5MFrNFjhc
+        XLQupMvNCR8+TuF7LI61ZBo/mVYTKfzYTqra3NvHqzdvQb4ayNDY++F2mwNr2wms7+7hIH8K6fwcTzrs
+        +JXe+avVrTjaLO0gvw7SzXmE2YUv2Nw/QFoUUVEUnBQKKmCD3VytmfAndHOXujDce6j8SaWRyOZQLJWg
+        MMCOeKwCYpkjnX4nU7jLAtZ1cKPxFhJHWewen6CH68cLtwcu90sVQFVTKicifpgBTUcHMDBikr3InErI
+        SrJaKQcCUK3WFsuI/DoA188LX5cjEOWCTgS4fBb+vADy6wDj48FAq8kMuViEzNLXRABtTdnk8nm0mNpA
+        /ppR9vUNRAMjo5DPzlCqVGoksakMDr0DP+CFteOZPgONxvO88JjNORJZgcSyKJfLrEpYXFyC6ZEZvb0e
+        OJ1O+P3++pBgKBQgUDMbLU2HKu3pnG42Go2w2+3w+Xz1IVf9NBrEZrPB673ic/4HYrVar9cFwakT0sTE
+        JC4A2evLqnFhjAkAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="mgZoomInComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 251</value>
+  </metadata>
+  <data name="mgZoomInComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIESURBVDhPnZPNSxtRFMX9T2ppN7axH2SjqaGpsU0TjJJi
+        RhsZm0WaUqVRBCmIMX9BV3Xl0pWgpFAsFNS46aJQsRRqxQkx5sPPmIzGmRhJMsd3B6ZkTCPFgcN9783h
+        9+6cyzQ0VD2vR0aHHS5X9E7zA6Xx5m00Ge4rtKfzat8/1509nGB5+hzTc2GsrG/gWzSm1un5MFrNFjhc
+        XLQupMvNCR8+TuF7LI61ZBo/mVYTKfzYTqra3NvHqzdvQb4ayNDY++F2mwNr2wms7+7hIH8K6fwcTzrs
+        +JXe+avVrTjaLO0gvw7SzXmE2YUv2Nw/QFoUUVEUnBQKKmCD3VytmfAndHOXujDce6j8SaWRyOZQLJWg
+        MMCOeKwCYpkjnX4nU7jLAtZ1cKPxFhJHWewen6CH68cLtwcu90sVQFVTKicifpgBTUcHMDBikr3InErI
+        SrJaKQcCUK3WFsuI/DoA188LX5cjEOWCTgS4fBb+vADy6wDj48FAq8kMuViEzNLXRABtTdnk8nm0mNpA
+        /ppR9vUNRAMjo5DPzlCqVGoksakMDr0DP+CFteOZPgONxvO88JjNORJZgcSyKJfLrEpYXFyC6ZEZvb0e
+        OJ1O+P3++pBgKBQgUDMbLU2HKu3pnG42Go2w2+3w+Xz1IVf9NBrEZrPB673ic/4HYrVar9cFwakT0sTE
+        JC4A2evLqnFhjAkAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripMenuItem15.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH5SURBVDhPnZPLSxtRFMb9T2qpm7ZRW7KpqaHBaNMEU0kx
+        o42MZpGmqDSKIIL4+Atc6cplVwUlhWKhoMaNi0LFUvCBE5KYh48Yk9E4EyNJ5vOegJIxiS0d+Dj33vn4
+        3TPfYWpqSp4PwyNDFpvN/6T+mVL7sA6PNY0K7em81Fdx3d7JCYa2N5hf8GJtexfr/kCxzi960aQ3wGLj
+        /FUhb+2cMDM7h5+BEDYjMfxm2ghH8Ws/UtTe0TH6PvaDfGWQwdGxoRaTBZv7YWwfHiGevoB0dVVc/4kd
+        3GojGEKzoQXkV0E6OIfwZek79o7jiIkiCoqC80wGQvwEu+zmUn32fkUHd6cLTcNzZScaQziZQjaXg8IA
+        B+IZgolTBO5oKxLFUxawqoMHtY8QPk3i8OwcnVwP3tkdsNnflymaEhE6SYCmowJoGDHCXiQuJCQluVgp
+        h0oKslzIrwJwPbzwY9UHUc78Vd5vSyC/CjA+Pulp0ukhZ7OQWfqVRNmk0mm80DWD/GWj7O7u9XuGRyBf
+        XiJXKJRJYlMZGPwEvtcJY+trdQY3NJ7nhVdszj7fGiSWRT6fZ1XC8vIKdC/16OpywGq1wu12V4dMTk97
+        CFTPRkvToUp7OqebtVotzGYzXC5Xdch9P80NxGQywem853P+BWI0Gv+vC4JTJ6SJiSlcA6LH15rL3j8W
+        AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="mgZoomOutComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>436, 251</value>
+  </metadata>
+  <data name="mgZoomOutComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH5SURBVDhPnZPLSxtRFMb9T2qpm7ZRW7KpqaHBaNMEU0kx
+        o42MZpGmqDSKIIL4+Atc6cplVwUlhWKhoMaNi0LFUvCBE5KYh48Yk9E4EyNJ5vOegJIxiS0d+Dj33vn4
+        3TPfYWpqSp4PwyNDFpvN/6T+mVL7sA6PNY0K7em81Fdx3d7JCYa2N5hf8GJtexfr/kCxzi960aQ3wGLj
+        /FUhb+2cMDM7h5+BEDYjMfxm2ghH8Ws/UtTe0TH6PvaDfGWQwdGxoRaTBZv7YWwfHiGevoB0dVVc/4kd
+        3GojGEKzoQXkV0E6OIfwZek79o7jiIkiCoqC80wGQvwEu+zmUn32fkUHd6cLTcNzZScaQziZQjaXg8IA
+        B+IZgolTBO5oKxLFUxawqoMHtY8QPk3i8OwcnVwP3tkdsNnflymaEhE6SYCmowJoGDHCXiQuJCQluVgp
+        h0oKslzIrwJwPbzwY9UHUc78Vd5vSyC/CjA+Pulp0ukhZ7OQWfqVRNmk0mm80DWD/GWj7O7u9XuGRyBf
+        XiJXKJRJYlMZGPwEvtcJY+trdQY3NJ7nhVdszj7fGiSWRT6fZ1XC8vIKdC/16OpywGq1wu12V4dMTk97
+        CFTPRkvToUp7OqebtVotzGYzXC5Xdch9P80NxGQywem853P+BWI0Gv+vC4JTJ6SJiSlcA6LH15rL3j8W
+        AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripMenuItem16.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIZvAISChAEBAXBJJai7zsfb8Nrn9M/a5Nnm81tgZNDh8sXa77jH16jR4+fu9dDh8brT
+        7erv89jm8uzw9ODq9Ku0vNHh8mRrcvT3+aStttri6oOGiJqbncrc7oaKjZ+fn9Di6JSVl67C1a6yt5u2
+        0F5cWsjd5IiOlM3U2Tg3N398ezAvLujjjKCnr5u83uXq73V5fnh3d+nv9OLaid/s76/N6pyzy9fn65mi
+        rLCurXahzJDO1tfb3+Do8dDg8UdKTb7L2EpMTFhYWZy20K22v6jG5KWqsaq8z+7sj7C/z6amp6C50uLr
+        9evw9aTF52RgX250esjQ2ISAf2xtb7S3u+Tr8WBocMPT43yQo7vU7cbb7+Hr9JGRkt7m7YSFiL7H0cza
+        6IWUo7bBzeqxd6uvs6uoqOLs9c7X31xbXbe/x+fs8evv84SHi8vY5XyPoq7L5wAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AABvACwAAAAAEAAQAAAIwgABvBFIcOCbgwgTJsQRxUkKMgkFBpj4xsMULz/CFNmiMMCRNxugcEkTg8cX
+        JGsOSlyRRAQENRcaTIjAAQwIhAFkwDghIQMVLQd6KKhxxuBEEi6YsLFSoIKCB0RQKJSyo0GZAgmyMKAh
+        xIfBNwFMjFlywAEBBjqaXHmCcwaaLmYSEMDSIoeSKhSM2njDQsONEG5GtLGAIGGADyXeDOkQRAWQFxgQ
+        CBAjECxFAwuMLDDwZoAAAQpDI/RcsHToAaJTvwkIADs=
+</value>
+  </data>
+  <metadata name="mgZoomToSelectionComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>200, 251</value>
+  </metadata>
+  <data name="mgZoomToSelectionComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIZvAISChAEBAXBJJai7zsfb8Nrn9M/a5Nnm81tgZNDh8sXa77jH16jR4+fu9dDh8brT
+        7erv89jm8uzw9ODq9Ku0vNHh8mRrcvT3+aStttri6oOGiJqbncrc7oaKjZ+fn9Di6JSVl67C1a6yt5u2
+        0F5cWsjd5IiOlM3U2Tg3N398ezAvLujjjKCnr5u83uXq73V5fnh3d+nv9OLaid/s76/N6pyzy9fn65mi
+        rLCurXahzJDO1tfb3+Do8dDg8UdKTb7L2EpMTFhYWZy20K22v6jG5KWqsaq8z+7sj7C/z6amp6C50uLr
+        9evw9aTF52RgX250esjQ2ISAf2xtb7S3u+Tr8WBocMPT43yQo7vU7cbb7+Hr9JGRkt7m7YSFiL7H0cza
+        6IWUo7bBzeqxd6uvs6uoqOLs9c7X31xbXbe/x+fs8evv84SHi8vY5XyPoq7L5wAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AABvACwAAAAAEAAQAAAIwgABvBFIcOCbgwgTJsQRxUkKMgkFBpj4xsMULz/CFNmiMMCRNxugcEkTg8cX
+        JGsOSlyRRAQENRcaTIjAAQwIhAFkwDghIQMVLQd6KKhxxuBEEi6YsLFSoIKCB0RQKJSyo0GZAgmyMKAh
+        xIfBNwFMjFlywAEBBjqaXHmCcwaaLmYSEMDSIoeSKhSM2njDQsONEG5GtLGAIGGADyXeDOkQRAWQFxgQ
+        CBAjECxFAwuMLDDwZoAAAQpDI/RcsHToAaJTvwkIADs=
+</value>
+  </data>
+  <data name="toolStripMenuItem17.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFqSURBVDhPpZPbTsJAEIZ5NaPxAXgI5UK50Qt9LmPSeBYQ
+        g2gFEWiVIsUWSjm2pdfjzOyyFbyrF1/+Ofwz2c1mMztb2bPd7SykgWYzNOj5k1TQLC+o6K1UqAXVmgHV
+        Whsh3Yhf23+uJ7yizifQGx/w8kaYoKOu0cAakts7Uot09pnJgnqzA2u0MCdk/Vy7Y3Nu/5i13vrknjpB
+        0/iCpokYXQHFTBe0yyIbtYsCvGNOMSnNqAWm1QezYyOoGBsE5lfXJTaRmpbsr3zoVQss2wGr54JlIz2K
+        Hbi5f2TDLSr1OrLOPo7dZIHteEDQAGmx9MRxoVThXDAU+i3yvvTzK7hDH1xvzEP5gxPWh/IzDLDmeqJH
+        DCgekgrUFfzxDEbjqXqm/OEp5z4yot6EFFmp7KkF0/kCiM3/MJ0HXBesYqmzIDnBIgxhEUYQICIWeQLm
+        AeYbqBNEyxii5RKJIWRF4qTG/VjWf3l5wX+/8w9/3Qe1qQ/dtwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="mgInitialViewComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 95</value>
+  </metadata>
+  <data name="mgInitialViewComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFqSURBVDhPpZPbTsJAEIZ5NaPxAXgI5UK50Qt9LmPSeBYQ
+        g2gFEWiVIsUWSjm2pdfjzOyyFbyrF1/+Ofwz2c1mMztb2bPd7SykgWYzNOj5k1TQLC+o6K1UqAXVmgHV
+        Whsh3Yhf23+uJ7yizifQGx/w8kaYoKOu0cAakts7Uot09pnJgnqzA2u0MCdk/Vy7Y3Nu/5i13vrknjpB
+        0/iCpokYXQHFTBe0yyIbtYsCvGNOMSnNqAWm1QezYyOoGBsE5lfXJTaRmpbsr3zoVQss2wGr54JlIz2K
+        Hbi5f2TDLSr1OrLOPo7dZIHteEDQAGmx9MRxoVThXDAU+i3yvvTzK7hDH1xvzEP5gxPWh/IzDLDmeqJH
+        DCgekgrUFfzxDEbjqXqm/OEp5z4yot6EFFmp7KkF0/kCiM3/MJ0HXBesYqmzIDnBIgxhEUYQICIWeQLm
+        AeYbqBNEyxii5RKJIWRF4qTG/VjWf3l5wX+/8w9/3Qe1qQ/dtwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripMenuItem18.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGTSURBVDhPlVNNSwJRFPV/tQpaiW1qFrmKICIqKMmICjIw
+        A4tIRCNpIFFKkUgMQ8FKyz4ohBBh3BlFH5vqL5w4F5/OqBsvHObjvnPeuWfe2Gz9F/qnNBlOp5NkNK/9
+        6ZhI4qD1/PP7h/L9A7a29+BaWoN7xYPQgY584RJGva7sys49MT23iHn3KoL7Eby9f6B4UxaBiB4VwWg8
+        gcenZ2iaZhZrOxifnAXr8+sbL9UaGo1X0BWL9ywKsedwDHdnQAGOYCZWKhVxw1r3BeVKJ3TXHKMdIEfY
+        2PTLzLRqJnJXFt+z9KMYKG6Jn9Z3A2EMDNqRSKXFjSJysXLGsXjPvDLZXPdZYOIUSaVzkj5BcRLNuC6W
+        MDo20RZgc2rGBWbBBkU4TufuSoSiFgF+LkItiB0nxSZHIQyj0eXCIjBkHwGD5DngzleluxZyhVtk80UJ
+        Vm3AnOjSEiTn8nj90qCbs2xBsjg5vUA8eS6o1gwEQrqsYcg9fwQ2uMC3E0boMNECiQvLXumZjnfvn0mJ
+        cDSCJAV+xk7WP7yJ9EN8DX7nAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="mgPanComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>214, 95</value>
+  </metadata>
+  <data name="mgPanComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGTSURBVDhPlVNNSwJRFPV/tQpaiW1qFrmKICIqKMmICjIw
+        A4tIRCNpIFFKkUgMQ8FKyz4ohBBh3BlFH5vqL5w4F5/OqBsvHObjvnPeuWfe2Gz9F/qnNBlOp5NkNK/9
+        6ZhI4qD1/PP7h/L9A7a29+BaWoN7xYPQgY584RJGva7sys49MT23iHn3KoL7Eby9f6B4UxaBiB4VwWg8
+        gcenZ2iaZhZrOxifnAXr8+sbL9UaGo1X0BWL9ywKsedwDHdnQAGOYCZWKhVxw1r3BeVKJ3TXHKMdIEfY
+        2PTLzLRqJnJXFt+z9KMYKG6Jn9Z3A2EMDNqRSKXFjSJysXLGsXjPvDLZXPdZYOIUSaVzkj5BcRLNuC6W
+        MDo20RZgc2rGBWbBBkU4TufuSoSiFgF+LkItiB0nxSZHIQyj0eXCIjBkHwGD5DngzleluxZyhVtk80UJ
+        Vm3AnOjSEiTn8nj90qCbs2xBsjg5vUA8eS6o1gwEQrqsYcg9fwQ2uMC3E0boMNECiQvLXumZjnfvn0mJ
+        cDSCJAV+xk7WP7yJ9EN8DX7nAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripMenuItem19.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPY2BMZZzJmMb4nywM1MsA0rjxRDMcv//y7D8I
+        I4vhYoP0YjXA0t6DKEPwGkCMIXgN+PPn739ChuA14NWb9/9BGJ8heA34+u37fxjGZQheA/6jAWyGEG0A
+        SDMMI0cxQQNAmkAAZjt6+iAYjcgGfPz6EiNxEUxIIBvRXYGcKrEaAFIAcyrZBqDnDZKikZhMBFMD8QKF
+        2RkA39ChmP3112gAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="mgSelectComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>229, 212</value>
+  </metadata>
+  <data name="mgSelectComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPY2BMZZzJmMb4nywM1MsA0rjxRDMcv//y7D8I
+        I4vhYoP0YjXA0t6DKEPwGkCMIXgN+PPn739ChuA14NWb9/9BGJ8heA34+u37fxjGZQheA/6jAWyGEG0A
+        SDMMI0cxQQNAmkAAZjt6+iAYjcgGfPz6EiNxEUxIIBvRXYGcKrEaAFIAcyrZBqDnDZKikZhMBFMD8QKF
+        2RkA39ChmP3112gAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripMenuItem20.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEOSURBVDhPY2CgANjY2PwnWztI8+aOgP8Mbs5B/0EYZBIx
+        bJi6TW2+/799eQ0xgBhnwNSBbN7Y6gPWfO5QL1F64ebDNH//+gaseeMMH+JdgE0zyCVEeQGk+dSpU/9B
+        9PnDfWCbQZoJxkKMAoM5SNGZM2f+f//+/f+FCxfAmlA04wrEWCUGmwRVhjWbXBkgNp8//3/FihX/Gxsb
+        UW3GZUCCIsOTwz4M/3+lMPzf4wkxpKGhgbCzYUEep8qw6UYYw/+bwQz/dzoz/G/WgxiCEeU4vaDMMLHP
+        nOH/CjuG/32GDP+LtRn+xyow2BNtQAgDA2e8MsOMBBWGI0nqDPDUSkyiI00NqUkZqxdIzUzIhgAAH4zC
+        0srGPRUAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="mgClearSelectionComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
+  <data name="mgClearSelectionComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEOSURBVDhPY2CgANjY2PwnWztI8+aOgP8Mbs5B/0EYZBIx
+        bJi6TW2+/799eQ0xgBhnwNSBbN7Y6gPWfO5QL1F64ebDNH//+gaseeMMH+JdgE0zyCVEeQGk+dSpU/9B
+        9PnDfWCbQZoJxkKMAoM5SNGZM2f+f//+/f+FCxfAmlA04wrEWCUGmwRVhjWbXBkgNp8//3/FihX/Gxsb
+        UW3GZUCCIsOTwz4M/3+lMPzf4wkxpKGhgbCzYUEep8qw6UYYw/+bwQz/dzoz/G/WgxiCEeU4vaDMMLHP
+        nOH/CjuG/32GDP+LtRn+xyow2BNtQAgDA2e8MsOMBBWGI0nqDPDUSkyiI00NqUkZqxdIzUzIhgAAH4zC
+        0srGPRUAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripMenuItem21.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAFoSURBVDhPpVNdKwRRGN47jZ/g57hQJGSzmxSTUv4DF26F
         tRa12JLaXVtKMimJ3ZKLsUyWbEImdsUwF37C4zwzTZ2z7a4pp956v57ned9zZiIRcbTJgy5NNzIduvGj
         jRtVbcKYY461UIeAWNpC2qxj/swG/U7dgAz2REhMgUYRJhaKNmZSOfR0R5GtfKA3YSokJIwLYvbR6HNq
@@ -133,11 +372,8 @@
         m4t4WHDwJU7vVHDy5GDXqoN+250b3/A/v/MvkqOAAMpRUaEAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="mgMenuItemComponentInvoker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>802, 95</value>
-  </metadata>
   <metadata name="mgBufferComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>446, 173</value>
+    <value>17, 290</value>
   </metadata>
   <data name="mgBufferComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -151,10 +387,7 @@
         m4t4WHDwJU7vVHDy5GDXqoN+250b3/A/v/MvkqOAAMpRUaEAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="appContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>338, 17</value>
-  </metadata>
-  <data name="toolStripMenuItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripMenuItem22.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAABjSURBVDhPY2AY+sDGxuY/Ob6A64MxiDUIQz1IgFwMdjlV
@@ -163,7 +396,7 @@
 </value>
   </data>
   <metadata name="mgMeasureComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 212</value>
+    <value>585, 290</value>
   </metadata>
   <data name="mgMeasureComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -173,7 +406,7 @@
         4kAccAMAwje0sEjeZewAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="toolStripMenuItem4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripMenuItem23.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAHySURBVDhPnZPLSxtRFMb9T6rUTW3Ulmw0GhqMNk0wSqCO
@@ -189,7 +422,7 @@
 </value>
   </data>
   <metadata name="mgQueryComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>840, 173</value>
+    <value>411, 290</value>
   </metadata>
   <data name="mgQueryComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -206,6 +439,81 @@
         RK5CYII=
 </value>
   </data>
+  <data name="toolStripMenuItem24.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC0SURBVDhPrZPLCsIwEEXzXeKyS/0bQUFxISiKK8EH/TXF
+        QtRiKBaLSqyrkQnkgovCkBg4zFyYOYRAlIo9raSTtpMuhcC7ihfPuQGD2Yak8K4TxOAEoQc3OGQnkrI/
+        avJAkOmcepMV4CwBAn0x1J+u6fmyrvrMfRM8A0F+LX5enrMECExRUggQ3MqKhvMt4CwBgnv1oNFiR3X9
+        cdVn7pvgGQj48cbLFHCWAIG1bwrhP4LY3/gFpD/IGPp59QYAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="mgViewerOptionsComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>190, 290</value>
+  </metadata>
+  <data name="mgViewerOptionsComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC0SURBVDhPrZPLCsIwEEXzXeKyS/0bQUFxISiKK8EH/TXF
+        QtRiKBaLSqyrkQnkgovCkBg4zFyYOYRAlIo9raSTtpMuhcC7ihfPuQGD2Yak8K4TxOAEoQc3OGQnkrI/
+        avJAkOmcepMV4CwBAn0x1J+u6fmyrvrMfRM8A0F+LX5enrMECExRUggQ3MqKhvMt4CwBgnv1oNFiR3X9
+        cdVn7pvgGQj48cbLFHCWAIG1bwrhP4LY3/gFpD/IGPp59QYAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIMAAAAAAP///ydYF5fYTmBfDJlmAGYzALWEU8yZZtSmeP/jyP///wAAAAAAAAAAAAAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAALACwAAAAAEAAQAAAIcwAXCBxIcIGAgwUTGhQQAKHAAhAj
+        FiDAcMAAhBATINioAEFFixchKhhJUsFBARcPFtC4kWNLlAIMLFiZoGZNBTZhyixwoKdPBT51zvT5M+jF
+        nSWTmjy4k2hPoE6bOoVKVCpRqj6tFo0604DXr2DBKhwrMCAAOw==
+</value>
+  </data>
+  <metadata name="mgLoadPackageComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 212</value>
+  </metadata>
+  <data name="mgLoadPackageComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIMAAAAAAP///ydYF5fYTmBfDJlmAGYzALWEU8yZZtSmeP/jyP///wAAAAAAAAAAAAAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAALACwAAAAAEAAQAAAIcwAXCBxIcIGAgwUTGhQQAKHAAhAj
+        FiDAcMAAhBATINioAEFFixchKhhJUsFBARcPFtC4kWNLlAIMLFiZoGZNBTZhyixwoKdPBT51zvT5M+jF
+        nSWTmjy4k2hPoE6bOoVKVCpRqj6tFo0604DXr2DBKhwrMCAAOw==
+</value>
+  </data>
+  <data name="toolStripMenuItem2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAFoSURBVDhPpVNdKwRRGN47jZ/g57hQJGSzmxSTUv4DF26F
+        tRa12JLaXVtKMimJ3ZKLsUyWbEImdsUwF37C4zwzTZ2z7a4pp956v57ned9zZiIRcbTJgy5NNzIduvGj
+        jRtVbcKYY461UIeAWNpC2qxj/swG/U7dgAz2REhMgUYRJhaKNmZSOfR0R5GtfKA3YSokJIwLYvbR6HNq
+        T4QEiyJJcGD520/0LfskNPrMsT6byiNTfgdX9gnEaKMbFgp3fkNgjGWTa4mSDQr7BGI/qvQnTezdqySM
+        m+XGNsUKQli5ZJIMJC+xX3WUSWRl1tjD3qYvxcLhg+OZDKTP3OCKD275vCwePX55JhMwHkqFAA+vlnH8
+        /K2AGTPfUjm4xKhoOn1RwYyZbzs2b3Nq+wYl21WUGY+s/QEOPqTsVU0Bn7+6iK2HAAcEuesalrYKHsnF
+        m4t4WHDwJU7vVHDy5GDXqoN+250b3/A/v/MvkqOAAMpRUaEAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripMenuItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAABjSURBVDhPY2AY+sDGxuY/Ob6A64MxiDUIQz1IgFwMdjlV
+        XEBRGJCjGUXPxCC2VfVBbP/QMVD8PzZxmBhIH9ggkMD/Fyn/F5ea/SeFBumDG/D9FNt/UjDIIrgBFHuB
+        4kAccAMAwje0sEjeZewAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripMenuItem4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAHySURBVDhPnZPLSxtRFMb9T6rUTW3Ulmw0GhqMNk0wSqCO
+        YhnNIkZUjCKUgvj4C7rSlUtXQksKRUHQxk0XhYpF8IETkpiHjxiT0TgTI0nm6z0DloxJbOmFj3Mf5/7u
+        me8wVVVFY2hyasLmcPjr6l8o1TW1eKZrVGhN+8V5ZeedbznB1PEGS5+82No/xHd/QI1Ln71oNppgc3D+
+        ipCuHk74uLCIH4EQdiIx/GLaDkfx8zii6ujsHIPDI6C8EsjY+w8TbRYbdo7D2D89Qzx9A+nuTp3vxk7+
+        aDsYQqupDZSvgXRz/cLK6hqOzuOIiSIKioLrTAZC/AKH7OViLXu/oJt7UIWu4aVyEI0hnEwhm8tBYYAT
+        8QrBxCUCD7QXieI5M1hTwZPqpwhfJnF6da1eTkqyCoimxBKFLhKg7mgAOkaMsIPEjaRepkg+lFOQ+UL5
+        GgD3jhfWv/kgypm/yvt1FZSvAUxPz3qaDUbI2Sxk5n45kTepdBpNhlZQfkkr+/oG/J7JKci3t8gVCiWS
+        WFdGx8bBDzhhbn+t9eCexvO88Ir12efbgsS8yOfzLErY2NiEocWI3t5+2O12uN3uypDZ+XkPgepZa6k7
+        FGlN+/SyXq+H1WqFy+WqDHnsp7mHWCwWOJ2PfM6/QMxm8/9VQXCqhDQzM4ffTfzkLal2r4sAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
   <data name="toolStripMenuItem28.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIMAAAAAAP///6e6zXG39mCc0bzd+87trIC4QpfYTv/eStm9P//vqmdnZywsLP///wAA
@@ -215,7 +523,7 @@
 </value>
   </data>
   <metadata name="mgThemeComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>508, 212</value>
+    <value>320, 329</value>
   </metadata>
   <data name="mgThemeComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -234,18 +542,6 @@
         cdVn7pvgGQj48cbLFHCWAIG1bwrhP4LY3/gFpD/IGPp59QYAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="mgViewerOptionsComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>619, 173</value>
-  </metadata>
-  <data name="mgViewerOptionsComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC0SURBVDhPrZPLCsIwEEXzXeKyS/0bQUFxISiKK8EH/TXF
-        QtRiKBaLSqyrkQnkgovCkBg4zFyYOYRAlIo9raSTtpMuhcC7ihfPuQGD2Yak8K4TxOAEoQc3OGQnkrI/
-        avJAkOmcepMV4CwBAn0x1J+u6fmyrvrMfRM8A0F+LX5enrMECExRUggQ3MqKhvMt4CwBgnv1oNFiR3X9
-        cdVn7pvgGQj48cbLFHCWAIG1bwrhP4LY3/gFpD/IGPp59QYAAAAASUVORK5CYII=
-</value>
-  </data>
   <metadata name="appToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>121, 17</value>
   </metadata>
@@ -260,10 +556,10 @@
 </value>
   </data>
   <metadata name="mgToolButtonComponentInvoker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>409, 95</value>
+    <value>409, 134</value>
   </metadata>
   <metadata name="mgPrintComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>243, 95</value>
+    <value>243, 134</value>
   </metadata>
   <data name="mgPrintComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -286,7 +582,7 @@
 </value>
   </data>
   <metadata name="mgCopyMapComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>235, 56</value>
   </metadata>
   <data name="mgCopyMapComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -313,24 +609,6 @@
         JC4A2evLqnFhjAkAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="mgZoomInComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>825, 134</value>
-  </metadata>
-  <data name="mgZoomInComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIESURBVDhPnZPNSxtRFMX9T2ppN7axH2SjqaGpsU0TjJJi
-        RhsZm0WaUqVRBCmIMX9BV3Xl0pWgpFAsFNS46aJQsRRqxQkx5sPPmIzGmRhJMsd3B6ZkTCPFgcN9783h
-        9+6cyzQ0VD2vR0aHHS5X9E7zA6Xx5m00Ge4rtKfzat8/1509nGB5+hzTc2GsrG/gWzSm1un5MFrNFjhc
-        XLQupMvNCR8+TuF7LI61ZBo/mVYTKfzYTqra3NvHqzdvQb4ayNDY++F2mwNr2wms7+7hIH8K6fwcTzrs
-        +JXe+avVrTjaLO0gvw7SzXmE2YUv2Nw/QFoUUVEUnBQKKmCD3VytmfAndHOXujDce6j8SaWRyOZQLJWg
-        MMCOeKwCYpkjnX4nU7jLAtZ1cKPxFhJHWewen6CH68cLtwcu90sVQFVTKicifpgBTUcHMDBikr3InErI
-        SrJaKQcCUK3WFsuI/DoA188LX5cjEOWCTgS4fBb+vADy6wDj48FAq8kMuViEzNLXRABtTdnk8nm0mNpA
-        /ppR9vUNRAMjo5DPzlCqVGoksakMDr0DP+CFteOZPgONxvO88JjNORJZgcSyKJfLrEpYXFyC6ZEZvb0e
-        OJ1O+P3++pBgKBQgUDMbLU2HKu3pnG42Go2w2+3w+Xz1IVf9NBrEZrPB673ic/4HYrVar9cFwakT0sTE
-        JC4A2evLqnFhjAkAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -346,24 +624,6 @@
         AAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="mgZoomOutComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>253, 173</value>
-  </metadata>
-  <data name="mgZoomOutComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH5SURBVDhPnZPLSxtRFMb9T2qpm7ZRW7KpqaHBaNMEU0kx
-        o42MZpGmqDSKIIL4+Atc6cplVwUlhWKhoMaNi0LFUvCBE5KYh48Yk9E4EyNJ5vOegJIxiS0d+Dj33vn4
-        3TPfYWpqSp4PwyNDFpvN/6T+mVL7sA6PNY0K7em81Fdx3d7JCYa2N5hf8GJtexfr/kCxzi960aQ3wGLj
-        /FUhb+2cMDM7h5+BEDYjMfxm2ghH8Ws/UtTe0TH6PvaDfGWQwdGxoRaTBZv7YWwfHiGevoB0dVVc/4kd
-        3GojGEKzoQXkV0E6OIfwZek79o7jiIkiCoqC80wGQvwEu+zmUn32fkUHd6cLTcNzZScaQziZQjaXg8IA
-        B+IZgolTBO5oKxLFUxawqoMHtY8QPk3i8OwcnVwP3tkdsNnflymaEhE6SYCmowJoGDHCXiQuJCQluVgp
-        h0oKslzIrwJwPbzwY9UHUc78Vd5vSyC/CjA+Pulp0ukhZ7OQWfqVRNmk0mm80DWD/GWj7O7u9XuGRyBf
-        XiJXKJRJYlMZGPwEvtcJY+trdQY3NJ7nhVdszj7fGiSWRT6fZ1XC8vIKdC/16OpywGq1wu12V4dMTk97
-        CFTPRkvToUp7OqebtVotzGYzXC5Xdch9P80NxGQywem853P+BWI0Gv+vC4JTJ6SJiSlcA6LH15rL3j8W
-        AAAAAElFTkSuQmCC
-</value>
-  </data>
   <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -376,21 +636,6 @@
         AeYbqBNEyxii5RKJIWRF4qTG/VjWf3l5wX+/8w9/3Qe1qQ/dtwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="mgInitialViewComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>384, 56</value>
-  </metadata>
-  <data name="mgInitialViewComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFqSURBVDhPpZPbTsJAEIZ5NaPxAXgI5UK50Qt9LmPSeBYQ
-        g2gFEWiVIsUWSjm2pdfjzOyyFbyrF1/+Ofwz2c1mMztb2bPd7SykgWYzNOj5k1TQLC+o6K1UqAXVmgHV
-        Whsh3Yhf23+uJ7yizifQGx/w8kaYoKOu0cAakts7Uot09pnJgnqzA2u0MCdk/Vy7Y3Nu/5i13vrknjpB
-        0/iCpokYXQHFTBe0yyIbtYsCvGNOMSnNqAWm1QezYyOoGBsE5lfXJTaRmpbsr3zoVQss2wGr54JlIz2K
-        Hbi5f2TDLSr1OrLOPo7dZIHteEDQAGmx9MRxoVThXDAU+i3yvvTzK7hDH1xvzEP5gxPWh/IzDLDmeqJH
-        DCgekgrUFfzxDEbjqXqm/OEp5z4yot6EFFmp7KkF0/kCiM3/MJ0HXBesYqmzIDnBIgxhEUYQICIWeQLm
-        AeYbqBNEyxii5RKJIWRF4qTG/VjWf3l5wX+/8w9/3Qe1qQ/dtwAAAABJRU5ErkJggg==
-</value>
-  </data>
   <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -400,18 +645,6 @@
         2RkA39ChmP3112gAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="mgSelectComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>435, 134</value>
-  </metadata>
-  <data name="mgSelectComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPY2BMZZzJmMb4nywM1MsA0rjxRDMcv//y7D8I
-        I4vhYoP0YjXA0t6DKEPwGkCMIXgN+PPn739ChuA14NWb9/9BGJ8heA34+u37fxjGZQheA/6jAWyGEG0A
-        SDMMI0cxQQNAmkAAZjt6+iAYjcgGfPz6EiNxEUxIIBvRXYGcKrEaAFIAcyrZBqDnDZKikZhMBFMD8QKF
-        2RkA39ChmP3112gAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -448,7 +681,7 @@
 </value>
   </data>
   <metadata name="mgPolygonSelectComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>742, 56</value>
+    <value>375, 95</value>
   </metadata>
   <data name="mgPolygonSelectComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -473,22 +706,6 @@
         cDSCJAV+xk7WP7yJ9EN8DX7nAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="mgPanComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>581, 56</value>
-  </metadata>
-  <data name="mgPanComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGTSURBVDhPlVNNSwJRFPV/tQpaiW1qFrmKICIqKMmICjIw
-        A4tIRCNpIFFKkUgMQ8FKyz4ohBBh3BlFH5vqL5w4F5/OqBsvHObjvnPeuWfe2Gz9F/qnNBlOp5NkNK/9
-        6ZhI4qD1/PP7h/L9A7a29+BaWoN7xYPQgY584RJGva7sys49MT23iHn3KoL7Eby9f6B4UxaBiB4VwWg8
-        gcenZ2iaZhZrOxifnAXr8+sbL9UaGo1X0BWL9ywKsedwDHdnQAGOYCZWKhVxw1r3BeVKJ3TXHKMdIEfY
-        2PTLzLRqJnJXFt+z9KMYKG6Jn9Z3A2EMDNqRSKXFjSJysXLGsXjPvDLZXPdZYOIUSaVzkj5BcRLNuC6W
-        MDo20RZgc2rGBWbBBkU4TufuSoSiFgF+LkItiB0nxSZHIQyj0eXCIjBkHwGD5DngzleluxZyhVtk80UJ
-        Vm3AnOjSEiTn8nj90qCbs2xBsjg5vUA8eS6o1gwEQrqsYcg9fwQ2uMC3E0boMNECiQvLXumZjnfvn0mJ
-        cDSCJAV+xk7WP7yJ9EN8DX7nAAAAAElFTkSuQmCC
-</value>
-  </data>
   <data name="toolStripButton10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -500,20 +717,6 @@
         0srGPRUAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="mgClearSelectionComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>687, 17</value>
-  </metadata>
-  <data name="mgClearSelectionComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEOSURBVDhPY2CgANjY2PwnWztI8+aOgP8Mbs5B/0EYZBIx
-        bJi6TW2+/799eQ0xgBhnwNSBbN7Y6gPWfO5QL1F64ebDNH//+gaseeMMH+JdgE0zyCVEeQGk+dSpU/9B
-        9PnDfWCbQZoJxkKMAoM5SNGZM2f+f//+/f+FCxfAmlA04wrEWCUGmwRVhjWbXBkgNp8//3/FihX/Gxsb
-        UW3GZUCCIsOTwz4M/3+lMPzf4wkxpKGhgbCzYUEep8qw6UYYw/+bwQz/dzoz/G/WgxiCEeU4vaDMMLHP
-        nOH/CjuG/32GDP+LtRn+xyow2BNtQAgDA2e8MsOMBBWGI0nqDPDUSkyiI00NqUkZqxdIzUzIhgAAH4zC
-        0srGPRUAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="toolStripButton11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -527,22 +730,6 @@
         IMoAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="mgRefreshMapComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 134</value>
-  </metadata>
-  <data name="mgRefreshMapComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPY2AAAifP4P+4MEieKAAy4Oev3ygYJAbSHJOc
-        /K2itnX/lClz5PEaBtLw6MlLOIYZYGnvATY4Pq3gT0Nr72yshoAkcktq/99/+AyrARu37jkPksvMr/yP
-        YQjIaSDTQQqAhqyHuQTmAnt/fwEnr5A1IG/ce/AM7BIU79Q0dh3fsmP//zUbdhx28gpeihywyM519Aye
-        D3LJlu37/oMMg8uBAglkclB48iUXl1B+mATMBTC+jXeUoH9owjmQWpAeuAHO3mFgfzt5hYJDHR/Q0tL6
-        A1IL0gNXB9JIkQEwL4Cch+wFWFjAbHJzCxECefPeg6eoXiiva9+3def+/xu27r7g6BW8AtkLsBQKMSx0
-        1frNu44AA/I/KODh6nqmzpMFRQ0ocEChC/TSQpBtMBeAEhHIIFAUw6IRpAclrBrb+mZlFVT9BynYuG3P
-        eVDqgxkAS50gp2fkV/wHqcWZGkEuAWnAZgA4oKH5A2dMgZwG8gYsntHzB1GGYAtEbNkdpA4A8r5nBCK/
-        IMoAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="toolStripButton12.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -554,7 +741,7 @@
 </value>
   </data>
   <metadata name="mgTooltipToggleComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>608, 134</value>
+    <value>402, 212</value>
   </metadata>
   <data name="mgTooltipToggleComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -618,55 +805,6 @@
         cdVn7pvgGQj48cbLFHCWAIG1bwrhP4LY3/gFpD/IGPp59QYAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>205, 212</value>
-  </metadata>
-  <data name="toolStripMenuItem5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAFoSURBVDhPpVNdKwRRGN47jZ/g57hQJGSzmxSTUv4DF26F
-        tRa12JLaXVtKMimJ3ZKLsUyWbEImdsUwF37C4zwzTZ2z7a4pp956v57ned9zZiIRcbTJgy5NNzIduvGj
-        jRtVbcKYY461UIeAWNpC2qxj/swG/U7dgAz2REhMgUYRJhaKNmZSOfR0R5GtfKA3YSokJIwLYvbR6HNq
-        T4QEiyJJcGD520/0LfskNPrMsT6byiNTfgdX9gnEaKMbFgp3fkNgjGWTa4mSDQr7BGI/qvQnTezdqySM
-        m+XGNsUKQli5ZJIMJC+xX3WUSWRl1tjD3qYvxcLhg+OZDKTP3OCKD275vCwePX55JhMwHkqFAA+vlnH8
-        /K2AGTPfUjm4xKhoOn1RwYyZbzs2b3Nq+wYl21WUGY+s/QEOPqTsVU0Bn7+6iK2HAAcEuesalrYKHsnF
-        m4t4WHDwJU7vVHDy5GDXqoN+250b3/A/v/MvkqOAAMpRUaEAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripMenuItem6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAABjSURBVDhPY2AY+sDGxuY/Ob6A64MxiDUIQz1IgFwMdjlV
-        XEBRGJCjGUXPxCC2VfVBbP/QMVD8PzZxmBhIH9ggkMD/Fyn/F5ea/SeFBumDG/D9FNt/UjDIIrgBFHuB
-        4kAccAMAwje0sEjeZewAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripMenuItem7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAHySURBVDhPnZPLSxtRFMb9T6rUTW3Ulmw0GhqMNk0wSqCO
-        YhnNIkZUjCKUgvj4C7rSlUtXQksKRUHQxk0XhYpF8IETkpiHjxiT0TgTI0nm6z0DloxJbOmFj3Mf5/7u
-        me8wVVVFY2hyasLmcPjr6l8o1TW1eKZrVGhN+8V5ZeedbznB1PEGS5+82No/xHd/QI1Ln71oNppgc3D+
-        ipCuHk74uLCIH4EQdiIx/GLaDkfx8zii6ujsHIPDI6C8EsjY+w8TbRYbdo7D2D89Qzx9A+nuTp3vxk7+
-        aDsYQqupDZSvgXRz/cLK6hqOzuOIiSIKioLrTAZC/AKH7OViLXu/oJt7UIWu4aVyEI0hnEwhm8tBYYAT
-        8QrBxCUCD7QXieI5M1hTwZPqpwhfJnF6da1eTkqyCoimxBKFLhKg7mgAOkaMsIPEjaRepkg+lFOQ+UL5
-        GgD3jhfWv/kgypm/yvt1FZSvAUxPz3qaDUbI2Sxk5n45kTepdBpNhlZQfkkr+/oG/J7JKci3t8gVCiWS
-        WFdGx8bBDzhhbn+t9eCexvO88Ir12efbgsS8yOfzLErY2NiEocWI3t5+2O12uN3uypDZ+XkPgepZa6k7
-        FGlN+/SyXq+H1WqFy+WqDHnsp7mHWCwWOJ2PfM6/QMxm8/9VQXCqhDQzM4ffTfzkLal2r4sAAAAASUVO
-        RK5CYII=
-</value>
-  </data>
-  <data name="toolStripMenuItem29.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIMAAAAAAP///6e6zXG39mCc0bzd+87trIC4QpfYTv/eStm9P//vqmdnZywsLP///wAA
-        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAOACwAAAAAEAAQAAAIeQAdCBxIsKADBggTIjQokIGBhxAb
-        MDxoAIFFBAckMnRoUaFCghwRMFhAsqTGhhVFLkjAMoGCkxQPHBjJ0qPCBjhpJmBQoKfPBgKCCtDJc4DR
-        AQRgjlSgoOjRpCBxNnBqFOpAoUMLHEUKE2QBAmDBdh3IQKrZiVixBgQAOw==
-</value>
-  </data>
-  <metadata name="statusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>237, 17</value>
-  </metadata>
   <data name="toolStripMenuItem8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -682,7 +820,7 @@
 </value>
   </data>
   <metadata name="plotToDwfComponent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>211, 56</value>
+    <value>429, 56</value>
   </metadata>
   <data name="plotToDwfComponent.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -701,7 +839,7 @@
   <data name="toolStripMenuItem25.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAACw0AAAsNAe0HwCwAAAG4SURBVDhPjZNNLwNRFIbPohv/oVhVk8kkNl0RQiQkWEkk
+        YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAG4SURBVDhPjZNNLwNRFIbPohv/oVhVk8kkNl0RQiQkWEkk
         CKmoIj42BLFjI5FGxI7/QCIsrLC20IU2Umm1PkZFW02FdjBpXvfM7fjKUIsn55w7c9/73nPvJQDEtLZ0
         LQrwTxateebkkgB29g7wZhhl4UV+FfinA3uB4+CZ6eI3vq5s64AF/qKswMnpOZhgSGDlXJfysgLhSBzh
         SKIE53HEr5LIZHPQX15hiAZb1m23EEtoiCZuBRo4v09ncZWJwbvRBGXAAVcnwd1HhjJHR+oKVbPIt2PU
@@ -713,12 +851,12 @@
 </value>
   </data>
   <metadata name="loadCompactViewerComponent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 95</value>
+    <value>17, 134</value>
   </metadata>
   <data name="loadCompactViewerComponent.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAACw0AAAsNAe0HwCwAAAG4SURBVDhPjZNNLwNRFIbPohv/oVhVk8kkNl0RQiQkWEkk
+        YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAG4SURBVDhPjZNNLwNRFIbPohv/oVhVk8kkNl0RQiQkWEkk
         CKmoIj42BLFjI5FGxI7/QCIsrLC20IU2Umm1PkZFW02FdjBpXvfM7fjKUIsn55w7c9/73nPvJQDEtLZ0
         LQrwTxateebkkgB29g7wZhhl4UV+FfinA3uB4+CZ6eI3vq5s64AF/qKswMnpOZhgSGDlXJfysgLhSBzh
         SKIE53HEr5LIZHPQX15hiAZb1m23EEtoiCZuBRo4v09ncZWJwbvRBGXAAVcnwd1HhjJHR+oKVbPIt2PU
@@ -732,7 +870,7 @@
   <data name="toolStripMenuItem26.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAACw4AAAsOAUC+4UEAAAG4SURBVDhPjZNNLwNRFIbPohv/oVhVk8kkNl0RQiQkWEkk
+        YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAG4SURBVDhPjZNNLwNRFIbPohv/oVhVk8kkNl0RQiQkWEkk
         CKmoIj42BLFjI5FGxI7/QCIsrLC20IU2Umm1PkZFW02FdjBpXvfM7fjKUIsn55w7c9/73nPvJQDEtLZ0
         LQrwTxateebkkgB29g7wZhhl4UV+FfinA3uB4+CZ6eI3vq5s64AF/qKswMnpOZhgSGDlXJfysgLhSBzh
         SKIE53HEr5LIZHPQX15hiAZb1m23EEtoiCZuBRo4v09ncZWJwbvRBGXAAVcnwd1HhjJHR+oKVbPIt2PU
@@ -744,12 +882,12 @@
 </value>
   </data>
   <metadata name="profileComponent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>651, 95</value>
+    <value>17, 173</value>
   </metadata>
   <data name="profileComponent.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAACw4AAAsOAUC+4UEAAAG4SURBVDhPjZNNLwNRFIbPohv/oVhVk8kkNl0RQiQkWEkk
+        YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAG4SURBVDhPjZNNLwNRFIbPohv/oVhVk8kkNl0RQiQkWEkk
         CKmoIj42BLFjI5FGxI7/QCIsrLC20IU2Umm1PkZFW02FdjBpXvfM7fjKUIsn55w7c9/73nPvJQDEtLZ0
         LQrwTxateebkkgB29g7wZhhl4UV+FfinA3uB4+CZ6eI3vq5s64AF/qKswMnpOZhgSGDlXJfysgLhSBzh
         SKIE53HEr5LIZHPQX15hiAZb1m23EEtoiCZuBRo4v09ncZWJwbvRBGXAAVcnwd1HhjJHR+oKVbPIt2PU
@@ -760,149 +898,12 @@
         RU5ErkJggg==
 </value>
   </data>
-  <data name="toolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIMAAAAAAP///ydYF5fYTmBfDJlmAGYzALWEU8yZZtSmeP/jyP///wAAAAAAAAAAAAAA
-        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAALACwAAAAAEAAQAAAIcwAXCBxIcIGAgwUTGhQQAKHAAhAj
-        FiDAcMAAhBATINioAEFFixchKhhJUsFBARcPFtC4kWNLlAIMLFiZoGZNBTZhyixwoKdPBT51zvT5M+jF
-        nSWTmjy4k2hPoE6bOoVKVCpRqj6tFo0604DXr2DBKhwrMCAAOw==
-</value>
-  </data>
-  <metadata name="mgLoadPackageComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>223, 134</value>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 329</value>
   </metadata>
-  <data name="mgLoadPackageComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripMenuItem5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlhEAAQAIMAAAAAAP///ydYF5fYTmBfDJlmAGYzALWEU8yZZtSmeP/jyP///wAAAAAAAAAAAAAA
-        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAALACwAAAAAEAAQAAAIcwAXCBxIcIGAgwUTGhQQAKHAAhAj
-        FiDAcMAAhBATINioAEFFixchKhhJUsFBARcPFtC4kWNLlAIMLFiZoGZNBTZhyixwoKdPBT51zvT5M+jF
-        nSWTmjy4k2hPoE6bOoVKVCpRqj6tFo0604DXr2DBKhwrMCAAOw==
-</value>
-  </data>
-  <data name="toolStripMenuItem13.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPY2AAAifP4P+4MEieKAAy4Oev3ygYJAbSHJOc
-        /K2itnX/lClz5PEaBtLw6MlLOIYZYGnvATY4Pq3gT0Nr72yshoAkcktq/99/+AyrARu37jkPksvMr/yP
-        YQjIaSDTQQqAhqyHuQTmAnt/fwEnr5A1IG/ce/AM7BIU79Q0dh3fsmP//zUbdhx28gpeihywyM519Aye
-        D3LJlu37/oMMg8uBAglkclB48iUXl1B+mATMBTC+jXeUoH9owjmQWpAeuAHO3mFgfzt5hYJDHR/Q0tL6
-        A1IL0gNXB9JIkQEwL4Cch+wFWFjAbHJzCxECefPeg6eoXiiva9+3def+/xu27r7g6BW8AtkLsBQKMSx0
-        1frNu44AA/I/KODh6nqmzpMFRQ0ocEChC/TSQpBtMBeAEhHIIFAUw6IRpAclrBrb+mZlFVT9BynYuG3P
-        eVDqgxkAS50gp2fkV/wHqcWZGkEuAWnAZgA4oKH5A2dMgZwG8gYsntHzB1GGYAtEbNkdpA4A8r5nBCK/
-        IMoAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripMenuItem14.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIESURBVDhPnZPNSxtRFMX9T2ppN7axH2SjqaGpsU0TjJJi
-        RhsZm0WaUqVRBCmIMX9BV3Xl0pWgpFAsFNS46aJQsRRqxQkx5sPPmIzGmRhJMsd3B6ZkTCPFgcN9783h
-        9+6cyzQ0VD2vR0aHHS5X9E7zA6Xx5m00Ge4rtKfzat8/1509nGB5+hzTc2GsrG/gWzSm1un5MFrNFjhc
-        XLQupMvNCR8+TuF7LI61ZBo/mVYTKfzYTqra3NvHqzdvQb4ayNDY++F2mwNr2wms7+7hIH8K6fwcTzrs
-        +JXe+avVrTjaLO0gvw7SzXmE2YUv2Nw/QFoUUVEUnBQKKmCD3VytmfAndHOXujDce6j8SaWRyOZQLJWg
-        MMCOeKwCYpkjnX4nU7jLAtZ1cKPxFhJHWewen6CH68cLtwcu90sVQFVTKicifpgBTUcHMDBikr3InErI
-        SrJaKQcCUK3WFsuI/DoA188LX5cjEOWCTgS4fBb+vADy6wDj48FAq8kMuViEzNLXRABtTdnk8nm0mNpA
-        /ppR9vUNRAMjo5DPzlCqVGoksakMDr0DP+CFteOZPgONxvO88JjNORJZgcSyKJfLrEpYXFyC6ZEZvb0e
-        OJ1O+P3++pBgKBQgUDMbLU2HKu3pnG42Go2w2+3w+Xz1IVf9NBrEZrPB673ic/4HYrVar9cFwakT0sTE
-        JC4A2evLqnFhjAkAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripMenuItem15.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH5SURBVDhPnZPLSxtRFMb9T2qpm7ZRW7KpqaHBaNMEU0kx
-        o42MZpGmqDSKIIL4+Atc6cplVwUlhWKhoMaNi0LFUvCBE5KYh48Yk9E4EyNJ5vOegJIxiS0d+Dj33vn4
-        3TPfYWpqSp4PwyNDFpvN/6T+mVL7sA6PNY0K7em81Fdx3d7JCYa2N5hf8GJtexfr/kCxzi960aQ3wGLj
-        /FUhb+2cMDM7h5+BEDYjMfxm2ghH8Ws/UtTe0TH6PvaDfGWQwdGxoRaTBZv7YWwfHiGevoB0dVVc/4kd
-        3GojGEKzoQXkV0E6OIfwZek79o7jiIkiCoqC80wGQvwEu+zmUn32fkUHd6cLTcNzZScaQziZQjaXg8IA
-        B+IZgolTBO5oKxLFUxawqoMHtY8QPk3i8OwcnVwP3tkdsNnflymaEhE6SYCmowJoGDHCXiQuJCQluVgp
-        h0oKslzIrwJwPbzwY9UHUc78Vd5vSyC/CjA+Pulp0ukhZ7OQWfqVRNmk0mm80DWD/GWj7O7u9XuGRyBf
-        XiJXKJRJYlMZGPwEvtcJY+trdQY3NJ7nhVdszj7fGiSWRT6fZ1XC8vIKdC/16OpywGq1wu12V4dMTk97
-        CFTPRkvToUp7OqebtVotzGYzXC5Xdch9P80NxGQywem853P+BWI0Gv+vC4JTJ6SJiSlcA6LH15rL3j8W
-        AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolStripMenuItem16.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIZvAISChAEBAXBJJai7zsfb8Nrn9M/a5Nnm81tgZNDh8sXa77jH16jR4+fu9dDh8brT
-        7erv89jm8uzw9ODq9Ku0vNHh8mRrcvT3+aStttri6oOGiJqbncrc7oaKjZ+fn9Di6JSVl67C1a6yt5u2
-        0F5cWsjd5IiOlM3U2Tg3N398ezAvLujjjKCnr5u83uXq73V5fnh3d+nv9OLaid/s76/N6pyzy9fn65mi
-        rLCurXahzJDO1tfb3+Do8dDg8UdKTb7L2EpMTFhYWZy20K22v6jG5KWqsaq8z+7sj7C/z6amp6C50uLr
-        9evw9aTF52RgX250esjQ2ISAf2xtb7S3u+Tr8WBocMPT43yQo7vU7cbb7+Hr9JGRkt7m7YSFiL7H0cza
-        6IWUo7bBzeqxd6uvs6uoqOLs9c7X31xbXbe/x+fs8evv84SHi8vY5XyPoq7L5wAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AABvACwAAAAAEAAQAAAIwgABvBFIcOCbgwgTJsQRxUkKMgkFBpj4xsMULz/CFNmiMMCRNxugcEkTg8cX
-        JGsOSlyRRAQENRcaTIjAAQwIhAFkwDghIQMVLQd6KKhxxuBEEi6YsLFSoIKCB0RQKJSyo0GZAgmyMKAh
-        xIfBNwFMjFlywAEBBjqaXHmCcwaaLmYSEMDSIoeSKhSM2njDQsONEG5GtLGAIGGADyXeDOkQRAWQFxgQ
-        CBAjECxFAwuMLDDwZoAAAQpDI/RcsHToAaJTvwkIADs=
-</value>
-  </data>
-  <metadata name="mgZoomToSelectionComponent1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 173</value>
-  </metadata>
-  <data name="mgZoomToSelectionComponent1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIZvAISChAEBAXBJJai7zsfb8Nrn9M/a5Nnm81tgZNDh8sXa77jH16jR4+fu9dDh8brT
-        7erv89jm8uzw9ODq9Ku0vNHh8mRrcvT3+aStttri6oOGiJqbncrc7oaKjZ+fn9Di6JSVl67C1a6yt5u2
-        0F5cWsjd5IiOlM3U2Tg3N398ezAvLujjjKCnr5u83uXq73V5fnh3d+nv9OLaid/s76/N6pyzy9fn65mi
-        rLCurXahzJDO1tfb3+Do8dDg8UdKTb7L2EpMTFhYWZy20K22v6jG5KWqsaq8z+7sj7C/z6amp6C50uLr
-        9evw9aTF52RgX250esjQ2ISAf2xtb7S3u+Tr8WBocMPT43yQo7vU7cbb7+Hr9JGRkt7m7YSFiL7H0cza
-        6IWUo7bBzeqxd6uvs6uoqOLs9c7X31xbXbe/x+fs8evv84SHi8vY5XyPoq7L5wAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AABvACwAAAAAEAAQAAAIwgABvBFIcOCbgwgTJsQRxUkKMgkFBpj4xsMULz/CFNmiMMCRNxugcEkTg8cX
-        JGsOSlyRRAQENRcaTIjAAQwIhAFkwDghIQMVLQd6KKhxxuBEEi6YsLFSoIKCB0RQKJSyo0GZAgmyMKAh
-        xIfBNwFMjFlywAEBBjqaXHmCcwaaLmYSEMDSIoeSKhSM2njDQsONEG5GtLGAIGGADyXeDOkQRAWQFxgQ
-        CBAjECxFAwuMLDDwZoAAAQpDI/RcsHToAaJTvwkIADs=
-</value>
-  </data>
-  <data name="toolStripMenuItem17.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFqSURBVDhPpZPbTsJAEIZ5NaPxAXgI5UK50Qt9LmPSeBYQ
-        g2gFEWiVIsUWSjm2pdfjzOyyFbyrF1/+Ofwz2c1mMztb2bPd7SykgWYzNOj5k1TQLC+o6K1UqAXVmgHV
-        Whsh3Yhf23+uJ7yizifQGx/w8kaYoKOu0cAakts7Uot09pnJgnqzA2u0MCdk/Vy7Y3Nu/5i13vrknjpB
-        0/iCpokYXQHFTBe0yyIbtYsCvGNOMSnNqAWm1QezYyOoGBsE5lfXJTaRmpbsr3zoVQss2wGr54JlIz2K
-        Hbi5f2TDLSr1OrLOPo7dZIHteEDQAGmx9MRxoVThXDAU+i3yvvTzK7hDH1xvzEP5gxPWh/IzDLDmeqJH
-        DCgekgrUFfzxDEbjqXqm/OEp5z4yot6EFFmp7KkF0/kCiM3/MJ0HXBesYqmzIDnBIgxhEUYQICIWeQLm
-        AeYbqBNEyxii5RKJIWRF4qTG/VjWf3l5wX+/8w9/3Qe1qQ/dtwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolStripMenuItem18.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGTSURBVDhPlVNNSwJRFPV/tQpaiW1qFrmKICIqKMmICjIw
-        A4tIRCNpIFFKkUgMQ8FKyz4ohBBh3BlFH5vqL5w4F5/OqBsvHObjvnPeuWfe2Gz9F/qnNBlOp5NkNK/9
-        6ZhI4qD1/PP7h/L9A7a29+BaWoN7xYPQgY584RJGva7sys49MT23iHn3KoL7Eby9f6B4UxaBiB4VwWg8
-        gcenZ2iaZhZrOxifnAXr8+sbL9UaGo1X0BWL9ywKsedwDHdnQAGOYCZWKhVxw1r3BeVKJ3TXHKMdIEfY
-        2PTLzLRqJnJXFt+z9KMYKG6Jn9Z3A2EMDNqRSKXFjSJysXLGsXjPvDLZXPdZYOIUSaVzkj5BcRLNuC6W
-        MDo20RZgc2rGBWbBBkU4TufuSoSiFgF+LkItiB0nxSZHIQyj0eXCIjBkHwGD5DngzleluxZyhVtk80UJ
-        Vm3AnOjSEiTn8nj90qCbs2xBsjg5vUA8eS6o1gwEQrqsYcg9fwQ2uMC3E0boMNECiQvLXumZjnfvn0mJ
-        cDSCJAV+xk7WP7yJ9EN8DX7nAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolStripMenuItem19.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPY2BMZZzJmMb4nywM1MsA0rjxRDMcv//y7D8I
-        I4vhYoP0YjXA0t6DKEPwGkCMIXgN+PPn739ChuA14NWb9/9BGJ8heA34+u37fxjGZQheA/6jAWyGEG0A
-        SDMMI0cxQQNAmkAAZjt6+iAYjcgGfPz6EiNxEUxIIBvRXYGcKrEaAFIAcyrZBqDnDZKikZhMBFMD8QKF
-        2RkA39ChmP3112gAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripMenuItem20.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEOSURBVDhPY2CgANjY2PwnWztI8+aOgP8Mbs5B/0EYZBIx
-        bJi6TW2+/799eQ0xgBhnwNSBbN7Y6gPWfO5QL1F64ebDNH//+gaseeMMH+JdgE0zyCVEeQGk+dSpU/9B
-        9PnDfWCbQZoJxkKMAoM5SNGZM2f+f//+/f+FCxfAmlA04wrEWCUGmwRVhjWbXBkgNp8//3/FihX/Gxsb
-        UW3GZUCCIsOTwz4M/3+lMPzf4wkxpKGhgbCzYUEep8qw6UYYw/+bwQz/dzoz/G/WgxiCEeU4vaDMMLHP
-        nOH/CjuG/32GDP+LtRn+xyow2BNtQAgDA2e8MsOMBBWGI0nqDPDUSkyiI00NqUkZqxdIzUzIhgAAH4zC
-        0srGPRUAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripMenuItem21.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAFoSURBVDhPpVNdKwRRGN47jZ/g57hQJGSzmxSTUv4DF26F
         tRa12JLaXVtKMimJ3ZKLsUyWbEImdsUwF37C4zwzTZ2z7a4pp956v57ned9zZiIRcbTJgy5NNzIduvGj
         jRtVbcKYY461UIeAWNpC2qxj/swG/U7dgAz2REhMgUYRJhaKNmZSOfR0R5GtfKA3YSokJIwLYvbR6HNq
@@ -912,7 +913,7 @@
         m4t4WHDwJU7vVHDy5GDXqoN+250b3/A/v/MvkqOAAMpRUaEAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="toolStripMenuItem22.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripMenuItem6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAABjSURBVDhPY2AY+sDGxuY/Ob6A64MxiDUIQz1IgFwMdjlV
@@ -920,7 +921,7 @@
         4kAccAMAwje0sEjeZewAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="toolStripMenuItem23.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripMenuItem7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAHySURBVDhPnZPLSxtRFMb9T6rUTW3Ulmw0GhqMNk0wSqCO
@@ -935,17 +936,19 @@
         RK5CYII=
 </value>
   </data>
-  <data name="toolStripMenuItem24.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripMenuItem29.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC0SURBVDhPrZPLCsIwEEXzXeKyS/0bQUFxISiKK8EH/TXF
-        QtRiKBaLSqyrkQnkgovCkBg4zFyYOYRAlIo9raSTtpMuhcC7ihfPuQGD2Yak8K4TxOAEoQc3OGQnkrI/
-        avJAkOmcepMV4CwBAn0x1J+u6fmyrvrMfRM8A0F+LX5enrMECExRUggQ3MqKhvMt4CwBgnv1oNFiR3X9
-        cdVn7pvgGQj48cbLFHCWAIG1bwrhP4LY3/gFpD/IGPp59QYAAAAASUVORK5CYII=
+        R0lGODlhEAAQAIMAAAAAAP///6e6zXG39mCc0bzd+87trIC4QpfYTv/eStm9P//vqmdnZywsLP///wAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAOACwAAAAAEAAQAAAIeQAdCBxIsKADBggTIjQokIGBhxAb
+        MDxoAIFFBAckMnRoUaFCghwRMFhAsqTGhhVFLkjAMoGCkxQPHBjJ0qPCBjhpJmBQoKfPBgKCCtDJc4DR
+        AQRgjlSgoOjRpCBxNnBqFOpAoUMLHEUKE2QBAmDBdh3IQKrZiVixBgQAOw==
 </value>
   </data>
+  <metadata name="statusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>237, 17</value>
+  </metadata>
   <metadata name="mgLayerSelectionHandler1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>310, 212</value>
+    <value>122, 329</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>111</value>

Modified: trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs	2012-05-15 13:41:04 UTC (rev 6652)
@@ -206,6 +206,13 @@
             }
         }
         
+        internal static System.Drawing.Bitmap map__arrow {
+            get {
+                object obj = ResourceManager.GetObject("map--arrow", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap PoweredBy_en {
             get {
                 object obj = ResourceManager.GetObject("PoweredBy_en", resourceCulture);

Modified: trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.resx
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.resx	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.resx	2012-05-15 13:41:04 UTC (rev 6652)
@@ -121,8 +121,8 @@
   <data name="layer-shape-line" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shape-line.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_clearselect" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_clearselect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ui-tooltip-balloon-bottom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ui-tooltip-balloon-bottom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="layer-shape-ellipse" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shape-ellipse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -130,11 +130,14 @@
   <data name="icon_refreshmap" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_refreshmap.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_tasks" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_tasks.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="layer-shape" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ui-tooltip-balloon-bottom" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ui-tooltip-balloon-bottom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_clearselect" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_clearselect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_select.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -148,15 +151,21 @@
   <data name="layer-shape-polyline" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shape-polyline.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DebugLayer" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DebugLayer.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  <data name="icon_home" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_home.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="lc_dwf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lc_dwf.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon_fitwindow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_fitwindow.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="layer-shape-polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shape-polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_zoomout" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomout.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon_refreshmap1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_refreshmap1.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -166,19 +175,13 @@
   <data name="icon_zoomin" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_zoomin.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_zoomout" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomout.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="DebugLayer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DebugLayer.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="PoweredBy_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\PoweredBy_en.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="lc_dwf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\lc_dwf.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="map--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\map--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_home" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_home.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icon_tasks" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_tasks.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>
\ No newline at end of file

Copied: trunk/MgDev/Desktop/MapViewerTest/Resources/map--arrow.png (from rev 6651, branches/2.4/MgDev/Desktop/MapViewerTest/Resources/map--arrow.png)
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp	2012-05-15 13:41:04 UTC (rev 6652)
@@ -410,6 +410,22 @@
     return reader.Detach();
 }
 
+MgSpatialContextReader* MgdLayer::GetSpatialContexts(bool active)
+{
+	Ptr<MgSpatialContextReader> reader;
+
+    MG_TRY()
+
+    Ptr<MgdFeatureService> featSvc = static_cast<MgdFeatureService*>(GetMap()->GetService(MgServiceType::FeatureService));
+    Ptr<MgResourceIdentifier> fsId = new MgResourceIdentifier(GetFeatureSourceId());
+
+    reader = featSvc->GetSpatialContexts(fsId, active);
+
+    MG_CATCH_AND_THROW(L"MgdLayer.GetSpatialContexts")
+
+    return reader.Detach();
+}
+
 MgFeatureReader* MgdLayer::InsertFeatures(MgPropertyCollection* propertyValues)
 {
     Ptr<MgFeatureReader> reader;

Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h	2012-05-15 13:30:19 UTC (rev 6651)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h	2012-05-15 13:41:04 UTC (rev 6652)
@@ -41,6 +41,8 @@
 
     virtual bool HasTooltips();
 
+	virtual MgSpatialContextReader* GetSpatialContexts(bool active);
+
 INTERNAL_API:
 
     //////////////////////////////////////////////////////////////////