[mapguide-commits] r7677 - in branches/maestro-4.0.x: Maestro.AddIn.ExtendedObjectModels/Templates Maestro.Base/Templates

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-07-09 05:47:04 -0700 (Tue, 09 Jul 2013)
New Revision: 7677

Modified:
   branches/maestro-4.0.x/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs
   branches/maestro-4.0.x/Maestro.Base/Templates/WebLayoutItemTemplate.cs
Log:
#2294: Auto-prompt for Map Definition when creating new Web Layout

Modified: branches/maestro-4.0.x/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs	2013-07-09 12:39:00 UTC (rev 7676)
+++ branches/maestro-4.0.x/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs	2013-07-09 12:47:04 UTC (rev 7677)
@@ -52,7 +52,18 @@
 
         public override IResource CreateItem(string startPoint, IServerConnection conn)
         {
-            return ObjectFactory.CreateWebLayout(conn, new Version(1, 1, 0), string.Empty);
+            //This is to just ensure we have a functional WebLayout when it's created
+            using (var picker = new ResourcePicker(conn.ResourceService, ResourceTypes.MapDefinition, ResourcePickerMode.OpenResource))
+            {
+                picker.SetStartingPoint(startPoint);
+                if (picker.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                {
+                    var wl = ObjectFactory.CreateWebLayout(conn, new Version(1, 1, 0), string.Empty);
+                    wl.Map.ResourceId = picker.ResourceID;
+                    return wl;
+                }
+            }
+            return null;
         }
     }
 }

Modified: branches/maestro-4.0.x/Maestro.Base/Templates/WebLayoutItemTemplate.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Templates/WebLayoutItemTemplate.cs	2013-07-09 12:39:00 UTC (rev 7676)
+++ branches/maestro-4.0.x/Maestro.Base/Templates/WebLayoutItemTemplate.cs	2013-07-09 12:47:04 UTC (rev 7677)
@@ -25,6 +25,7 @@
 using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
+using Maestro.Editors.Generic;
 
 namespace Maestro.Base.Templates
 {
@@ -41,7 +42,18 @@
 
         public override IResource CreateItem(string startPoint, IServerConnection conn)
         {
-            return ObjectFactory.CreateWebLayout(conn, new Version(1, 0, 0), string.Empty);
+            //This is to just ensure we have a functional WebLayout when it's created
+            using (var picker = new ResourcePicker(conn.ResourceService, ResourceTypes.MapDefinition, ResourcePickerMode.OpenResource))
+            {
+                picker.SetStartingPoint(startPoint);
+                if (picker.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                {
+                    var wl = ObjectFactory.CreateWebLayout(conn, new Version(1, 0, 0), string.Empty);
+                    wl.Map.ResourceId = picker.ResourceID;
+                    return wl;
+                }
+            }
+            return null;
         }
     }
 }