[mapguide-commits] r6637 - in branches/maestro-4.0.x:
Maestro.Base/Commands Maestro.Base/Editor
Maestro.Base/Properties Maestro.Editors
Maestro.Editors/MapDefinition Maestro.Editors/Properties
Maestro.Editors/SymbolDefinition
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed May 9 10:53:28 EDT 2012
Author: jng
Date: 2012-05-09 07:53:28 -0700 (Wed, 09 May 2012)
New Revision: 6637
Modified:
branches/maestro-4.0.x/Maestro.Base/Commands/MgCookerCommand.cs
branches/maestro-4.0.x/Maestro.Base/Editor/ResourceEditorService.cs
branches/maestro-4.0.x/Maestro.Base/Properties/Resources.Designer.cs
branches/maestro-4.0.x/Maestro.Base/Properties/Resources.resx
branches/maestro-4.0.x/Maestro.Editors/IEditorService.cs
branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx
branches/maestro-4.0.x/Maestro.Editors/Properties/Resources.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/Properties/Resources.resx
branches/maestro-4.0.x/Maestro.Editors/ResourceEditorServiceBase.cs
branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs
Log:
#1992: Add a button to convert base layer groups to regular groups. Layers in this converted group are put into the bottom of the draw order
#1993: Add the missing MgCooker shortcut in the Map Definition editor. Unfortunately this will still require a login prompt (because we don't store username/password and MgCooker is not yet capable of initializing from a session yet), but after login here MgCooker will correctly show the current Map Definition.
Modified: branches/maestro-4.0.x/Maestro.Base/Commands/MgCookerCommand.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Commands/MgCookerCommand.cs 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Base/Commands/MgCookerCommand.cs 2012-05-09 14:53:28 UTC (rev 6637)
@@ -32,6 +32,11 @@
{
public override void Run()
{
+ RunCooker();
+ }
+
+ internal static void RunCooker(params string [] args)
+ {
string exe = PropertyService.Get(ConfigProperties.MgCookerPath, "");
if (!File.Exists(exe))
@@ -50,6 +55,7 @@
var procInfo = new ProcessStartInfo(exe);
procInfo.WorkingDirectory = Path.GetDirectoryName(exe);
+ procInfo.Arguments = string.Join(" ", args);
var proc = Process.Start(procInfo);
}
}
Modified: branches/maestro-4.0.x/Maestro.Base/Editor/ResourceEditorService.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Editor/ResourceEditorService.cs 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Base/Editor/ResourceEditorService.cs 2012-05-09 14:53:28 UTC (rev 6637)
@@ -79,5 +79,18 @@
{
_orm.Open(resourceId, _conn, false, _siteExp);
}
+
+ public override void RunProcess(string processName, params string[] args)
+ {
+ //HACK: Yeah yeah
+ if (processName.ToLower() == "mgcooker")
+ {
+ Maestro.Base.Commands.MgCookerCommand.RunCooker(args);
+ }
+ else
+ {
+ throw new ApplicationException(string.Format(Properties.Resources.ErrorUnknownExecutable, processName));
+ }
+ }
}
}
Modified: branches/maestro-4.0.x/Maestro.Base/Properties/Resources.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Properties/Resources.Designer.cs 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Base/Properties/Resources.Designer.cs 2012-05-09 14:53:28 UTC (rev 6637)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.5448
+// Runtime Version:2.0.50727.5420
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -518,11 +518,12 @@
/// Andrew DeMerchant
/// Gabriele Monfardini
/// Gordon Luckett
+ /// Hans Milling
///
///Many thanks to the following people who have translated Maestro into other languages:
///
/// José Manuel Cerrejón González (Spanish)
- /// Pierre Cardina [rest of string was truncated]";.
+ /// [rest of string was truncated]";.
/// </summary>
internal static string Contributors {
get {
@@ -740,6 +741,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Unknown executable specified: {0}.
+ /// </summary>
+ internal static string ErrorUnknownExecutable {
+ get {
+ return ResourceManager.GetString("ErrorUnknownExecutable", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Autodesk DWF (*.dwf)|*.dwf.
/// </summary>
internal static string Filter_Dwf_Files {
Modified: branches/maestro-4.0.x/Maestro.Base/Properties/Resources.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Properties/Resources.resx 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Base/Properties/Resources.resx 2012-05-09 14:53:28 UTC (rev 6637)
@@ -1103,4 +1103,7 @@
<data name="ResourceNotFound" xml:space="preserve">
<value>Resource not found</value>
</data>
+ <data name="ErrorUnknownExecutable" xml:space="preserve">
+ <value>Unknown executable specified: {0}</value>
+ </data>
</root>
\ No newline at end of file
Modified: branches/maestro-4.0.x/Maestro.Editors/IEditorService.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/IEditorService.cs 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Editors/IEditorService.cs 2012-05-09 14:53:28 UTC (rev 6637)
@@ -245,5 +245,12 @@
/// <param name="name"></param>
/// <returns></returns>
object GetCustomProperty(string name);
+
+ /// <summary>
+ /// Invokes the specified process name with the specified arguments
+ /// </summary>
+ /// <param name="processName"></param>
+ /// <param name="args"></param>
+ void RunProcess(string processName, params string[] args);
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs 2012-05-09 14:53:28 UTC (rev 6637)
@@ -71,6 +71,9 @@
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.btnMoveBaseLayerUp = new System.Windows.Forms.ToolStripButton();
this.btnMoveBaseLayerDown = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.btnBaseLayerGroupToRegular = new System.Windows.Forms.ToolStripButton();
+ this.btnInvokeMgCooker = new System.Windows.Forms.ToolStripButton();
this.splitter1 = new System.Windows.Forms.Splitter();
this.propertiesPanel = new System.Windows.Forms.Panel();
this.contentPanel.SuspendLayout();
@@ -121,12 +124,12 @@
this.trvLayersGroup.NodeControls.Add(this.NODE_GROUP_ICON);
this.trvLayersGroup.NodeControls.Add(this.NODE_GROUP_TEXT);
this.trvLayersGroup.SelectedNode = null;
- this.trvLayersGroup.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvLayersGroup_ItemDrag);
+ this.trvLayersGroup.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvLayersGroup_MouseDoubleClick);
+ this.trvLayersGroup.DragOver += new System.Windows.Forms.DragEventHandler(this.trvLayersGroup_DragOver);
+ this.trvLayersGroup.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trvLayersGroup_MouseClick);
this.trvLayersGroup.DragDrop += new System.Windows.Forms.DragEventHandler(this.trvLayersGroup_DragDrop);
this.trvLayersGroup.DragEnter += new System.Windows.Forms.DragEventHandler(this.trvLayersGroup_DragEnter);
- this.trvLayersGroup.DragOver += new System.Windows.Forms.DragEventHandler(this.trvLayersGroup_DragOver);
- this.trvLayersGroup.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trvLayersGroup_MouseClick);
- this.trvLayersGroup.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvLayersGroup_MouseDoubleClick);
+ this.trvLayersGroup.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvLayersGroup_ItemDrag);
//
// NODE_GROUP_ICON
//
@@ -251,12 +254,12 @@
this.trvLayerDrawingOrder.NodeControls.Add(this.NODE_DRAW_ICON);
this.trvLayerDrawingOrder.NodeControls.Add(this.NODE_DRAW_TEXT);
this.trvLayerDrawingOrder.SelectedNode = null;
- this.trvLayerDrawingOrder.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvLayerDrawingOrder_ItemDrag);
+ this.trvLayerDrawingOrder.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvLayerDrawingOrder_MouseDoubleClick);
+ this.trvLayerDrawingOrder.DragOver += new System.Windows.Forms.DragEventHandler(this.trvLayerDrawingOrder_DragOver);
+ this.trvLayerDrawingOrder.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trvLayerDrawingOrder_MouseClick);
this.trvLayerDrawingOrder.DragDrop += new System.Windows.Forms.DragEventHandler(this.trvLayerDrawingOrder_DragDrop);
this.trvLayerDrawingOrder.DragEnter += new System.Windows.Forms.DragEventHandler(this.trvLayerDrawingOrder_DragEnter);
- this.trvLayerDrawingOrder.DragOver += new System.Windows.Forms.DragEventHandler(this.trvLayerDrawingOrder_DragOver);
- this.trvLayerDrawingOrder.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trvLayerDrawingOrder_MouseClick);
- this.trvLayerDrawingOrder.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvLayerDrawingOrder_MouseDoubleClick);
+ this.trvLayerDrawingOrder.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvLayerDrawingOrder_ItemDrag);
//
// NODE_DRAW_ICON
//
@@ -366,12 +369,12 @@
this.trvBaseLayers.NodeControls.Add(this.nodeIcon1);
this.trvBaseLayers.NodeControls.Add(this.nodeTextBox1);
this.trvBaseLayers.SelectedNode = null;
- this.trvBaseLayers.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvBaseLayers_ItemDrag);
+ this.trvBaseLayers.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvBaseLayers_MouseDoubleClick);
+ this.trvBaseLayers.DragOver += new System.Windows.Forms.DragEventHandler(this.trvBaseLayers_DragOver);
+ this.trvBaseLayers.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trvBaseLayers_MouseClick);
this.trvBaseLayers.DragDrop += new System.Windows.Forms.DragEventHandler(this.trvBaseLayers_DragDrop);
this.trvBaseLayers.DragEnter += new System.Windows.Forms.DragEventHandler(this.trvBaseLayers_DragEnter);
- this.trvBaseLayers.DragOver += new System.Windows.Forms.DragEventHandler(this.trvBaseLayers_DragOver);
- this.trvBaseLayers.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trvBaseLayers_MouseClick);
- this.trvBaseLayers.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.trvBaseLayers_MouseDoubleClick);
+ this.trvBaseLayers.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.trvBaseLayers_ItemDrag);
//
// nodeIcon1
//
@@ -397,7 +400,10 @@
this.btnRemoveBaseLayer,
this.toolStripSeparator4,
this.btnMoveBaseLayerUp,
- this.btnMoveBaseLayerDown});
+ this.btnMoveBaseLayerDown,
+ this.toolStripSeparator8,
+ this.btnBaseLayerGroupToRegular,
+ this.btnInvokeMgCooker});
resources.ApplyResources(this.toolStrip3, "toolStrip3");
this.toolStrip3.Name = "toolStrip3";
//
@@ -459,6 +465,26 @@
this.btnMoveBaseLayerDown.Name = "btnMoveBaseLayerDown";
this.btnMoveBaseLayerDown.Click += new System.EventHandler(this.btnMoveBaseLayerDown_Click);
//
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
+ //
+ // btnBaseLayerGroupToRegular
+ //
+ this.btnBaseLayerGroupToRegular.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ resources.ApplyResources(this.btnBaseLayerGroupToRegular, "btnBaseLayerGroupToRegular");
+ this.btnBaseLayerGroupToRegular.Image = global::Maestro.Editors.Properties.Resources.arrow_curve_180_left;
+ this.btnBaseLayerGroupToRegular.Name = "btnBaseLayerGroupToRegular";
+ this.btnBaseLayerGroupToRegular.Click += new System.EventHandler(this.btnBaseGroupToRegular_Click);
+ //
+ // btnInvokeMgCooker
+ //
+ this.btnInvokeMgCooker.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ resources.ApplyResources(this.btnInvokeMgCooker, "btnInvokeMgCooker");
+ this.btnInvokeMgCooker.Name = "btnInvokeMgCooker";
+ this.btnInvokeMgCooker.Click += new System.EventHandler(this.btnInvokeMgCooker_Click);
+ //
// splitter1
//
resources.ApplyResources(this.splitter1, "splitter1");
@@ -539,5 +565,8 @@
private System.Windows.Forms.ToolStripButton btnMoveGroupUp;
private System.Windows.Forms.ToolStripButton btnMoveGroupDown;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.ToolStripButton btnBaseLayerGroupToRegular;
+ private System.Windows.Forms.ToolStripButton btnInvokeMgCooker;
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-05-09 14:53:28 UTC (rev 6637)
@@ -371,6 +371,45 @@
}
}
+ private void btnBaseGroupToRegular_Click(object sender, EventArgs e)
+ {
+ var group = GetSelectedTiledLayerItem() as BaseLayerGroupItem;
+ if (group != null)
+ {
+ int counter = 0;
+ string groupName = group.Tag.Name;
+ while (_map.GetGroupByName(groupName) != null)
+ {
+ counter++;
+ groupName = group.Tag.Name + "(" + counter + ")";
+ }
+ _map.AddGroup(groupName);
+ int layerCount = _map.GetLayerCount();
+ foreach (var layer in group.Tag.BaseMapLayer)
+ {
+ //We an avoid a duplicate name check because the Map Definition should already ensure uniqueness
+ //among existing layers
+ var dlayer = _map.AddLayer(groupName, layer.Name, layer.ResourceId);
+ dlayer.ExpandInLegend = layer.ExpandInLegend;
+ dlayer.LegendLabel = layer.LegendLabel;
+ dlayer.Selectable = layer.Selectable;
+ dlayer.ShowInLegend = layer.ShowInLegend;
+
+ //HACK-ish, but we need to relocate this
+ _map.RemoveLayer(dlayer);
+
+ //Add to bottom
+ _map.InsertLayer(layerCount, dlayer);
+ layerCount++;
+ }
+ //Detach the base layer group
+ _map.BaseMap.RemoveBaseLayerGroup(group.Tag);
+ MessageBox.Show(string.Format(Properties.Resources.BaseLayerGroupConvertedToLayerGroup, group.Tag.Name, groupName));
+ this.RefreshModels();
+ tabControl1.SelectedIndex = 0; //Switch to Layer Groups
+ }
+ }
+
private void btnDLAddLayer_Click(object sender, EventArgs e)
{
using (var picker = new ResourcePicker(_edSvc.ResourceService, ResourceTypes.LayerDefinition, ResourcePickerMode.OpenResource))
@@ -869,6 +908,7 @@
{
btnAddBaseLayer.Enabled = true;
btnRemoveBaseLayerGroup.Enabled = true;
+ btnBaseLayerGroupToRegular.Enabled = true;
propertiesPanel.Controls.Clear();
var item = new GroupPropertiesCtrl(group.Tag);
@@ -882,6 +922,7 @@
btnRemoveBaseLayer.Enabled = true;
btnMoveBaseLayerDown.Enabled = true;
btnMoveBaseLayerUp.Enabled = true;
+ btnBaseLayerGroupToRegular.Enabled = false;
propertiesPanel.Controls.Clear();
var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService);
@@ -1306,5 +1347,35 @@
}
}
}
+
+ private void btnInvokeMgCooker_Click(object sender, EventArgs e)
+ {
+ if (_edSvc.IsNew || _edSvc.IsDirty)
+ {
+ MessageBox.Show(Properties.Resources.SaveMapBeforeTiling);
+ return;
+ }
+
+ var conn = _map.CurrentConnection;
+ //HACK: Can't support other connection types beyond HTTP atm
+ if (!conn.ProviderName.ToLower().Contains("maestro.http"))
+ {
+ MessageBox.Show(string.Format(Properties.Resources.UnsupportedConnectionType, conn.ProviderName));
+ return;
+ }
+
+ if (_map.BaseMap == null || _map.BaseMap.GroupCount == 0)
+ {
+ MessageBox.Show(Properties.Resources.NotATiledMap);
+ return;
+ }
+
+ //HACK: This will ask for login again because we don't store username/password and MgCooker does not
+ //support initialization from a session id yet. But at least MgCooker will launch with the correct
+ //map definition loaded
+ _edSvc.RunProcess("MgCooker",
+ "--mapagent=" + conn.GetCustomProperty("BaseUrl"),
+ "--mapdefinitions=" + _edSvc.ResourceID);
+ }
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx 2012-05-09 14:53:28 UTC (rev 6637)
@@ -594,6 +594,47 @@
<data name="btnMoveBaseLayerDown.ToolTipText" xml:space="preserve">
<value>Move selected layer down</value>
</data>
+ <data name="toolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
+ <value>6, 25</value>
+ </data>
+ <data name="btnBaseLayerGroupToRegular.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
+ <data name="btnBaseLayerGroupToRegular.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <value>Magenta</value>
+ </data>
+ <data name="btnBaseLayerGroupToRegular.Size" type="System.Drawing.Size, System.Drawing">
+ <value>23, 22</value>
+ </data>
+ <data name="btnBaseLayerGroupToRegular.Text" xml:space="preserve">
+ <value>Convert Tiled Group to Regular Group</value>
+ </data>
+ <data name="btnInvokeMgCooker.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKcSURBVDhPfZHbT9JhGMe9qr+g27xoa8ta5ShQUJEsFA8N
+ bbNJ2tJ5WE1ucg1aTiaN1mJiBzMrRDBBSKHhIZFEEBGQg/wAD2nlocMWq4u6ccHml36r2c0Pe7fP9u55
+ 3/fzfPe8aWkpFq/GdLj42lRHznWlk92inOM1jXSXCF7RUt2l1Eqbp5voUsmvWosBnKG7KNQzkak6j3rD
+ +k5x9WvpfyUlTbZi5v2GnVKTAumP+Cgf1YKlEyLPsoKj1gRqR2LgVpiv7ilhi59HCnRMcLRnkKXJRYX5
+ KYTBBMpcCdBM4zg52An+zb5vRUXC/RRJJudWOl3WgoJBJlj92RBalehe2UYrEYfAm8AJTSuOqwRgyBuR
+ lfOATREcyW9ntJkJMNQNaBh/gtHNOJSrcUjCcdTMfiQTlSCrnwe+Vo5TjM6LFAGNJTrYZliHNBpHuakD
+ PH0VRK4ZiEJxVLzxgqlh4hyZjqO4AjpTkZtyDo3tvpAouA2BZRBccvrsgRyUjQ6g0JkAwxrDaXUlcpul
+ sYwMyb6UAv5lE1c8/H6n3vUV2eQQWQMXwLVtgTaVwKHxbeR13EbVpT7xnr/Q1aXM63xsQ+09I/LVNcmz
+ E2tJ+sTPJM/2I1n3kIBEMgKDwWjfUzA5OTXscvkwNOzAHfk0JPJZtMrsuCF+CYVCB7vdDZfLC5lMdowi
+ IYsHvN5APBxeQji8iECAgM+38OeB0+mG3x9CKBRBNLoMlUqjoAh6e9WVBLGEYDD6j0AgCn8gAp8/jHkf
+ gbk5PzyeBZjNltUUghfVa++2yJgeCsHgMtn5A/R19ZjWGTEz49lMKdjY+IKxMSsFIvwWnz5/x/wzFdZC
+ y2SKeaqgp0eZTR5E3G73osOxi2PRat3FTu7/otcbtbsJfgMnls65GQK1+wAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="btnInvokeMgCooker.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <value>Magenta</value>
+ </data>
+ <data name="btnInvokeMgCooker.Size" type="System.Drawing.Size, System.Drawing">
+ <value>23, 22</value>
+ </data>
+ <data name="btnInvokeMgCooker.Text" xml:space="preserve">
+ <value>Start MgCooker</value>
+ </data>
<data name="toolStrip3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
@@ -885,10 +926,28 @@
<data name=">>btnMoveBaseLayerDown.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name=">>toolStripSeparator8.Name" xml:space="preserve">
+ <value>toolStripSeparator8</value>
+ </data>
+ <data name=">>toolStripSeparator8.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnBaseLayerGroupToRegular.Name" xml:space="preserve">
+ <value>btnBaseLayerGroupToRegular</value>
+ </data>
+ <data name=">>btnBaseLayerGroupToRegular.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnInvokeMgCooker.Name" xml:space="preserve">
+ <value>btnInvokeMgCooker</value>
+ </data>
+ <data name=">>btnInvokeMgCooker.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>$this.Name" xml:space="preserve">
<value>MapLayersSectionCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=3.5.0.5977, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
</root>
\ No newline at end of file
Modified: branches/maestro-4.0.x/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Properties/Resources.Designer.cs 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Editors/Properties/Resources.Designer.cs 2012-05-09 14:53:28 UTC (rev 6637)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.5448
+// Runtime Version:2.0.50727.5420
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -211,6 +211,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Base Layer Group ({0}) converted to Regular Group ({1}).
+ /// </summary>
+ internal static string BaseLayerGroupConvertedToLayerGroup {
+ get {
+ return ResourceManager.GetString("BaseLayerGroupConvertedToLayerGroup", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Between {0} and {1}.
/// </summary>
internal static string BetweenLabel {
@@ -2166,6 +2175,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to This is not a Map Definition with tiled layers.
+ /// </summary>
+ internal static string NotATiledMap {
+ get {
+ return ResourceManager.GetString("NotATiledMap", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to No transformation required.
/// </summary>
internal static string NoTransformationRequired {
@@ -2581,6 +2599,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to You must save this map first before you can run MgCooker.
+ /// </summary>
+ internal static string SaveMapBeforeTiling {
+ get {
+ return ResourceManager.GetString("SaveMapBeforeTiling", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Save Resource.
/// </summary>
internal static string SaveResource {
@@ -3071,6 +3098,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Invoking MgCooker is not supported for this connection type: {0}.
+ /// </summary>
+ internal static string UnsupportedConnectionType {
+ get {
+ return ResourceManager.GetString("UnsupportedConnectionType", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Updating Configuration Document.
/// </summary>
internal static string UpdatingConfiguration {
Modified: branches/maestro-4.0.x/Maestro.Editors/Properties/Resources.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Properties/Resources.resx 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Editors/Properties/Resources.resx 2012-05-09 14:53:28 UTC (rev 6637)
@@ -1319,4 +1319,16 @@
<data name="PromptResetOdbcConfigDocument" xml:space="preserve">
<value>Changing the DSN will reset the current configuration document. Proceed?</value>
</data>
+ <data name="SaveMapBeforeTiling" xml:space="preserve">
+ <value>You must save this map first before you can run MgCooker</value>
+ </data>
+ <data name="UnsupportedConnectionType" xml:space="preserve">
+ <value>Invoking MgCooker is not supported for this connection type: {0}</value>
+ </data>
+ <data name="NotATiledMap" xml:space="preserve">
+ <value>This is not a Map Definition with tiled layers</value>
+ </data>
+ <data name="BaseLayerGroupConvertedToLayerGroup" xml:space="preserve">
+ <value>Base Layer Group ({0}) converted to Regular Group ({1})</value>
+ </data>
</root>
\ No newline at end of file
Modified: branches/maestro-4.0.x/Maestro.Editors/ResourceEditorServiceBase.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/ResourceEditorServiceBase.cs 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Editors/ResourceEditorServiceBase.cs 2012-05-09 14:53:28 UTC (rev 6637)
@@ -481,5 +481,7 @@
{
get { return _conn.Capabilities.SupportedServices; }
}
+
+ public abstract void RunProcess(string processName, params string[] args);
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs 2012-05-09 13:31:51 UTC (rev 6636)
+++ branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs 2012-05-09 14:53:28 UTC (rev 6637)
@@ -220,5 +220,10 @@
{
return _inner.GetCustomProperty(name);
}
+
+ public void RunProcess(string processName, params string[] args)
+ {
+ throw new NotImplementedException();
+ }
}
}
More information about the mapguide-commits
mailing list