From 4e296bfb5f0232d312c08333b2419f1aab563ca2 Mon Sep 17 00:00:00 2001 From: rimach Date: Sat, 1 May 2010 21:45:06 +0200 Subject: [PATCH] changes --- openlp/core/ui/aboutdialog.py | 38 +++---- openlp/core/ui/amendthemedialog.py | 102 +++++++++--------- openlp/core/ui/plugindialog.py | 26 ++--- openlp/core/ui/serviceitemeditdialog.py | 16 +-- openlp/core/ui/servicenotedialog.py | 16 +-- openlp/core/ui/settingsdialog.py | 24 ++--- openlp/plugins/alerts/forms/alertdialog.py | 70 ++++++------ .../plugins/bibles/forms/bibleimportwizard.py | 28 ++--- .../plugins/custom/forms/editcustomdialog.py | 66 ++++++------ openlp/plugins/songs/forms/authorsdialog.py | 34 +++--- openlp/plugins/songs/forms/editsongdialog.py | 78 +++++++------- openlp/plugins/songs/forms/editversedialog.py | 22 ++-- .../plugins/songs/forms/openlpexportdialog.py | 28 ++--- .../plugins/songs/forms/openlpimportdialog.py | 28 ++--- .../songs/forms/opensongexportdialog.py | 28 ++--- .../songs/forms/opensongimportdialog.py | 26 ++--- openlp/plugins/songs/forms/songbookdialog.py | 30 +++--- .../songs/forms/songmaintenancedialog.py | 24 ++--- openlp/plugins/songs/forms/topicsdialog.py | 26 ++--- .../songusage/forms/songusagedeletedialog.py | 22 ++-- .../songusage/forms/songusagedetaildialog.py | 26 ++--- 21 files changed, 379 insertions(+), 379 deletions(-) diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index 8c351b17c..fac8874f5 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -27,25 +27,25 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_AboutDialog(object): - def setupUi(self, AboutForm): - AboutForm.setObjectName(u'AboutDialog') - AboutForm.resize(516, 481) + def setupUi(self, AboutDialog): + AboutDialog.setObjectName(u'AboutDialog') + AboutDialog.resize(516, 481) LogoIcon = QtGui.QIcon() LogoIcon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - AboutForm.setWindowIcon(LogoIcon) - self.AboutFormLayout = QtGui.QVBoxLayout(AboutForm) - self.AboutFormLayout.setSpacing(8) - self.AboutFormLayout.setMargin(8) - self.AboutFormLayout.setObjectName(u'AboutFormLayout') - self.LogoLabel = QtGui.QLabel(AboutForm) + AboutDialog.setWindowIcon(LogoIcon) + self.AboutDialogLayout = QtGui.QVBoxLayout(AboutDialog) + self.AboutDialogLayout.setSpacing(8) + self.AboutDialogLayout.setMargin(8) + self.AboutDialogLayout.setObjectName(u'AboutDialogLayout') + self.LogoLabel = QtGui.QLabel(AboutDialog) self.LogoLabel.setPixmap( QtGui.QPixmap(u':/graphics/openlp-about-logo.png')) self.LogoLabel.setScaledContents(False) self.LogoLabel.setIndent(0) self.LogoLabel.setObjectName(u'LogoLabel') - self.AboutFormLayout.addWidget(self.LogoLabel) - self.AboutNotebook = QtGui.QTabWidget(AboutForm) + self.AboutDialogLayout.addWidget(self.LogoLabel) + self.AboutNotebook = QtGui.QTabWidget(AboutDialog) self.AboutNotebook.setObjectName(u'AboutNotebook') self.AboutTab = QtGui.QWidget() self.AboutTab.setObjectName(u'AboutTab') @@ -80,8 +80,8 @@ class Ui_AboutDialog(object): self.LicenseTextEdit.setObjectName(u'LicenseTextEdit') self.LicenseTabLayout.addWidget(self.LicenseTextEdit) self.AboutNotebook.addTab(self.LicenseTab, '') - self.AboutFormLayout.addWidget(self.AboutNotebook) - self.ButtonWidget = QtGui.QWidget(AboutForm) + self.AboutDialogLayout.addWidget(self.AboutNotebook) + self.ButtonWidget = QtGui.QWidget(AboutDialog) self.ButtonWidget.setObjectName(u'ButtonWidget') self.ButtonWidgetLayout = QtGui.QHBoxLayout(self.ButtonWidget) self.ButtonWidgetLayout.setSpacing(8) @@ -105,16 +105,16 @@ class Ui_AboutDialog(object): self.CloseButton.setIcon(CloseIcon) self.CloseButton.setObjectName(u'CloseButton') self.ButtonWidgetLayout.addWidget(self.CloseButton) - self.AboutFormLayout.addWidget(self.ButtonWidget) + self.AboutDialogLayout.addWidget(self.ButtonWidget) - self.retranslateUi(AboutForm) + self.retranslateUi(AboutDialog) self.AboutNotebook.setCurrentIndex(0) QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL(u'clicked()'), - AboutForm.close) - QtCore.QMetaObject.connectSlotsByName(AboutForm) + AboutDialog.close) + QtCore.QMetaObject.connectSlotsByName(AboutDialog) - def retranslateUi(self, AboutForm): - AboutForm.setWindowTitle(translate('AboutForm', 'About OpenLP')) + def retranslateUi(self, AboutDialog): + AboutDialog.setWindowTitle(translate('AboutForm', 'About OpenLP')) self.AboutTextEdit.setPlainText(translate('AboutForm', 'OpenLP - Open Source Lyrics ' 'Projection\n' diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py index 00000f23d..34c3573da 100644 --- a/openlp/core/ui/amendthemedialog.py +++ b/openlp/core/ui/amendthemedialog.py @@ -28,18 +28,18 @@ from openlp.core.lib import build_icon from openlp.core.lib import translate class Ui_AmendThemeDialog(object): - def setupUi(self, AmendThemeForm): - AmendThemeForm.setObjectName(u'AmendThemeDialog') - AmendThemeForm.setWindowModality(QtCore.Qt.ApplicationModal) - AmendThemeForm.resize(586, 651) + def setupUi(self, AmendThemeDialog): + AmendThemeDialog.setObjectName(u'AmendThemeDialog') + AmendThemeDialog.setWindowModality(QtCore.Qt.ApplicationModal) + AmendThemeDialog.resize(586, 651) icon = build_icon(u':/icon/openlp-logo-16x16.png') - AmendThemeForm.setWindowIcon(icon) - AmendThemeForm.setModal(True) - self.AmendThemeLayout = QtGui.QVBoxLayout(AmendThemeForm) + AmendThemeDialog.setWindowIcon(icon) + AmendThemeDialog.setModal(True) + self.AmendThemeLayout = QtGui.QVBoxLayout(AmendThemeDialog) self.AmendThemeLayout.setSpacing(8) self.AmendThemeLayout.setMargin(8) self.AmendThemeLayout.setObjectName(u'AmendThemeLayout') - self.ThemeNameWidget = QtGui.QWidget(AmendThemeForm) + self.ThemeNameWidget = QtGui.QWidget(AmendThemeDialog) self.ThemeNameWidget.setObjectName(u'ThemeNameWidget') self.ThemeNameLayout = QtGui.QHBoxLayout(self.ThemeNameWidget) self.ThemeNameLayout.setSpacing(8) @@ -52,7 +52,7 @@ class Ui_AmendThemeDialog(object): self.ThemeNameEdit.setObjectName(u'ThemeNameEdit') self.ThemeNameLayout.addWidget(self.ThemeNameEdit) self.AmendThemeLayout.addWidget(self.ThemeNameWidget) - self.ContentWidget = QtGui.QWidget(AmendThemeForm) + self.ContentWidget = QtGui.QWidget(AmendThemeDialog) self.ContentWidget.setObjectName(u'ContentWidget') self.ContentLayout = QtGui.QHBoxLayout(self.ContentWidget) self.ContentLayout.setSpacing(8) @@ -532,7 +532,7 @@ class Ui_AmendThemeDialog(object): self.ThemeTabWidget.addTab(self.OtherOptionsTab, u'') self.ContentLayout.addWidget(self.ThemeTabWidget) self.AmendThemeLayout.addWidget(self.ContentWidget) - self.PreviewGroupBox = QtGui.QGroupBox(AmendThemeForm) + self.PreviewGroupBox = QtGui.QGroupBox(AmendThemeDialog) self.PreviewGroupBox.setObjectName(u'PreviewGroupBox') self.ThemePreviewLayout = QtGui.QHBoxLayout(self.PreviewGroupBox) self.ThemePreviewLayout.setSpacing(8) @@ -556,53 +556,53 @@ class Ui_AmendThemeDialog(object): spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) self.ThemePreviewLayout.addItem(spacerItem8) self.AmendThemeLayout.addWidget(self.PreviewGroupBox) - self.ThemeButtonBox = QtGui.QDialogButtonBox(AmendThemeForm) + self.ThemeButtonBox = QtGui.QDialogButtonBox(AmendThemeDialog) self.ThemeButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) self.ThemeButtonBox.setObjectName(u'ThemeButtonBox') self.AmendThemeLayout.addWidget(self.ThemeButtonBox) - self.retranslateUi(AmendThemeForm) + self.retranslateUi(AmendThemeDialog) self.ThemeTabWidget.setCurrentIndex(0) - QtCore.QObject.connect(self.ThemeButtonBox, QtCore.SIGNAL(u'accepted()'), AmendThemeForm.accept) - QtCore.QObject.connect(self.ThemeButtonBox, QtCore.SIGNAL(u'rejected()'), AmendThemeForm.reject) - QtCore.QMetaObject.connectSlotsByName(AmendThemeForm) - AmendThemeForm.setTabOrder(self.ThemeButtonBox, self.ThemeNameEdit) - AmendThemeForm.setTabOrder(self.ThemeNameEdit, self.ThemeTabWidget) - AmendThemeForm.setTabOrder(self.ThemeTabWidget, self.BackgroundComboBox) - AmendThemeForm.setTabOrder(self.BackgroundComboBox, self.BackgroundTypeComboBox) - AmendThemeForm.setTabOrder(self.BackgroundTypeComboBox, self.Color1PushButton) - AmendThemeForm.setTabOrder(self.Color1PushButton, self.Color2PushButton) - AmendThemeForm.setTabOrder(self.Color2PushButton, self.ImageLineEdit) - AmendThemeForm.setTabOrder(self.ImageLineEdit, self.ImageToolButton) - AmendThemeForm.setTabOrder(self.ImageToolButton, self.GradientComboBox) - AmendThemeForm.setTabOrder(self.GradientComboBox, self.FontMainComboBox) - AmendThemeForm.setTabOrder(self.FontMainComboBox, self.FontMainColorPushButton) - AmendThemeForm.setTabOrder(self.FontMainColorPushButton, self.FontMainSizeSpinBox) - AmendThemeForm.setTabOrder(self.FontMainSizeSpinBox, self.FontMainWeightComboBox) - AmendThemeForm.setTabOrder(self.FontMainWeightComboBox, self.FontMainLineSpacingSpinBox) - AmendThemeForm.setTabOrder(self.FontMainLineSpacingSpinBox, self.FontMainDefaultCheckBox) - AmendThemeForm.setTabOrder(self.FontMainDefaultCheckBox, self.FontMainXSpinBox) - AmendThemeForm.setTabOrder(self.FontMainXSpinBox, self.FontMainYSpinBox) - AmendThemeForm.setTabOrder(self.FontMainYSpinBox, self.FontMainWidthSpinBox) - AmendThemeForm.setTabOrder(self.FontMainWidthSpinBox, self.FontMainHeightSpinBox) - AmendThemeForm.setTabOrder(self.FontMainHeightSpinBox, self.FontFooterComboBox) - AmendThemeForm.setTabOrder(self.FontFooterComboBox, self.FontFooterColorPushButton) - AmendThemeForm.setTabOrder(self.FontFooterColorPushButton, self.FontFooterSizeSpinBox) - AmendThemeForm.setTabOrder(self.FontFooterSizeSpinBox, self.FontFooterWeightComboBox) - AmendThemeForm.setTabOrder(self.FontFooterWeightComboBox, self.FontFooterDefaultCheckBox) - AmendThemeForm.setTabOrder(self.FontFooterDefaultCheckBox, self.FontFooterXSpinBox) - AmendThemeForm.setTabOrder(self.FontFooterXSpinBox, self.FontFooterYSpinBox) - AmendThemeForm.setTabOrder(self.FontFooterYSpinBox, self.FontFooterWidthSpinBox) - AmendThemeForm.setTabOrder(self.FontFooterWidthSpinBox, self.FontFooterHeightSpinBox) - AmendThemeForm.setTabOrder(self.FontFooterHeightSpinBox, self.OutlineCheckBox) - AmendThemeForm.setTabOrder(self.OutlineCheckBox, self.OutlineColorPushButton) - AmendThemeForm.setTabOrder(self.OutlineColorPushButton, self.ShadowCheckBox) - AmendThemeForm.setTabOrder(self.ShadowCheckBox, self.ShadowColorPushButton) - AmendThemeForm.setTabOrder(self.ShadowColorPushButton, self.HorizontalComboBox) - AmendThemeForm.setTabOrder(self.HorizontalComboBox, self.VerticalComboBox) + QtCore.QObject.connect(self.ThemeButtonBox, QtCore.SIGNAL(u'accepted()'), AmendThemeDialog.accept) + QtCore.QObject.connect(self.ThemeButtonBox, QtCore.SIGNAL(u'rejected()'), AmendThemeDialog.reject) + QtCore.QMetaObject.connectSlotsByName(AmendThemeDialog) + AmendThemeDialog.setTabOrder(self.ThemeButtonBox, self.ThemeNameEdit) + AmendThemeDialog.setTabOrder(self.ThemeNameEdit, self.ThemeTabWidget) + AmendThemeDialog.setTabOrder(self.ThemeTabWidget, self.BackgroundComboBox) + AmendThemeDialog.setTabOrder(self.BackgroundComboBox, self.BackgroundTypeComboBox) + AmendThemeDialog.setTabOrder(self.BackgroundTypeComboBox, self.Color1PushButton) + AmendThemeDialog.setTabOrder(self.Color1PushButton, self.Color2PushButton) + AmendThemeDialog.setTabOrder(self.Color2PushButton, self.ImageLineEdit) + AmendThemeDialog.setTabOrder(self.ImageLineEdit, self.ImageToolButton) + AmendThemeDialog.setTabOrder(self.ImageToolButton, self.GradientComboBox) + AmendThemeDialog.setTabOrder(self.GradientComboBox, self.FontMainComboBox) + AmendThemeDialog.setTabOrder(self.FontMainComboBox, self.FontMainColorPushButton) + AmendThemeDialog.setTabOrder(self.FontMainColorPushButton, self.FontMainSizeSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainSizeSpinBox, self.FontMainWeightComboBox) + AmendThemeDialog.setTabOrder(self.FontMainWeightComboBox, self.FontMainLineSpacingSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainLineSpacingSpinBox, self.FontMainDefaultCheckBox) + AmendThemeDialog.setTabOrder(self.FontMainDefaultCheckBox, self.FontMainXSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainXSpinBox, self.FontMainYSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainYSpinBox, self.FontMainWidthSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainWidthSpinBox, self.FontMainHeightSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainHeightSpinBox, self.FontFooterComboBox) + AmendThemeDialog.setTabOrder(self.FontFooterComboBox, self.FontFooterColorPushButton) + AmendThemeDialog.setTabOrder(self.FontFooterColorPushButton, self.FontFooterSizeSpinBox) + AmendThemeDialog.setTabOrder(self.FontFooterSizeSpinBox, self.FontFooterWeightComboBox) + AmendThemeDialog.setTabOrder(self.FontFooterWeightComboBox, self.FontFooterDefaultCheckBox) + AmendThemeDialog.setTabOrder(self.FontFooterDefaultCheckBox, self.FontFooterXSpinBox) + AmendThemeDialog.setTabOrder(self.FontFooterXSpinBox, self.FontFooterYSpinBox) + AmendThemeDialog.setTabOrder(self.FontFooterYSpinBox, self.FontFooterWidthSpinBox) + AmendThemeDialog.setTabOrder(self.FontFooterWidthSpinBox, self.FontFooterHeightSpinBox) + AmendThemeDialog.setTabOrder(self.FontFooterHeightSpinBox, self.OutlineCheckBox) + AmendThemeDialog.setTabOrder(self.OutlineCheckBox, self.OutlineColorPushButton) + AmendThemeDialog.setTabOrder(self.OutlineColorPushButton, self.ShadowCheckBox) + AmendThemeDialog.setTabOrder(self.ShadowCheckBox, self.ShadowColorPushButton) + AmendThemeDialog.setTabOrder(self.ShadowColorPushButton, self.HorizontalComboBox) + AmendThemeDialog.setTabOrder(self.HorizontalComboBox, self.VerticalComboBox) - def retranslateUi(self, AmendThemeForm): - AmendThemeForm.setWindowTitle(translate('AmendThemeForm', 'Theme Maintenance')) + def retranslateUi(self, AmendThemeDialog): + AmendThemeDialog.setWindowTitle(translate('AmendThemeForm', 'Theme Maintenance')) self.ThemeNameLabel.setText(translate('AmendThemeForm', 'Theme Name:')) self.BackgroundLabel.setText(translate('AmendThemeForm', 'Background:')) self.BackgroundComboBox.setItemText(0, translate('AmendThemeForm', 'Opaque')) diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py index 3e94d91b6..e9c205e20 100644 --- a/openlp/core/ui/plugindialog.py +++ b/openlp/core/ui/plugindialog.py @@ -27,18 +27,18 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_PluginViewDialog(object): - def setupUi(self, PluginForm): - PluginForm.setObjectName(u'PluginViewDialog') - PluginForm.setWindowModality(QtCore.Qt.ApplicationModal) - PluginForm.resize(554, 344) - self.PluginLayout = QtGui.QVBoxLayout(PluginForm) + def setupUi(self, PluginViewDialog): + PluginViewDialog.setObjectName(u'PluginViewDialog') + PluginViewDialog.setWindowModality(QtCore.Qt.ApplicationModal) + PluginViewDialog.resize(554, 344) + self.PluginLayout = QtGui.QVBoxLayout(PluginViewDialog) self.PluginLayout.setSpacing(8) self.PluginLayout.setMargin(8) self.PluginLayout.setObjectName(u'PluginLayout') self.ListLayout = QtGui.QHBoxLayout() self.ListLayout.setSpacing(8) self.ListLayout.setObjectName(u'ListLayout') - self.PluginListWidget = QtGui.QListWidget(PluginForm) + self.PluginListWidget = QtGui.QListWidget(PluginViewDialog) sizePolicy = QtGui.QSizePolicy( QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) @@ -49,7 +49,7 @@ class Ui_PluginViewDialog(object): self.PluginListWidget.setMaximumSize(QtCore.QSize(192, 16777215)) self.PluginListWidget.setObjectName(u'PluginListWidget') self.ListLayout.addWidget(self.PluginListWidget) - self.PluginInfoGroupBox = QtGui.QGroupBox(PluginForm) + self.PluginInfoGroupBox = QtGui.QGroupBox(PluginViewDialog) self.PluginInfoGroupBox.setAlignment( QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.PluginInfoGroupBox.setFlat(False) @@ -88,18 +88,18 @@ class Ui_PluginViewDialog(object): 2, QtGui.QFormLayout.FieldRole, self.AboutTextBrowser) self.ListLayout.addWidget(self.PluginInfoGroupBox) self.PluginLayout.addLayout(self.ListLayout) - self.PluginListButtonBox = QtGui.QDialogButtonBox(PluginForm) + self.PluginListButtonBox = QtGui.QDialogButtonBox(PluginViewDialog) self.PluginListButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) self.PluginListButtonBox.setObjectName(u'PluginListButtonBox') self.PluginLayout.addWidget(self.PluginListButtonBox) - self.retranslateUi(PluginForm) + self.retranslateUi(PluginViewDialog) QtCore.QObject.connect(self.PluginListButtonBox, - QtCore.SIGNAL(u'accepted()'), PluginForm.close) - QtCore.QMetaObject.connectSlotsByName(PluginForm) + QtCore.SIGNAL(u'accepted()'), PluginViewDialog.close) + QtCore.QMetaObject.connectSlotsByName(PluginViewDialog) - def retranslateUi(self, PluginForm): - PluginForm.setWindowTitle(translate('PluginForm', 'Plugin List')) + def retranslateUi(self, PluginViewDialog): + PluginViewDialog.setWindowTitle(translate('PluginForm', 'Plugin List')) self.PluginInfoGroupBox.setTitle(translate('PluginForm', 'Plugin Details')) self.VersionLabel.setText(translate('PluginForm', 'Version:')) self.VersionNumberLabel.setText(translate('PluginForm', 'TextLabel')) diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py index 47691fcdb..467c2aed8 100644 --- a/openlp/core/ui/serviceitemeditdialog.py +++ b/openlp/core/ui/serviceitemeditdialog.py @@ -27,10 +27,10 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_ServiceItemEditDialog(object): - def setupUi(self, ServiceItemEditForm): - ServiceItemEditForm.setObjectName(u'ServiceItemEditDialog') - ServiceItemEditForm.resize(386, 272) - self.layoutWidget = QtGui.QWidget(ServiceItemEditForm) + def setupUi(self, 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(u'layoutWidget') self.outerLayout = QtGui.QVBoxLayout(self.layoutWidget) @@ -63,11 +63,11 @@ class Ui_ServiceItemEditDialog(object): self.buttonBox.setObjectName(u'buttonBox') self.outerLayout.addWidget(self.buttonBox) - self.retranslateUi(ServiceItemEditForm) - QtCore.QMetaObject.connectSlotsByName(ServiceItemEditForm) + self.retranslateUi(ServiceItemEditDialog) + QtCore.QMetaObject.connectSlotsByName(ServiceItemEditDialog) - def retranslateUi(self, ServiceItemEditForm): - ServiceItemEditForm.setWindowTitle(translate('ServiceItemEditForm', 'Service Item Maintenance')) + def retranslateUi(self, ServiceItemEditDialog): + ServiceItemEditDialog.setWindowTitle(translate('ServiceItemEditForm', 'Service Item Maintenance')) self.upButton.setText(translate('ServiceItemEditForm', 'Up')) self.deleteButton.setText(translate('ServiceItemEditForm', 'Delete')) self.downButton.setText(translate('ServiceItemEditForm', 'Down')) diff --git a/openlp/core/ui/servicenotedialog.py b/openlp/core/ui/servicenotedialog.py index c39b29473..b21adce8d 100644 --- a/openlp/core/ui/servicenotedialog.py +++ b/openlp/core/ui/servicenotedialog.py @@ -27,10 +27,10 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_ServiceNoteEdit(object): - def setupUi(self, ServiceNoteForm): - ServiceNoteForm.setObjectName(u'ServiceNoteEdit') - ServiceNoteForm.resize(400, 243) - self.widget = QtGui.QWidget(ServiceNoteForm) + def setupUi(self, ServiceNoteEdit): + ServiceNoteEdit.setObjectName(u'ServiceNoteEdit') + ServiceNoteEdit.resize(400, 243) + self.widget = QtGui.QWidget(ServiceNoteEdit) self.widget.setGeometry(QtCore.QRect(20, 10, 361, 223)) self.widget.setObjectName(u'widget') self.verticalLayout = QtGui.QVBoxLayout(self.widget) @@ -43,8 +43,8 @@ class Ui_ServiceNoteEdit(object): self.buttonBox.setObjectName(u'buttonBox') self.verticalLayout.addWidget(self.buttonBox) - self.retranslateUi(ServiceNoteForm) - QtCore.QMetaObject.connectSlotsByName(ServiceNoteForm) + self.retranslateUi(ServiceNoteEdit) + QtCore.QMetaObject.connectSlotsByName(ServiceNoteEdit) - def retranslateUi(self, ServiceNoteForm): - ServiceNoteForm.setWindowTitle(translate('ServiceNoteForm', 'Service Item Notes')) + def retranslateUi(self, ServiceNoteEdit): + ServiceNoteEdit.setWindowTitle(translate('ServiceNoteForm', 'Service Item Notes')) diff --git a/openlp/core/ui/settingsdialog.py b/openlp/core/ui/settingsdialog.py index fc1ae8ba0..66501e380 100644 --- a/openlp/core/ui/settingsdialog.py +++ b/openlp/core/ui/settingsdialog.py @@ -27,17 +27,17 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_SettingsDialog(object): - def setupUi(self, SettingsForm): - SettingsForm.setObjectName(u'SettingsDialog') - SettingsForm.resize(724, 502) - self.SettingsLayout = QtGui.QVBoxLayout(SettingsForm) + def setupUi(self, SettingsDialog): + SettingsDialog.setObjectName(u'SettingsDialog') + SettingsDialog.resize(724, 502) + self.SettingsLayout = QtGui.QVBoxLayout(SettingsDialog) self.SettingsLayout.setSpacing(8) self.SettingsLayout.setMargin(8) self.SettingsLayout.setObjectName(u'SettingsLayout') - self.SettingsTabWidget = QtGui.QTabWidget(SettingsForm) + self.SettingsTabWidget = QtGui.QTabWidget(SettingsDialog) self.SettingsTabWidget.setObjectName(u'SettingsTabWidget') self.SettingsLayout.addWidget(self.SettingsTabWidget) - self.ButtonsBox = QtGui.QDialogButtonBox(SettingsForm) + self.ButtonsBox = QtGui.QDialogButtonBox(SettingsDialog) sizePolicy = QtGui.QSizePolicy( QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) @@ -51,13 +51,13 @@ class Ui_SettingsDialog(object): QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) self.ButtonsBox.setObjectName(u'ButtonsBox') self.SettingsLayout.addWidget(self.ButtonsBox) - self.retranslateUi(SettingsForm) + self.retranslateUi(SettingsDialog) self.SettingsTabWidget.setCurrentIndex(0) QtCore.QObject.connect(self.ButtonsBox, - QtCore.SIGNAL(u'accepted()'), SettingsForm.accept) + QtCore.SIGNAL(u'accepted()'), SettingsDialog.accept) QtCore.QObject.connect(self.ButtonsBox, - QtCore.SIGNAL(u'rejected()'), SettingsForm.reject) - QtCore.QMetaObject.connectSlotsByName(SettingsForm) + QtCore.SIGNAL(u'rejected()'), SettingsDialog.reject) + QtCore.QMetaObject.connectSlotsByName(SettingsDialog) - def retranslateUi(self, SettingsForm): - SettingsForm.setWindowTitle(translate('SettingsForm', 'Settings')) + def retranslateUi(self, SettingsDialog): + SettingsDialog.setWindowTitle(translate('SettingsForm', 'Settings')) diff --git a/openlp/plugins/alerts/forms/alertdialog.py b/openlp/plugins/alerts/forms/alertdialog.py index cdb455cd3..2dc117655 100644 --- a/openlp/plugins/alerts/forms/alertdialog.py +++ b/openlp/plugins/alerts/forms/alertdialog.py @@ -27,21 +27,21 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_AlertDialog(object): - def setupUi(self, AlertForm): - AlertForm.setObjectName(u'AlertDialog') - AlertForm.resize(567, 440) + def setupUi(self, AlertDialog): + AlertDialog.setObjectName(u'AlertDialog') + AlertDialog.resize(567, 440) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - AlertForm.setWindowIcon(icon) - self.AlertFormLayout = QtGui.QVBoxLayout(AlertForm) - self.AlertFormLayout.setSpacing(8) - self.AlertFormLayout.setMargin(8) - self.AlertFormLayout.setObjectName(u'AlertFormLayout') + AlertDialog.setWindowIcon(icon) + self.AlertDialogLayout = QtGui.QVBoxLayout(AlertDialog) + self.AlertDialogLayout.setSpacing(8) + self.AlertDialogLayout.setMargin(8) + self.AlertDialogLayout.setObjectName(u'AlertDialogLayout') self.AlertTextLayout = QtGui.QFormLayout() self.AlertTextLayout.setContentsMargins(0, 0, -1, -1) self.AlertTextLayout.setSpacing(8) self.AlertTextLayout.setObjectName(u'AlertTextLayout') - self.AlertEntryLabel = QtGui.QLabel(AlertForm) + self.AlertEntryLabel = QtGui.QLabel(AlertDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -49,41 +49,41 @@ class Ui_AlertDialog(object): self.AlertEntryLabel.setSizePolicy(sizePolicy) self.AlertEntryLabel.setObjectName(u'AlertEntryLabel') self.AlertTextLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.AlertEntryLabel) - self.AlertParameter = QtGui.QLabel(AlertForm) + self.AlertParameter = QtGui.QLabel(AlertDialog) self.AlertParameter.setObjectName(u'AlertParameter') self.AlertTextLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.AlertParameter) - self.ParameterEdit = QtGui.QLineEdit(AlertForm) + self.ParameterEdit = QtGui.QLineEdit(AlertDialog) self.ParameterEdit.setObjectName(u'ParameterEdit') self.AlertTextLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.ParameterEdit) - self.AlertTextEdit = QtGui.QLineEdit(AlertForm) + self.AlertTextEdit = QtGui.QLineEdit(AlertDialog) self.AlertTextEdit.setObjectName(u'AlertTextEdit') self.AlertTextLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.AlertTextEdit) - self.AlertFormLayout.addLayout(self.AlertTextLayout) + self.AlertDialogLayout.addLayout(self.AlertTextLayout) self.ManagementLayout = QtGui.QHBoxLayout() self.ManagementLayout.setSpacing(8) self.ManagementLayout.setContentsMargins(-1, -1, -1, 0) self.ManagementLayout.setObjectName(u'ManagementLayout') - self.AlertListWidget = QtGui.QListWidget(AlertForm) + self.AlertListWidget = QtGui.QListWidget(AlertDialog) self.AlertListWidget.setAlternatingRowColors(True) self.AlertListWidget.setObjectName(u'AlertListWidget') self.ManagementLayout.addWidget(self.AlertListWidget) self.ManageButtonLayout = QtGui.QVBoxLayout() self.ManageButtonLayout.setSpacing(8) self.ManageButtonLayout.setObjectName(u'ManageButtonLayout') - self.NewButton = QtGui.QPushButton(AlertForm) + self.NewButton = QtGui.QPushButton(AlertDialog) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(u':/general/general_new.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.NewButton.setIcon(icon1) self.NewButton.setObjectName(u'NewButton') self.ManageButtonLayout.addWidget(self.NewButton) - self.SaveButton = QtGui.QPushButton(AlertForm) + self.SaveButton = QtGui.QPushButton(AlertDialog) self.SaveButton.setEnabled(False) icon2 = QtGui.QIcon() icon2.addPixmap(QtGui.QPixmap(u':/general/general_save.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.SaveButton.setIcon(icon2) self.SaveButton.setObjectName(u'SaveButton') self.ManageButtonLayout.addWidget(self.SaveButton) - self.DeleteButton = QtGui.QPushButton(AlertForm) + self.DeleteButton = QtGui.QPushButton(AlertDialog) icon3 = QtGui.QIcon() icon3.addPixmap(QtGui.QPixmap(u':/general/general_delete.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.DeleteButton.setIcon(icon3) @@ -92,49 +92,49 @@ class Ui_AlertDialog(object): spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.ManageButtonLayout.addItem(spacerItem) self.ManagementLayout.addLayout(self.ManageButtonLayout) - self.AlertFormLayout.addLayout(self.ManagementLayout) + self.AlertDialogLayout.addLayout(self.ManagementLayout) self.AlertButtonLayout = QtGui.QHBoxLayout() self.AlertButtonLayout.setSpacing(8) self.AlertButtonLayout.setObjectName(u'AlertButtonLayout') spacerItem1 = QtGui.QSpacerItem(181, 0, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.AlertButtonLayout.addItem(spacerItem1) - self.DisplayButton = QtGui.QPushButton(AlertForm) + self.DisplayButton = QtGui.QPushButton(AlertDialog) icon4 = QtGui.QIcon() icon4.addPixmap(QtGui.QPixmap(u':/general/general_live.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.DisplayButton.setIcon(icon4) self.DisplayButton.setObjectName(u'DisplayButton') self.AlertButtonLayout.addWidget(self.DisplayButton) - self.DisplayCloseButton = QtGui.QPushButton(AlertForm) + self.DisplayCloseButton = QtGui.QPushButton(AlertDialog) self.DisplayCloseButton.setIcon(icon4) self.DisplayCloseButton.setObjectName(u'DisplayCloseButton') self.AlertButtonLayout.addWidget(self.DisplayCloseButton) - self.CloseButton = QtGui.QPushButton(AlertForm) + self.CloseButton = QtGui.QPushButton(AlertDialog) icon5 = QtGui.QIcon() icon5.addPixmap(QtGui.QPixmap(u':/system/system_close.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.CloseButton.setIcon(icon5) self.CloseButton.setObjectName(u'CloseButton') self.AlertButtonLayout.addWidget(self.CloseButton) - self.AlertFormLayout.addLayout(self.AlertButtonLayout) + self.AlertDialogLayout.addLayout(self.AlertButtonLayout) self.AlertEntryLabel.setBuddy(self.AlertTextEdit) self.AlertParameter.setBuddy(self.ParameterEdit) - self.retranslateUi(AlertForm) - QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL(u'clicked()'), AlertForm.close) - QtCore.QMetaObject.connectSlotsByName(AlertForm) - AlertForm.setTabOrder(self.AlertTextEdit, self.ParameterEdit) - AlertForm.setTabOrder(self.ParameterEdit, self.AlertListWidget) - AlertForm.setTabOrder(self.AlertListWidget, self.NewButton) - AlertForm.setTabOrder(self.NewButton, self.SaveButton) - AlertForm.setTabOrder(self.SaveButton, self.DeleteButton) - AlertForm.setTabOrder(self.DeleteButton, self.DisplayButton) - AlertForm.setTabOrder(self.DisplayButton, self.DisplayCloseButton) - AlertForm.setTabOrder(self.DisplayCloseButton, self.CloseButton) + self.retranslateUi(AlertDialog) + QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL(u'clicked()'), AlertDialog.close) + QtCore.QMetaObject.connectSlotsByName(AlertDialog) + AlertDialog.setTabOrder(self.AlertTextEdit, self.ParameterEdit) + AlertDialog.setTabOrder(self.ParameterEdit, self.AlertListWidget) + AlertDialog.setTabOrder(self.AlertListWidget, self.NewButton) + AlertDialog.setTabOrder(self.NewButton, self.SaveButton) + AlertDialog.setTabOrder(self.SaveButton, self.DeleteButton) + AlertDialog.setTabOrder(self.DeleteButton, self.DisplayButton) + AlertDialog.setTabOrder(self.DisplayButton, self.DisplayCloseButton) + AlertDialog.setTabOrder(self.DisplayCloseButton, self.CloseButton) - def retranslateUi(self, AlertForm): - AlertForm.setWindowTitle(translate('AlertForm', 'Alert Message')) + def retranslateUi(self, AlertDialog): + AlertDialog.setWindowTitle(translate('AlertForm', 'Alert Message')) self.AlertEntryLabel.setText(translate('AlertForm', 'Alert &text:')) self.AlertParameter.setText(translate('AlertForm', '&Parameter(s):')) self.NewButton.setText(translate('AlertForm', '&New')) diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py index 8acfdac21..c709dae81 100644 --- a/openlp/plugins/bibles/forms/bibleimportwizard.py +++ b/openlp/plugins/bibles/forms/bibleimportwizard.py @@ -27,12 +27,12 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_BibleImportWizard(object): - def setupUi(self, ImportWizardForm): - ImportWizardForm.setObjectName(u'BibleImportWizard') - ImportWizardForm.resize(550, 386) - ImportWizardForm.setModal(True) - ImportWizardForm.setWizardStyle(QtGui.QWizard.ModernStyle) - ImportWizardForm.setOptions( + def setupUi(self, BibleImportWizard): + BibleImportWizard.setObjectName(u'BibleImportWizard') + BibleImportWizard.resize(550, 386) + BibleImportWizard.setModal(True) + BibleImportWizard.setWizardStyle(QtGui.QWizard.ModernStyle) + BibleImportWizard.setOptions( QtGui.QWizard.IndependentPages | \ QtGui.QWizard.NoBackButtonOnStartPage | \ QtGui.QWizard.NoBackButtonOnLastPage) @@ -58,7 +58,7 @@ class Ui_BibleImportWizard(object): spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.WelcomeLayout.addItem(spacerItem1) - ImportWizardForm.addPage(self.WelcomePage) + BibleImportWizard.addPage(self.WelcomePage) self.SelectPage = QtGui.QWizardPage() self.SelectPage.setObjectName(u'SelectPage') self.SelectPageLayout = QtGui.QVBoxLayout(self.SelectPage) @@ -252,7 +252,7 @@ class Ui_BibleImportWizard(object): self.WebDownloadLayout.addWidget(self.WebDownloadTabWidget) self.FormatWidget.addWidget(self.WebDownloadPage) self.SelectPageLayout.addWidget(self.FormatWidget) - ImportWizardForm.addPage(self.SelectPage) + BibleImportWizard.addPage(self.SelectPage) self.LicenseDetailsPage = QtGui.QWizardPage() self.LicenseDetailsPage.setObjectName(u'LicenseDetailsPage') self.LicenseDetailsLayout = QtGui.QFormLayout(self.LicenseDetailsPage) @@ -283,7 +283,7 @@ class Ui_BibleImportWizard(object): self.PermissionEdit.setObjectName(u'PermissionEdit') self.LicenseDetailsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PermissionEdit) - ImportWizardForm.addPage(self.LicenseDetailsPage) + BibleImportWizard.addPage(self.LicenseDetailsPage) self.ImportPage = QtGui.QWizardPage() self.ImportPage.setObjectName(u'ImportPage') self.ImportLayout = QtGui.QVBoxLayout(self.ImportPage) @@ -297,18 +297,18 @@ class Ui_BibleImportWizard(object): self.ImportProgressBar.setValue(0) self.ImportProgressBar.setObjectName(u'ImportProgressBar') self.ImportLayout.addWidget(self.ImportProgressBar) - ImportWizardForm.addPage(self.ImportPage) + BibleImportWizard.addPage(self.ImportPage) - self.retranslateUi(ImportWizardForm) + self.retranslateUi(BibleImportWizard) self.FormatWidget.setCurrentIndex(0) self.WebDownloadTabWidget.setCurrentIndex(0) QtCore.QObject.connect(self.FormatComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'), self.FormatWidget.setCurrentIndex) - QtCore.QMetaObject.connectSlotsByName(ImportWizardForm) + QtCore.QMetaObject.connectSlotsByName(BibleImportWizard) - def retranslateUi(self, ImportWizardForm): - ImportWizardForm.setWindowTitle(translate('ImportWizardForm', 'Bible Import Wizard')) + def retranslateUi(self, BibleImportWizard): + BibleImportWizard.setWindowTitle(translate('ImportWizardForm', 'Bible Import Wizard')) self.TitleLabel.setText( u'' + \ translate('ImportWizardForm', 'Welcome to the Bible Import Wizard') + u'') diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py index 79380b9ba..57497ebaf 100644 --- a/openlp/plugins/custom/forms/editcustomdialog.py +++ b/openlp/plugins/custom/forms/editcustomdialog.py @@ -27,33 +27,33 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_customEditDialog(object): - def setupUi(self, EditCustomForm): - EditCustomForm.setObjectName(u'customEditDialog') - EditCustomForm.resize(590, 541) + def setupUi(self, customEditDialog): + customEditDialog.setObjectName(u'customEditDialog') + customEditDialog.resize(590, 541) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - EditCustomForm.setWindowIcon(icon) - self.gridLayout = QtGui.QGridLayout(EditCustomForm) + customEditDialog.setWindowIcon(icon) + self.gridLayout = QtGui.QGridLayout(customEditDialog) self.gridLayout.setObjectName(u'gridLayout') self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout.setObjectName(u'horizontalLayout') - self.TitleLabel = QtGui.QLabel(EditCustomForm) + self.TitleLabel = QtGui.QLabel(customEditDialog) self.TitleLabel.setObjectName(u'TitleLabel') self.horizontalLayout.addWidget(self.TitleLabel) - self.TitleEdit = QtGui.QLineEdit(EditCustomForm) + self.TitleEdit = QtGui.QLineEdit(customEditDialog) self.TitleEdit.setObjectName(u'TitleEdit') self.horizontalLayout.addWidget(self.TitleEdit) self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1) self.horizontalLayout_4 = QtGui.QHBoxLayout() self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') - self.VerseListView = QtGui.QListWidget(EditCustomForm) + self.VerseListView = QtGui.QListWidget(customEditDialog) self.VerseListView.setAlternatingRowColors(True) self.VerseListView.setObjectName(u'VerseListView') self.horizontalLayout_4.addWidget(self.VerseListView) self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout.setObjectName(u'verticalLayout') - self.UpButton = QtGui.QPushButton(EditCustomForm) + self.UpButton = QtGui.QPushButton(customEditDialog) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(u':/services/service_up.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -63,7 +63,7 @@ class Ui_customEditDialog(object): spacerItem = QtGui.QSpacerItem(20, 128, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.verticalLayout.addItem(spacerItem) - self.DownButton = QtGui.QPushButton(EditCustomForm) + self.DownButton = QtGui.QPushButton(customEditDialog) icon2 = QtGui.QIcon() icon2.addPixmap(QtGui.QPixmap(u':/services/service_down.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -72,7 +72,7 @@ class Ui_customEditDialog(object): self.verticalLayout.addWidget(self.DownButton) self.horizontalLayout_4.addLayout(self.verticalLayout) self.gridLayout.addLayout(self.horizontalLayout_4, 1, 0, 1, 1) - self.EditWidget = QtGui.QWidget(EditCustomForm) + self.EditWidget = QtGui.QWidget(customEditDialog) self.EditWidget.setObjectName(u'EditWidget') self.EditLayout_3 = QtGui.QHBoxLayout(self.EditWidget) self.EditLayout_3.setSpacing(8) @@ -113,47 +113,47 @@ class Ui_customEditDialog(object): self.gridLayout.addWidget(self.EditWidget, 2, 0, 1, 1) self.horizontalLayout_3 = QtGui.QHBoxLayout() self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') - self.ThemeLabel = QtGui.QLabel(EditCustomForm) + self.ThemeLabel = QtGui.QLabel(customEditDialog) self.ThemeLabel.setObjectName(u'ThemeLabel') self.horizontalLayout_3.addWidget(self.ThemeLabel) - self.ThemeComboBox = QtGui.QComboBox(EditCustomForm) + self.ThemeComboBox = QtGui.QComboBox(customEditDialog) self.ThemeComboBox.setObjectName(u'ThemeComboBox') self.horizontalLayout_3.addWidget(self.ThemeComboBox) self.gridLayout.addLayout(self.horizontalLayout_3, 3, 0, 1, 1) self.horizontalLayout_2 = QtGui.QHBoxLayout() self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') - self.CreditLabel = QtGui.QLabel(EditCustomForm) + self.CreditLabel = QtGui.QLabel(customEditDialog) self.CreditLabel.setObjectName(u'CreditLabel') self.horizontalLayout_2.addWidget(self.CreditLabel) - self.CreditEdit = QtGui.QLineEdit(EditCustomForm) + self.CreditEdit = QtGui.QLineEdit(customEditDialog) self.CreditEdit.setObjectName(u'CreditEdit') self.horizontalLayout_2.addWidget(self.CreditEdit) self.gridLayout.addLayout(self.horizontalLayout_2, 4, 0, 1, 1) - self.buttonBox = QtGui.QDialogButtonBox(EditCustomForm) + self.buttonBox = QtGui.QDialogButtonBox(customEditDialog) self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) self.buttonBox.setObjectName(u'buttonBox') self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 1) - self.retranslateUi(EditCustomForm) + self.retranslateUi(customEditDialog) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'), - EditCustomForm.accept) + customEditDialog.accept) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'), - EditCustomForm.closePressed) - QtCore.QMetaObject.connectSlotsByName(EditCustomForm) - EditCustomForm.setTabOrder(self.TitleEdit, self.VerseTextEdit) - EditCustomForm.setTabOrder(self.VerseTextEdit, self.AddButton) - EditCustomForm.setTabOrder(self.AddButton, self.VerseListView) - EditCustomForm.setTabOrder(self.VerseListView, self.EditButton) - EditCustomForm.setTabOrder(self.EditButton, self.EditAllButton) - EditCustomForm.setTabOrder(self.EditAllButton, self.SaveButton) - EditCustomForm.setTabOrder(self.SaveButton, self.DeleteButton) - EditCustomForm.setTabOrder(self.DeleteButton, self.CreditEdit) - EditCustomForm.setTabOrder(self.CreditEdit, self.UpButton) - EditCustomForm.setTabOrder(self.UpButton, self.DownButton) - EditCustomForm.setTabOrder(self.DownButton, self.ThemeComboBox) + customEditDialog.closePressed) + QtCore.QMetaObject.connectSlotsByName(customEditDialog) + customEditDialog.setTabOrder(self.TitleEdit, self.VerseTextEdit) + customEditDialog.setTabOrder(self.VerseTextEdit, self.AddButton) + customEditDialog.setTabOrder(self.AddButton, self.VerseListView) + customEditDialog.setTabOrder(self.VerseListView, self.EditButton) + customEditDialog.setTabOrder(self.EditButton, self.EditAllButton) + customEditDialog.setTabOrder(self.EditAllButton, self.SaveButton) + customEditDialog.setTabOrder(self.SaveButton, self.DeleteButton) + customEditDialog.setTabOrder(self.DeleteButton, self.CreditEdit) + customEditDialog.setTabOrder(self.CreditEdit, self.UpButton) + customEditDialog.setTabOrder(self.UpButton, self.DownButton) + customEditDialog.setTabOrder(self.DownButton, self.ThemeComboBox) - def retranslateUi(self, EditCustomForm): - EditCustomForm.setWindowTitle(translate('EditCustomForm', 'Edit Custom Slides')) + def retranslateUi(self, customEditDialog): + customEditDialog.setWindowTitle(translate('EditCustomForm', 'Edit Custom Slides')) self.UpButton.setToolTip(translate('EditCustomForm', 'Move slide Up 1')) self.DownButton.setToolTip(translate('EditCustomForm', 'Move slide down 1')) self.TitleLabel.setText(translate('EditCustomForm', 'Title:')) diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py index 10bef469f..dbd7af077 100644 --- a/openlp/plugins/songs/forms/authorsdialog.py +++ b/openlp/plugins/songs/forms/authorsdialog.py @@ -27,38 +27,38 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_AuthorsDialog(object): - def setupUi(self, AuthorsForm): - AuthorsForm.setObjectName(u'AuthorsDialog') - AuthorsForm.resize(393, 147) - self.AuthorsLayout = QtGui.QFormLayout(AuthorsForm) + def setupUi(self, AuthorsDialog): + AuthorsDialog.setObjectName(u'AuthorsDialog') + AuthorsDialog.resize(393, 147) + self.AuthorsLayout = QtGui.QFormLayout(AuthorsDialog) self.AuthorsLayout.setMargin(8) self.AuthorsLayout.setSpacing(8) self.AuthorsLayout.setObjectName(u'AuthorsLayout') - self.FirstNameLabel = QtGui.QLabel(AuthorsForm) + self.FirstNameLabel = QtGui.QLabel(AuthorsDialog) self.FirstNameLabel.setObjectName(u'FirstNameLabel') self.AuthorsLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.FirstNameLabel) - self.FirstNameEdit = QtGui.QLineEdit(AuthorsForm) + self.FirstNameEdit = QtGui.QLineEdit(AuthorsDialog) self.FirstNameEdit.setObjectName(u'FirstNameEdit') self.AuthorsLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.FirstNameEdit) - self.LastNameLabel = QtGui.QLabel(AuthorsForm) + self.LastNameLabel = QtGui.QLabel(AuthorsDialog) self.LastNameLabel.setObjectName(u'LastNameLabel') self.AuthorsLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.LastNameLabel) - self.LastNameEdit = QtGui.QLineEdit(AuthorsForm) + self.LastNameEdit = QtGui.QLineEdit(AuthorsDialog) self.LastNameEdit.setObjectName(u'LastNameEdit') self.AuthorsLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.LastNameEdit) - self.DisplayLabel = QtGui.QLabel(AuthorsForm) + self.DisplayLabel = QtGui.QLabel(AuthorsDialog) self.DisplayLabel.setObjectName(u'DisplayLabel') self.AuthorsLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.DisplayLabel) - self.DisplayEdit = QtGui.QLineEdit(AuthorsForm) + self.DisplayEdit = QtGui.QLineEdit(AuthorsDialog) self.DisplayEdit.setObjectName(u'DisplayEdit') self.AuthorsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.DisplayEdit) - self.AuthorButtonBox = QtGui.QDialogButtonBox(AuthorsForm) + self.AuthorButtonBox = QtGui.QDialogButtonBox(AuthorsDialog) self.AuthorButtonBox.setOrientation(QtCore.Qt.Horizontal) self.AuthorButtonBox.setStandardButtons( QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) @@ -66,15 +66,15 @@ class Ui_AuthorsDialog(object): self.AuthorsLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.AuthorButtonBox) - self.retranslateUi(AuthorsForm) + self.retranslateUi(AuthorsDialog) QtCore.QObject.connect(self.AuthorButtonBox, - QtCore.SIGNAL(u'accepted()'), AuthorsForm.accept) + QtCore.SIGNAL(u'accepted()'), AuthorsDialog.accept) QtCore.QObject.connect(self.AuthorButtonBox, - QtCore.SIGNAL(u'rejected()'), AuthorsForm.reject) - QtCore.QMetaObject.connectSlotsByName(AuthorsForm) + QtCore.SIGNAL(u'rejected()'), AuthorsDialog.reject) + QtCore.QMetaObject.connectSlotsByName(AuthorsDialog) - def retranslateUi(self, AuthorsForm): - AuthorsForm.setWindowTitle(translate('AuthorsForm', 'Author Maintenance')) + def retranslateUi(self, AuthorsDialog): + AuthorsDialog.setWindowTitle(translate('AuthorsForm', 'Author Maintenance')) self.DisplayLabel.setText(translate('AuthorsForm', 'Display name:')) self.FirstNameLabel.setText(translate('AuthorsForm', 'First name:')) self.LastNameLabel.setText(translate('AuthorsForm', 'Last name:')) diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 04df954ec..6d617072d 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -29,16 +29,16 @@ from openlp.core.lib import translate from openlp.core.lib import build_icon class Ui_EditSongDialog(object): - def setupUi(self, EditSongForm): - EditSongForm.setObjectName(u'EditSongDialog') - EditSongForm.resize(645, 417) + def setupUi(self, EditSongDialog): + EditSongDialog.setObjectName(u'EditSongDialog') + EditSongDialog.resize(645, 417) icon = build_icon(u':/icon/openlp.org-icon-32.bmp') - EditSongForm.setWindowIcon(icon) - EditSongForm.setModal(True) - self.verticalLayout = QtGui.QVBoxLayout(EditSongForm) + EditSongDialog.setWindowIcon(icon) + EditSongDialog.setModal(True) + self.verticalLayout = QtGui.QVBoxLayout(EditSongDialog) self.verticalLayout.setMargin(8) self.verticalLayout.setObjectName(u'verticalLayout') - self.SongTabWidget = QtGui.QTabWidget(EditSongForm) + self.SongTabWidget = QtGui.QTabWidget(EditSongDialog) self.SongTabWidget.setObjectName(u'SongTabWidget') self.LyricsTab = QtGui.QWidget() self.LyricsTab.setObjectName(u'LyricsTab') @@ -380,46 +380,46 @@ class Ui_EditSongDialog(object): self.ThemeTabLayout.addItem(spacerItem5) self.SongTabWidget.addTab(self.ThemeTab, u'') self.verticalLayout.addWidget(self.SongTabWidget) - self.ButtonBox = QtGui.QDialogButtonBox(EditSongForm) + self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog) self.ButtonBox.setStandardButtons( QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Save) self.ButtonBox.setObjectName(u'ButtonBox') self.verticalLayout.addWidget(self.ButtonBox) - self.retranslateUi(EditSongForm) + self.retranslateUi(EditSongDialog) QtCore.QObject.connect(self.ButtonBox, - QtCore.SIGNAL(u'rejected()'), EditSongForm.closePressed) + QtCore.SIGNAL(u'rejected()'), EditSongDialog.closePressed) QtCore.QObject.connect(self.ButtonBox, - QtCore.SIGNAL(u'accepted()'), EditSongForm.accept) - QtCore.QMetaObject.connectSlotsByName(EditSongForm) - EditSongForm.setTabOrder(self.SongTabWidget, self.TitleEditItem) - EditSongForm.setTabOrder(self.TitleEditItem, self.AlternativeEdit) - EditSongForm.setTabOrder(self.AlternativeEdit, self.VerseListWidget) - EditSongForm.setTabOrder(self.VerseListWidget, self.VerseAddButton) - EditSongForm.setTabOrder(self.VerseAddButton, self.VerseEditButton) - EditSongForm.setTabOrder(self.VerseEditButton, self.VerseEditAllButton) - EditSongForm.setTabOrder(self.VerseEditAllButton, self.VerseDeleteButton) - EditSongForm.setTabOrder(self.VerseDeleteButton, self.VerseOrderEdit) - EditSongForm.setTabOrder(self.VerseOrderEdit, self.AuthorsSelectionComboItem) - EditSongForm.setTabOrder(self.AuthorsSelectionComboItem, self.AuthorAddButton) - EditSongForm.setTabOrder(self.AuthorAddButton, self.AuthorsListView) - EditSongForm.setTabOrder(self.AuthorsListView, self.AuthorRemoveButton) - EditSongForm.setTabOrder(self.AuthorRemoveButton, self.MaintenanceButton) - EditSongForm.setTabOrder(self.MaintenanceButton, self.SongTopicCombo) - EditSongForm.setTabOrder(self.SongTopicCombo, self.TopicAddButton) - EditSongForm.setTabOrder(self.TopicAddButton, self.TopicsListView) - EditSongForm.setTabOrder(self.TopicsListView, self.TopicRemoveButton) - EditSongForm.setTabOrder(self.TopicRemoveButton, self.SongbookCombo) - EditSongForm.setTabOrder(self.SongbookCombo, self.ThemeSelectionComboItem) - EditSongForm.setTabOrder(self.ThemeSelectionComboItem, self.ThemeAddButton) - EditSongForm.setTabOrder(self.ThemeAddButton, self.CopyrightEditItem) - EditSongForm.setTabOrder(self.CopyrightEditItem, self.CopyrightInsertButton) - EditSongForm.setTabOrder(self.CopyrightInsertButton, self.CCLNumberEdit) - EditSongForm.setTabOrder(self.CCLNumberEdit, self.CommentsEdit) - EditSongForm.setTabOrder(self.CommentsEdit, self.ButtonBox) + QtCore.SIGNAL(u'accepted()'), EditSongDialog.accept) + QtCore.QMetaObject.connectSlotsByName(EditSongDialog) + EditSongDialog.setTabOrder(self.SongTabWidget, self.TitleEditItem) + EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit) + EditSongDialog.setTabOrder(self.AlternativeEdit, self.VerseListWidget) + EditSongDialog.setTabOrder(self.VerseListWidget, self.VerseAddButton) + EditSongDialog.setTabOrder(self.VerseAddButton, self.VerseEditButton) + EditSongDialog.setTabOrder(self.VerseEditButton, self.VerseEditAllButton) + EditSongDialog.setTabOrder(self.VerseEditAllButton, self.VerseDeleteButton) + EditSongDialog.setTabOrder(self.VerseDeleteButton, self.VerseOrderEdit) + EditSongDialog.setTabOrder(self.VerseOrderEdit, self.AuthorsSelectionComboItem) + EditSongDialog.setTabOrder(self.AuthorsSelectionComboItem, self.AuthorAddButton) + EditSongDialog.setTabOrder(self.AuthorAddButton, self.AuthorsListView) + EditSongDialog.setTabOrder(self.AuthorsListView, self.AuthorRemoveButton) + EditSongDialog.setTabOrder(self.AuthorRemoveButton, self.MaintenanceButton) + EditSongDialog.setTabOrder(self.MaintenanceButton, self.SongTopicCombo) + EditSongDialog.setTabOrder(self.SongTopicCombo, self.TopicAddButton) + EditSongDialog.setTabOrder(self.TopicAddButton, self.TopicsListView) + EditSongDialog.setTabOrder(self.TopicsListView, self.TopicRemoveButton) + EditSongDialog.setTabOrder(self.TopicRemoveButton, self.SongbookCombo) + EditSongDialog.setTabOrder(self.SongbookCombo, self.ThemeSelectionComboItem) + EditSongDialog.setTabOrder(self.ThemeSelectionComboItem, self.ThemeAddButton) + EditSongDialog.setTabOrder(self.ThemeAddButton, self.CopyrightEditItem) + EditSongDialog.setTabOrder(self.CopyrightEditItem, self.CopyrightInsertButton) + EditSongDialog.setTabOrder(self.CopyrightInsertButton, self.CCLNumberEdit) + EditSongDialog.setTabOrder(self.CCLNumberEdit, self.CommentsEdit) + EditSongDialog.setTabOrder(self.CommentsEdit, self.ButtonBox) - def retranslateUi(self, EditSongForm): - EditSongForm.setWindowTitle(translate('EditSongForm', 'Song Editor')) + def retranslateUi(self, EditSongDialog): + EditSongDialog.setWindowTitle(translate('EditSongForm', 'Song Editor')) self.TitleLabel.setText(translate('EditSongForm', 'Title:')) self.AlternativeTitleLabel.setText(translate('EditSongForm', 'Alternative Title:')) self.LyricsLabel.setText(translate('EditSongForm', 'Lyrics:')) diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index 40a75b073..201f06cc7 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -27,11 +27,11 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_EditVerseDialog(object): - def setupUi(self, EditVerseForm): - EditVerseForm.setObjectName(u'EditVerseDialog') - EditVerseForm.resize(500, 521) - EditVerseForm.setModal(True) - self.layoutWidget = QtGui.QWidget(EditVerseForm) + def setupUi(self, EditVerseDialog): + EditVerseDialog.setObjectName(u'EditVerseDialog') + EditVerseDialog.resize(500, 521) + EditVerseDialog.setModal(True) + self.layoutWidget = QtGui.QWidget(EditVerseDialog) self.layoutWidget.setGeometry(QtCore.QRect(11, 1, 471, 491)) self.layoutWidget.setObjectName(u'layoutWidget') self.verticalLayout_3 = QtGui.QVBoxLayout(self.layoutWidget) @@ -104,13 +104,13 @@ class Ui_EditVerseDialog(object): self.ButtonBox.setObjectName(u'ButtonBox') self.verticalLayout_3.addWidget(self.ButtonBox) - self.retranslateUi(EditVerseForm) - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'accepted()'), EditVerseForm.accept) - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'rejected()'), EditVerseForm.reject) - QtCore.QMetaObject.connectSlotsByName(EditVerseForm) + self.retranslateUi(EditVerseDialog) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'accepted()'), EditVerseDialog.accept) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'rejected()'), EditVerseDialog.reject) + QtCore.QMetaObject.connectSlotsByName(EditVerseDialog) - def retranslateUi(self, EditVerseForm): - EditVerseForm.setWindowTitle(translate('EditVerseForm', 'Edit Verse')) + def retranslateUi(self, EditVerseDialog): + EditVerseDialog.setWindowTitle(translate('EditVerseForm', 'Edit Verse')) self.VerseTypeLabel.setText(translate('EditVerseForm', 'Verse Type')) self.VerseListComboBox.setItemText(0, translate('EditVerseForm', 'Intro')) self.VerseListComboBox.setItemText(1, translate('EditVerseForm', 'Verse')) diff --git a/openlp/plugins/songs/forms/openlpexportdialog.py b/openlp/plugins/songs/forms/openlpexportdialog.py index 82934e19d..2046f2f95 100644 --- a/openlp/plugins/songs/forms/openlpexportdialog.py +++ b/openlp/plugins/songs/forms/openlpexportdialog.py @@ -27,16 +27,16 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_OpenLPExportDialog(object): - def setupUi(self, OpenLPExportForm): - OpenLPExportForm.setObjectName(u'OpenLPExportDialog') - OpenLPExportForm.resize(473, 459) + def setupUi(self, OpenLPExportDialog): + OpenLPExportDialog.setObjectName(u'OpenLPExportDialog') + OpenLPExportDialog.resize(473, 459) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - OpenLPExportForm.setWindowIcon(icon) - self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPExportForm) + OpenLPExportDialog.setWindowIcon(icon) + self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPExportDialog) self.verticalLayout_5.setMargin(8) self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.ExportFileWidget = QtGui.QWidget(OpenLPExportForm) + self.ExportFileWidget = QtGui.QWidget(OpenLPExportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -60,7 +60,7 @@ class Ui_OpenLPExportDialog(object): self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) self.verticalLayout_5.addWidget(self.ExportFileWidget) - self.SongListFrame = QtGui.QFrame(OpenLPExportForm) + self.SongListFrame = QtGui.QFrame(OpenLPExportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -243,7 +243,7 @@ class Ui_OpenLPExportDialog(object): self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) self.verticalLayout_5.addWidget(self.SongListFrame) - self.ProgressGroupBox = QtGui.QGroupBox(OpenLPExportForm) + self.ProgressGroupBox = QtGui.QGroupBox(OpenLPExportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -262,7 +262,7 @@ class Ui_OpenLPExportDialog(object): self.ProgressBar.setObjectName(u'ProgressBar') self.verticalLayout_4.addWidget(self.ProgressBar) self.verticalLayout_5.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(OpenLPExportForm) + self.ButtonBarWidget = QtGui.QWidget(OpenLPExportDialog) self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) self.horizontalLayout_7.setSpacing(8) @@ -278,15 +278,15 @@ class Ui_OpenLPExportDialog(object): self.horizontalLayout_7.addWidget(self.ClosePushButton) self.verticalLayout_5.addWidget(self.ButtonBarWidget) - self.retranslateUi(OpenLPExportForm) - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPExportForm.close) + self.retranslateUi(OpenLPExportDialog) + QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPExportDialog.close) QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll) QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) - QtCore.QMetaObject.connectSlotsByName(OpenLPExportForm) + QtCore.QMetaObject.connectSlotsByName(OpenLPExportDialog) - def retranslateUi(self, OpenLPExportForm): - OpenLPExportForm.setWindowTitle(translate('OpenLPExportForm', 'openlp.org Song Exporter')) + def retranslateUi(self, OpenLPExportDialog): + OpenLPExportDialog.setWindowTitle(translate('OpenLPExportForm', 'openlp.org Song Exporter')) self.ExportFileLabel.setText(translate('OpenLPExportForm', 'Select openlp.org export filename:')) self.ExportListLabel.setText(translate('OpenLPExportForm', 'Full Song List')) self.ExportListTable.horizontalHeaderItem(0).setText(translate('OpenLPExportForm', 'Song Title')) diff --git a/openlp/plugins/songs/forms/openlpimportdialog.py b/openlp/plugins/songs/forms/openlpimportdialog.py index 455b6347c..8080b5a25 100644 --- a/openlp/plugins/songs/forms/openlpimportdialog.py +++ b/openlp/plugins/songs/forms/openlpimportdialog.py @@ -27,16 +27,16 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_OpenLPImportDialog(object): - def setupUi(self, OpenLPImportForm): - OpenLPImportForm.setObjectName(u'OpenLPImportDialog') - OpenLPImportForm.resize(473, 459) + def setupUi(self, OpenLPImportDialog): + OpenLPImportDialog.setObjectName(u'OpenLPImportDialog') + OpenLPImportDialog.resize(473, 459) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - OpenLPImportForm.setWindowIcon(icon) - self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPImportForm) + OpenLPImportDialog.setWindowIcon(icon) + self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPImportDialog) self.verticalLayout_5.setMargin(8) self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.ImportFileWidget = QtGui.QWidget(OpenLPImportForm) + self.ImportFileWidget = QtGui.QWidget(OpenLPImportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -60,7 +60,7 @@ class Ui_OpenLPImportDialog(object): self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) self.verticalLayout_5.addWidget(self.ImportFileWidget) - self.SongListFrame = QtGui.QFrame(OpenLPImportForm) + self.SongListFrame = QtGui.QFrame(OpenLPImportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -243,7 +243,7 @@ class Ui_OpenLPImportDialog(object): self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) self.verticalLayout_5.addWidget(self.SongListFrame) - self.ProgressGroupBox = QtGui.QGroupBox(OpenLPImportForm) + self.ProgressGroupBox = QtGui.QGroupBox(OpenLPImportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -262,7 +262,7 @@ class Ui_OpenLPImportDialog(object): self.ProgressBar.setObjectName(u'ProgressBar') self.verticalLayout_4.addWidget(self.ProgressBar) self.verticalLayout_5.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(OpenLPImportForm) + self.ButtonBarWidget = QtGui.QWidget(OpenLPImportDialog) self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) self.horizontalLayout_7.setSpacing(8) @@ -278,15 +278,15 @@ class Ui_OpenLPImportDialog(object): self.horizontalLayout_7.addWidget(self.ClosePushButton) self.verticalLayout_5.addWidget(self.ButtonBarWidget) - self.retranslateUi(OpenLPImportForm) - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPImportForm.close) + self.retranslateUi(OpenLPImportDialog) + QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPImportDialog.close) QtCore.QObject.connect(self.ImportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ImportListTable.selectAll) QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) - QtCore.QMetaObject.connectSlotsByName(OpenLPImportForm) + QtCore.QMetaObject.connectSlotsByName(OpenLPImportDialog) - def retranslateUi(self, OpenLPImportForm): - OpenLPImportForm.setWindowTitle(translate('OpenLPImportForm', 'openlp.org Song Importer')) + def retranslateUi(self, OpenLPImportDialog): + OpenLPImportDialog.setWindowTitle(translate('OpenLPImportForm', 'openlp.org Song Importer')) self.ImportFileLabel.setText(translate('OpenLPImportForm', 'Select openlp.org songfile to import:')) self.ImportListLabel.setText(translate('OpenLPImportForm', 'Import File Song List')) self.ImportListTable.horizontalHeaderItem(0).setText(translate('OpenLPImportForm', 'Song Title')) diff --git a/openlp/plugins/songs/forms/opensongexportdialog.py b/openlp/plugins/songs/forms/opensongexportdialog.py index 571be630b..4d95e48e2 100644 --- a/openlp/plugins/songs/forms/opensongexportdialog.py +++ b/openlp/plugins/songs/forms/opensongexportdialog.py @@ -27,16 +27,16 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_OpenSongExportDialog(object): - def setupUi(self, OpenSongExportForm): - OpenSongExportForm.setObjectName(u'OpenSongExportDialog') - OpenSongExportForm.resize(473, 459) + def setupUi(self, OpenSongExportDialog): + OpenSongExportDialog.setObjectName(u'OpenSongExportDialog') + OpenSongExportDialog.resize(473, 459) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - OpenSongExportForm.setWindowIcon(icon) - self.verticalLayout_5 = QtGui.QVBoxLayout(OpenSongExportForm) + OpenSongExportDialog.setWindowIcon(icon) + self.verticalLayout_5 = QtGui.QVBoxLayout(OpenSongExportDialog) self.verticalLayout_5.setMargin(8) self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.ExportFileWidget = QtGui.QWidget(OpenSongExportForm) + self.ExportFileWidget = QtGui.QWidget(OpenSongExportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -60,7 +60,7 @@ class Ui_OpenSongExportDialog(object): self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) self.verticalLayout_5.addWidget(self.ExportFileWidget) - self.SongListFrame = QtGui.QFrame(OpenSongExportForm) + self.SongListFrame = QtGui.QFrame(OpenSongExportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -243,7 +243,7 @@ class Ui_OpenSongExportDialog(object): self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) self.verticalLayout_5.addWidget(self.SongListFrame) - self.ProgressGroupBox = QtGui.QGroupBox(OpenSongExportForm) + self.ProgressGroupBox = QtGui.QGroupBox(OpenSongExportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -262,7 +262,7 @@ class Ui_OpenSongExportDialog(object): self.ProgressBar.setObjectName(u'ProgressBar') self.verticalLayout_4.addWidget(self.ProgressBar) self.verticalLayout_5.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(OpenSongExportForm) + self.ButtonBarWidget = QtGui.QWidget(OpenSongExportDialog) self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) self.horizontalLayout_7.setSpacing(8) @@ -278,15 +278,15 @@ class Ui_OpenSongExportDialog(object): self.horizontalLayout_7.addWidget(self.ClosePushButton) self.verticalLayout_5.addWidget(self.ButtonBarWidget) - self.retranslateUi(OpenSongExportForm) - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongExportForm.close) + self.retranslateUi(OpenSongExportDialog) + QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongExportDialog.close) QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll) QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) - QtCore.QMetaObject.connectSlotsByName(OpenSongExportForm) + QtCore.QMetaObject.connectSlotsByName(OpenSongExportDialog) - def retranslateUi(self, OpenSongExportForm): - OpenSongExportForm.setWindowTitle(translate('OpenSong Song Exporter')) + def retranslateUi(self, OpenSongExportDialog): + OpenSongExportDialog.setWindowTitle(translate('OpenSong Song Exporter')) self.ExportFileLabel.setText(translate('OpenSongExportForm', 'Select OpenSong song folder:')) self.ExportListLabel.setText(translate('OpenSongExportForm', 'Full Song List')) self.ExportListTable.horizontalHeaderItem(0).setText(translate('OpenSongExportForm', 'Song Title')) diff --git a/openlp/plugins/songs/forms/opensongimportdialog.py b/openlp/plugins/songs/forms/opensongimportdialog.py index df9bce507..9091e08ad 100644 --- a/openlp/plugins/songs/forms/opensongimportdialog.py +++ b/openlp/plugins/songs/forms/opensongimportdialog.py @@ -27,17 +27,17 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_OpenSongImportDialog(object): - def setupUi(self, OpenSongImportForm): - OpenSongImportForm.setObjectName(u'OpenSongImportDialog') - OpenSongImportForm.resize(481, 172) + def setupUi(self, OpenSongImportDialog): + OpenSongImportDialog.setObjectName(u'OpenSongImportDialog') + OpenSongImportDialog.resize(481, 172) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - OpenSongImportForm.setWindowIcon(icon) - self.verticalLayout = QtGui.QVBoxLayout(OpenSongImportForm) + OpenSongImportDialog.setWindowIcon(icon) + self.verticalLayout = QtGui.QVBoxLayout(OpenSongImportDialog) self.verticalLayout.setSpacing(6) self.verticalLayout.setMargin(8) self.verticalLayout.setObjectName(u'verticalLayout') - self.ImportFileWidget = QtGui.QWidget(OpenSongImportForm) + self.ImportFileWidget = QtGui.QWidget(OpenSongImportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -61,7 +61,7 @@ class Ui_OpenSongImportDialog(object): self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) self.verticalLayout.addWidget(self.ImportFileWidget) - self.ProgressGroupBox = QtGui.QGroupBox(OpenSongImportForm) + self.ProgressGroupBox = QtGui.QGroupBox(OpenSongImportDialog) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -80,7 +80,7 @@ class Ui_OpenSongImportDialog(object): self.ProgressBar.setObjectName(u'ProgressBar') self.verticalLayout_4.addWidget(self.ProgressBar) self.verticalLayout.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(OpenSongImportForm) + self.ButtonBarWidget = QtGui.QWidget(OpenSongImportDialog) self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) self.horizontalLayout_7.setSpacing(8) @@ -96,12 +96,12 @@ class Ui_OpenSongImportDialog(object): self.horizontalLayout_7.addWidget(self.ClosePushButton) self.verticalLayout.addWidget(self.ButtonBarWidget) - self.retranslateUi(OpenSongImportForm) - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongImportForm.close) - QtCore.QMetaObject.connectSlotsByName(OpenSongImportForm) + self.retranslateUi(OpenSongImportDialog) + QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongImportDialog.close) + QtCore.QMetaObject.connectSlotsByName(OpenSongImportDialog) - def retranslateUi(self, OpenSongImportForm): - OpenSongImportForm.setWindowTitle(translate('OpenSongImportForm', 'OpenSong Song Importer')) + def retranslateUi(self, OpenSongImportDialog): + OpenSongImportDialog.setWindowTitle(translate('OpenSongImportForm', 'OpenSong Song Importer')) self.ImportFileLabel.setText(translate('OpenSongImportForm', 'OpenSong Folder:')) self.ProgressGroupBox.setTitle(translate('OpenSongImportForm', 'Progress:')) self.ProgressLabel.setText(translate('OpenSongImportForm', 'Ready to import')) diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py index 4276ae9da..3122ed21b 100644 --- a/openlp/plugins/songs/forms/songbookdialog.py +++ b/openlp/plugins/songs/forms/songbookdialog.py @@ -27,30 +27,30 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_SongBookDialog(object): - def setupUi(self, SongBookForm): - SongBookForm.setObjectName(u'SongBookDialog') - SongBookForm.resize(367, 120) - self.SongBookLayout = QtGui.QFormLayout(SongBookForm) + def setupUi(self, SongBookDialog): + SongBookDialog.setObjectName(u'SongBookDialog') + SongBookDialog.resize(367, 120) + self.SongBookLayout = QtGui.QFormLayout(SongBookDialog) self.SongBookLayout.setMargin(8) self.SongBookLayout.setSpacing(8) self.SongBookLayout.setObjectName(u'SongBookLayout') - self.NameLabel = QtGui.QLabel(SongBookForm) + self.NameLabel = QtGui.QLabel(SongBookDialog) self.NameLabel.setObjectName(u'NameLabel') self.SongBookLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.NameLabel) - self.NameEdit = QtGui.QLineEdit(SongBookForm) + self.NameEdit = QtGui.QLineEdit(SongBookDialog) self.NameEdit.setObjectName(u'NameEdit') self.SongBookLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.NameEdit) - self.PublisherLabel = QtGui.QLabel(SongBookForm) + self.PublisherLabel = QtGui.QLabel(SongBookDialog) self.PublisherLabel.setObjectName(u'PublisherLabel') self.SongBookLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.PublisherLabel) - self.PublisherEdit = QtGui.QLineEdit(SongBookForm) + self.PublisherEdit = QtGui.QLineEdit(SongBookDialog) self.PublisherEdit.setObjectName(u'PublisherEdit') self.SongBookLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.PublisherEdit) - self.ButtonBox = QtGui.QDialogButtonBox(SongBookForm) + self.ButtonBox = QtGui.QDialogButtonBox(SongBookDialog) self.ButtonBox.setOrientation(QtCore.Qt.Horizontal) self.ButtonBox.setStandardButtons( QtGui.QDialogButtonBox.Save | QtGui.QDialogButtonBox.Cancel) @@ -58,14 +58,14 @@ class Ui_SongBookDialog(object): self.SongBookLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.ButtonBox) - self.retranslateUi(SongBookForm) + self.retranslateUi(SongBookDialog) QtCore.QObject.connect(self.ButtonBox, - QtCore.SIGNAL(u'accepted()'), SongBookForm.accept) + QtCore.SIGNAL(u'accepted()'), SongBookDialog.accept) QtCore.QObject.connect(self.ButtonBox, - QtCore.SIGNAL(u'rejected()'), SongBookForm.reject) - QtCore.QMetaObject.connectSlotsByName(SongBookForm) + QtCore.SIGNAL(u'rejected()'), SongBookDialog.reject) + QtCore.QMetaObject.connectSlotsByName(SongBookDialog) - def retranslateUi(self, SongBookForm): - SongBookForm.setWindowTitle(translate('SongBookForm', 'Edit Book')) + def retranslateUi(self, SongBookDialog): + SongBookDialog.setWindowTitle(translate('SongBookForm', 'Edit Book')) self.NameLabel.setText(translate('SongBookForm', 'Name:')) self.PublisherLabel.setText(translate('SongBookForm', 'Publisher:')) diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py index ca4b5ec0e..a8751b132 100644 --- a/openlp/plugins/songs/forms/songmaintenancedialog.py +++ b/openlp/plugins/songs/forms/songmaintenancedialog.py @@ -28,15 +28,15 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import build_icon, translate class Ui_SongMaintenanceDialog(object): - def setupUi(self, SongMaintenanceForm): - SongMaintenanceForm.setObjectName(u'SongMaintenanceDialog') - SongMaintenanceForm.setWindowModality(QtCore.Qt.ApplicationModal) - SongMaintenanceForm.resize(486, 361) - self.DialogLayout = QtGui.QVBoxLayout(SongMaintenanceForm) + def setupUi(self, SongMaintenanceDialog): + SongMaintenanceDialog.setObjectName(u'SongMaintenanceDialog') + SongMaintenanceDialog.setWindowModality(QtCore.Qt.ApplicationModal) + SongMaintenanceDialog.resize(486, 361) + self.DialogLayout = QtGui.QVBoxLayout(SongMaintenanceDialog) self.DialogLayout.setSpacing(8) self.DialogLayout.setMargin(8) self.DialogLayout.setObjectName(u'DialogLayout') - self.ContentWidget = QtGui.QWidget(SongMaintenanceForm) + self.ContentWidget = QtGui.QWidget(SongMaintenanceDialog) self.ContentWidget.setObjectName(u'ContentWidget') self.ContentLayout = QtGui.QHBoxLayout(self.ContentWidget) self.ContentLayout.setSpacing(8) @@ -192,23 +192,23 @@ class Ui_SongMaintenanceDialog(object): self.TypeStackedWidget.addWidget(self.BooksPage) self.ContentLayout.addWidget(self.TypeStackedWidget) self.DialogLayout.addWidget(self.ContentWidget) - self.MaintenanceButtonBox = QtGui.QDialogButtonBox(SongMaintenanceForm) + self.MaintenanceButtonBox = QtGui.QDialogButtonBox(SongMaintenanceDialog) self.MaintenanceButtonBox.setOrientation(QtCore.Qt.Horizontal) self.MaintenanceButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Close) self.MaintenanceButtonBox.setObjectName(u'MaintenanceButtonBox') self.DialogLayout.addWidget(self.MaintenanceButtonBox) - self.retranslateUi(SongMaintenanceForm) + self.retranslateUi(SongMaintenanceDialog) self.TypeStackedWidget.setCurrentIndex(0) QtCore.QObject.connect(self.MaintenanceButtonBox, - QtCore.SIGNAL(u'rejected()'), SongMaintenanceForm.accept) + QtCore.SIGNAL(u'rejected()'), SongMaintenanceDialog.accept) QtCore.QObject.connect(self.TypeListWidget, QtCore.SIGNAL(u'currentRowChanged(int)'), self.TypeStackedWidget.setCurrentIndex) - QtCore.QMetaObject.connectSlotsByName(SongMaintenanceForm) + QtCore.QMetaObject.connectSlotsByName(SongMaintenanceDialog) - def retranslateUi(self, SongMaintenanceForm): - SongMaintenanceForm.setWindowTitle(translate('SongMaintenanceForm', 'Song Maintenance')) + def retranslateUi(self, SongMaintenanceDialog): + SongMaintenanceDialog.setWindowTitle(translate('SongMaintenanceForm', 'Song Maintenance')) self.TypeListWidget.item(0).setText(translate('SongMaintenanceForm', 'Authors')) self.TypeListWidget.item(1).setText(translate('SongMaintenanceForm', 'Topics')) self.TypeListWidget.item(2).setText(translate('SongMaintenanceForm', 'Books/Hymnals')) diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py index 559c24e12..a78d905f4 100644 --- a/openlp/plugins/songs/forms/topicsdialog.py +++ b/openlp/plugins/songs/forms/topicsdialog.py @@ -27,24 +27,24 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_TopicsDialog(object): - def setupUi(self, TopicsForm): - TopicsForm.setObjectName(u'TopicsDialog') - TopicsForm.resize(365, 77) - self.TopicLayout = QtGui.QFormLayout(TopicsForm) + def setupUi(self, TopicsDialog): + TopicsDialog.setObjectName(u'TopicsDialog') + TopicsDialog.resize(365, 77) + self.TopicLayout = QtGui.QFormLayout(TopicsDialog) self.TopicLayout.setFieldGrowthPolicy( QtGui.QFormLayout.ExpandingFieldsGrow) self.TopicLayout.setMargin(8) self.TopicLayout.setSpacing(8) self.TopicLayout.setObjectName(u'TopicLayout') - self.NameLabel = QtGui.QLabel(TopicsForm) + self.NameLabel = QtGui.QLabel(TopicsDialog) self.NameLabel.setObjectName(u'NameLabel') self.TopicLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.NameLabel) - self.NameEdit = QtGui.QLineEdit(TopicsForm) + self.NameEdit = QtGui.QLineEdit(TopicsDialog) self.NameEdit.setObjectName(u'NameEdit') self.TopicLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.NameEdit) - self.TopicButtonBox = QtGui.QDialogButtonBox(TopicsForm) + self.TopicButtonBox = QtGui.QDialogButtonBox(TopicsDialog) self.TopicButtonBox.setOrientation(QtCore.Qt.Horizontal) self.TopicButtonBox.setStandardButtons( QtGui.QDialogButtonBox.Save | QtGui.QDialogButtonBox.Cancel) @@ -52,13 +52,13 @@ class Ui_TopicsDialog(object): self.TopicLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.TopicButtonBox) - self.retranslateUi(TopicsForm) + self.retranslateUi(TopicsDialog) QtCore.QObject.connect(self.TopicButtonBox, - QtCore.SIGNAL(u'accepted()'), TopicsForm.accept) + QtCore.SIGNAL(u'accepted()'), TopicsDialog.accept) QtCore.QObject.connect(self.TopicButtonBox, - QtCore.SIGNAL(u'rejected()'), TopicsForm.reject) - QtCore.QMetaObject.connectSlotsByName(TopicsForm) + QtCore.SIGNAL(u'rejected()'), TopicsDialog.reject) + QtCore.QMetaObject.connectSlotsByName(TopicsDialog) - def retranslateUi(self, TopicsForm): - TopicsForm.setWindowTitle(translate('TopicsForm', 'Topic Maintenance')) + def retranslateUi(self, TopicsDialog): + TopicsDialog.setWindowTitle(translate('TopicsForm', 'Topic Maintenance')) self.NameLabel.setText(translate('TopicsForm', 'Topic name:')) diff --git a/openlp/plugins/songusage/forms/songusagedeletedialog.py b/openlp/plugins/songusage/forms/songusagedeletedialog.py index dc02965f5..02b7496b2 100644 --- a/openlp/plugins/songusage/forms/songusagedeletedialog.py +++ b/openlp/plugins/songusage/forms/songusagedeletedialog.py @@ -27,10 +27,10 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_SongUsageDeleteDialog(object): - def setupUi(self, AuditDeleteDialog): - AuditDeleteDialog.setObjectName(u'AuditDeleteDialog') - AuditDeleteDialog.resize(291, 243) - self.layoutWidget = QtGui.QWidget(AuditDeleteDialog) + def setupUi(self, SongUsageDeleteDialog): + SongUsageDeleteDialog.setObjectName(u'SongUsageDeleteDialog') + SongUsageDeleteDialog.resize(291, 243) + self.layoutWidget = QtGui.QWidget(SongUsageDeleteDialog) self.layoutWidget.setGeometry(QtCore.QRect(20, 10, 247, 181)) self.layoutWidget.setObjectName(u'layoutWidget') self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget) @@ -42,20 +42,20 @@ class Ui_SongUsageDeleteDialog(object): QtGui.QCalendarWidget.NoVerticalHeader) self.DeleteCalendar.setObjectName(u'DeleteCalendar') self.verticalLayout.addWidget(self.DeleteCalendar) - self.buttonBox = QtGui.QDialogButtonBox(AuditDeleteDialog) + self.buttonBox = QtGui.QDialogButtonBox(SongUsageDeleteDialog) self.buttonBox.setGeometry(QtCore.QRect(30, 210, 245, 25)) self.buttonBox.setStandardButtons( QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) self.buttonBox.setObjectName(u'buttonBox') - self.retranslateUi(AuditDeleteDialog) + self.retranslateUi(SongUsageDeleteDialog) QtCore.QObject.connect( self.buttonBox, QtCore.SIGNAL(u'accepted()'), - AuditDeleteDialog.accept) + SongUsageDeleteDialog.accept) QtCore.QObject.connect( self.buttonBox, QtCore.SIGNAL(u'rejected()'), - AuditDeleteDialog.close) - QtCore.QMetaObject.connectSlotsByName(AuditDeleteDialog) + SongUsageDeleteDialog.close) + QtCore.QMetaObject.connectSlotsByName(SongUsageDeleteDialog) - def retranslateUi(self, AuditDeleteDialog): - AuditDeleteDialog.setWindowTitle(translate('AuditDeleteDialog', 'Song Usage Delete')) + def retranslateUi(self, SongUsageDeleteDialog): + SongUsageDeleteDialog.setWindowTitle(translate('AuditDeleteDialog', 'Song Usage Delete')) diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py index 9512a4278..9e25651ab 100644 --- a/openlp/plugins/songusage/forms/songusagedetaildialog.py +++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py @@ -27,12 +27,12 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_SongUsageDetailDialog(object): - def setupUi(self, AuditDetailDialog): - AuditDetailDialog.setObjectName(u'AuditDetailDialog') - AuditDetailDialog.resize(609, 413) - self.verticalLayout = QtGui.QVBoxLayout(AuditDetailDialog) + def setupUi(self, SongUsageDetailDialog): + SongUsageDetailDialog.setObjectName(u'SongUsageDetailDialog') + SongUsageDetailDialog.resize(609, 413) + self.verticalLayout = QtGui.QVBoxLayout(SongUsageDetailDialog) self.verticalLayout.setObjectName(u'verticalLayout') - self.DateRangeGroupBox = QtGui.QGroupBox(AuditDetailDialog) + self.DateRangeGroupBox = QtGui.QGroupBox(SongUsageDetailDialog) self.DateRangeGroupBox.setObjectName(u'DateRangeGroupBox') self.verticalLayout_2 = QtGui.QVBoxLayout(self.DateRangeGroupBox) self.verticalLayout_2.setObjectName(u'verticalLayout_2') @@ -69,25 +69,25 @@ class Ui_SongUsageDetailDialog(object): self.verticalLayout_4.addLayout(self.horizontalLayout) self.verticalLayout_2.addWidget(self.FileGroupBox) self.verticalLayout.addWidget(self.DateRangeGroupBox) - self.buttonBox = QtGui.QDialogButtonBox(AuditDetailDialog) + self.buttonBox = QtGui.QDialogButtonBox(SongUsageDetailDialog) self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) self.buttonBox.setObjectName(u'buttonBox') self.verticalLayout.addWidget(self.buttonBox) - self.retranslateUi(AuditDetailDialog) + self.retranslateUi(SongUsageDetailDialog) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'), - AuditDetailDialog.accept) + SongUsageDetailDialog.accept) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'), - AuditDetailDialog.close) + SongUsageDetailDialog.close) QtCore.QObject.connect(self.SaveFilePushButton, QtCore.SIGNAL(u'pressed()'), - AuditDetailDialog.defineOutputLocation) - QtCore.QMetaObject.connectSlotsByName(AuditDetailDialog) + SongUsageDetailDialog.defineOutputLocation) + QtCore.QMetaObject.connectSlotsByName(SongUsageDetailDialog) - def retranslateUi(self, AuditDetailDialog): - AuditDetailDialog.setWindowTitle(translate('AuditDetailDialog', 'Song Usage Extraction')) + def retranslateUi(self, SongUsageDetailDialog): + SongUsageDetailDialog.setWindowTitle(translate('AuditDetailDialog', 'Song Usage Extraction')) self.DateRangeGroupBox.setTitle(translate('AuditDetailDialog', 'Select Date Range')) self.ToLabel.setText(translate('AuditDetailDialog', 'to')) self.FileGroupBox.setTitle(translate('AuditDetailDialog', 'Report Location'))