forked from openlp/openlp
Workaround for OSX for the bug #1247661 with the dock icon click.
bzr-revno: 2189
This commit is contained in:
commit
dc3795212b
@ -220,7 +220,14 @@ class OpenLP(QtGui.QApplication):
|
|||||||
log.debug(u'Got open file event for %s!', file_name)
|
log.debug(u'Got open file event for %s!', file_name)
|
||||||
self.args.insert(0, unicode(file_name))
|
self.args.insert(0, unicode(file_name))
|
||||||
return True
|
return True
|
||||||
else:
|
# 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)
|
return QtGui.QApplication.event(self, event)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user