Clean up maintenance - Complete

This commit is contained in:
Tim Bentley 2010-03-19 07:23:48 +00:00
parent 66b23f6a6f
commit 09f18fd96d
2 changed files with 45 additions and 31 deletions

View File

@ -1,55 +1,73 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
# Form implementation generated from reading ui file 'serviceitemeditdialog.ui' ###############################################################################
# # OpenLP - Open Source Lyrics Projection #
# Created: Thu Mar 18 22:05:22 2010 # --------------------------------------------------------------------------- #
# by: PyQt4 UI code generator 4.7 # Copyright (c) 2008-2010 Raoul Snyman #
# # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# WARNING! All changes made in this file will be lost! # 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 from PyQt4 import QtCore, QtGui
class Ui_ServiceItemEditDialog(object): class Ui_ServiceItemEditDialog(object):
def setupUi(self, ServiceItemEditDialog): def setupUi(self, ServiceItemEditDialog):
ServiceItemEditDialog.setObjectName("ServiceItemEditDialog") ServiceItemEditDialog.setObjectName(u'ServiceItemEditDialog')
ServiceItemEditDialog.resize(386, 272) ServiceItemEditDialog.resize(386, 272)
self.layoutWidget = QtGui.QWidget(ServiceItemEditDialog) self.layoutWidget = QtGui.QWidget(ServiceItemEditDialog)
self.layoutWidget.setGeometry(QtCore.QRect(20, 20, 351, 241)) 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 = QtGui.QVBoxLayout(self.layoutWidget)
self.outerLayout.setObjectName("outerLayout") self.outerLayout.setObjectName(u'outerLayout')
self.topLayout = QtGui.QHBoxLayout() self.topLayout = QtGui.QHBoxLayout()
self.topLayout.setObjectName("topLayout") self.topLayout.setObjectName(u'topLayout')
self.listWidget = QtGui.QListWidget(self.layoutWidget) self.listWidget = QtGui.QListWidget(self.layoutWidget)
self.listWidget.setAlternatingRowColors(True) self.listWidget.setAlternatingRowColors(True)
self.listWidget.setObjectName("listWidget") self.listWidget.setObjectName(u'listWidget')
self.topLayout.addWidget(self.listWidget) self.topLayout.addWidget(self.listWidget)
self.buttonLayout = QtGui.QVBoxLayout() self.buttonLayout = QtGui.QVBoxLayout()
self.buttonLayout.setObjectName("buttonLayout") self.buttonLayout.setObjectName(u'buttonLayout')
self.upButton = QtGui.QPushButton(self.layoutWidget) self.upButton = QtGui.QPushButton(self.layoutWidget)
self.upButton.setObjectName("upButton") self.upButton.setObjectName(u'upButton')
self.buttonLayout.addWidget(self.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.buttonLayout.addItem(spacerItem)
self.deleteButton = QtGui.QPushButton(self.layoutWidget) self.deleteButton = QtGui.QPushButton(self.layoutWidget)
self.deleteButton.setObjectName("deleteButton") self.deleteButton.setObjectName(u'deleteButton')
self.buttonLayout.addWidget(self.deleteButton) self.buttonLayout.addWidget(self.deleteButton)
self.downButton = QtGui.QPushButton(self.layoutWidget) self.downButton = QtGui.QPushButton(self.layoutWidget)
self.downButton.setObjectName("downButton") self.downButton.setObjectName(u'downButton')
self.buttonLayout.addWidget(self.downButton) self.buttonLayout.addWidget(self.downButton)
self.topLayout.addLayout(self.buttonLayout) self.topLayout.addLayout(self.buttonLayout)
self.outerLayout.addLayout(self.topLayout) self.outerLayout.addLayout(self.topLayout)
self.buttonBox = QtGui.QDialogButtonBox(self.layoutWidget) self.buttonBox = QtGui.QDialogButtonBox(self.layoutWidget)
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) self.buttonBox.setStandardButtons(
self.buttonBox.setObjectName("buttonBox") QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
self.buttonBox.setObjectName(u'buttonBox')
self.outerLayout.addWidget(self.buttonBox) self.outerLayout.addWidget(self.buttonBox)
self.retranslateUi(ServiceItemEditDialog) self.retranslateUi(ServiceItemEditDialog)
QtCore.QMetaObject.connectSlotsByName(ServiceItemEditDialog) QtCore.QMetaObject.connectSlotsByName(ServiceItemEditDialog)
def retranslateUi(self, ServiceItemEditDialog): def retranslateUi(self, ServiceItemEditDialog):
ServiceItemEditDialog.setWindowTitle(QtGui.QApplication.translate("ServiceItemEditDialog", "Service Item Maintenance", None, QtGui.QApplication.UnicodeUTF8)) ServiceItemEditDialog.setWindowTitle(self.trUtf8('Service Item Maintenance'))
self.upButton.setText(QtGui.QApplication.translate("ServiceItemEditDialog", "Up", None, QtGui.QApplication.UnicodeUTF8)) self.upButton.setText(self.trUtf8('Up'))
self.deleteButton.setText(QtGui.QApplication.translate("ServiceItemEditDialog", "Delete", None, QtGui.QApplication.UnicodeUTF8)) self.deleteButton.setText(self.trUtf8('Delete'))
self.downButton.setText(QtGui.QApplication.translate("ServiceItemEditDialog", "Down", None, QtGui.QApplication.UnicodeUTF8)) self.downButton.setText(self.trUtf8('Down'))

View File

@ -81,20 +81,17 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
def onItemDelete(self): def onItemDelete(self):
""" """
Move the current ServiceItem up in the list Delete the selected row
Note move up means move to top of area ie 0.
""" """
items = self.listWidget.selectedItems() items = self.listWidget.selectedItems()
for item in items: for item in items:
row = self.listWidget.row(item) row = self.listWidget.row(item)
if row > 0: self.itemList.remove(self.itemList[row])
self.itemList.remove(self.itemList[row]) self.loadData()
self.loadData()
def onItemUp(self): def onItemUp(self):
""" """
Move the current ServiceItem up in the list Move the selected row up in the list
Note move up means move to top of area ie 0.
""" """
items = self.listWidget.selectedItems() items = self.listWidget.selectedItems()
for item in items: for item in items:
@ -107,8 +104,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
def onItemDown(self): def onItemDown(self):
""" """
Move the current ServiceItem down in the list Move the selected row down in the list
Note move down means move to bottom of area i.e len().
""" """
items = self.listWidget.selectedItems() items = self.listWidget.selectedItems()
for item in items: for item in items: