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

Merge branch 'fix-twice-modal' into 'master'

Browse Source 
Avoiding screen setup changed modals twice+ on fast screen changes

See merge request openlp/openlp!438
This commit is contained in:
Tim Bentley 2022-03-03 07:59:39 +00:00
commit 67f682cdfd
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1015,13 +1015,13 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert
# also do not show if the settings window is visible # also do not show if the settings window is visible
if not self.settings_form.isVisible() and not self.screen_change_timestamp or \ if not self.settings_form.isVisible() and not self.screen_change_timestamp or \
self.screen_change_timestamp and (datetime.now() - self.screen_change_timestamp).seconds > 5: self.screen_change_timestamp and (datetime.now() - self.screen_change_timestamp).seconds > 5:
self.screen_change_timestamp = datetime.now()
QtWidgets.QMessageBox.warning(self, translate('OpenLP.MainWindow', 'Screen setup has changed'), QtWidgets.QMessageBox.warning(self, translate('OpenLP.MainWindow', 'Screen setup has changed'),
translate('OpenLP.MainWindow', translate('OpenLP.MainWindow',
'The screen setup has changed. ' 'The screen setup has changed. '
'OpenLP will try to automatically select a display screen, but ' 'OpenLP will try to automatically select a display screen, but '
'you should consider updating the screen settings.'), 'you should consider updating the screen settings.'),
QtWidgets.QMessageBox.StandardButtons(QtWidgets.QMessageBox.Ok)) QtWidgets.QMessageBox.StandardButtons(QtWidgets.QMessageBox.Ok))
self.screen_change_timestamp = datetime.now()
def closeEvent(self, event): def closeEvent(self, event):
""" """

43
tests/openlp_core/ui/test_mainwindow.py
View File

@ -687,3 +687,46 @@ def test_load_settings_view_mode_live(mocked_view_mode, main_window, settings):
# THEN: # THEN:
# The default mode should have been called. # The default mode should have been called.
mocked_view_mode.assert_called_with(True, True, True, True, False, True) mocked_view_mode.assert_called_with(True, True, True, True, False, True)
@patch('openlp.core.ui.mainwindow.QtWidgets.QMessageBox.warning')
def test_screen_changed_modal(mocked_warning, main_window):
"""
Test that the screen changed modal is shown whether a 'config_screen_changed' event is dispatched
"""
# GIVEN: a newly opened OpenLP instance, mocked screens and renderer
main_window._live_controller = MagicMock()
main_window._preview_controller = MagicMock()
main_window._renderer = MagicMock()
# WHEN: we trigger a 'config_screen_changed' event
Registry().execute('config_screen_changed')
# THEN: The modal should be called once
mocked_warning.assert_called_once()
@patch('openlp.core.ui.mainwindow.QtWidgets.QMessageBox.warning')
def test_screen_changed_modal_sets_timestamp_before_blocking_on_modal(mocked_warning, main_window):
"""
Test that the screen changed modal latest shown timestamp is set before showing warning message, so
that duplicate modals due to event spamming on 'config_screen_changed' in less than 5 seconds is mitigated.
"""
# GIVEN: a newly opened OpenLP instance, mocked screens, renderer and an special QMessageBox warning handler
main_window._live_controller = MagicMock()
main_window._preview_controller = MagicMock()
main_window._renderer = MagicMock()
def resets_timestamp(*args, **kwargs):
nonlocal main_window
main_window.screen_change_timestamp = None
mocked_warning.side_effect = resets_timestamp
# WHEN: we trigger a 'config_screen_changed' event
Registry().execute('config_screen_changed')
# THEN: main_window.screen_change_timestamp should be "None", indicating that timestamp is set before
# the blocking modal is shown.
mocked_warning.assert_called_once()
assert main_window.screen_change_timestamp is None