[mapguide-commits] r7069 - in branches/2.4/MgDev/Desktop: MapViewer/AppLayoutEngine MgDesktop Samples Samples/FreeFormExample Samples/FreeFormExample/Properties Samples/FreeFormExample/Resources Samples/Lib Samples/SampleExtension

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Wed Oct 3 09:47:53 PDT 2012


Author: jng
Date: 2012-10-03 09:47:53 -0700 (Wed, 03 Oct 2012)
New Revision: 7069

Added:
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/MainForm.Designer.cs
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/MainForm.cs
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/MainForm.resx
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Program.cs
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/AssemblyInfo.cs
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Resources.resx
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.settings
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/icon_pan.gif
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/lc_select.gif
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-clear.png
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-features.png
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-polygon.png
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-radius.png
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/view-refresh.png
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-full.png
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-in-fixed.png
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-in.png
   branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-out-fixed.png
   branches/2.4/MgDev/Desktop/Samples/Lib/SheboyganSample.AppLayout
Modified:
   branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.cs
   branches/2.4/MgDev/Desktop/MgDesktop/changelog.txt
   branches/2.4/MgDev/Desktop/Samples/MgDesktopSamples.sln
   branches/2.4/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj
   branches/2.4/MgDev/Desktop/Samples/samples_readme.txt
Log:
mg-desktop: This submission includes the following changes:
 - Add a new sample (FreeFormExample) that demonstrates that the MgMapViewer control functions like any other WinForms control and can have other controls placed on top of it, allowing for minimal user interfaces.
 - Fix AppLayout Shell not using the referenced Map Definition for components using the map: value prefix
 - Add a sample-specific AppLayout for the SampleExtension project

Modified: branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.cs	2012-10-03 15:01:55 UTC (rev 7068)
+++ branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.cs	2012-10-03 16:47:53 UTC (rev 7069)
@@ -407,7 +407,7 @@
                         var mapName = prop.Value.Substring(StringPrefixes.MAPDEFINITION.Length);
                         //TODO: Update for multi-maps if/when we support it
                         if (layout.Map.Name == mapName)
-                            comp.SetPropertyValue(prop.Name, mapName);
+                            comp.SetPropertyValue(prop.Name, layout.Map.MapDefinition);
                         else
                             throw new InvalidOperationException(string.Format(Strings.ErrorMapNotFound, mapName));
                     }
@@ -449,15 +449,21 @@
 
             //Apply viewer properties. We do this here because we want to respect the viewer options component
             //So we apply before the viewer options component gets its chance to
-
             foreach (var prop in layout.Settings)
             {
+                //Special case
+                if (prop.Name == "InvokeOnStartup") //NOXLATE
+                {
+                    _invokeComponentOnStartup = prop.Value.Substring(StringPrefixes.COMPONENTID.Length);
+                    continue;
+                }
+
                 if (prop.Value.StartsWith(StringPrefixes.MAPDEFINITION))
                 {
                     var mapName = prop.Value.Substring(StringPrefixes.MAPDEFINITION.Length);
                     //TODO: Update for multi-maps if/when we support it
                     if (layout.Map.Name == mapName)
-                        mapViewer.SetPropertyValue(prop.Name, mapName);
+                        mapViewer.SetPropertyValue(prop.Name, layout.Map.MapDefinition);
                     else
                         throw new InvalidOperationException(string.Format(Strings.ErrorMapNotFound, mapName));
                 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/changelog.txt
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/changelog.txt	2012-10-03 15:01:55 UTC (rev 7068)
+++ branches/2.4/MgDev/Desktop/MgDesktop/changelog.txt	2012-10-03 16:47:53 UTC (rev 7069)
@@ -1,9 +1,20 @@
 API Changelog:
+
  - MgdPlatform::Terminate() did not call MgdFdoConnectionPool::Cleanup() leaving that to the static initializer to cleanup. This caused problems for the GDAL provider if connection pooling is enabled. The call has been put into MgdPlatform::Terminate() and connection pooling for the GDAL provider has been re-enabled in Platform.ini
  - Add support for MapGuide's PreCacheMaps configuration property in Platform.ini
+ - MgMapViewer is now an IMapComponent, and any properties tagged with MgComponentPropertyAttribute can be dynamically set by the AppLayout engine.
 
 Viewer Changelog:
  - Support for Localization
+ - New Viewer properties to support display of Tiled Maps:
+    - UseRenderMapIfTiledLayersExist (if true will use the RenderMap API, which includes tiled layers in the rendered image)
+    - RespectFiniteDisplayScales (if true will cause all zooms to snap to the nearest finite display scale)
+ - NOTE: Because RenderMap pre-fills the map's background color into the final image, setting the viewer to use the RenderMap API makes it impossible to use the viewer's Pre-Rendering hook as the rendered image will be drawn completely over it.
+ - MgQueryResultsDialog now allows for unbounded size in search results (passing a limit of -1 will instruct the dialog to spin through the entire feature reader)
+ - Fix legend node display for tiled layers (checkboxes should not show)
+ - Fix illegal attempts to fetch theme icons at scales where they're not applicable.
+ - New simple search component. Similar to the search command in the AJAX/Fusion viewer
+ - AppLayout schema change to accomodate dynamic assignment of viewer properties. See updated AppLayout examples.
  - Improve performance of MgMapViewerProvider
 
 2.4.0.6971 (Aug 30 2012)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample
___________________________________________________________________
Added: svn:ignore
   + bin
obj

Added: bugtraq:number
   + true

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj	2012-10-03 16:47:53 UTC (rev 7069)
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{41EF1524-D186-4079-BAA9-1A99F0AC31CA}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>FreeFormExample</RootNamespace>
+    <AssemblyName>FreeFormExample</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Lib\OSGeo.MapGuide.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OSGeo.MapGuide.Foundation, Version=2.4.0.7019, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Lib\OSGeo.MapGuide.Foundation.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OSGeo.MapGuide.Geometry, Version=2.4.0.7019, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Lib\OSGeo.MapGuide.Geometry.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.4.0.7019, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Lib\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OSGeo.MapGuide.Viewer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Lib\OSGeo.MapGuide.Viewer.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OSGeo.MapGuide.Viewer.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Lib\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\zoom-in-fixed.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\zoom-out-fixed.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\zoom-in.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\zoom-full.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\lc_select.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\select-features.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\select-polygon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\select-radius.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\select-clear.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\view-refresh.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\icon_pan.gif" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>if not exist "$(TargetDir)FDO" md "$(TargetDir)FDO"
+xcopy /s /y "$(SolutionDir)Lib\FDO" "$(TargetDir)FDO"
+if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
+xcopy /s /y "$(SolutionDir)Lib\Dictionaries" "$(TargetDir)Dictionaries"
+if not exist "$(TargetDir)Resources" md "$(TargetDir)Resources"
+xcopy /s /y "$(SolutionDir)Lib\Resources" "$(TargetDir)Resources"
+if not exist "$(TargetDir)Schema" md "$(TargetDir)Schema"
+xcopy /s /y "$(SolutionDir)Lib\Schema" "$(TargetDir)Schema"
+copy /y "$(SolutionDir)Lib\*.dll" "$(TargetDir)"
+copy /y "$(SolutionDir)Lib\Platform.ini" "$(TargetDir)"</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/MainForm.Designer.cs
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/FreeFormExample/MainForm.Designer.cs	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/Samples/FreeFormExample/MainForm.Designer.cs	2012-10-03 16:47:53 UTC (rev 7069)
@@ -0,0 +1,335 @@
+namespace FreeFormExample
+{
+    partial class MainForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.mgLegend1 = new OSGeo.MapGuide.Viewer.MgLegend();
+            this.mgPropertyPane1 = new OSGeo.MapGuide.Viewer.MgPropertyPane();
+            this.mgMapViewer1 = new OSGeo.MapGuide.Viewer.MgMapViewer();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.lblCoords = new System.Windows.Forms.ToolStripStatusLabel();
+            this.lblSelected = new System.Windows.Forms.ToolStripStatusLabel();
+            this.lblScale = new System.Windows.Forms.ToolStripStatusLabel();
+            this.lblSize = new System.Windows.Forms.ToolStripStatusLabel();
+            this.btnPan = new System.Windows.Forms.Button();
+            this.btnRefresh = new System.Windows.Forms.Button();
+            this.btnClearSelection = new System.Windows.Forms.Button();
+            this.btnSelectCircle = new System.Windows.Forms.Button();
+            this.btnSelectPolygon = new System.Windows.Forms.Button();
+            this.btnSelect = new System.Windows.Forms.Button();
+            this.btnZoomExtents = new System.Windows.Forms.Button();
+            this.btnZoomOut = new System.Windows.Forms.Button();
+            this.btnZoomIn = new System.Windows.Forms.Button();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            this.statusStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.btnPan);
+            this.splitContainer1.Panel2.Controls.Add(this.btnRefresh);
+            this.splitContainer1.Panel2.Controls.Add(this.btnClearSelection);
+            this.splitContainer1.Panel2.Controls.Add(this.btnSelectCircle);
+            this.splitContainer1.Panel2.Controls.Add(this.btnSelectPolygon);
+            this.splitContainer1.Panel2.Controls.Add(this.btnSelect);
+            this.splitContainer1.Panel2.Controls.Add(this.btnZoomExtents);
+            this.splitContainer1.Panel2.Controls.Add(this.btnZoomOut);
+            this.splitContainer1.Panel2.Controls.Add(this.btnZoomIn);
+            this.splitContainer1.Panel2.Controls.Add(this.mgMapViewer1);
+            this.splitContainer1.Size = new System.Drawing.Size(607, 495);
+            this.splitContainer1.SplitterDistance = 202;
+            this.splitContainer1.TabIndex = 3;
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.mgLegend1);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.mgPropertyPane1);
+            this.splitContainer2.Size = new System.Drawing.Size(202, 495);
+            this.splitContainer2.SplitterDistance = 235;
+            this.splitContainer2.TabIndex = 0;
+            // 
+            // mgLegend1
+            // 
+            this.mgLegend1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.mgLegend1.GroupContextMenu = null;
+            this.mgLegend1.LayerContextMenu = null;
+            this.mgLegend1.Location = new System.Drawing.Point(0, 0);
+            this.mgLegend1.Name = "mgLegend1";
+            this.mgLegend1.ShowTooltips = true;
+            this.mgLegend1.Size = new System.Drawing.Size(202, 235);
+            this.mgLegend1.TabIndex = 0;
+            this.mgLegend1.ThemeCompressionLimit = 0;
+            // 
+            // mgPropertyPane1
+            // 
+            this.mgPropertyPane1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.mgPropertyPane1.Location = new System.Drawing.Point(0, 0);
+            this.mgPropertyPane1.Name = "mgPropertyPane1";
+            this.mgPropertyPane1.Size = new System.Drawing.Size(202, 256);
+            this.mgPropertyPane1.TabIndex = 0;
+            // 
+            // mgMapViewer1
+            // 
+            this.mgMapViewer1.Cursor = System.Windows.Forms.Cursors.Default;
+            this.mgMapViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.mgMapViewer1.Location = new System.Drawing.Point(0, 0);
+            this.mgMapViewer1.MaxScale = 1000000000;
+            this.mgMapViewer1.MinScale = 10;
+            this.mgMapViewer1.MouseWheelDelayRenderInterval = 800;
+            this.mgMapViewer1.Name = "mgMapViewer1";
+            this.mgMapViewer1.PointPixelBuffer = 2;
+            this.mgMapViewer1.RespectFiniteDisplayScales = false;
+            this.mgMapViewer1.SelectionColor = System.Drawing.Color.Blue;
+            this.mgMapViewer1.Size = new System.Drawing.Size(401, 495);
+            this.mgMapViewer1.TabIndex = 0;
+            this.mgMapViewer1.Text = "mgMapViewer1";
+            this.mgMapViewer1.TooltipDelayInterval = 1000;
+            this.mgMapViewer1.UseRenderMapIfTiledLayersExist = false;
+            this.mgMapViewer1.ZoomInFactor = 0.5;
+            this.mgMapViewer1.ZoomOutFactor = 2;
+            this.mgMapViewer1.SelectionChanged += new System.EventHandler(this.mgMapViewer1_SelectionChanged);
+            this.mgMapViewer1.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(this.mgMapViewer1_PropertyChanged);
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.lblCoords,
+            this.lblSelected,
+            this.lblScale,
+            this.lblSize});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 495);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(607, 22);
+            this.statusStrip1.TabIndex = 4;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // lblCoords
+            // 
+            this.lblCoords.Name = "lblCoords";
+            this.lblCoords.Size = new System.Drawing.Size(0, 17);
+            // 
+            // lblSelected
+            // 
+            this.lblSelected.Name = "lblSelected";
+            this.lblSelected.Size = new System.Drawing.Size(592, 17);
+            this.lblSelected.Spring = true;
+            this.lblSelected.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // lblScale
+            // 
+            this.lblScale.Name = "lblScale";
+            this.lblScale.Size = new System.Drawing.Size(0, 17);
+            this.lblScale.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // lblSize
+            // 
+            this.lblSize.Name = "lblSize";
+            this.lblSize.Size = new System.Drawing.Size(0, 17);
+            // 
+            // btnPan
+            // 
+            this.btnPan.BackColor = System.Drawing.Color.Transparent;
+            this.btnPan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnPan.Image = global::FreeFormExample.Properties.Resources.icon_pan;
+            this.btnPan.Location = new System.Drawing.Point(13, 44);
+            this.btnPan.Name = "btnPan";
+            this.btnPan.Size = new System.Drawing.Size(26, 26);
+            this.btnPan.TabIndex = 12;
+            this.btnPan.UseVisualStyleBackColor = false;
+            this.btnPan.Click += new System.EventHandler(this.btnPan_Click);
+            // 
+            // btnRefresh
+            // 
+            this.btnRefresh.BackColor = System.Drawing.Color.Transparent;
+            this.btnRefresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnRefresh.Image = global::FreeFormExample.Properties.Resources.view_refresh;
+            this.btnRefresh.Location = new System.Drawing.Point(77, 44);
+            this.btnRefresh.Name = "btnRefresh";
+            this.btnRefresh.Size = new System.Drawing.Size(26, 26);
+            this.btnRefresh.TabIndex = 11;
+            this.btnRefresh.UseVisualStyleBackColor = false;
+            this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
+            // 
+            // btnClearSelection
+            // 
+            this.btnClearSelection.BackColor = System.Drawing.Color.Transparent;
+            this.btnClearSelection.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnClearSelection.Image = global::FreeFormExample.Properties.Resources.select_clear;
+            this.btnClearSelection.Location = new System.Drawing.Point(45, 44);
+            this.btnClearSelection.Name = "btnClearSelection";
+            this.btnClearSelection.Size = new System.Drawing.Size(26, 26);
+            this.btnClearSelection.TabIndex = 10;
+            this.btnClearSelection.UseVisualStyleBackColor = false;
+            this.btnClearSelection.Click += new System.EventHandler(this.btnClearSelection_Click);
+            // 
+            // btnSelectCircle
+            // 
+            this.btnSelectCircle.BackColor = System.Drawing.Color.Transparent;
+            this.btnSelectCircle.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnSelectCircle.Image = global::FreeFormExample.Properties.Resources.select_radius;
+            this.btnSelectCircle.Location = new System.Drawing.Point(77, 76);
+            this.btnSelectCircle.Name = "btnSelectCircle";
+            this.btnSelectCircle.Size = new System.Drawing.Size(26, 26);
+            this.btnSelectCircle.TabIndex = 9;
+            this.btnSelectCircle.UseVisualStyleBackColor = false;
+            this.btnSelectCircle.Click += new System.EventHandler(this.btnSelectCircle_Click);
+            // 
+            // btnSelectPolygon
+            // 
+            this.btnSelectPolygon.BackColor = System.Drawing.Color.Transparent;
+            this.btnSelectPolygon.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnSelectPolygon.Image = global::FreeFormExample.Properties.Resources.select_polygon;
+            this.btnSelectPolygon.Location = new System.Drawing.Point(45, 76);
+            this.btnSelectPolygon.Name = "btnSelectPolygon";
+            this.btnSelectPolygon.Size = new System.Drawing.Size(26, 26);
+            this.btnSelectPolygon.TabIndex = 8;
+            this.btnSelectPolygon.UseVisualStyleBackColor = false;
+            this.btnSelectPolygon.Click += new System.EventHandler(this.btnSelectPolygon_Click);
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.BackColor = System.Drawing.Color.Transparent;
+            this.btnSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnSelect.Image = global::FreeFormExample.Properties.Resources.select_features;
+            this.btnSelect.Location = new System.Drawing.Point(13, 76);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(26, 26);
+            this.btnSelect.TabIndex = 7;
+            this.btnSelect.UseVisualStyleBackColor = false;
+            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+            // 
+            // btnZoomExtents
+            // 
+            this.btnZoomExtents.BackColor = System.Drawing.Color.Transparent;
+            this.btnZoomExtents.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnZoomExtents.Image = global::FreeFormExample.Properties.Resources.zoom_full;
+            this.btnZoomExtents.Location = new System.Drawing.Point(77, 12);
+            this.btnZoomExtents.Name = "btnZoomExtents";
+            this.btnZoomExtents.Size = new System.Drawing.Size(26, 26);
+            this.btnZoomExtents.TabIndex = 6;
+            this.btnZoomExtents.UseVisualStyleBackColor = false;
+            this.btnZoomExtents.Click += new System.EventHandler(this.btnZoomExtents_Click);
+            // 
+            // btnZoomOut
+            // 
+            this.btnZoomOut.BackColor = System.Drawing.Color.Transparent;
+            this.btnZoomOut.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnZoomOut.Image = global::FreeFormExample.Properties.Resources.zoom_out_fixed;
+            this.btnZoomOut.Location = new System.Drawing.Point(45, 12);
+            this.btnZoomOut.Name = "btnZoomOut";
+            this.btnZoomOut.Size = new System.Drawing.Size(26, 26);
+            this.btnZoomOut.TabIndex = 4;
+            this.btnZoomOut.UseVisualStyleBackColor = false;
+            this.btnZoomOut.Click += new System.EventHandler(this.btnZoomOut_Click);
+            // 
+            // btnZoomIn
+            // 
+            this.btnZoomIn.BackColor = System.Drawing.Color.Transparent;
+            this.btnZoomIn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnZoomIn.Image = global::FreeFormExample.Properties.Resources.zoom_in_fixed;
+            this.btnZoomIn.Location = new System.Drawing.Point(13, 12);
+            this.btnZoomIn.Name = "btnZoomIn";
+            this.btnZoomIn.Size = new System.Drawing.Size(26, 26);
+            this.btnZoomIn.TabIndex = 3;
+            this.btnZoomIn.UseVisualStyleBackColor = false;
+            this.btnZoomIn.Click += new System.EventHandler(this.btnZoomIn_Click);
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(607, 517);
+            this.Controls.Add(this.splitContainer1);
+            this.Controls.Add(this.statusStrip1);
+            this.Name = "MainForm";
+            this.Text = "mg-desktop free-form map viewer example";
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            this.splitContainer1.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            this.splitContainer2.ResumeLayout(false);
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private OSGeo.MapGuide.Viewer.MgLegend mgLegend1;
+        private OSGeo.MapGuide.Viewer.MgPropertyPane mgPropertyPane1;
+        private OSGeo.MapGuide.Viewer.MgMapViewer mgMapViewer1;
+        private System.Windows.Forms.Button btnZoomIn;
+        private System.Windows.Forms.Button btnZoomExtents;
+        private System.Windows.Forms.Button btnZoomOut;
+        private System.Windows.Forms.Button btnSelect;
+        private System.Windows.Forms.Button btnSelectPolygon;
+        private System.Windows.Forms.Button btnSelectCircle;
+        private System.Windows.Forms.Button btnRefresh;
+        private System.Windows.Forms.Button btnClearSelection;
+        private System.Windows.Forms.StatusStrip statusStrip1;
+        private System.Windows.Forms.ToolStripStatusLabel lblCoords;
+        private System.Windows.Forms.ToolStripStatusLabel lblSelected;
+        private System.Windows.Forms.ToolStripStatusLabel lblScale;
+        private System.Windows.Forms.ToolStripStatusLabel lblSize;
+        private System.Windows.Forms.Button btnPan;
+
+    }
+}
+

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/MainForm.cs
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/FreeFormExample/MainForm.cs	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/Samples/FreeFormExample/MainForm.cs	2012-10-03 16:47:53 UTC (rev 7069)
@@ -0,0 +1,233 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using OSGeo.MapGuide.Viewer.Desktop;
+using OSGeo.MapGuide;
+using OSGeo.MapGuide.Viewer;
+using System.Globalization;
+
+namespace FreeFormExample
+{
+    public partial class MainForm : Form, IMapStatusBar
+    {
+        public MainForm()
+        {
+            InitializeComponent();
+        }
+
+        private MgWktReaderWriter _wktRw;
+        private MgGeometryFactory _geomFact;
+
+        protected override void OnLoad(EventArgs e)
+        {
+            _wktRw = new MgWktReaderWriter();
+            _geomFact = new MgGeometryFactory();
+            new MapViewerController(mgMapViewer1,          //The MgMapViewer
+                                    mgLegend1,             //The MgLegend
+                                    this,                  //The IMapStatusBar
+                                    mgPropertyPane1);      //The MgPropertyPane
+
+            MgdServiceFactory factory = new MgdServiceFactory();
+            MgdResourceService resSvc = (MgdResourceService)factory.CreateService(MgServiceType.ResourceService);
+            MgResourceIdentifier mapDefId = new MgResourceIdentifier("Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition");
+            //If this map definition doesn't exist, we ask the user to
+            //load the Sheboygan package
+            if (!resSvc.ResourceExists(mapDefId))
+            {
+                using (OpenFileDialog diag = new OpenFileDialog())
+                {
+                    diag.Filter = "MapGuide Packages (*.mgp)|*.mgp";
+                    if (diag.ShowDialog() == DialogResult.OK)
+                    {
+                        MgByteSource source = new MgByteSource(diag.FileName);
+                        MgByteReader reader = source.GetReader();
+                        resSvc.ApplyResourcePackage(reader);
+                    }
+                    else
+                    {
+                        //No map, nothing to do here
+                        Application.Exit();
+                    }
+                }
+            }
+
+            //Create our runtime map
+            MgdMap map = new MgdMap(mapDefId);
+            //Create our viewer provider
+            MgMapViewerProvider provider = new MgDesktopMapViewerProvider(map);
+            //Initialize our viewer with this provider
+            mgMapViewer1.Init(provider);
+            UpdateButtonCheckedState();
+        }
+
+        public void SetCursorPositionMessage(string message)
+        {
+            lblCoords.Text = message;
+        }
+
+        public void SetFeatureSelectedMessage(string message)
+        {
+            lblSelected.Text = message;
+        }
+
+        public void SetMapScaleMessage(string message)
+        {
+            lblScale.Text = message;
+        }
+
+        public void SetMapSizeMessage(string message)
+        {
+            lblSize.Text = message;
+        }
+
+        private void mgMapViewer1_SelectionChanged(object sender, EventArgs e)
+        {
+            MgSelectionBase selection = mgMapViewer1.GetSelection();
+            MgReadOnlyLayerCollection layers = selection.GetLayers();
+            if (layers != null)
+            {
+                for (int i = 0; i < layers.GetCount(); i++)
+                {
+                    MgLayerBase layer = layers.GetItem(i);
+                    if (layer.Name == "Parcels") //The selected layer is parcels
+                    {
+                        //Check that we only have one selected object
+                        int count = selection.GetSelectedFeaturesCount(layer, layer.FeatureClassName);
+                        if (count == 1)
+                        {
+                            MgFeatureReader reader = null;
+                            try
+                            {
+                                reader = selection.GetSelectedFeatures(layer, layer.FeatureClassName, false);
+                                if (reader.ReadNext())
+                                {
+                                    //Address is in the RPROPAD property
+                                    if (reader.IsNull("RPROPAD"))
+                                        MessageBox.Show("Selected parcel has no address");
+                                    else
+                                        MessageBox.Show("Address: " + reader.GetString("RPROPAD"));
+                                }
+                            }
+                            finally //Must close all readers, otherwise connections will leak
+                            {
+                                reader.Close();
+                            }
+                        }
+                        else
+                        {
+                            MessageBox.Show("Please select only one parcel");
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        private void btnZoomIn_Click(object sender, EventArgs e)
+        {
+            mgMapViewer1.ActiveTool = MapActiveTool.ZoomIn;
+        }
+
+        private void btnZoomOut_Click(object sender, EventArgs e)
+        {
+            mgMapViewer1.ActiveTool = MapActiveTool.ZoomOut;
+        }
+
+        private void btnZoomExtents_Click(object sender, EventArgs e)
+        {
+            mgMapViewer1.InitialMapView();
+        }
+
+        private void btnSelect_Click(object sender, EventArgs e)
+        {
+            mgMapViewer1.ActiveTool = MapActiveTool.Select;
+        }
+
+        private void btnSelectPolygon_Click(object sender, EventArgs e)
+        {
+            mgMapViewer1.DigitizePolygon((coordinates) =>
+            {
+                MgCoordinateCollection coords = new MgCoordinateCollection();
+                for (int i = 0; i < coordinates.GetLength(0); i++)
+                {
+                    coords.Add(_geomFact.CreateCoordinateXY(coordinates[i, 0], coordinates[i, 1]));
+                }
+                coords.Add(_geomFact.CreateCoordinateXY(coordinates[0, 0], coordinates[0, 1]));
+                MgLinearRing ring = _geomFact.CreateLinearRing(coords);
+                MgGeometry poly = _geomFact.CreatePolygon(ring, null);
+                mgMapViewer1.SelectByGeometry(poly);
+            });
+        }
+
+        static string MakeWktCircle(double x, double y, double r)
+        {
+            return "CURVEPOLYGON ((" + (x - r).ToString(CultureInfo.InvariantCulture) + " " + y.ToString(CultureInfo.InvariantCulture) + " (CIRCULARARCSEGMENT (" + x.ToString(CultureInfo.InvariantCulture) + " " + (y - r).ToString(CultureInfo.InvariantCulture) + ", " + (x + r).ToString(CultureInfo.InvariantCulture) + " " + y.ToString(CultureInfo.InvariantCulture) + "), CIRCULARARCSEGMENT (" + x.ToString(CultureInfo.InvariantCulture) + " " + (y + r).ToString(CultureInfo.InvariantCulture) + ", " + (x - r).ToString(CultureInfo.InvariantCulture) + " " + y.ToString(CultureInfo.InvariantCulture) + "))))"; //NOXLATE
+        }
+
+        static string MakeWktPolygon(double x1, double y1, double x2, double y2)
+        {
+            string x1str = x1.ToString(CultureInfo.InvariantCulture);
+            string y1str = y1.ToString(CultureInfo.InvariantCulture);
+            string x2str = x2.ToString(CultureInfo.InvariantCulture);
+            string y2str = y2.ToString(CultureInfo.InvariantCulture);
+            return "POLYGON((" + x1str + " " + y1str + ", " + x2str + " " + y1str + ", " + x2str + " " + y2str + ", " + x1str + " " + y2str + ", " + x1str + " " + y1str + "))"; //NOXLATE
+        }
+
+        private void btnSelectCircle_Click(object sender, EventArgs e)
+        {
+            mgMapViewer1.DigitizeCircle((x, y, r) =>
+            {
+                MgGeometry geom = _wktRw.Read(MakeWktCircle(x, y, r));
+                mgMapViewer1.SelectByGeometry(geom);
+            });
+        }
+
+        private void btnClearSelection_Click(object sender, EventArgs e)
+        {
+            mgMapViewer1.ClearSelection();
+        }
+
+        private void btnRefresh_Click(object sender, EventArgs e)
+        {
+            mgMapViewer1.RefreshMap();
+        }
+
+        private void mgMapViewer1_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "IsBusy") //NOXLATE
+            {
+                var busy = mgMapViewer1.IsBusy;
+                btnZoomExtents.Enabled = btnZoomIn.Enabled
+                                         = btnZoomOut.Enabled
+                                         = btnClearSelection.Enabled
+                                         = btnPan.Enabled
+                                         = btnSelect.Enabled
+                                         = btnSelectPolygon.Enabled
+                                         = btnSelectCircle.Enabled
+                                         = btnRefresh.Enabled = !busy;
+            }
+            else if (e.PropertyName == "ActiveTool" || e.PropertyName == "DigitizingType") //NOXLATE
+            {
+                UpdateButtonCheckedState();
+            }
+        }
+
+        private void UpdateButtonCheckedState()
+        {
+            var at = (mgMapViewer1 == null) ? MapActiveTool.None : mgMapViewer1.ActiveTool;
+            btnPan.BackColor = (at == MapActiveTool.Pan) ? Color.LemonChiffon : Control.DefaultBackColor;
+            btnSelect.BackColor = (at == MapActiveTool.Select) ? Color.LemonChiffon : Control.DefaultBackColor;
+            btnZoomIn.BackColor = (at == MapActiveTool.ZoomIn) ? Color.LemonChiffon : Control.DefaultBackColor;
+            btnZoomOut.BackColor = (at == MapActiveTool.ZoomOut) ? Color.LemonChiffon : Control.DefaultBackColor;
+        }
+
+        private void btnPan_Click(object sender, EventArgs e)
+        {
+            mgMapViewer1.ActiveTool = MapActiveTool.Pan;
+        }
+    }
+}

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

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Program.cs
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Program.cs	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Program.cs	2012-10-03 16:47:53 UTC (rev 7069)
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using OSGeo.MapGuide;
+
+namespace FreeFormExample
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            MgdPlatform.Initialize("Platform.ini");
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new MainForm());
+            MgdPlatform.Terminate();
+        }
+    }
+}


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties
___________________________________________________________________
Added: bugtraq:number
   + true

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/AssemblyInfo.cs
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/AssemblyInfo.cs	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/AssemblyInfo.cs	2012-10-03 16:47:53 UTC (rev 7069)
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("FreeFormExample")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("FreeFormExample")]
+[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("9b7750d6-26d1-4791-b252-b4b40ebc057a")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs	2012-10-03 16:47:53 UTC (rev 7069)
@@ -0,0 +1,140 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.5420
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FreeFormExample.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FreeFormExample.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static System.Drawing.Bitmap icon_pan {
+            get {
+                object obj = ResourceManager.GetObject("icon_pan", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap lc_select {
+            get {
+                object obj = ResourceManager.GetObject("lc_select", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap select_clear {
+            get {
+                object obj = ResourceManager.GetObject("select-clear", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap select_features {
+            get {
+                object obj = ResourceManager.GetObject("select-features", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap select_polygon {
+            get {
+                object obj = ResourceManager.GetObject("select-polygon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap select_radius {
+            get {
+                object obj = ResourceManager.GetObject("select-radius", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap view_refresh {
+            get {
+                object obj = ResourceManager.GetObject("view-refresh", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap zoom_full {
+            get {
+                object obj = ResourceManager.GetObject("zoom-full", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap zoom_in {
+            get {
+                object obj = ResourceManager.GetObject("zoom-in", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap zoom_in_fixed {
+            get {
+                object obj = ResourceManager.GetObject("zoom-in-fixed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap zoom_out_fixed {
+            get {
+                object obj = ResourceManager.GetObject("zoom-out-fixed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}

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

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs	2012-10-03 16:47:53 UTC (rev 7069)
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.5420
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FreeFormExample.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.settings
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.settings	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.settings	2012-10-03 16:47:53 UTC (rev 7069)
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources
___________________________________________________________________
Added: bugtraq:number
   + true

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/icon_pan.gif
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/icon_pan.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/lc_select.gif
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/lc_select.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-clear.png
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-clear.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-features.png
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-features.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-polygon.png
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-polygon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-radius.png
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/select-radius.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/view-refresh.png
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/view-refresh.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-full.png
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-full.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-in-fixed.png
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-in-fixed.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-in.png
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-in.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-out-fixed.png
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/Desktop/Samples/FreeFormExample/Resources/zoom-out-fixed.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.4/MgDev/Desktop/Samples/Lib/SheboyganSample.AppLayout
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/Lib/SheboyganSample.AppLayout	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/Samples/Lib/SheboyganSample.AppLayout	2012-10-03 16:47:53 UTC (rev 7069)
@@ -0,0 +1,533 @@
+<?xml version="1.0"?>
+<AppLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Title>MapGuide Desktop App Layout Example</Title>
+  <Icon>app.ico</Icon>
+  <Settings>
+    <NameValue>
+      <Name>InvokeOnStartup</Name>
+      <Value>component:Startup</Value>
+    </NameValue>
+    <NameValue>
+      <Name>SelectionColor</Name>
+      <Value>color:0000FF</Value>
+    </NameValue>
+    <NameValue>
+      <Name>ConvertTiledGroupsToNonTiled</Name>
+      <Value>false</Value>
+    </NameValue>
+    <NameValue>
+      <Name>UseRenderMapIfTiledLayersExist</Name>
+      <Value>false</Value>
+    </NameValue>
+    <NameValue>
+      <Name>RespectFiniteDisplayScales</Name>
+      <Value>false</Value>
+    </NameValue>
+    <NameValue>
+      <Name>ShowVertexCoordinatesWhenDigitizing</Name>
+      <Value>false</Value>
+    </NameValue>
+    <NameValue>
+      <Name>ZoomInFactor</Name>
+      <Value>0.5</Value>
+    </NameValue>
+    <NameValue>
+      <Name>ZoomOutFactor</Name>
+      <Value>2</Value>
+    </NameValue>
+    <NameValue>
+      <Name>PointPixelBuffer</Name>
+      <Value>3</Value>
+    </NameValue>
+  </Settings>
+  <InfoPane>
+    <Width>200</Width>
+    <Legend>
+      <Visible>true</Visible>
+      <ShowTooltips>true</ShowTooltips>
+      <ThemeCompressionLimit>25</ThemeCompressionLimit>
+    </Legend>
+    <PropertyPane>
+      <Visible>true</Visible>
+    </PropertyPane>
+  </InfoPane>
+  <Map>
+    <Name>Sheboygan</Name>
+    <MapDefinition>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</MapDefinition>
+  </Map>
+  <Menu>
+    <Items>
+      <ItemBase xsi:type="SubMenu">
+        <Label>File</Label>
+        <Items>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>LoadMap</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>LoadPackage</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="SeparatorItem" />
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Quit</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+        </Items>
+      </ItemBase>
+      <ItemBase xsi:type="SubMenu">
+        <Label>Tools</Label>
+        <Items>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Buffer</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Measure</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Query</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Theme</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="SeparatorItem" />
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>ViewerOptions</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+        </Items>
+      </ItemBase>
+    </Items>
+  </Menu>
+  <Toolbar>
+    <Items>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>PrintMap</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>CopyMap</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ZoomIn</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ZoomOut</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>InitialView</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ZoomPrev</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ZoomNext</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>Select</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>SelectRadius</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>SelectPolygon</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>Pan</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ClearSelection</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>RefreshMap</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>TooltipToggle</ComponentID>
+        <ShowLabel>true</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="SubMenu">
+        <Label>Tools</Label>
+        <Items>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Buffer</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Measure</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Query</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Theme</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="SeparatorItem" />
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>ViewerOptions</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+        </Items>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="SubMenu">
+        <Label>Custom</Label>
+        <Items>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>PlotToDwf</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Profile</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+        </Items>
+      </ItemBase>
+    </Items>
+  </Toolbar>
+  <ContextMenu>
+    <Items>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>RefreshMap</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ZoomIn</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ZoomOut</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ZoomToSelection</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>InitialView</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>Pan</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>Select</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ClearSelection</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="SubMenu">
+        <Label>Tools</Label>
+        <Items>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Buffer</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Measure</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Query</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>Theme</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+        </Items>
+      </ItemBase>
+      <ItemBase xsi:type="SeparatorItem" />
+      <ItemBase xsi:type="CommandItem">
+        <ComponentID>ViewerOptions</ComponentID>
+        <ShowLabel>false</ShowLabel>
+      </ItemBase>
+    </Items>
+  </ContextMenu>
+  <TaskPane>
+    <Width>250</Width>
+    <InitialComponentID>SamplesTaskPane</InitialComponentID>
+    <TaskMenu>
+      <Items>
+        <ItemBase xsi:type="CommandItem">
+          <ComponentID>Buffer</ComponentID>
+          <ShowLabel>false</ShowLabel>
+        </ItemBase>
+        <ItemBase xsi:type="CommandItem">
+          <ComponentID>Measure</ComponentID>
+          <ShowLabel>false</ShowLabel>
+        </ItemBase>
+        <ItemBase xsi:type="CommandItem">
+          <ComponentID>Query</ComponentID>
+          <ShowLabel>false</ShowLabel>
+        </ItemBase>
+        <ItemBase xsi:type="CommandItem">
+          <ComponentID>Theme</ComponentID>
+          <ShowLabel>false</ShowLabel>
+        </ItemBase>
+      </Items>
+    </TaskMenu>
+  </TaskPane>
+  <Components>
+    <ComponentDefinition>
+      <ComponentID>Buffer</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgBufferComponent</ClassName>
+      <Properties>
+        <NameValue>
+          <Name>DefaultLayerName</Name>
+          <Value>BufferLayer</Value>
+        </NameValue>
+        <NameValue>
+          <Name>DefaultBufferUnits</Name>
+          <Value>enum:OSGeo.MapGuide.Viewer.MeasurementUnit:Meters</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Target</Name>
+          <Value>enum:OSGeo.MapGuide.Viewer.MgViewerTarget:TaskPane</Value>
+        </NameValue>
+        <NameValue>
+          <Name>TaskPane</Name>
+          <Value>taskpane:</Value>
+        </NameValue>
+      </Properties>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>SelectRadius</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgCircleSelectComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>ClearSelection</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgClearSelectionComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>CopyMap</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgCopyMapComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>InitialView</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgInitialViewComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>LoadMap</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgLoadMapComponent</ClassName>
+      <Properties>
+        <NameValue>
+          <Name>Label</Name>
+          <Value>Load Sheboygan Map</Value>
+        </NameValue>
+        <NameValue>
+          <Name>MapDefinition</Name>
+          <Value>map:Sheboygan</Value>
+        </NameValue>
+      </Properties>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>LoadPackage</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgLoadPackageComponent</ClassName>
+      <Properties>
+        <NameValue>
+          <Name>InvokeOnPackageLoad</Name>
+          <Value>component:LoadMap</Value>
+        </NameValue>
+      </Properties>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>Measure</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgMeasureComponent</ClassName>
+      <Properties>
+        <NameValue>
+          <Name>MeasureMode</Name>
+          <Value>enum:OSGeo.MapGuide.Viewer.MeasureMode:Line</Value>
+        </NameValue>
+        <NameValue>
+          <Name>PreferredUnits</Name>
+          <Value>enum:OSGeo.MapGuide.Viewer.MeasurementUnit:Meters</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Target</Name>
+          <Value>enum:OSGeo.MapGuide.Viewer.MgViewerTarget:TaskPane</Value>
+        </NameValue>
+        <NameValue>
+          <Name>TaskPane</Name>
+          <Value>taskpane:</Value>
+        </NameValue>
+      </Properties>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>Pan</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgPanComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>SelectPolygon</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgPolygonSelectComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>PrintMap</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgPrintComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>Query</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgQueryComponent</ClassName>
+      <Properties>
+        <NameValue>
+          <Name>Target</Name>
+          <Value>enum:OSGeo.MapGuide.Viewer.MgViewerTarget:TaskPane</Value>
+        </NameValue>
+        <NameValue>
+          <Name>TaskPane</Name>
+          <Value>taskpane:</Value>
+        </NameValue>
+      </Properties>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>Quit</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.AppLayoutEngine.MgQuitComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>RefreshMap</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgRefreshMapComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>Select</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgSelectComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>Theme</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgThemeComponent</ClassName>
+      <Properties>
+        <NameValue>
+          <Name>Target</Name>
+          <Value>enum:OSGeo.MapGuide.Viewer.MgViewerTarget:TaskPane</Value>
+        </NameValue>
+        <NameValue>
+          <Name>TaskPane</Name>
+          <Value>taskpane:</Value>
+        </NameValue>
+      </Properties>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>TooltipToggle</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgTooltipToggleComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>ViewerOptions</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgViewerOptionsComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>ZoomIn</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgZoomInComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>ZoomNext</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgZoomNextComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>ZoomOut</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgZoomOutComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>ZoomPrev</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgZoomPreviousComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>ZoomToSelection</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgZoomToSelectionComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>PlotToDwf</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgPlotToDwfComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>Profile</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgProfileComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>Startup</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgStartupComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>SamplesTaskPane</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgSampleTaskPaneComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>HelloMap</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgHelloMapComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>HelloViewer</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgHelloViewerComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>InteractingWithLayers</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgInteractingWithLayersComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>WorkingWithFeatureData</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgWorkingWithFeatureDataComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>ModifyingMapsAndLayers</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgModifyingMapsAndLayersComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>AnalyzingFeatures</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgAnalyzingFeaturesComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>DigitizingAndRedlining</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgDigitizingAndRedliningComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition>
+      <ComponentID>CustomOutput</ComponentID>
+      <Assembly>SampleExtension.dll</Assembly>
+      <ClassName>SampleExtension.MgCustomOutputComponent</ClassName>
+    </ComponentDefinition>
+    <ComponentDefinition> 
+      <ComponentID>PrePostRender</ComponentID> 
+      <Assembly>SampleExtension.dll</Assembly> 
+      <ClassName>SampleExtension.MgPrePostRenderingComponent</ClassName> 
+    </ComponentDefinition> 
+  </Components>
+</AppLayout>
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/Samples/MgDesktopSamples.sln
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/MgDesktopSamples.sln	2012-10-03 15:01:55 UTC (rev 7068)
+++ branches/2.4/MgDev/Desktop/Samples/MgDesktopSamples.sln	2012-10-03 16:47:53 UTC (rev 7069)
@@ -7,6 +7,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedSample", "AdvancedSample\AdvancedSample.csproj", "{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeFormExample", "FreeFormExample\FreeFormExample.csproj", "{41EF1524-D186-4079-BAA9-1A99F0AC31CA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -25,6 +27,10 @@
 		{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x86.Build.0 = Debug|x86
 		{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x86.ActiveCfg = Release|x86
 		{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x86.Build.0 = Release|x86
+		{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x86.ActiveCfg = Debug|x86
+		{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x86.Build.0 = Debug|x86
+		{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Release|x86.ActiveCfg = Release|x86
+		{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: branches/2.4/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj	2012-10-03 15:01:55 UTC (rev 7068)
+++ branches/2.4/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj	2012-10-03 16:47:53 UTC (rev 7069)
@@ -290,6 +290,6 @@
 copy /y "$(SolutionDir)Lib\*.dll" "$(TargetDir)"
 copy /y "$(SolutionDir)Lib\Platform.ini" "$(TargetDir)"
 copy /y "$(SolutionDir)Lib\MgAppLayout.exe" "$(TargetDir)"
-copy /y "$(SolutionDir)Lib\Sheboygan.AppLayout" "$(TargetDir)"</PostBuildEvent>
+copy /y "$(SolutionDir)Lib\SheboyganSample.AppLayout" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/Samples/samples_readme.txt
===================================================================
--- branches/2.4/MgDev/Desktop/Samples/samples_readme.txt	2012-10-03 15:01:55 UTC (rev 7068)
+++ branches/2.4/MgDev/Desktop/Samples/samples_readme.txt	2012-10-03 16:47:53 UTC (rev 7069)
@@ -20,6 +20,11 @@
 
 Demonstrates a Windows Forms Application that embeds the mg-desktop map viewer and shows how to do things like measuring and digitizing
 
+FreeFormSample
+==============
+
+Demonstrates that the MgMapViewer control is like any other WinForms control, and that you can have your toolbar buttons on top of the viewer control itself, allowing for a minimal user interface.
+
 SampleExtension
 ===============
 



More information about the mapguide-commits mailing list