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

Fix bug #1247661 by restoring the main window when it was previously minimized and user switch to OpenLP from another app.

This commit is contained in:
Martin Zibricky 2014-01-30 08:16:36 +01:00
parent 109030c2c2
commit 252701451d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/core/__init__.py
View File

@ -220,8 +220,15 @@ class OpenLP(QtGui.QApplication):
log.debug(u'Got open file event for %s!', file_name)
self.args.insert(0, unicode(file_name))
return True
else:
return QtGui.QApplication.event(self, event)
# Mac OS X should restore app window when user clicked on the OpenLP icon
# in the Dock bar. However, OpenLP constists of multiple windows and this
# does not work. This workaround fixes that.
# The main OpenLP window is restored when it was previously minimized.
elif event.type() == QtCore.QEvent.ApplicationActivate:
if sys.platform.startswith('darwin') and self.mainWindow.isMinimized():
self.mainWindow.showNormal()
return True
return QtGui.QApplication.event(self, event)
def set_up_logging(log_path):