[mapguide-commits] r7121 - in trunk/Tools/Maestro: . Maestro SDK SDK/Samples SDK/Samples/MapViewer SDK/Samples/MapViewer/Properties

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Oct 16 05:05:50 PDT 2012


Author: jng
Date: 2012-10-16 05:05:50 -0700 (Tue, 16 Oct 2012)
New Revision: 7121

Added:
   trunk/Tools/Maestro/SDK/Samples/MapViewer/
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.Designer.cs
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.cs
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.resx
   trunk/Tools/Maestro/SDK/Samples/MapViewer/MapViewer.csproj
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Program.cs
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Resources.resx
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Settings.Designer.cs
   trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Settings.settings
   trunk/Tools/Maestro/SDK/Samples/MapViewer/app.config
Removed:
   trunk/Tools/Maestro/Maestro.TestViewer/
Modified:
   trunk/Tools/Maestro/Maestro/Maestro_All.sln
   trunk/Tools/Maestro/SDK/Samples/Samples.sln
   trunk/Tools/Maestro/SDK/Samples/readme.txt
   trunk/Tools/Maestro/SDK/sdk_changelog.txt
Log:
#2138: Add a MapViewer sample to the SDK demonstrating the use of the new Maestro MapViewer component. This is effectively the same as the existing Maestro.TestViewer code, which we no longer need anymore so that project has been removed.

Modified: trunk/Tools/Maestro/Maestro/Maestro_All.sln
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro_All.sln	2012-10-16 11:27:09 UTC (rev 7120)
+++ trunk/Tools/Maestro/Maestro/Maestro_All.sln	2012-10-16 12:05:50 UTC (rev 7121)
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maestro", "Maestro.csproj", "{E0C36475-2B70-4F6D-ACE0-8943167806DC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B3A2B816-9F41-4857-A111-09D2DF2550D6} = {B3A2B816-9F41-4857-A111-09D2DF2550D6}
@@ -141,8 +141,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maestro.MapViewer", "..\Maestro.MapViewer\Maestro.MapViewer.csproj", "{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maestro.TestViewer", "..\Maestro.TestViewer\Maestro.TestViewer.csproj", "{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maestro.LiveMapEditor", "..\Maestro.LiveMapEditor\Maestro.LiveMapEditor.csproj", "{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}"
 EndProject
 Global
@@ -335,10 +333,6 @@
 		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Debug|Any CPU.Build.0 = Debug|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Release|Any CPU.ActiveCfg = Release|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Release|Any CPU.Build.0 = Release|x86
 		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Debug|Any CPU.Build.0 = Debug|x86
 		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Release|Any CPU.ActiveCfg = Release|x86


Property changes on: trunk/Tools/Maestro/SDK/Samples/MapViewer
___________________________________________________________________
Added: svn:ignore
   + bin
obj

Added: bugtraq:number
   + true

Added: trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.Designer.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.Designer.cs	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.Designer.cs	2012-10-16 12:05:50 UTC (rev 7121)
@@ -0,0 +1,213 @@
+namespace MapViewer
+{
+    partial class Form1
+    {
+        /// <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.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openMapDefinitionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.lblCoordinates = new System.Windows.Forms.ToolStripStatusLabel();
+            this.lblSelected = new System.Windows.Forms.ToolStripStatusLabel();
+            this.lblScale = new System.Windows.Forms.ToolStripStatusLabel();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.legend1 = new Maestro.MapViewer.Legend();
+            this.mapViewer = new Maestro.MapViewer.MapViewer();
+            this.defaultToolbar1 = new Maestro.MapViewer.DefaultToolbar();
+            this.mapStatusTracker1 = new Maestro.MapViewer.MapStatusTracker();
+            this.menuStrip1.SuspendLayout();
+            this.statusStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(667, 24);
+            this.menuStrip1.TabIndex = 0;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // fileToolStripMenuItem
+            // 
+            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.openMapDefinitionToolStripMenuItem});
+            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.fileToolStripMenuItem.Text = "File";
+            // 
+            // openMapDefinitionToolStripMenuItem
+            // 
+            this.openMapDefinitionToolStripMenuItem.Name = "openMapDefinitionToolStripMenuItem";
+            this.openMapDefinitionToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+            this.openMapDefinitionToolStripMenuItem.Text = "Open Map Definition";
+            this.openMapDefinitionToolStripMenuItem.Click += new System.EventHandler(this.openMapDefinitionToolStripMenuItem_Click);
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.lblCoordinates,
+            this.lblSelected,
+            this.lblScale});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 370);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(667, 22);
+            this.statusStrip1.TabIndex = 1;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // lblCoordinates
+            // 
+            this.lblCoordinates.Name = "lblCoordinates";
+            this.lblCoordinates.Size = new System.Drawing.Size(0, 17);
+            // 
+            // lblSelected
+            // 
+            this.lblSelected.Name = "lblSelected";
+            this.lblSelected.Size = new System.Drawing.Size(652, 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);
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 49);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.legend1);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.mapViewer);
+            this.splitContainer1.Size = new System.Drawing.Size(667, 321);
+            this.splitContainer1.SplitterDistance = 222;
+            this.splitContainer1.TabIndex = 2;
+            // 
+            // legend1
+            // 
+            this.legend1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.legend1.GroupContextMenu = null;
+            this.legend1.LayerContextMenu = null;
+            this.legend1.Location = new System.Drawing.Point(0, 0);
+            this.legend1.Name = "legend1";
+            this.legend1.SelectOnRightClick = false;
+            this.legend1.ShowAllLayersAndGroups = false;
+            this.legend1.ShowTooltips = true;
+            this.legend1.Size = new System.Drawing.Size(222, 321);
+            this.legend1.TabIndex = 0;
+            this.legend1.ThemeCompressionLimit = 25;
+            this.legend1.Viewer = this.mapViewer;
+            // 
+            // mapViewer
+            // 
+            this.mapViewer.Cursor = System.Windows.Forms.Cursors.Default;
+            this.mapViewer.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.mapViewer.Location = new System.Drawing.Point(0, 0);
+            this.mapViewer.MaxScale = 1000000000;
+            this.mapViewer.MinScale = 10;
+            this.mapViewer.MouseWheelDelayRenderInterval = 800;
+            this.mapViewer.Name = "mapViewer";
+            this.mapViewer.PointPixelBuffer = 2;
+            this.mapViewer.SelectionColor = System.Drawing.Color.Blue;
+            this.mapViewer.Size = new System.Drawing.Size(441, 321);
+            this.mapViewer.TabIndex = 0;
+            this.mapViewer.Text = "mapViewer1";
+            this.mapViewer.TooltipDelayInterval = 1000;
+            this.mapViewer.ZoomInFactor = 0.5D;
+            this.mapViewer.ZoomOutFactor = 2D;
+            // 
+            // defaultToolbar1
+            // 
+            this.defaultToolbar1.Location = new System.Drawing.Point(0, 24);
+            this.defaultToolbar1.Name = "defaultToolbar1";
+            this.defaultToolbar1.Size = new System.Drawing.Size(667, 25);
+            this.defaultToolbar1.TabIndex = 3;
+            this.defaultToolbar1.Text = "defaultToolbar1";
+            this.defaultToolbar1.Viewer = this.mapViewer;
+            // 
+            // mapStatusTracker1
+            // 
+            this.mapStatusTracker1.CoordinatesLabel = this.lblCoordinates;
+            this.mapStatusTracker1.ScaleLabel = this.lblScale;
+            this.mapStatusTracker1.SelectedLabel = this.lblSelected;
+            this.mapStatusTracker1.Viewer = this.mapViewer;
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(667, 392);
+            this.Controls.Add(this.splitContainer1);
+            this.Controls.Add(this.defaultToolbar1);
+            this.Controls.Add(this.statusStrip1);
+            this.Controls.Add(this.menuStrip1);
+            this.MainMenuStrip = this.menuStrip1;
+            this.Name = "Form1";
+            this.Text = "Map Viewer Example";
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.MenuStrip menuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem openMapDefinitionToolStripMenuItem;
+        private System.Windows.Forms.StatusStrip statusStrip1;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.ToolStripStatusLabel lblCoordinates;
+        private System.Windows.Forms.ToolStripStatusLabel lblSelected;
+        private System.Windows.Forms.ToolStripStatusLabel lblScale;
+        private Maestro.MapViewer.Legend legend1;
+        private Maestro.MapViewer.MapViewer mapViewer;
+        private Maestro.MapViewer.DefaultToolbar defaultToolbar1;
+        private Maestro.MapViewer.MapStatusTracker mapStatusTracker1;
+    }
+}
+

Added: trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.cs	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.cs	2012-10-16 12:05:50 UTC (rev 7121)
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ExtendedObjectModels;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using Maestro.Editors.Generic;
+
+namespace MapViewer
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+
+        private IServerConnection _conn;
+
+        protected override void OnLoad(EventArgs e)
+        {
+            //This call is a one-time only call that will instantly register all known resource 
+            //version types and validators. This way you never have to manually reference a 
+            //ObjectModels assembly of the desired resource type you want to work with
+            ModelSetup.Initialize();
+
+            //Anytime we work with the Maestro API, we require an IServerConnection
+            //reference. The Maestro.Login.LoginDialog provides a UI to obtain such a 
+            //reference.
+
+            //If you need to obtain an IServerConnection reference programmatically and
+            //without user intervention, use the ConnectionProviderRegistry class
+            var login = new Maestro.Login.LoginDialog();
+            if (login.ShowDialog() == DialogResult.OK)
+            {
+                _conn = login.Connection;
+            }
+            else //This sample does not work without an IServerConnection
+            {
+                Application.Exit();
+            }
+        }
+
+        private void LoadMap(IServerConnection conn, string mapDefinitionId)
+        {
+            //To render a map, we need to create a runtime map instance. IMappingService gives us
+            //the required services. This is not a standard service, so you need to call GetService()
+            //with the correct ServiceType to get the IMappingService reference.
+            IMappingService mapSvc = (IMappingService)conn.GetService((int)ServiceType.Mapping);
+
+            //Get an IMapDefinition from the specified resource id. GetResource() returns an instance
+            //of IResource, which IMapDefinition extends. As long as you pass in a valid resource id
+            //of the right type, you can safely cast the returned object to the expected type.
+            IMapDefinition mapDef = (IMapDefinition)conn.ResourceService.GetResource(mapDefinitionId);
+
+            //Create a runtime map
+            var rtMap = mapSvc.CreateMap(mapDef);
+
+            //Load it into the viewer
+            mapViewer.LoadMap(rtMap);
+        }
+
+        private void openMapDefinitionToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            //The ResourcePicker class, functions like a file dialog allowing the user
+            //to easily select a given resource. In our case, we want the user to select
+            //a Map Definition
+            using (var picker = new ResourcePicker(_conn.ResourceService,
+                                                   ResourceTypes.MapDefinition,
+                                                   ResourcePickerMode.OpenResource))
+            {
+                if (picker.ShowDialog() == DialogResult.OK)
+                {
+                    LoadMap(_conn, picker.ResourceID);
+                }
+            }
+        }
+    }
+}

Added: trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.resx
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.resx	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.resx	2012-10-16 12:05:50 UTC (rev 7121)
@@ -0,0 +1,132 @@
+<?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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>132, 17</value>
+  </metadata>
+  <metadata name="defaultToolbar1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>248, 17</value>
+  </metadata>
+  <metadata name="mapStatusTracker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>386, 17</value>
+  </metadata>
+</root>
\ No newline at end of file

Added: trunk/Tools/Maestro/SDK/Samples/MapViewer/MapViewer.csproj
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/MapViewer.csproj	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/MapViewer.csproj	2012-10-16 12:05:50 UTC (rev 7121)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{19E838BC-A875-424A-A272-34380D862643}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MapViewer</RootNamespace>
+    <AssemblyName>MapViewer</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Maestro.Editors">
+      <HintPath>..\..\bin\Maestro.Editors.dll</HintPath>
+    </Reference>
+    <Reference Include="Maestro.Login">
+      <HintPath>..\..\bin\Maestro.Login.dll</HintPath>
+    </Reference>
+    <Reference Include="Maestro.MapViewer">
+      <HintPath>..\..\bin\Maestro.MapViewer.dll</HintPath>
+    </Reference>
+    <Reference Include="OSGeo.MapGuide.ExtendedObjectModels">
+      <HintPath>..\..\bin\OSGeo.MapGuide.ExtendedObjectModels.dll</HintPath>
+    </Reference>
+    <Reference Include="OSGeo.MapGuide.MaestroAPI">
+      <HintPath>..\..\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <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="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.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="app.config" />
+    <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>
+    <Content Include="..\..\bin\ConnectionProviders.xml">
+      <Link>ConnectionProviders.xml</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\bin\OSGeo.MapGuide.MaestroAPI.Http.dll">
+      <Link>OSGeo.MapGuide.MaestroAPI.Http.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </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>
+  -->
+</Project>
\ No newline at end of file

Added: trunk/Tools/Maestro/SDK/Samples/MapViewer/Program.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Program.cs	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Program.cs	2012-10-16 12:05:50 UTC (rev 7121)
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace MapViewer
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new Form1());
+        }
+    }
+}


Property changes on: trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties
___________________________________________________________________
Added: bugtraq:number
   + true

Added: trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/AssemblyInfo.cs	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/AssemblyInfo.cs	2012-10-16 12:05:50 UTC (rev 7121)
@@ -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("MapViewer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MapViewer")]
+[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("eafd022b-dc3d-44f5-8a50-ca6029dacd5f")]
+
+// 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: trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Resources.Designer.cs	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Resources.Designer.cs	2012-10-16 12:05:50 UTC (rev 7121)
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.17929
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MapViewer.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", "4.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("MapViewer.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;
+            }
+        }
+    }
+}

Added: trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Resources.resx	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Resources.resx	2012-10-16 12:05:50 UTC (rev 7121)
@@ -0,0 +1,117 @@
+<?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.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: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" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </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" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

Added: trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Settings.Designer.cs	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Settings.Designer.cs	2012-10-16 12:05:50 UTC (rev 7121)
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.17929
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MapViewer.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.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: trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Settings.settings
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Settings.settings	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Properties/Settings.settings	2012-10-16 12:05:50 UTC (rev 7121)
@@ -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>

Added: trunk/Tools/Maestro/SDK/Samples/MapViewer/app.config
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/app.config	                        (rev 0)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/app.config	2012-10-16 12:05:50 UTC (rev 7121)
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: trunk/Tools/Maestro/SDK/Samples/Samples.sln
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/Samples.sln	2012-10-16 11:27:09 UTC (rev 7120)
+++ trunk/Tools/Maestro/SDK/Samples/Samples.sln	2012-10-16 12:05:50 UTC (rev 7121)
@@ -11,32 +11,78 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneWebLayoutEditor", "StandaloneWebLayoutEditor\StandaloneWebLayoutEditor.csproj", "{6C2F72BB-7B46-4D82-99AC-31A5840A869D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer", "MapViewer\MapViewer.csproj", "{19E838BC-A875-424A-A272-34380D862643}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{30EA9CAC-7DFA-4434-87F4-0AB226F2D305}.Release|x86.ActiveCfg = Release|Any CPU
 		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7C572B2A-5E77-4AB4-B8AD-1172D3E725EC}.Release|x86.ActiveCfg = Release|Any CPU
 		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6105DB0C-65F5-47DF-B3AE-36A430EC16E0}.Release|x86.ActiveCfg = Release|Any CPU
 		{F568A956-4D93-46DF-856A-01883CA61CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F568A956-4D93-46DF-856A-01883CA61CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F568A956-4D93-46DF-856A-01883CA61CBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F568A956-4D93-46DF-856A-01883CA61CBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F568A956-4D93-46DF-856A-01883CA61CBB}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F568A956-4D93-46DF-856A-01883CA61CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F568A956-4D93-46DF-856A-01883CA61CBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F568A956-4D93-46DF-856A-01883CA61CBB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F568A956-4D93-46DF-856A-01883CA61CBB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F568A956-4D93-46DF-856A-01883CA61CBB}.Release|x86.ActiveCfg = Release|Any CPU
 		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6C2F72BB-7B46-4D82-99AC-31A5840A869D}.Release|x86.ActiveCfg = Release|Any CPU
+		{19E838BC-A875-424A-A272-34380D862643}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{19E838BC-A875-424A-A272-34380D862643}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{19E838BC-A875-424A-A272-34380D862643}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{19E838BC-A875-424A-A272-34380D862643}.Debug|x86.ActiveCfg = Debug|x86
+		{19E838BC-A875-424A-A272-34380D862643}.Debug|x86.Build.0 = Debug|x86
+		{19E838BC-A875-424A-A272-34380D862643}.Release|Any CPU.ActiveCfg = Release|x86
+		{19E838BC-A875-424A-A272-34380D862643}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{19E838BC-A875-424A-A272-34380D862643}.Release|Mixed Platforms.Build.0 = Release|x86
+		{19E838BC-A875-424A-A272-34380D862643}.Release|x86.ActiveCfg = Release|x86
+		{19E838BC-A875-424A-A272-34380D862643}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Tools/Maestro/SDK/Samples/readme.txt
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/readme.txt	2012-10-16 11:27:09 UTC (rev 7120)
+++ trunk/Tools/Maestro/SDK/Samples/readme.txt	2012-10-16 12:05:50 UTC (rev 7121)
@@ -29,4 +29,9 @@
 StandaloneWebLayoutEditor
 -------------------------
 
-This sample demonstrates using the Maestro.Editors library allowing you to re-use the resource editor UI components for use outside of MapGuide Maestro
\ No newline at end of file
+This sample demonstrates using the Maestro.Editors library allowing you to re-use the resource editor UI components for use outside of MapGuide Maestro
+
+MapViewer
+---------
+
+This sample demonstrates using the Maestro.MapViewer library for an easily embeddable map viewer with most functionality found in the AJAX viewer, but as a pure WinForms library (this is not an embedded WebBrowser that connects to the AJAX viewer)
\ No newline at end of file

Modified: trunk/Tools/Maestro/SDK/sdk_changelog.txt
===================================================================
--- trunk/Tools/Maestro/SDK/sdk_changelog.txt	2012-10-16 11:27:09 UTC (rev 7120)
+++ trunk/Tools/Maestro/SDK/sdk_changelog.txt	2012-10-16 12:05:50 UTC (rev 7121)
@@ -1,3 +1,11 @@
+5.0
+---
+
+- Samples updated for VS2010/.net Framework 4.0 to match updated MaestroAPI requirements.
+
+- New Desktop Sample
+    - MapViewer
+
 4.1
 ---
 



More information about the mapguide-commits mailing list