openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxx>]

Phill has proposed merging lp:~phill-ridout/openlp/fixesa into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1390697 in OpenLP: "Update URLs in About Dialog"
  https://bugs.launchpad.net/openlp/+bug/1390697

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/fixesa/+merge/243586

A few minor fixes.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/fixesa into lp:openlp.

=== modified file 'openlp/core/lib/colorbutton.py'
--- openlp/core/lib/colorbutton.py	2014-11-02 16:50:18 +0000
+++ openlp/core/lib/colorbutton.py	2014-12-03 19:55:41 +0000
@@ -73,7 +73,7 @@
     @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
         """

=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py	2014-05-03 15:01:43 +0000
+++ openlp/core/ui/aboutdialog.py	2014-12-03 19:55:41 +0000
@@ -225,10 +225,10 @@
                       '\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'

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2014-11-02 19:57:06 +0000
+++ openlp/core/ui/themeform.py	2014-12-03 19:55:41 +0000
@@ -67,8 +67,8 @@
         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 @@
         """
         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.
         """

=== modified file 'tests/functional/openlp_core_lib/test_color_button.py'
--- tests/functional/openlp_core_lib/test_color_button.py	2014-11-02 17:19:02 +0000
+++ tests/functional/openlp_core_lib/test_color_button.py	2014-12-03 19:55:41 +0000
@@ -202,5 +202,5 @@
         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')