[mapguide-commits] r8579 - in trunk/Tools/Maestro/Maestro.Editors: . Common TileSetDefinition

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-03-15 08:36:33 -0700 (Sun, 15 Mar 2015)
New Revision: 8579

Modified:
   trunk/Tools/Maestro/Maestro.Editors/Common/IExpressionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Strings.resx
   trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs
Log:
- Revert expression editor implementation selection
- Do not allow MgCooker to be invoked for non-Default tile sets

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/IExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/IExpressionEditor.cs	2015-03-15 14:36:51 UTC (rev 8578)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/IExpressionEditor.cs	2015-03-15 15:36:33 UTC (rev 8579)
@@ -88,8 +88,7 @@
     {
         public static IExpressionEditor Create()
         {
-            //if (Platform.IsRunningOnMono)
-            if (true)
+            if (Platform.IsRunningOnMono)
                 return new MonoCompatibleExpressionEditor();
             else
                 return new ExpressionEditor();

Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs	2015-03-15 14:36:51 UTC (rev 8578)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs	2015-03-15 15:36:33 UTC (rev 8579)
@@ -1922,6 +1922,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to MgCooker only works with Tile Sets using the 'Default' tile provider.
+        /// </summary>
+        internal static string MgCookerIncompatibleTileSet {
+            get {
+                return ResourceManager.GetString("MgCookerIncompatibleTileSet", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Missing column "{0}".
         /// </summary>
         internal static string MissingColumnError {

Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.resx	2015-03-15 14:36:51 UTC (rev 8578)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.resx	2015-03-15 15:36:33 UTC (rev 8579)
@@ -1718,4 +1718,7 @@
   <data name="SavedTileSet" xml:space="preserve">
     <value>Saved tile set to: {0}</value>
   </data>
+  <data name="MgCookerIncompatibleTileSet" xml:space="preserve">
+    <value>MgCooker only works with Tile Sets using the 'Default' tile provider</value>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs	2015-03-15 14:36:51 UTC (rev 8578)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs	2015-03-15 15:36:33 UTC (rev 8579)
@@ -195,6 +195,12 @@
                 return;
             }
 
+            if (_tsd.TileStoreParameters.TileProvider != "Default") //NOXLATE
+            {
+                MessageBox.Show(Maestro.Editors.Strings.MgCookerIncompatibleTileSet);
+                return;
+            }
+
             var conn = _edSvc.CurrentConnection;
             //HACK: Can't support other connection types beyond HTTP atm
             if (!conn.ProviderName.ToLower().Contains("maestro.http"))