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

Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows.

Browse Source
This commit is contained in:
Tomas Groth 2015-10-13 22:52:33 +01:00
parent 924d0f8b29
commit 949bf4a8a7
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openlp/core/ui/maindisplay.py
View File

@ -173,6 +173,19 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
Registry().register_function('live_display_hide', self.hide_display) Registry().register_function('live_display_hide', self.hide_display)
Registry().register_function('live_display_show', self.show_display) Registry().register_function('live_display_show', self.show_display)
Registry().register_function('update_display_css', self.css_changed) Registry().register_function('update_display_css', self.css_changed)
self.close_display = False
def closeEvent(self, event):
"""
Catch the close event, and check that the close event is triggered by OpenLP closing the display.
On Windows this event can be triggered by pressing ALT+F4, which we want to ignore.
:param event: The triggered event
"""
if self.close_display:
super().closeEvent(event)
else:
event.ignore()
def close(self): def close(self):
""" """
@ -182,6 +195,7 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
Registry().remove_function('live_display_hide', self.hide_display) Registry().remove_function('live_display_hide', self.hide_display)
Registry().remove_function('live_display_show', self.show_display) Registry().remove_function('live_display_show', self.show_display)
Registry().remove_function('update_display_css', self.css_changed) Registry().remove_function('update_display_css', self.css_changed)
self.close_display = True
super().close() super().close()
def set_transparency(self, enabled): def set_transparency(self, enabled):