[mapguide-commits] r7027 - in trunk/Tools/Maestro: Maestro.Base/Services Maestro.Editors/WebLayout

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-09-18 05:54:32 -0700 (Tue, 18 Sep 2012)
New Revision: 7027

Modified:
   trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
Log:
#2122: Fix improper dirty state management

Modified: trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs	2012-09-18 12:21:25 UTC (rev 7026)
+++ trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs	2012-09-18 12:54:32 UTC (rev 7027)
@@ -210,7 +210,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: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs	2012-09-18 12:21:25 UTC (rev 7026)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs	2012-09-18 12:54:32 UTC (rev 7027)
@@ -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;
                 }