[mapguide-commits] r6212 - in trunk/Tools/Maestro: . Maestro Maestro.AddIn.Local/UI Maestro.Login Properties

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Nov 8 11:09:42 EST 2011


Author: jng
Date: 2011-11-08 08:09:42 -0800 (Tue, 08 Nov 2011)
New Revision: 6212

Modified:
   trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
   trunk/Tools/Maestro/Maestro.Login/LocalLoginCtrl.cs
   trunk/Tools/Maestro/Maestro.Login/LocalNativeLoginCtrl.cs
   trunk/Tools/Maestro/Maestro/changelog.txt
   trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
   trunk/Tools/Maestro/build.bat
Log:
Prep 4.0 RC1 release

Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt	2011-11-08 15:41:32 UTC (rev 6211)
+++ trunk/Tools/Maestro/Maestro/changelog.txt	2011-11-08 16:09:42 UTC (rev 6212)
@@ -1,4 +1,27 @@
-4.0 beta 2
+4.0 RC1
+-------
+
+ - A warning will now be displayed when attempting to preview a map definition with tiled layers in Local Connection Mode (because the mg-desktop viewer has not implemented support for this yet)
+ - Failed non-transactional package loading operations now include a corresponding exception as part of the results display.
+ - Support for deleting multiple resource data items
+ - New context menu command for editing raw document/header XML
+ - Document tabs now have a context menu for mass tab closure.
+ - Updated mg-desktop binaries for Local Connection mode.
+ - Re-instated the Package editor, which has been missing since Maestro 2.1
+ - Feature Source Preview now shows elapsed query time for executed queries.
+ - MgCooker windows application no longer closes after a successful tiling run.
+ - Improved Color editor field support. Can now use either FDO expressions or pick a color.
+ - Theme Generation will now use the UNIQUE() aggregate function first instead of raw spinning a feature reader for distinct values.
+ - Fix: Non-Transactional package loading will now skip any SETRESOURCE operations with no content
+ - Fix: Layer Property display cannot be re-ordered in Layer Definition editor
+ - Fix: Fields for built-in WebLayout commands are now editable
+ - Fix: Search layer display in WebLayout editor
+ - Fix: SHP Feature Source editor does not properly handle multiple embedded SHP files.
+ - Fix: Duplicate repository items being displayed in Site Explorer
+ - Fix: Min/Max Scale display in Layer Definition editor
+ - Fix: Error re-ordering style rules in Layer Definition editor
+
+4.0 beta 2
 ----------
 
  - Support for non-transactional package loading w/ ability to retry failed operations

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs	2011-11-08 15:41:32 UTC (rev 6211)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs	2011-11-08 16:09:42 UTC (rev 6212)
@@ -53,6 +53,19 @@
         public void Init(MgResourceIdentifier mapResId)
         {
             _map = new MgdMap(mapResId);
+            var groups = _map.GetLayerGroups();
+            if (groups != null && groups.GetCount() > 0)
+            {
+                for (int i = 0; i < groups.GetCount(); i++)
+                {
+                    var grp = groups.GetItem(i);
+                    if (grp.LayerGroupType == MgLayerGroupType.BaseMap)
+                    {
+                        MessageBox.Show("WARNING: The Map Preview does not yet support previews of maps with tiled layers. You will only see un-tiled ones");
+                        break;
+                    }
+                }
+            }
             viewer.Init(_map);
             viewer.RefreshMap();
         }

Modified: trunk/Tools/Maestro/Maestro.Login/LocalLoginCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/LocalLoginCtrl.cs	2011-11-08 15:41:32 UTC (rev 6211)
+++ trunk/Tools/Maestro/Maestro.Login/LocalLoginCtrl.cs	2011-11-08 16:09:42 UTC (rev 6212)
@@ -40,7 +40,8 @@
         {
             using (var open = DialogFactory.OpenFile())
             {
-                open.RestoreDirectory = true; 
+                open.InitialDirectory = Application.StartupPath;
+                open.RestoreDirectory = true;
                 open.Filter = "*.ini|*.ini";
                 if (open.ShowDialog() == DialogResult.OK)
                 {

Modified: trunk/Tools/Maestro/Maestro.Login/LocalNativeLoginCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/LocalNativeLoginCtrl.cs	2011-11-08 15:41:32 UTC (rev 6211)
+++ trunk/Tools/Maestro/Maestro.Login/LocalNativeLoginCtrl.cs	2011-11-08 16:09:42 UTC (rev 6212)
@@ -84,6 +84,7 @@
         {
             using (var dlg = DialogFactory.OpenFile())
             {
+                dlg.InitialDirectory = Application.StartupPath;
                 //WTF does this default to false??? Does MS not realize that changing directories 
                 //via this dialog absolutely screws up file/assembly loading from relative paths?
                 dlg.RestoreDirectory = true; 

Modified: trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2011-11-08 15:41:32 UTC (rev 6211)
+++ trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2011-11-08 16:09:42 UTC (rev 6212)
@@ -35,5 +35,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.6143")]
-[assembly: AssemblyFileVersion("4.0.0.6143")]
+[assembly: AssemblyVersion("4.0.0.6212")]
+[assembly: AssemblyFileVersion("4.0.0.6212")]

Modified: trunk/Tools/Maestro/build.bat
===================================================================
--- trunk/Tools/Maestro/build.bat	2011-11-08 15:41:32 UTC (rev 6211)
+++ trunk/Tools/Maestro/build.bat	2011-11-08 16:09:42 UTC (rev 6212)
@@ -2,7 +2,7 @@
 SET TYPEACTION=build
 SET TYPEBUILD=Release
 SET PLATFORM=Any CPU
-SET RELEASE_VERSION=4.0b2
+SET RELEASE_VERSION=4.0rc1
 SET OLDPATH=%PATH%
 SET PATH=%PATH%;%CD%\Thirdparty\NSIS;C:\Windows\Microsoft.NET\Framework\v3.5
 SET SLNDIR=%CD%



More information about the mapguide-commits mailing list