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

Fix bug #1668669 by reducing the height of the widget.

Browse Source 
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-Windo...

bzr-revno: 2673
This commit is contained in:
raoul@snyman.info 2017-03-02 17:49:44 +00:00 committed by Tim Bentley
commit 0d6f015eec
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/ui/settingsdialog.py
View File

@ -39,7 +39,7 @@ class Ui_SettingsDialog(object):
""" """
settings_dialog.setObjectName('settings_dialog') settings_dialog.setObjectName('settings_dialog')
settings_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg')) 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 = QtWidgets.QGridLayout(settings_dialog)
self.dialog_layout.setObjectName('dialog_layout') self.dialog_layout.setObjectName('dialog_layout')
self.dialog_layout.setContentsMargins(8, 8, 8, 8) self.dialog_layout.setContentsMargins(8, 8, 8, 8)

11
tests/functional/openlp_core_ui/test_settingsform.py
View File

@ -151,3 +151,14 @@ class TestSettingsForm(TestCase):
# THEN: The general tab's cancel() method should have been called, but not the themes tab # THEN: The general tab's cancel() method should have been called, but not the themes tab
mocked_general_cancel.assert_called_with() mocked_general_cancel.assert_called_with()
self.assertEqual(0, mocked_theme_cancel.call_count, 'The Themes tab\'s cancel() should not have been called') 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