Changeset 3357

Timestamp:

05/14/08 22:58:29 (2 months ago)

Author:

aaronr

Message:

Swapping in calls to markAsClean and isDirty for interacting with xml model dirty bit

Location:

trunk/opus_gui

Files:

• config/xmlmodelview/opusdatamodel.py (modified) (1 diff)
• main/opusgui.py (modified) (4 diffs)

trunk/opus_gui/config/xmlmodelview/opusdatamodel.py

@@ -273 +273 @@
             self.parentObj.setWindowTitle(wintitle)
         self.dirty = True
+
+    def markAsClean(self):
+        if self.dirty == True:
+            wintitle = self.parentObj.windowTitle().replace("*", "")
+            self.parentObj.setWindowTitle(wintitle)
+        self.dirty = False
         
-
+    def isDirty(self):
+        return self.dirty
+    
     def setData(self,index,value,role):
         if not index.isValid():

trunk/opus_gui/main/opusgui.py

@@ -216 +216 @@
             opusXMLTree.update(str(domDocument.toString(indentSize)))
             opusXMLTree.save()
-            self.toolboxStuff.runManagerTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
-            self.toolboxStuff.dataManagerTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
-            self.toolboxStuff.dataManagerDBSTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
-            self.toolboxStuff.modelManagerTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
-            self.toolboxStuff.resultsManagerTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
+            self.toolboxStuff.runManagerTree.model.markAsClean()
+            self.toolboxStuff.dataManagerTree.model.markAsClean()
+            self.toolboxStuff.dataManagerDBSTree.model.markAsClean()
+            self.toolboxStuff.modelManagerTree.model.markAsClean()
+            self.toolboxStuff.resultsManagerTree.model.markAsClean()
         except:
             print "Unexpected error:", sys.exc_info()[0]
@@ -248 +243 @@
             opusXMLTree.update(str(domDocument.toString(indentSize)))
             opusXMLTree.save_as(str(fileName))
-            self.toolboxStuff.runManagerTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
-            self.toolboxStuff.dataManagerTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
-            self.toolboxStuff.dataManagerDBSTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
-            self.toolboxStuff.modelManagerTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
-            self.toolboxStuff.resultsManagerTree.model.dirty = False
-            self.setWindowTitle(self.windowTitle().replace("*", ""))
+            self.toolboxStuff.runManagerTree.model.markAsClean()
+            self.toolboxStuff.dataManagerTree.model.markAsClean()
+            self.toolboxStuff.dataManagerDBSTree.model.markAsClean()
+            self.toolboxStuff.modelManagerTree.model.markAsClean()
+            self.toolboxStuff.resultsManagerTree.model.markAsClean()
         except:
             print "Unexpected error:", sys.exc_info()[0]
@@ -267 +257 @@
         """
         saveBeforeOpen = QMessageBox.Discard
-        if self.toolboxStuff.resultsManagerTree and self.toolboxStuff.resultsManagerTree.model.dirty:
+        if self.toolboxStuff.resultsManagerTree and self.toolboxStuff.resultsManagerTree.model.isDirty():
             saveBeforeOpen = QMessageBox.question(self,"Warning",
                                             "Current project contains changes... \nShould we save or discard those changes?",
                                             QMessageBox.Discard,QMessageBox.Save)
-        elif self.toolboxStuff.modelManagerTree and self.toolboxStuff.modelManagerTree.model.dirty:
+        elif self.toolboxStuff.modelManagerTree and self.toolboxStuff.modelManagerTree.model.isDirty():
             saveBeforeOpen = QMessageBox.question(self,"Warning",
                                             "Current project contains changes... \nShould we save or discard those changes?",
                                             QMessageBox.Discard,QMessageBox.Save)
-        elif self.toolboxStuff.runManagerTree and self.toolboxStuff.runManagerTree.model.dirty:
+        elif self.toolboxStuff.runManagerTree and self.toolboxStuff.runManagerTree.model.isDirty():
             saveBeforeOpen = QMessageBox.question(self,"Warning",
                                             "Current project contains changes... \nShould we save or discard those changes?",
                                             QMessageBox.Discard,QMessageBox.Save)
-        elif self.toolboxStuff.dataManagerTree and self.toolboxStuff.dataManagerTree.model.dirty:
+        elif self.toolboxStuff.dataManagerTree and self.toolboxStuff.dataManagerTree.model.isDirty():
             saveBeforeOpen = QMessageBox.question(self,"Warning",
                                             "Current project contains changes... \nShould we save or discard those changes?",
@@ -289 +279 @@
             #if we have an existing tree we need to remove the dirty bit since we are discarding
             if self.toolboxStuff.runManagerTree:
-                self.toolboxStuff.runManagerTree.model.dirty = False
+                self.toolboxStuff.runManagerTree.model.markAsClean()
             if self.toolboxStuff.dataManagerTree:
-                self.toolboxStuff.dataManagerTree.model.dirty = False
+                self.toolboxStuff.dataManagerTree.model.markAsClean()
             if self.toolboxStuff.modelManagerTree:
-                self.toolboxStuff.modelManagerTree.model.dirty = False
+                self.toolboxStuff.modelManagerTree.model.markAsClean()
             if self.toolboxStuff.resultsManagerTree:
-                self.toolboxStuff.resultsManagerTree.model.dirty = False
+                self.toolboxStuff.resultsManagerTree.model.markAsClean()
 
     def closeConfig(self):