diff --git a/openlp/plugins/alerts/forms/alertdialog.py b/openlp/plugins/alerts/forms/alertdialog.py index 536b2297e..272a96f3d 100644 --- a/openlp/plugins/alerts/forms/alertdialog.py +++ b/openlp/plugins/alerts/forms/alertdialog.py @@ -29,81 +29,81 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import build_icon, translate class Ui_AlertDialog(object): - def setupUi(self, AlertDialog): - AlertDialog.setObjectName(u'AlertDialog') - AlertDialog.resize(400, 300) - AlertDialog.setWindowIcon(build_icon(u':/icon/openlp.org-icon-32.bmp')) - self.AlertDialogLayout = QtGui.QGridLayout(AlertDialog) - self.AlertDialogLayout.setObjectName(u'AlertDialogLayout') - self.AlertTextLayout = QtGui.QFormLayout() - self.AlertTextLayout.setObjectName(u'AlertTextLayout') - self.AlertEntryLabel = QtGui.QLabel(AlertDialog) - self.AlertEntryLabel.setObjectName(u'AlertEntryLabel') - self.AlertTextEdit = QtGui.QLineEdit(AlertDialog) - self.AlertTextEdit.setObjectName(u'AlertTextEdit') - self.AlertEntryLabel.setBuddy(self.AlertTextEdit) - self.AlertTextLayout.addRow(self.AlertEntryLabel, self.AlertTextEdit) - self.AlertParameter = QtGui.QLabel(AlertDialog) - self.AlertParameter.setObjectName(u'AlertParameter') - self.ParameterEdit = QtGui.QLineEdit(AlertDialog) - self.ParameterEdit.setObjectName(u'ParameterEdit') - self.AlertParameter.setBuddy(self.ParameterEdit) - self.AlertTextLayout.addRow(self.AlertParameter, self.ParameterEdit) - self.AlertDialogLayout.addLayout(self.AlertTextLayout, 0, 0, 1, 2) - self.AlertListWidget = QtGui.QListWidget(AlertDialog) - self.AlertListWidget.setAlternatingRowColors(True) - self.AlertListWidget.setObjectName(u'AlertListWidget') - self.AlertDialogLayout.addWidget(self.AlertListWidget, 1, 0) - self.ManageButtonLayout = QtGui.QVBoxLayout() - self.ManageButtonLayout.setObjectName(u'ManageButtonLayout') - self.NewButton = QtGui.QPushButton(AlertDialog) - self.NewButton.setIcon(build_icon(u':/general/general_new.png')) - self.NewButton.setObjectName(u'NewButton') - self.ManageButtonLayout.addWidget(self.NewButton) - self.SaveButton = QtGui.QPushButton(AlertDialog) - self.SaveButton.setEnabled(False) - self.SaveButton.setIcon(build_icon(u':/general/general_save.png')) - self.SaveButton.setObjectName(u'SaveButton') - self.ManageButtonLayout.addWidget(self.SaveButton) - self.DeleteButton = QtGui.QPushButton(AlertDialog) - self.DeleteButton.setIcon(build_icon(u':/general/general_delete.png')) - self.DeleteButton.setObjectName(u'DeleteButton') - self.ManageButtonLayout.addWidget(self.DeleteButton) - self.ManageButtonLayout.addStretch() - self.AlertDialogLayout.addLayout(self.ManageButtonLayout, 1, 1) - self.ButtonBox = QtGui.QDialogButtonBox(AlertDialog) - self.ButtonBox.addButton(QtGui.QDialogButtonBox.Close) + def setupUi(self, alertDialog): + alertDialog.setObjectName(u'alertDialog') + alertDialog.resize(400, 300) + alertDialog.setWindowIcon(build_icon(u':/icon/openlp.org-icon-32.bmp')) + self.alertDialogLayout = QtGui.QGridLayout(alertDialog) + self.alertDialogLayout.setObjectName(u'alertDialogLayout') + self.alertTextLayout = QtGui.QFormLayout() + self.alertTextLayout.setObjectName(u'alertTextLayout') + self.alertEntryLabel = QtGui.QLabel(alertDialog) + self.alertEntryLabel.setObjectName(u'alertEntryLabel') + self.alertTextEdit = QtGui.QLineEdit(alertDialog) + self.alertTextEdit.setObjectName(u'alertTextEdit') + self.alertEntryLabel.setBuddy(self.alertTextEdit) + self.alertTextLayout.addRow(self.alertEntryLabel, self.alertTextEdit) + self.alertParameter = QtGui.QLabel(alertDialog) + self.alertParameter.setObjectName(u'alertParameter') + self.parameterEdit = QtGui.QLineEdit(alertDialog) + self.parameterEdit.setObjectName(u'parameterEdit') + self.alertParameter.setBuddy(self.parameterEdit) + self.alertTextLayout.addRow(self.alertParameter, self.parameterEdit) + self.alertDialogLayout.addLayout(self.alertTextLayout, 0, 0, 1, 2) + self.alertListWidget = QtGui.QListWidget(alertDialog) + self.alertListWidget.setAlternatingRowColors(True) + self.alertListWidget.setObjectName(u'alertListWidget') + self.alertDialogLayout.addWidget(self.alertListWidget, 1, 0) + self.manageButtonLayout = QtGui.QVBoxLayout() + self.manageButtonLayout.setObjectName(u'manageButtonLayout') + self.newButton = QtGui.QPushButton(alertDialog) + self.newButton.setIcon(build_icon(u':/general/general_new.png')) + self.newButton.setObjectName(u'newButton') + self.manageButtonLayout.addWidget(self.newButton) + self.saveButton = QtGui.QPushButton(alertDialog) + self.saveButton.setEnabled(False) + self.saveButton.setIcon(build_icon(u':/general/general_save.png')) + self.saveButton.setObjectName(u'saveButton') + self.manageButtonLayout.addWidget(self.saveButton) + self.deleteButton = QtGui.QPushButton(alertDialog) + self.deleteButton.setIcon(build_icon(u':/general/general_delete.png')) + self.deleteButton.setObjectName(u'deleteButton') + self.manageButtonLayout.addWidget(self.deleteButton) + self.manageButtonLayout.addStretch() + self.alertDialogLayout.addLayout(self.manageButtonLayout, 1, 1) + self.buttonBox = QtGui.QDialogButtonBox(alertDialog) + self.buttonBox.addButton(QtGui.QDialogButtonBox.Close) displayIcon = build_icon(u':/general/general_live.png') - self.DisplayButton = QtGui.QPushButton(AlertDialog) - self.DisplayButton.setIcon(displayIcon) - self.DisplayButton.setObjectName(u'DisplayButton') - self.ButtonBox.addButton(self.DisplayButton, + self.displayButton = QtGui.QPushButton(alertDialog) + self.displayButton.setIcon(displayIcon) + self.displayButton.setObjectName(u'displayButton') + self.buttonBox.addButton(self.displayButton, QtGui.QDialogButtonBox.ActionRole) - self.DisplayCloseButton = QtGui.QPushButton(AlertDialog) - self.DisplayCloseButton.setIcon(displayIcon) - self.DisplayCloseButton.setObjectName(u'DisplayCloseButton') - self.ButtonBox.addButton(self.DisplayCloseButton, + self.displayCloseButton = QtGui.QPushButton(alertDialog) + self.displayCloseButton.setIcon(displayIcon) + self.displayCloseButton.setObjectName(u'displayCloseButton') + self.buttonBox.addButton(self.displayCloseButton, QtGui.QDialogButtonBox.ActionRole) - self.AlertDialogLayout.addWidget(self.ButtonBox, 2, 0, 1, 2) - self.retranslateUi(AlertDialog) - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'rejected()'), - AlertDialog.close) - QtCore.QMetaObject.connectSlotsByName(AlertDialog) + self.alertDialogLayout.addWidget(self.buttonBox, 2, 0, 1, 2) + self.retranslateUi(alertDialog) + QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'), + alertDialog.close) + QtCore.QMetaObject.connectSlotsByName(alertDialog) - def retranslateUi(self, AlertDialog): - AlertDialog.setWindowTitle( + def retranslateUi(self, alertDialog): + alertDialog.setWindowTitle( translate('AlertsPlugin.AlertForm', 'Alert Message')) - self.AlertEntryLabel.setText( + self.alertEntryLabel.setText( translate('AlertsPlugin.AlertForm', 'Alert &text:')) - self.AlertParameter.setText( + self.alertParameter.setText( translate('AlertsPlugin.AlertForm', '&Parameter:')) - self.NewButton.setText( + self.newButton.setText( translate('AlertsPlugin.AlertForm', '&New')) - self.SaveButton.setText( + self.saveButton.setText( translate('AlertsPlugin.AlertForm', '&Save')) - self.DeleteButton.setText( + self.deleteButton.setText( translate('AlertsPlugin.AlertForm', '&Delete')) - self.DisplayButton.setText( + self.displayButton.setText( translate('AlertsPlugin.AlertForm', 'Displ&ay')) - self.DisplayCloseButton.setText( + self.displayCloseButton.setText( translate('AlertsPlugin.AlertForm', 'Display && Cl&ose')) diff --git a/openlp/plugins/alerts/forms/alertform.py b/openlp/plugins/alerts/forms/alertform.py index 8e0d808a0..bd03b9171 100644 --- a/openlp/plugins/alerts/forms/alertform.py +++ b/openlp/plugins/alerts/forms/alertform.py @@ -44,62 +44,62 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog): self.item_id = None QtGui.QDialog.__init__(self, plugin.formparent) self.setupUi(self) - QtCore.QObject.connect(self.DisplayButton, QtCore.SIGNAL(u'clicked()'), + QtCore.QObject.connect(self.displayButton, QtCore.SIGNAL(u'clicked()'), self.onDisplayClicked) - QtCore.QObject.connect(self.DisplayCloseButton, + QtCore.QObject.connect(self.displayCloseButton, QtCore.SIGNAL(u'clicked()'), self.onDisplayCloseClicked) - QtCore.QObject.connect(self.AlertTextEdit, + QtCore.QObject.connect(self.alertTextEdit, QtCore.SIGNAL(u'textChanged(const QString&)'), self.onTextChanged) - QtCore.QObject.connect(self.NewButton, QtCore.SIGNAL(u'clicked()'), + QtCore.QObject.connect(self.newButton, QtCore.SIGNAL(u'clicked()'), self.onNewClick) - QtCore.QObject.connect(self.DeleteButton, QtCore.SIGNAL(u'clicked()'), + QtCore.QObject.connect(self.deleteButton, QtCore.SIGNAL(u'clicked()'), self.onDeleteClick) - QtCore.QObject.connect(self.SaveButton, QtCore.SIGNAL(u'clicked()'), + QtCore.QObject.connect(self.saveButton, QtCore.SIGNAL(u'clicked()'), self.onSaveClick) - QtCore.QObject.connect(self.AlertListWidget, + QtCore.QObject.connect(self.alertListWidget, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onDoubleClick) - QtCore.QObject.connect(self.AlertListWidget, + QtCore.QObject.connect(self.alertListWidget, QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSingleClick) def loadList(self): """ Loads the list with alerts. """ - self.AlertListWidget.clear() + self.alertListWidget.clear() alerts = self.manager.get_all_objects(AlertItem, order_by_ref=AlertItem.text) for alert in alerts: item_name = QtGui.QListWidgetItem(alert.text) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(alert.id)) - self.AlertListWidget.addItem(item_name) - self.SaveButton.setEnabled(False) - self.DeleteButton.setEnabled(False) + self.alertListWidget.addItem(item_name) + self.saveButton.setEnabled(False) + self.deleteButton.setEnabled(False) def onDisplayClicked(self): - if self.triggerAlert(unicode(self.AlertTextEdit.text())): + if self.triggerAlert(unicode(self.alertTextEdit.text())): self.loadList() def onDisplayCloseClicked(self): - if self.triggerAlert(unicode(self.AlertTextEdit.text())): + if self.triggerAlert(unicode(self.alertTextEdit.text())): self.close() def onDeleteClick(self): """ Deletes the selected item. """ - item = self.AlertListWidget.currentItem() + item = self.alertListWidget.currentItem() if item: item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] self.manager.delete_object(AlertItem, item_id) - row = self.AlertListWidget.row(item) - self.AlertListWidget.takeItem(row) + row = self.alertListWidget.row(item) + self.alertListWidget.takeItem(row) self.item_id = None - self.AlertTextEdit.setText(u'') - self.SaveButton.setEnabled(False) - self.DeleteButton.setEnabled(False) + self.alertTextEdit.setText(u'') + self.saveButton.setEnabled(False) + self.deleteButton.setEnabled(False) def onNewClick(self): - if len(self.AlertTextEdit.text()) == 0: + if len(self.alertTextEdit.text()) == 0: QtGui.QMessageBox.information(self, translate('AlertsPlugin.AlertForm', 'New Alert'), translate('AlertsPlugin.AlertForm', 'You haven\'t specified ' @@ -107,9 +107,9 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog): 'clicking New.')) else: alert = AlertItem() - alert.text = unicode(self.AlertTextEdit.text()) + alert.text = unicode(self.alertTextEdit.text()) self.manager.save_object(alert) - self.AlertTextEdit.setText(u'') + self.alertTextEdit.setText(u'') self.loadList() def onSaveClick(self): @@ -118,7 +118,7 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog): """ if self.item_id: alert = self.manager.get_object(AlertItem, self.item_id) - alert.text = unicode(self.AlertTextEdit.text()) + alert.text = unicode(self.alertTextEdit.text()) self.manager.save_object(alert) self.item_id = None self.loadList() @@ -129,36 +129,36 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog): """ # Only enable the button, if we are editing an item. if self.item_id: - self.SaveButton.setEnabled(True) + self.saveButton.setEnabled(True) def onDoubleClick(self): """ List item has been double clicked to display it """ - items = self.AlertListWidget.selectedIndexes() + items = self.alertListWidget.selectedIndexes() for item in items: - bitem = self.AlertListWidget.item(item.row()) + bitem = self.alertListWidget.item(item.row()) self.triggerAlert(unicode(bitem.text())) - self.AlertTextEdit.setText(unicode(bitem.text())) + self.alertTextEdit.setText(unicode(bitem.text())) self.item_id = (bitem.data(QtCore.Qt.UserRole)).toInt()[0] - self.SaveButton.setEnabled(False) - self.DeleteButton.setEnabled(True) + self.saveButton.setEnabled(False) + self.deleteButton.setEnabled(True) def onSingleClick(self): """ List item has been single clicked to add it to the edit field so it can be changed. """ - items = self.AlertListWidget.selectedIndexes() + items = self.alertListWidget.selectedIndexes() for item in items: - bitem = self.AlertListWidget.item(item.row()) - self.AlertTextEdit.setText(unicode(bitem.text())) + bitem = self.alertListWidget.item(item.row()) + self.alertTextEdit.setText(unicode(bitem.text())) self.item_id = (bitem.data(QtCore.Qt.UserRole)).toInt()[0] # If the alert does not contain '<>' we clear the ParameterEdit field. - if unicode(self.AlertTextEdit.text()).find(u'<>') == -1: - self.ParameterEdit.setText(u'') - self.SaveButton.setEnabled(False) - self.DeleteButton.setEnabled(True) + if unicode(self.alertTextEdit.text()).find(u'<>') == -1: + self.parameterEdit.setText(u'') + self.saveButton.setEnabled(False) + self.deleteButton.setEnabled(True) def triggerAlert(self, text): """ @@ -170,27 +170,27 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog): if text: # We found '<>' in the alert text, but the ParameterEdit field is # empty. - if text.find(u'<>') != -1 and not self.ParameterEdit.text() and \ + if text.find(u'<>') != -1 and not self.parameterEdit.text() and \ QtGui.QMessageBox.question(self, translate('AlertPlugin.AlertForm', 'No Parameter found'), translate('AlertPlugin.AlertForm', 'You have not entered a ' 'parameter to be replaced.\nDo you want to continue anyway?'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No: - self.ParameterEdit.setFocus() + self.parameterEdit.setFocus() return False # The ParameterEdit field is not empty, but we have not found '<>' # in the alert text. - elif text.find(u'<>') == -1 and self.ParameterEdit.text() and \ + elif text.find(u'<>') == -1 and self.parameterEdit.text() and \ QtGui.QMessageBox.question(self, translate('AlertPlugin.AlertForm', 'No Placeholder found'), translate('AlertPlugin.AlertForm', 'The alert text does not' ' contain \'<>\'.\nDo want to continue anyway?'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No: - self.ParameterEdit.setFocus() + self.parameterEdit.setFocus() return False - text = text.replace(u'<>', unicode(self.ParameterEdit.text())) + text = text.replace(u'<>', unicode(self.parameterEdit.text())) self.parent.alertsmanager.displayAlert(text) return True - return False \ No newline at end of file + return False