From c8e5f9c07e483d227f3662d6a3457ac97faa755d Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 24 Oct 2010 13:00:20 +0200 Subject: [PATCH 1/2] fixed traceback after editing image item, icons for down/up buttons --- openlp/core/ui/serviceitemeditdialog.py | 26 ++++++++++++++++-------- openlp/core/ui/servicemanager.py | 2 +- resources/forms/serviceitemeditdialog.ui | 22 ++++++++++++++------ 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py index 383f34f72..222808ddf 100644 --- a/openlp/core/ui/serviceitemeditdialog.py +++ b/openlp/core/ui/serviceitemeditdialog.py @@ -25,6 +25,7 @@ ############################################################################### from PyQt4 import QtCore, QtGui + from openlp.core.lib import translate class Ui_ServiceItemEditDialog(object): @@ -44,16 +45,26 @@ class Ui_ServiceItemEditDialog(object): self.topLayout.addWidget(self.listWidget) self.buttonLayout = QtGui.QVBoxLayout() self.buttonLayout.setObjectName(u'buttonLayout') - self.upButton = QtGui.QPushButton(self.layoutWidget) - self.upButton.setObjectName(u'upButton') - self.buttonLayout.addWidget(self.upButton) - spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, - QtGui.QSizePolicy.Expanding) - self.buttonLayout.addItem(spacerItem) self.deleteButton = QtGui.QPushButton(self.layoutWidget) self.deleteButton.setObjectName(u'deleteButton') self.buttonLayout.addWidget(self.deleteButton) + spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, + QtGui.QSizePolicy.Expanding) + self.buttonLayout.addItem(spacerItem) + self.upButton = QtGui.QPushButton(self.layoutWidget) + self.upButton.setText(u'') + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(u':/services/service_up.png'), + QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.upButton.setIcon(icon) + self.upButton.setObjectName(u'upButton') + self.buttonLayout.addWidget(self.upButton) self.downButton = QtGui.QPushButton(self.layoutWidget) + self.downButton.setText(u'') + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(u':/services/service_down.png'), + QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.downButton.setIcon(icon) self.downButton.setObjectName(u'downButton') self.buttonLayout.addWidget(self.downButton) self.topLayout.addLayout(self.buttonLayout) @@ -63,14 +74,11 @@ class Ui_ServiceItemEditDialog(object): QtGui.QDialogButtonBox.Save) self.buttonBox.setObjectName(u'buttonBox') self.outerLayout.addWidget(self.buttonBox) - self.retranslateUi(serviceItemEditDialog) QtCore.QMetaObject.connectSlotsByName(serviceItemEditDialog) def retranslateUi(self, serviceItemEditDialog): serviceItemEditDialog.setWindowTitle( translate('OpenLP.ServiceItemEditForm', 'Reorder Service Item')) - self.upButton.setText(translate('OpenLP.ServiceItemEditForm', 'Up')) self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm', 'Delete')) - self.downButton.setText(translate('OpenLP.ServiceItemEditForm', 'Down')) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index b1140eb49..2bf6394cd 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -346,7 +346,7 @@ class ServiceManager(QtGui.QWidget): self.serviceItems[item][u'service_item']) if self.serviceItemEditForm.exec_(): self.addServiceItem(self.serviceItemEditForm.getServiceItem(), - replace=True, expand=self.serviceItems[item][u'expand']) + replace=True, expand=self.serviceItems[item][u'expanded']) def nextItem(self): """ diff --git a/resources/forms/serviceitemeditdialog.ui b/resources/forms/serviceitemeditdialog.ui index 24c86b966..c5e73ce04 100644 --- a/resources/forms/serviceitemeditdialog.ui +++ b/resources/forms/serviceitemeditdialog.ui @@ -35,9 +35,9 @@ - + - Up + Delete @@ -55,16 +55,24 @@ - + - Delete + + + + + :/services/service_up.png:/services/service_up.png - Down + + + + + :/services/service_down.png:/services/service_down.png @@ -82,6 +90,8 @@ - + + + From 8d82715924dae1948f58aa742b5a092b342b5937 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 24 Oct 2010 13:08:46 +0200 Subject: [PATCH 2/2] added empty lines --- openlp/core/ui/serviceitemeditdialog.py | 1 + openlp/plugins/custom/forms/editcustomdialog.py | 1 + 2 files changed, 2 insertions(+) diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py index 222808ddf..215cc6146 100644 --- a/openlp/core/ui/serviceitemeditdialog.py +++ b/openlp/core/ui/serviceitemeditdialog.py @@ -74,6 +74,7 @@ class Ui_ServiceItemEditDialog(object): QtGui.QDialogButtonBox.Save) self.buttonBox.setObjectName(u'buttonBox') self.outerLayout.addWidget(self.buttonBox) + self.retranslateUi(serviceItemEditDialog) QtCore.QMetaObject.connectSlotsByName(serviceItemEditDialog) diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py index 89cd0b6df..1b16c6236 100644 --- a/openlp/plugins/custom/forms/editcustomdialog.py +++ b/openlp/plugins/custom/forms/editcustomdialog.py @@ -110,6 +110,7 @@ class Ui_CustomEditDialog(object): self.titleEdit.setObjectName(u'titleEdit') self.horizontalLayout.addWidget(self.titleEdit) self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1) + self.retranslateUi(customEditDialog) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'), customEditDialog.accept)