From af5a52fa62390a3f6c4e5095008f85190b6512aa Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 14 Mar 2010 17:05:50 +0000 Subject: [PATCH 1/3] Fix service saving and cancelling Fix Red and Bla --- openlp/core/ui/maindisplay.py | 3 +-- openlp/core/ui/mainwindow.py | 2 +- openlp/core/ui/servicemanager.py | 27 +++++++++++++-------------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 510b0ecc7..e59ce2060 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -168,8 +168,7 @@ class MainDisplay(DisplayWidget): self.screen[u'size'].height(), QtGui.QImage.Format_ARGB32_Premultiplied) painter.begin(self.blankFrame) - #TODO make black when testing finished - painter.fillRect(self.blankFrame.rect(), QtCore.Qt.red) + painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black) #build a blank transparent image self.transparent = QtGui.QPixmap(self.screen[u'size'].width(), self.screen[u'size'].height()) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index d7213860f..beb7cd148 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -419,7 +419,7 @@ class Ui_MainWindow(object): self.LanguageEnglishItem.setText(self.trUtf8('English')) self.LanguageEnglishItem.setStatusTip( self.trUtf8('Set the interface language to English')) - self.ToolsAddToolItem.setText(self.trUtf8('&Add Tool...')) + self.ToolsAddToolItem.setText(self.trUtf8('Add &Tool...')) self.ToolsAddToolItem.setStatusTip( self.trUtf8('Add an application to the list of tools')) self.action_Preview_Panel.setText(self.trUtf8('&Preview Pane')) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index b41fd24dc..6fbb34009 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -478,6 +478,7 @@ class ServiceManager(QtGui.QWidget): if not quick or self.isNew: filename = QtGui.QFileDialog.getSaveFileName(self, u'Save Service', self.config.get_last_dir()) + print filename else: filename = self.config.get_last_dir() if filename: @@ -516,9 +517,9 @@ class ServiceManager(QtGui.QWidget): os.remove(servicefile) except: pass #if not present do not worry - name = filename.split(os.path.sep) - self.serviceName = name[-1] - self.parent.serviceChanged(True, self.serviceName) + name = filename.split(os.path.sep) + self.serviceName = name[-1] + self.parent.serviceChanged(True, self.serviceName) def onQuickSaveService(self): self.onSaveService(True) @@ -741,12 +742,7 @@ class ServiceManager(QtGui.QWidget): if item is None: endpos = len(self.serviceItems) else: - parentitem = item.parent() - if parentitem is None: - endpos = item.data(0, QtCore.Qt.UserRole).toInt()[0] - else: - endpos = parentitem.data(0, QtCore.Qt.UserRole).toInt()[0] - endpos -= 1 + endpos = self._getParentItemData(item) - 1 if endpos < startpos: newpos = endpos else: @@ -759,11 +755,7 @@ class ServiceManager(QtGui.QWidget): if item == None: self.droppos = len(self.serviceItems) else: - parentitem = item.parent() - if parentitem is None: - self.droppos = item.data(0, QtCore.Qt.UserRole).toInt()[0] - else: - self.droppos = parentitem.data(0, QtCore.Qt.UserRole).toInt()[0] + self.droppos = self._getParentItemData(item) Receiver.send_message(u'%s_add_service_item' % plugin) def updateThemeList(self, theme_list): @@ -798,3 +790,10 @@ class ServiceManager(QtGui.QWidget): item, count = self.findServiceItem() self.serviceItems[item][u'service_item'].theme = theme self.regenerateServiceItems() + + def _getParentItemData(self, item): + parentitem = item.parent() + if parentitem is None: + return item.data(0, QtCore.Qt.UserRole).toInt()[0] + else: + return parentitem.data(0, QtCore.Qt.UserRole).toInt()[0] From 23236b50e1c92293dfa2172c9eef0748b4340c10 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 14 Mar 2010 17:14:38 +0000 Subject: [PATCH 2/3] remove print --- openlp/core/ui/servicemanager.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 6fbb34009..d9dd8acb6 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -478,7 +478,6 @@ class ServiceManager(QtGui.QWidget): if not quick or self.isNew: filename = QtGui.QFileDialog.getSaveFileName(self, u'Save Service', self.config.get_last_dir()) - print filename else: filename = self.config.get_last_dir() if filename: From 36b9688695aef0a283b4ff3560f4da4ad4ca36d6 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 14 Mar 2010 17:53:14 +0000 Subject: [PATCH 3/3] Fix save service file name --- openlp/core/ui/servicemanager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index d9dd8acb6..cec14fc8c 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -477,7 +477,8 @@ class ServiceManager(QtGui.QWidget): log.debug(u'onSaveService') if not quick or self.isNew: filename = QtGui.QFileDialog.getSaveFileName(self, - u'Save Service', self.config.get_last_dir()) + self.trUtf8(u'Save Service'), self.config.get_last_dir(), + self.trUtf8(u'OpenLP Service Files (*.osz)')) else: filename = self.config.get_last_dir() if filename: