← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~alisonken1/openlp/projector-manager-typos into lp:openlp

 

Ken Roberts has proposed merging lp:~alisonken1/openlp/projector-manager-typos into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/projector-manager-typos/+merge/250229

Fix typo's in function calls

lp:~alisonken1/openlp/projector-manager-typos (revision 2502)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/956/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/882/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/826/
[SUCCESS] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/718/
[SUCCESS] http://ci.openlp.org/job/Branch-04b-Windows_Interface_Tests/317/
[FAILURE] http://ci.openlp.org/job/Branch-05a-Code_Analysis/454/
Stopping after failure

Code analysis failure:
openlp/branch/openlp/core/common/historycombobox.py
Not part of this branch
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/projector-manager-typos into lp:openlp.
=== modified file 'openlp/core/ui/projector/manager.py'
--- openlp/core/ui/projector/manager.py	2015-01-22 17:42:29 +0000
+++ openlp/core/ui/projector/manager.py	2015-02-18 22:29:51 +0000
@@ -114,15 +114,15 @@
                                             text=translate('OpenLP.ProjectorManager',
                                                            'Connect to selected projector'),
                                             icon=':/projector/projector_connect.png',
-                                            tootip=translate('OpenLP.ProjectorManager',
-                                                             'Connect to selected projector'),
+                                            tooltip=translate('OpenLP.ProjectorManager',
+                                                              'Connect to selected projector'),
                                             triggers=self.on_connect_projector)
         self.one_toolbar.add_toolbar_action('connect_projector_multiple',
                                             text=translate('OpenLP.ProjectorManager',
                                                            'Connect to selected projectors'),
                                             icon=':/projector/projector_connect_tiled.png',
-                                            tootip=translate('OpenLP.ProjectorManager',
-                                                             'Connect to selected projector'),
+                                            tooltip=translate('OpenLP.ProjectorManager',
+                                                              'Connect to selected projector'),
                                             triggers=self.on_connect_projector)
         self.one_toolbar.add_toolbar_action('disconnect_projector',
                                             text=translate('OpenLP.ProjectorManager',
@@ -181,15 +181,15 @@
                                                               'Blank selected projector screen'),
                                             triggers=self.on_blank_projector)
         self.one_toolbar.add_toolbar_action('show_projector',
-                                            ext=translate('OpenLP.ProjectorManager',
-                                                          'Show selected projector screen'),
+                                            text=translate('OpenLP.ProjectorManager',
+                                                           'Show selected projector screen'),
                                             icon=':/projector/projector_show.png',
                                             tooltip=translate('OpenLP.ProjectorManager',
                                                               'Show selected projector screen'),
                                             triggers=self.on_show_projector)
         self.one_toolbar.add_toolbar_action('show_projector_multiple',
-                                            ext=translate('OpenLP.ProjectorManager',
-                                                          'Show selected projector screen'),
+                                            text=translate('OpenLP.ProjectorManager',
+                                                           'Show selected projector screen'),
                                             icon=':/projector/projector_show_tiled.png',
                                             tooltip=translate('OpenLP.ProjectorManager',
                                                               'Show selected projector screen'),


Follow ups