[mapguide-commits] r7676 - in trunk/Tools/Maestro: Maestro.AddIn.ExtendedObjectModels/Templates Maestro.Base/Templates
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jul 9 05:39:01 PDT 2013
Author: jng
Date: 2013-07-09 05:39:00 -0700 (Tue, 09 Jul 2013)
New Revision: 7676
Modified:
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs
trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs
Log:
#2294: Auto-prompt for Map Definition when creating new Web Layout
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs 2013-07-09 12:32:25 UTC (rev 7675)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs 2013-07-09 12:39:00 UTC (rev 7676)
@@ -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: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs 2013-07-09 12:32:25 UTC (rev 7675)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs 2013-07-09 12:39:00 UTC (rev 7676)
@@ -52,7 +52,18 @@
public override IResource CreateItem(string startPoint, IServerConnection conn)
{
- return ObjectFactory.CreateWebLayout(conn, new Version(2, 4, 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(2, 4, 0), string.Empty);
+ wl.Map.ResourceId = picker.ResourceID;
+ return wl;
+ }
+ }
+ return null;
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs 2013-07-09 12:32:25 UTC (rev 7675)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs 2013-07-09 12:39:00 UTC (rev 7676)
@@ -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;
}
}
}
More information about the mapguide-commits
mailing list