diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py index bb1666418..b388fb98c 100644 --- a/openlp/core/ui/serviceitemeditdialog.py +++ b/openlp/core/ui/serviceitemeditdialog.py @@ -1,55 +1,73 @@ # -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -# Form implementation generated from reading ui file 'serviceitemeditdialog.ui' -# -# Created: Thu Mar 18 22:05:22 2010 -# by: PyQt4 UI code generator 4.7 -# -# WARNING! All changes made in this file will be lost! +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2010 Raoul Snyman # +# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # +# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # +# Carsten Tinggaard # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### from PyQt4 import QtCore, QtGui class Ui_ServiceItemEditDialog(object): def setupUi(self, ServiceItemEditDialog): - ServiceItemEditDialog.setObjectName("ServiceItemEditDialog") + ServiceItemEditDialog.setObjectName(u'ServiceItemEditDialog') ServiceItemEditDialog.resize(386, 272) self.layoutWidget = QtGui.QWidget(ServiceItemEditDialog) self.layoutWidget.setGeometry(QtCore.QRect(20, 20, 351, 241)) - self.layoutWidget.setObjectName("layoutWidget") + self.layoutWidget.setObjectName(u'layoutWidget') self.outerLayout = QtGui.QVBoxLayout(self.layoutWidget) - self.outerLayout.setObjectName("outerLayout") + self.outerLayout.setObjectName(u'outerLayout') self.topLayout = QtGui.QHBoxLayout() - self.topLayout.setObjectName("topLayout") + self.topLayout.setObjectName(u'topLayout') self.listWidget = QtGui.QListWidget(self.layoutWidget) self.listWidget.setAlternatingRowColors(True) - self.listWidget.setObjectName("listWidget") + self.listWidget.setObjectName(u'listWidget') self.topLayout.addWidget(self.listWidget) self.buttonLayout = QtGui.QVBoxLayout() - self.buttonLayout.setObjectName("buttonLayout") + self.buttonLayout.setObjectName(u'buttonLayout') self.upButton = QtGui.QPushButton(self.layoutWidget) - self.upButton.setObjectName("upButton") + self.upButton.setObjectName(u'upButton') self.buttonLayout.addWidget(self.upButton) - spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + spacerItem = QtGui.QSpacerItem(20, 40, + QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.buttonLayout.addItem(spacerItem) self.deleteButton = QtGui.QPushButton(self.layoutWidget) - self.deleteButton.setObjectName("deleteButton") + self.deleteButton.setObjectName(u'deleteButton') self.buttonLayout.addWidget(self.deleteButton) self.downButton = QtGui.QPushButton(self.layoutWidget) - self.downButton.setObjectName("downButton") + self.downButton.setObjectName(u'downButton') self.buttonLayout.addWidget(self.downButton) self.topLayout.addLayout(self.buttonLayout) self.outerLayout.addLayout(self.topLayout) self.buttonBox = QtGui.QDialogButtonBox(self.layoutWidget) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) - self.buttonBox.setObjectName("buttonBox") + self.buttonBox.setStandardButtons( + QtGui.QDialogButtonBox.Cancel|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(QtGui.QApplication.translate("ServiceItemEditDialog", "Service Item Maintenance", None, QtGui.QApplication.UnicodeUTF8)) - self.upButton.setText(QtGui.QApplication.translate("ServiceItemEditDialog", "Up", None, QtGui.QApplication.UnicodeUTF8)) - self.deleteButton.setText(QtGui.QApplication.translate("ServiceItemEditDialog", "Delete", None, QtGui.QApplication.UnicodeUTF8)) - self.downButton.setText(QtGui.QApplication.translate("ServiceItemEditDialog", "Down", None, QtGui.QApplication.UnicodeUTF8)) + ServiceItemEditDialog.setWindowTitle(self.trUtf8('Service Item Maintenance')) + self.upButton.setText(self.trUtf8('Up')) + self.deleteButton.setText(self.trUtf8('Delete')) + self.downButton.setText(self.trUtf8('Down')) diff --git a/openlp/core/ui/serviceitemeditform.py b/openlp/core/ui/serviceitemeditform.py index cbe530d80..4293e15c8 100644 --- a/openlp/core/ui/serviceitemeditform.py +++ b/openlp/core/ui/serviceitemeditform.py @@ -81,20 +81,17 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog): def onItemDelete(self): """ - Move the current ServiceItem up in the list - Note move up means move to top of area ie 0. + Delete the selected row """ items = self.listWidget.selectedItems() for item in items: row = self.listWidget.row(item) - if row > 0: - self.itemList.remove(self.itemList[row]) - self.loadData() + self.itemList.remove(self.itemList[row]) + self.loadData() def onItemUp(self): """ - Move the current ServiceItem up in the list - Note move up means move to top of area ie 0. + Move the selected row up in the list """ items = self.listWidget.selectedItems() for item in items: @@ -107,8 +104,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog): def onItemDown(self): """ - Move the current ServiceItem down in the list - Note move down means move to bottom of area i.e len(). + Move the selected row down in the list """ items = self.listWidget.selectedItems() for item in items: