diff --git a/openlp/core/lib/colorbutton.py b/openlp/core/lib/colorbutton.py index 6ebf9ee99..30d2ad394 100644 --- a/openlp/core/lib/colorbutton.py +++ b/openlp/core/lib/colorbutton.py @@ -73,7 +73,7 @@ class ColorButton(QtGui.QPushButton): @color.setter def color(self, color): """ - Property setter to change the imstamce color + Property setter to change the instance color :param color: String representation of a hexidecimal color """ diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index 251e0657c..99ddcc92d 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -225,10 +225,10 @@ class Ui_AboutDialog(object): '\n' 'Built With\n' ' Python: http://www.python.org/\n' - ' Qt4: http://qt.digia.com/\n' - ' PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/' - 'intro\n' - ' Oxygen Icons: http://oxygen-icons.org/\n' + ' Qt4: http://qt.io\n' + ' PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro\n' + ' Oxygen Icons: http://techbase.kde.org/Projects/Oxygen/\n' + ' MuPDF: http://www.mupdf.com/\n' '\n' 'Final Credit\n' ' "For God so loved the world that He gave\n' diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 611ac2d4d..0c90986e5 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -67,8 +67,8 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard, RegistryProperties): self.gradient_combo_box.currentIndexChanged.connect(self.on_gradient_combo_box_current_index_changed) self.color_button.colorChanged.connect(self.on_color_changed) self.image_color_button.colorChanged.connect(self.on_image_color_changed) - self.gradient_start_button.colorChanged.connect(self.on_gradient_start_button_changed) - self.gradient_end_button.colorChanged.connect(self.on_gradient_end_button_changed) + self.gradient_start_button.colorChanged.connect(self.on_gradient_start_color_changed) + self.gradient_end_button.colorChanged.connect(self.on_gradient_end_color_changed) self.image_browse_button.clicked.connect(self.on_image_browse_button_clicked) self.image_file_edit.editingFinished.connect(self.on_image_file_edit_editing_finished) self.main_color_button.colorChanged.connect(self.on_main_color_changed) @@ -411,13 +411,13 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard, RegistryProperties): """ self.theme.background_border_color = color - def on_gradient_start_button_changed(self, color): + def on_gradient_start_color_changed(self, color): """ Gradient 2 _color button pushed. """ self.theme.background_start_color = color - def on_gradient_end_button_changed(self, color): + def on_gradient_end_color_changed(self, color): """ Gradient 2 _color button pushed. """ diff --git a/tests/functional/openlp_core_lib/test_color_button.py b/tests/functional/openlp_core_lib/test_color_button.py index a7b743918..3d605b6d5 100644 --- a/tests/functional/openlp_core_lib/test_color_button.py +++ b/tests/functional/openlp_core_lib/test_color_button.py @@ -202,5 +202,5 @@ class TestColorDialog(TestCase): widget.on_clicked() # THEN: change_color should have been called and the colorChanged signal should have been emitted - self.mocked_change_color.assert_call_once_with('#ffffff') + self.mocked_change_color.assert_called_once_with('#ffffff') self.mocked_color_changed.emit.assert_called_once_with('#ffffff')