From 1932ed886e0893b40051ec483422376bea628c14 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 6 Mar 2010 08:00:36 +0000 Subject: [PATCH 1/2] Fix up service notes --- openlp/core/ui/servicemanager.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index ad0da357b..0c955f392 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -42,7 +42,6 @@ class ServiceManagerList(QtGui.QTreeWidget): def __init__(self, parent=None, name=None): QtGui.QTreeWidget.__init__(self,parent) self.parent = parent - self.setExpandsOnDoubleClick(False) def keyPressEvent(self, event): if type(event) == QtGui.QKeyEvent: @@ -250,6 +249,7 @@ class ServiceManager(QtGui.QWidget): if self.serviceItemNoteForm.exec_(): self.serviceItems[item][u'service_item'].notes = \ self.serviceItemNoteForm.textEdit.toPlainText() + self.repaintServiceList(item, 0) def nextItem(self): """ @@ -429,15 +429,20 @@ class ServiceManager(QtGui.QWidget): for itemcount, item in enumerate(self.serviceItems): serviceitem = item[u'service_item'] treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList) - treewidgetitem.setText(0,serviceitem.title) - treewidgetitem.setIcon(0,serviceitem.iconic_representation) + if len(serviceitem.notes) > 0: + title = self.trUtf8(u'(N) - %s' % serviceitem.title) + else: + title = serviceitem.title + treewidgetitem.setText(0, title) + treewidgetitem.setToolTip(0, serviceitem.notes) + treewidgetitem.setIcon(0, serviceitem.iconic_representation) treewidgetitem.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(item[u'order'])) treewidgetitem.setExpanded(item[u'expanded']) for count, frame in enumerate(serviceitem.get_frames()): treewidgetitem1 = QtGui.QTreeWidgetItem(treewidgetitem) text = frame[u'title'] - treewidgetitem1.setText(0,text[:40]) + treewidgetitem1.setText(0, text[:40]) treewidgetitem1.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(count)) if serviceItem == itemcount and serviceItemCount == count: From d3564b2df7b122bd760caf60cbf42a62b00fb05e Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 6 Mar 2010 14:08:51 +0000 Subject: [PATCH 2/2] Fix translation --- openlp/core/ui/servicemanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 0c955f392..4b29fd7e7 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -430,7 +430,7 @@ class ServiceManager(QtGui.QWidget): serviceitem = item[u'service_item'] treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList) if len(serviceitem.notes) > 0: - title = self.trUtf8(u'(N) - %s' % serviceitem.title) + title = u'%s - %s' % (self.trUtf8('(N)'), serviceitem.title) else: title = serviceitem.title treewidgetitem.setText(0, title)