openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/service-manager-fixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/service-manager-fixes/+merge/45444

Fix some overlooked bugs from the change in the way service files are saved.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/service-manager-fixes/+merge/45444
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/service-manager-fixes into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2011-01-05 16:54:44 +0000
+++ openlp/core/ui/servicemanager.py	2011-01-06 20:41:45 +0000
@@ -28,6 +28,7 @@
 import logging
 import cPickle
 import zipfile
+from pprint import pformat
 
 log = logging.getLogger(__name__)
 
@@ -307,7 +308,7 @@
         Setter for service file.
         """
         self._fileName = unicode(fileName)
-        self.parent.setServiceModified(self.isModified, self.shortFileName())
+        self.parent.setServiceModified(self.isModified(), self.shortFileName())
         QtCore.QSettings(). \
             setValue(u'service/last file',QtCore.QVariant(fileName))
 
@@ -685,7 +686,7 @@
         # Top Item was selected so set the last one
         if setLastItem:
             lastItem.setSelected(True)
-        self.isModified = True
+        self.setModified(True)
 
     def onMoveSelectionDown(self):
         """
@@ -708,7 +709,7 @@
             serviceIterator += 1
         if setSelected:
             firstItem.setSelected(True)
-        self.isModified = True
+        self.setModified(True)
 
     def onCollapseAll(self):
         """
@@ -752,7 +753,7 @@
             self.serviceItems.remove(self.serviceItems[item])
             self.serviceItems.insert(0, temp)
             self.repaintServiceList(0, count)
-        self.isModified = True
+        self.setModified(True)
 
     def onServiceUp(self):
         """

=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py	2010-12-26 11:04:47 +0000
+++ openlp/core/ui/settingsform.py	2011-01-06 20:41:45 +0000
@@ -98,4 +98,4 @@
         Run any post-setup code for the tabs on the form
         """
         for tabIndex in range(0, self.settingsTabWidget.count()):
-            self.settingsTabWidget.widget(tabIndex).postSetUp()
\ No newline at end of file
+            self.settingsTabWidget.widget(tabIndex).postSetUp()