diff --git a/openlp/core/lib/searchedit.py b/openlp/core/lib/searchedit.py index b4069d9f8..14863878d 100644 --- a/openlp/core/lib/searchedit.py +++ b/openlp/core/lib/searchedit.py @@ -54,8 +54,8 @@ class SearchEdit(QtGui.QLineEdit): self.clear_button.setStyleSheet(u'QToolButton { border: none; padding: 0px; }') self.clear_button.resize(18, 18) self.clear_button.hide() - QtCore.QObject.connect(self.clear_button, QtCore.SIGNAL(u'clicked()'), self._on_clear_button_clicked) - QtCore.QObject.connect(self, QtCore.SIGNAL(u'textChanged(const QString&)'), self._on_search_edit_text_changed) + self.clear_button.clicked.connect(self._on_clear_button_clicked) + self.textChanged.connect(self._on_search_edit_text_changed) self._update_style_sheet() self.setAcceptDrops(False) diff --git a/openlp/core/ui/aboutform.py b/openlp/core/ui/aboutform.py index 29f64c0cd..c847f1f04 100644 --- a/openlp/core/ui/aboutform.py +++ b/openlp/core/ui/aboutform.py @@ -57,7 +57,7 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog): build_text = u'' about_text = about_text.replace(u'', build_text) self.about_text_edit.setPlainText(about_text) - QtCore.QObject.connect(self.volunteer_button, QtCore.SIGNAL(u'clicked()'), self.on_volunteer_button_clicked) + self.volunteer_button.clicked.connect(self.on_volunteer_button_clicked) def on_volunteer_button_clicked(self): """ diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index 0bc8dc44d..7b9339237 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -85,7 +85,7 @@ class Ui_ExceptionDialog(object): self.exceptionLayout.addWidget(self.button_box) self.retranslateUi(exceptionDialog) - QtCore.QObject.connect(self.descriptionTextEdit, QtCore.SIGNAL(u'textChanged()'), self.onDescriptionUpdated) + self.descriptionTextEdit.textChanged.connect(self.onDescriptionUpdated) def retranslateUi(self, exceptionDialog): """ diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index e4a9368a8..dd60ca968 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -98,10 +98,9 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard): self.update_screen_list_combo() self.was_download_cancelled = False self.downloading = translate('OpenLP.FirstTimeWizard', 'Downloading %s...') - QtCore.QObject.connect(self.cancelButton, QtCore.SIGNAL('clicked()'), self.onCancelButtonClicked) - QtCore.QObject.connect(self.noInternetFinishButton, QtCore.SIGNAL('clicked()'), - self.onNoInternetFinishButtonClicked) - QtCore.QObject.connect(self, QtCore.SIGNAL(u'currentIdChanged(int)'), self.onCurrentIdChanged) + self.cancelButton.clicked.connect(self.onCancelButtonClicked) + self.noInternetFinishButton.clicked.connect(self.onNoInternetFinishButtonClicked) + self.currentIdChanged.connect(self.onCurrentIdChanged) Registry().register_function(u'config_screen_changed', self.update_screen_list_combo) def exec_(self): diff --git a/openlp/core/ui/serviceitemeditform.py b/openlp/core/ui/serviceitemeditform.py index 54e6c8cc4..62870492b 100644 --- a/openlp/core/ui/serviceitemeditform.py +++ b/openlp/core/ui/serviceitemeditform.py @@ -46,7 +46,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog): QtGui.QDialog.__init__(self, self.main_window) self.setupUi(self) self.item_list = [] - QtCore.QObject.connect(self.list_widget, QtCore.SIGNAL(u'currentRowChanged(int)'), self.on_current_row_changed) + self.list_widget.currentRowChanged.connect(self.on_current_row_changed) def set_service_item(self, item): """ @@ -161,3 +161,4 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog): return self._main_window main_window = property(_get_main_window) +