[mapguide-commits] r6810 - in trunk/Tools/Maestro: Maestro.Base Maestro.Base/Commands Maestro.Base/Properties Maestro.Base/UI/Preferences Maestro.LiveMapEditor

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Jun 25 07:47:53 PDT 2012


Author: jng
Date: 2012-06-25 07:47:52 -0700 (Mon, 25 Jun 2012)
New Revision: 6810

Added:
   trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/MapGuide Maestro.ico
Modified:
   trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
   trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
   trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.resx
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.resx
   trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj
Log:
#2042: Add Live Map Definition editor shortcut to Tools menu. Also update app icon for the Live Map Definition Editor

Added: trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs	2012-06-25 14:47:52 UTC (rev 6810)
@@ -0,0 +1,57 @@
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ICSharpCode.Core;
+using Maestro.Base.UI.Preferences;
+using System.IO;
+using Maestro.Shared.UI;
+using System.Diagnostics;
+
+namespace Maestro.Base.Commands
+{
+    public class LiveMapEditorCommand : AbstractMenuCommand
+    {
+        public override void Run()
+        {
+            string exe = PropertyService.Get(ConfigProperties.LiveMapEditorPath, "");
+
+            if (!File.Exists(exe))
+            {
+                using (var dlg = DialogFactory.OpenFile())
+                {
+                    dlg.Title = string.Format(Properties.Resources.LocateExecutable, "Maestro.LiveMapEditor.exe");
+                    dlg.Filter = Properties.Resources.FilterExecutables;
+                    if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                    {
+                        exe = dlg.FileName;
+                        PropertyService.Set(ConfigProperties.LiveMapEditorPath, exe);
+                    }
+                }
+            }
+
+            var procInfo = new ProcessStartInfo(exe);
+            procInfo.WorkingDirectory = Path.GetDirectoryName(exe);
+            var proc = Process.Start(procInfo);
+        }
+    }
+}

Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin	2012-06-25 14:47:52 UTC (rev 6810)
@@ -695,6 +695,9 @@
         <MenuItem id="CacheView"
                   label="${res:CacheView}"
                   class="Maestro.Base.Commands.CacheViewerCommand"/>
+        <MenuItem id="LiveMapEditor"
+                  label="${res:LiveMapEditor}"
+                  class="Maestro.Base.Commands.LiveMapEditorCommand"/>
     </Path>
     
 </AddIn>

Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj	2012-06-25 14:47:52 UTC (rev 6810)
@@ -91,6 +91,7 @@
     <Compile Include="Commands\CutCommand.cs" />
     <Compile Include="Commands\EditAsXmlCommand.cs" />
     <Compile Include="Commands\EditPackageCommand.cs" />
+    <Compile Include="Commands\LiveMapEditorCommand.cs" />
     <Compile Include="Commands\OpenResourceIdCommand.cs" />
     <Compile Include="Commands\RtMapInspectorCommand.cs" />
     <Compile Include="Commands\SiteExplorer\EditResourceHeaderCommand.cs" />

Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs	2012-06-25 14:47:52 UTC (rev 6810)
@@ -1066,6 +1066,15 @@
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Live Map Definition Editor.
+        /// </summary>
+        internal static string LiveMapEditor {
+            get {
+                return ResourceManager.GetString("LiveMapEditor", resourceCulture);
+            }
+        }
+        
         internal static System.Drawing.Bitmap loading {
             get {
                 object obj = ResourceManager.GetObject("loading", resourceCulture);

Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx	2012-06-25 14:47:52 UTC (rev 6810)
@@ -2688,4 +2688,7 @@
   <data name="StatusActiveConnection" xml:space="preserve">
     <value>Active Connection: {0}</value>
   </data>
+  <data name="LiveMapEditor" xml:space="preserve">
+    <value>Live Map Definition Editor</value>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs	2012-06-25 14:47:52 UTC (rev 6810)
@@ -41,6 +41,7 @@
         public const string ValidateOnSave = "General.ValidateResourceOnSave";
         public const string XsdSchemaPath = "Editor.XsdSchemaPath";
         public const string ShowTipOfTheDay = "General.ShowTipOfTheDay";
+        public const string LiveMapEditorPath = "General.LiveMapEditorPath";
 
         internal static void ApplyDefaults()
         {
@@ -66,6 +67,7 @@
             Props.Set(ConfigProperties.RtMapInspectorPath, DefaultRtMapInspectorPath);
             Props.Set(ConfigProperties.LocalFsPreviewPath, DefaultLocalFsPreviewPath);
             Props.Set(ConfigProperties.ShowTipOfTheDay, DefaultShowTipOfTheDay);
+            Props.Set(ConfigProperties.LiveMapEditorPath, DefaultLiveMapEditorPath);
         }
 
         public static bool DefaultShowTipOfTheDay { get { return true; } }
@@ -75,6 +77,8 @@
         public static string DefaultLocalFsPreviewPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "MaestroFsPreview.exe"); } }
 
         public static string DefaultRtMapInspectorPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "RtMapInspector.exe"); } }
+
+        public static string DefaultLiveMapEditorPath { get { return Path.Combine(FileUtility.ApplicationRootPath, "Maestro.LiveMapEditor.exe"); } }
         
         public static Color DefaultOpenColor { get { return Color.LightGreen; } }
 

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.Designer.cs	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.Designer.cs	2012-06-25 14:47:52 UTC (rev 6810)
@@ -54,6 +54,9 @@
             this.cmbOpenedColor = new Maestro.Editors.Common.ColorComboBox();
             this.label6 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.btnBrowseLiveMapEditor = new System.Windows.Forms.Button();
+            this.txtLiveMapEditor = new System.Windows.Forms.TextBox();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -126,6 +129,9 @@
             // groupBox2
             // 
             resources.ApplyResources(this.groupBox2, "groupBox2");
+            this.groupBox2.Controls.Add(this.label8);
+            this.groupBox2.Controls.Add(this.btnBrowseLiveMapEditor);
+            this.groupBox2.Controls.Add(this.txtLiveMapEditor);
             this.groupBox2.Controls.Add(this.label7);
             this.groupBox2.Controls.Add(this.btnBrowseRtMapInspector);
             this.groupBox2.Controls.Add(this.txtRtMapInspector);
@@ -224,6 +230,24 @@
             resources.ApplyResources(this.label5, "label5");
             this.label5.Name = "label5";
             // 
+            // label8
+            // 
+            resources.ApplyResources(this.label8, "label8");
+            this.label8.Name = "label8";
+            // 
+            // btnBrowseLiveMapEditor
+            // 
+            resources.ApplyResources(this.btnBrowseLiveMapEditor, "btnBrowseLiveMapEditor");
+            this.btnBrowseLiveMapEditor.Name = "btnBrowseLiveMapEditor";
+            this.btnBrowseLiveMapEditor.UseVisualStyleBackColor = true;
+            this.btnBrowseLiveMapEditor.Click += new System.EventHandler(this.btnBrowseLiveMapEditor_Click);
+            // 
+            // txtLiveMapEditor
+            // 
+            resources.ApplyResources(this.txtLiveMapEditor, "txtLiveMapEditor");
+            this.txtLiveMapEditor.Name = "txtLiveMapEditor";
+            this.txtLiveMapEditor.ReadOnly = true;
+            // 
             // GeneralPreferencesCtrl
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -276,5 +300,8 @@
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.Button btnBrowseRtMapInspector;
         private System.Windows.Forms.TextBox txtRtMapInspector;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Button btnBrowseLiveMapEditor;
+        private System.Windows.Forms.TextBox txtLiveMapEditor;
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs	2012-06-25 14:47:52 UTC (rev 6810)
@@ -59,10 +59,10 @@
             var totd = Props.Get(ConfigProperties.ShowTipOfTheDay, ConfigProperties.DefaultShowTipOfTheDay);
             chkShowTipOfTheDay.Checked = totd;
             
-
             txtFsPreview.Text = Props.Get(ConfigProperties.LocalFsPreviewPath, ConfigProperties.DefaultLocalFsPreviewPath);
             txtMgCooker.Text = Props.Get(ConfigProperties.MgCookerPath, ConfigProperties.DefaultMgCookerPath);
             txtRtMapInspector.Text = Props.Get(ConfigProperties.RtMapInspectorPath, ConfigProperties.DefaultRtMapInspectorPath);
+            txtLiveMapEditor.Text = Props.Get(ConfigProperties.LiveMapEditorPath, ConfigProperties.DefaultLiveMapEditorPath);
 
             cmbOpenedColor.CurrentColor = Props.Get(ConfigProperties.OpenColor, Color.LightGreen);
             cmbModifiedColor.CurrentColor = Props.Get(ConfigProperties.DirtyColor, Color.Pink);
@@ -78,12 +78,12 @@
             get { return this; }
         }
 
-        private bool Apply(string key, object newValue)
+        private bool Apply<T>(string key, T newValue)
         {
-            if (Props.Get(key).Equals(newValue))
+            if (Props.Get<T>(key, newValue).Equals(newValue))
                 return false;
 
-            Props.Set(key, newValue);
+            Props.Set<T>(key, newValue);
             return true;
         }
 
@@ -101,6 +101,7 @@
             Apply(ConfigProperties.MgCookerPath, txtMgCooker.Text);
             Apply(ConfigProperties.LocalFsPreviewPath, txtFsPreview.Text);
             Apply(ConfigProperties.RtMapInspectorPath, txtRtMapInspector.Text);
+            Apply(ConfigProperties.LiveMapEditorPath, txtLiveMapEditor.Text);
             Apply(ConfigProperties.OpenColor, (Color)cmbOpenedColor.CurrentColor);
             Apply(ConfigProperties.DirtyColor, (Color)cmbModifiedColor.CurrentColor);
             Apply(ConfigProperties.ShowTipOfTheDay, chkShowTipOfTheDay.Checked);
@@ -170,5 +171,18 @@
                 }
             }
         }
+
+        private void btnBrowseLiveMapEditor_Click(object sender, EventArgs e)
+        {
+            using (var dlg = DialogFactory.OpenFile())
+            {
+                dlg.Title = string.Format(Properties.Resources.LocateExecutable, "Maestro.LiveMapEditor.exe");
+                dlg.Filter = Properties.Resources.FilterExecutables;
+                if (dlg.ShowDialog() == DialogResult.OK)
+                {
+                    txtLiveMapEditor.Text = dlg.FileName;
+                }
+            }
+        }
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.resx	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.resx	2012-06-25 14:47:52 UTC (rev 6810)
@@ -285,6 +285,66 @@
   <data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
+  <data name=">>chkShowTipOfTheDay.Name" xml:space="preserve">
+    <value>chkShowTipOfTheDay</value>
+  </data>
+  <data name=">>chkShowTipOfTheDay.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>chkShowTipOfTheDay.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name=">>chkShowTipOfTheDay.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name=">>chkOutbound.Name" xml:space="preserve">
+    <value>chkOutbound</value>
+  </data>
+  <data name=">>chkOutbound.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>chkOutbound.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name=">>chkOutbound.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name=">>chkMessages.Name" xml:space="preserve">
+    <value>chkMessages</value>
+  </data>
+  <data name=">>chkMessages.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>chkMessages.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name=">>chkMessages.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>16, 93</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>426, 50</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Show on Startup</value>
+  </data>
+  <data name=">>groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name=">>groupBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>groupBox1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <data name="chkShowTipOfTheDay.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -366,33 +426,93 @@
   <data name=">>chkMessages.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 93</value>
+  <data name="groupBox2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>426, 50</value>
+  <data name="label8.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+  <data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Show on Startup</value>
+  <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
+    <value>17, 100</value>
   </data>
-  <data name=">>groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>136, 13</value>
   </data>
-  <data name=">>groupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label8.TabIndex" type="System.Int32, mscorlib">
+    <value>17</value>
   </data>
-  <data name=">>groupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="label8.Text" xml:space="preserve">
+    <value>Maestro.LiveMapEditor.exe</value>
   </data>
-  <data name=">>groupBox1.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name=">>label8.Name" xml:space="preserve">
+    <value>label8</value>
   </data>
-  <data name="groupBox2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+  <data name=">>label8.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>label8.Parent" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name=">>label8.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnBrowseLiveMapEditor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="btnBrowseLiveMapEditor.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnBrowseLiveMapEditor.Location" type="System.Drawing.Point, System.Drawing">
+    <value>386, 95</value>
+  </data>
+  <data name="btnBrowseLiveMapEditor.Size" type="System.Drawing.Size, System.Drawing">
+    <value>25, 23</value>
+  </data>
+  <data name="btnBrowseLiveMapEditor.TabIndex" type="System.Int32, mscorlib">
+    <value>16</value>
+  </data>
+  <data name="btnBrowseLiveMapEditor.Text" xml:space="preserve">
+    <value>...</value>
+  </data>
+  <data name=">>btnBrowseLiveMapEditor.Name" xml:space="preserve">
+    <value>btnBrowseLiveMapEditor</value>
+  </data>
+  <data name=">>btnBrowseLiveMapEditor.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>btnBrowseLiveMapEditor.Parent" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name=">>btnBrowseLiveMapEditor.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtLiveMapEditor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
+  <data name="txtLiveMapEditor.Location" type="System.Drawing.Point, System.Drawing">
+    <value>159, 97</value>
+  </data>
+  <data name="txtLiveMapEditor.Size" type="System.Drawing.Size, System.Drawing">
+    <value>221, 20</value>
+  </data>
+  <data name="txtLiveMapEditor.TabIndex" type="System.Int32, mscorlib">
+    <value>15</value>
+  </data>
+  <data name=">>txtLiveMapEditor.Name" xml:space="preserve">
+    <value>txtLiveMapEditor</value>
+  </data>
+  <data name=">>txtLiveMapEditor.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>txtLiveMapEditor.Parent" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name=">>txtLiveMapEditor.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <data name="label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -418,7 +538,7 @@
     <value>groupBox2</value>
   </data>
   <data name=">>label7.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>3</value>
   </data>
   <data name="btnBrowseRtMapInspector.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -448,16 +568,16 @@
     <value>groupBox2</value>
   </data>
   <data name=">>btnBrowseRtMapInspector.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>4</value>
   </data>
   <data name="txtRtMapInspector.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
   <data name="txtRtMapInspector.Location" type="System.Drawing.Point, System.Drawing">
-    <value>141, 71</value>
+    <value>159, 71</value>
   </data>
   <data name="txtRtMapInspector.Size" type="System.Drawing.Size, System.Drawing">
-    <value>239, 20</value>
+    <value>221, 20</value>
   </data>
   <data name="txtRtMapInspector.TabIndex" type="System.Int32, mscorlib">
     <value>12</value>
@@ -472,7 +592,7 @@
     <value>groupBox2</value>
   </data>
   <data name=">>txtRtMapInspector.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>5</value>
   </data>
   <data name="btnBrowseFsPreview.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -499,16 +619,16 @@
     <value>groupBox2</value>
   </data>
   <data name=">>btnBrowseFsPreview.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>6</value>
   </data>
   <data name="txtFsPreview.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
   <data name="txtFsPreview.Location" type="System.Drawing.Point, System.Drawing">
-    <value>141, 45</value>
+    <value>159, 45</value>
   </data>
   <data name="txtFsPreview.Size" type="System.Drawing.Size, System.Drawing">
-    <value>239, 20</value>
+    <value>221, 20</value>
   </data>
   <data name="txtFsPreview.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -523,7 +643,7 @@
     <value>groupBox2</value>
   </data>
   <data name=">>txtFsPreview.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>7</value>
   </data>
   <data name="btnBrowseMgCooker.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -550,7 +670,7 @@
     <value>groupBox2</value>
   </data>
   <data name=">>btnBrowseMgCooker.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>8</value>
   </data>
   <data name="label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -577,16 +697,16 @@
     <value>groupBox2</value>
   </data>
   <data name=">>label4.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>9</value>
   </data>
   <data name="txtMgCooker.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
   <data name="txtMgCooker.Location" type="System.Drawing.Point, System.Drawing">
-    <value>141, 19</value>
+    <value>159, 19</value>
   </data>
   <data name="txtMgCooker.Size" type="System.Drawing.Size, System.Drawing">
-    <value>239, 20</value>
+    <value>221, 20</value>
   </data>
   <data name="txtMgCooker.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -601,7 +721,7 @@
     <value>groupBox2</value>
   </data>
   <data name=">>txtMgCooker.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>10</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -628,13 +748,13 @@
     <value>groupBox2</value>
   </data>
   <data name=">>label3.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>11</value>
   </data>
   <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
     <value>16, 245</value>
   </data>
   <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>426, 115</value>
+    <value>426, 142</value>
   </data>
   <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -657,6 +777,78 @@
   <data name="groupBox3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
+  <data name=">>cmbModifiedColor.Name" xml:space="preserve">
+    <value>cmbModifiedColor</value>
+  </data>
+  <data name=">>cmbModifiedColor.Type" xml:space="preserve">
+    <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+  </data>
+  <data name=">>cmbModifiedColor.Parent" xml:space="preserve">
+    <value>groupBox3</value>
+  </data>
+  <data name=">>cmbModifiedColor.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name=">>cmbOpenedColor.Name" xml:space="preserve">
+    <value>cmbOpenedColor</value>
+  </data>
+  <data name=">>cmbOpenedColor.Type" xml:space="preserve">
+    <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+  </data>
+  <data name=">>cmbOpenedColor.Parent" xml:space="preserve">
+    <value>groupBox3</value>
+  </data>
+  <data name=">>cmbOpenedColor.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name=">>label6.Name" xml:space="preserve">
+    <value>label6</value>
+  </data>
+  <data name=">>label6.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>label6.Parent" xml:space="preserve">
+    <value>groupBox3</value>
+  </data>
+  <data name=">>label6.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name=">>label5.Name" xml:space="preserve">
+    <value>label5</value>
+  </data>
+  <data name=">>label5.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>label5.Parent" xml:space="preserve">
+    <value>groupBox3</value>
+  </data>
+  <data name=">>label5.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>16, 149</value>
+  </data>
+  <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>426, 90</value>
+  </data>
+  <data name="groupBox3.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="groupBox3.Text" xml:space="preserve">
+    <value>Site Explorer</value>
+  </data>
+  <data name=">>groupBox3.Name" xml:space="preserve">
+    <value>groupBox3</value>
+  </data>
+  <data name=">>groupBox3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>groupBox3.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>groupBox3.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="cmbModifiedColor.Location" type="System.Drawing.Point, System.Drawing">
     <value>187, 49</value>
   </data>
@@ -670,7 +862,7 @@
     <value>cmbModifiedColor</value>
   </data>
   <data name=">>cmbModifiedColor.Type" xml:space="preserve">
-    <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+    <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
   </data>
   <data name=">>cmbModifiedColor.Parent" xml:space="preserve">
     <value>groupBox3</value>
@@ -691,7 +883,7 @@
     <value>cmbOpenedColor</value>
   </data>
   <data name=">>cmbOpenedColor.Type" xml:space="preserve">
-    <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+    <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
   </data>
   <data name=">>cmbOpenedColor.Parent" xml:space="preserve">
     <value>groupBox3</value>
@@ -753,35 +945,11 @@
   <data name=">>label5.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 149</value>
-  </data>
-  <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>426, 90</value>
-  </data>
-  <data name="groupBox3.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
-  </data>
-  <data name="groupBox3.Text" xml:space="preserve">
-    <value>Site Explorer</value>
-  </data>
-  <data name=">>groupBox3.Name" xml:space="preserve">
-    <value>groupBox3</value>
-  </data>
-  <data name=">>groupBox3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name=">>groupBox3.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name=">>groupBox3.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>459, 376</value>
+    <value>459, 411</value>
   </data>
   <data name=">>$this.Name" xml:space="preserve">
     <value>GeneralPreferencesCtrl</value>

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.resx	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.resx	2012-06-25 14:47:52 UTC (rev 6810)
@@ -112,23 +112,23 @@
     <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>
+    <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.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" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>498, 401</value>
+    <value>498, 433</value>
   </data>
   <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
@@ -139,7 +139,7 @@
     <value>btnOK</value>
   </data>
   <data name=">>btnOK.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>btnOK.Parent" xml:space="preserve">
     <value>$this</value>
@@ -151,7 +151,7 @@
     <value>Bottom, Right</value>
   </data>
   <data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>580, 401</value>
+    <value>580, 433</value>
   </data>
   <data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -166,7 +166,7 @@
     <value>btnCancel</value>
   </data>
   <data name=">>btnCancel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>btnCancel.Parent" xml:space="preserve">
     <value>$this</value>
@@ -181,7 +181,7 @@
     <value>13, 13</value>
   </data>
   <data name="tabPreferences.Size" type="System.Drawing.Size, System.Drawing">
-    <value>642, 382</value>
+    <value>642, 414</value>
   </data>
   <data name="tabPreferences.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -190,7 +190,7 @@
     <value>tabPreferences</value>
   </data>
   <data name=">>tabPreferences.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>tabPreferences.Parent" xml:space="preserve">
     <value>$this</value>
@@ -202,7 +202,7 @@
     <value>Bottom, Left</value>
   </data>
   <data name="btnReset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 401</value>
+    <value>13, 433</value>
   </data>
   <data name="btnReset.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -217,7 +217,7 @@
     <value>btnReset</value>
   </data>
   <data name=">>btnReset.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>btnReset.Parent" xml:space="preserve">
     <value>$this</value>
@@ -225,11 +225,11 @@
   <data name=">>btnReset.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>667, 436</value>
+    <value>667, 468</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -744,6 +744,6 @@
     <value>OptionsDialog</value>
   </data>
   <data name=">>$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj	2012-06-25 14:18:23 UTC (rev 6809)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj	2012-06-25 14:47:52 UTC (rev 6810)
@@ -24,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -33,7 +34,11 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>MapGuide Maestro.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -151,6 +156,9 @@
   <ItemGroup>
     <None Include="Resources\property.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="MapGuide Maestro.ico" />
+  </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.

Added: trunk/Tools/Maestro/Maestro.LiveMapEditor/MapGuide Maestro.ico
===================================================================
(Binary files differ)


Property changes on: trunk/Tools/Maestro/Maestro.LiveMapEditor/MapGuide Maestro.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream



More information about the mapguide-commits mailing list