openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #31041
[Merge] lp:~raoul-snyman/openlp/hide-projectors into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/hide-projectors into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/hide-projectors/+merge/315518
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/hide-projectors (revision 2719)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1894/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1805/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1744/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1480/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1070/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1138/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/1006/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/150/
--
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/hide-projectors into lp:openlp.
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2016-12-31 11:01:36 +0000
+++ openlp/core/ui/mainwindow.py 2017-01-24 22:04:07 +0000
@@ -176,6 +176,7 @@
self.projector_manager_contents = ProjectorManager(self.projector_manager_dock)
self.projector_manager_contents.setObjectName('projector_manager_contents')
self.projector_manager_dock.setWidget(self.projector_manager_contents)
+ self.projector_manager_dock.setVisible(False)
main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, self.projector_manager_dock)
# Create the menu items
action_list = ActionList.get_instance()
=== modified file 'tests/functional/openlp_core_ui/test_mainwindow.py'
--- tests/functional/openlp_core_ui/test_mainwindow.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_core_ui/test_mainwindow.py 2017-01-24 22:04:07 +0000
@@ -158,6 +158,15 @@
self.assertTrue('plugin_manager' in self.registry.service_list,
'The plugin_manager should have been registered.')
+ def test_projector_manager_hidden_on_startup(self):
+ """
+ Test that the projector manager is hidden on startup
+ """
+ # GIVEN: A built main window
+ # WHEN: OpenLP is started
+ # THEN: The projector manager should be hidden
+ self.main_window.projector_manager_dock.setVisible.assert_called_once_with(False)
+
def test_on_search_shortcut_triggered_shows_media_manager(self):
"""
Test that the media manager is made visible when the search shortcut is triggered
Follow ups