From 9d8b40d1c233d46ed827f3f13c28bcab300a064b Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 6 Jan 2011 22:34:46 +0200 Subject: [PATCH] Fix some overlooked bugs from the change in the way service files are saved. --- openlp/core/ui/servicemanager.py | 9 +++++---- openlp/core/ui/settingsform.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index e1aa126ae..a9bf232d4 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -28,6 +28,7 @@ import os import logging import cPickle import zipfile +from pprint import pformat log = logging.getLogger(__name__) @@ -307,7 +308,7 @@ class ServiceManager(QtGui.QWidget): 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 @@ class ServiceManager(QtGui.QWidget): # 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 @@ class ServiceManager(QtGui.QWidget): serviceIterator += 1 if setSelected: firstItem.setSelected(True) - self.isModified = True + self.setModified(True) def onCollapseAll(self): """ @@ -752,7 +753,7 @@ class ServiceManager(QtGui.QWidget): self.serviceItems.remove(self.serviceItems[item]) self.serviceItems.insert(0, temp) self.repaintServiceList(0, count) - self.isModified = True + self.setModified(True) def onServiceUp(self): """ diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 86e3c6150..068057902 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -98,4 +98,4 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog): 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()