Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-1668669-2.4 into lp:openlp/2.4.
Requested reviews: OpenLP Core (openlp-core) Related bugs: Bug #1668669 in OpenLP: "Configure OpenLP windows extends beyond the bottom of the screen" https://bugs.launchpad.net/openlp/+bug/1668669 For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/bug-1668669-2.4/+merge/318821 Fix bug #1668669 by reducing the height of the widget. Add this to your merge proposal: -------------------------------- lp:~raoul-snyman/openlp/bug-1668669-2.4 (revision 2673) [SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1908/ [SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1819/ [SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1759/ [SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1493/ [SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1083/ [SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1151/ [SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/1019/ -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-1668669-2.4 into lp:openlp/2.4.
=== modified file 'openlp/core/ui/settingsdialog.py' --- openlp/core/ui/settingsdialog.py 2016-12-31 11:05:48 +0000 +++ openlp/core/ui/settingsdialog.py 2017-03-02 17:37:15 +0000 @@ -39,7 +39,7 @@ """ settings_dialog.setObjectName('settings_dialog') settings_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) - settings_dialog.resize(800, 700) + settings_dialog.resize(920, 625) self.dialog_layout = QtWidgets.QGridLayout(settings_dialog) self.dialog_layout.setObjectName('dialog_layout') self.dialog_layout.setContentsMargins(8, 8, 8, 8) === modified file 'tests/functional/openlp_core_ui/test_settingsform.py' --- tests/functional/openlp_core_ui/test_settingsform.py 2016-12-31 11:05:48 +0000 +++ tests/functional/openlp_core_ui/test_settingsform.py 2017-03-02 17:37:15 +0000 @@ -151,3 +151,14 @@ # THEN: The general tab's cancel() method should have been called, but not the themes tab mocked_general_cancel.assert_called_with() self.assertEqual(0, mocked_theme_cancel.call_count, 'The Themes tab\'s cancel() should not have been called') + + def test_register_post_process(self): + # GIVEN: A settings form instance + settings_form = SettingsForm(None) + fake_function = MagicMock() + + # WHEN: register_post_process() is called + settings_form.register_post_process(fake_function) + + # THEN: The fake function should be in the settings form's list + assert fake_function in settings_form.processes
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp