[mapguide-commits] r7028 - in branches/maestro-4.0.x: Maestro Maestro.Base/Services Maestro.Editors/WebLayout

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-09-18 05:58:42 -0700 (Tue, 18 Sep 2012)
New Revision: 7028

Modified:
   branches/maestro-4.0.x/Maestro.Base/Services/OpenResourceManager.cs
   branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
   branches/maestro-4.0.x/Maestro/changelog.txt
Log:
#2122: Fix improper dirty state management

Modified: branches/maestro-4.0.x/Maestro/changelog.txt
===================================================================
--- branches/maestro-4.0.x/Maestro/changelog.txt	2012-09-18 12:54:32 UTC (rev 7027)
+++ branches/maestro-4.0.x/Maestro/changelog.txt	2012-09-18 12:58:42 UTC (rev 7028)
@@ -3,6 +3,8 @@
  - Use UNIQUE() for fetching distinct values in Expression Editor
  - Fusion editor fixes
    - OSM support
+ - Fix: Dirty state not properly raised for certain Web Layout properties
+ - Fix: Node color incorrectly set in Site Explorer for re-activated editors
  - Fix: Updating a dynamic group name in a Map Definition did not update child groups
  - Fix: Have RDBMS Feature Source editor fill a fake password when opening a RDBMS feature source with secured credentials to give appearance of a password filled in.
  - Fix: Duplicating vector scale ranges not creating true clones

Modified: branches/maestro-4.0.x/Maestro.Base/Services/OpenResourceManager.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Services/OpenResourceManager.cs	2012-09-18 12:54:32 UTC (rev 7027)
+++ branches/maestro-4.0.x/Maestro.Base/Services/OpenResourceManager.cs	2012-09-18 12:58:42 UTC (rev 7028)
@@ -198,7 +198,7 @@
                 };
             }
             _openItems[key].Activate();
-            siteExp.FlagNode(conn.DisplayName, res.ResourceID, NodeFlagAction.HighlightOpen);
+            siteExp.FlagNode(conn.DisplayName, res.ResourceID, _openItems[key].IsDirty ? NodeFlagAction.HighlightDirty : NodeFlagAction.HighlightOpen);
             return _openItems[key];
         }
 

Modified: branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs	2012-09-18 12:54:32 UTC (rev 7027)
+++ branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs	2012-09-18 12:58:42 UTC (rev 7028)
@@ -110,6 +110,8 @@
             _wl.InformationPane.PropertyChanged += OnWebLayoutPropertyChanged;
             _wl.StatusBar.PropertyChanged += OnWebLayoutPropertyChanged;
             _wl.TaskPane.PropertyChanged += OnWebLayoutPropertyChanged;
+            _wl.TaskPane.TaskBar.PropertyChanged += OnWebLayoutPropertyChanged;
+            _wl.ToolBar.PropertyChanged += OnWebLayoutPropertyChanged;
             _wl.ZoomControl.PropertyChanged += OnWebLayoutPropertyChanged;
         }
 
@@ -161,6 +163,8 @@
                     _wl.InformationPane.PropertyChanged -= OnWebLayoutPropertyChanged;
                     _wl.StatusBar.PropertyChanged -= OnWebLayoutPropertyChanged;
                     _wl.TaskPane.PropertyChanged -= OnWebLayoutPropertyChanged;
+                    _wl.TaskPane.TaskBar.PropertyChanged -= OnWebLayoutPropertyChanged;
+                    _wl.ToolBar.PropertyChanged -= OnWebLayoutPropertyChanged;
                     _wl.ZoomControl.PropertyChanged -= OnWebLayoutPropertyChanged;
                 }