raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix links and Color buttons

Browse Source 
bzr-revno: 2452
This commit is contained in:
Philip Ridout 2014-12-07 08:16:15 +00:00 committed by Tim Bentley
commit c9a2b87ac5
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/colorbutton.py
View File

@ -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
"""

8
openlp/core/ui/aboutdialog.py
View File

@ -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'

8
openlp/core/ui/themeform.py
View File

@ -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.
"""

2
tests/functional/openlp_core_lib/test_color_button.py
View File

@ -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')