Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions labscript_utils/splash.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,32 @@
QtWidgets.QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps, True)


def configure_qapplication(qapplication):
"""Apply labscript-wide QApplication configuration."""
qapplication.setAttribute(Qt.AA_DontShowIconsInMenus, False)
if sys.platform == 'darwin':
icon_path = qapplication.property('_labscript_icon_path')
if icon_path:
icon = QtGui.QIcon(icon_path)
if not icon.isNull():
qapplication.setWindowIcon(icon)
if qapplication.property('_labscript_qapplication_configured'):
return qapplication
# Native macOS widget styling makes many Qt controls look inconsistent
# with the rest of the suite. Use Qt's own style, but preserve the
# current palette so dark/light appearance still follows the active
# theme.
palette = QtGui.QPalette(qapplication.palette())
style = QtWidgets.QStyleFactory.create('Fusion')
if style is not None:
qapplication.setStyle(style)
qapplication.setPalette(palette)
elif qapplication.property('_labscript_qapplication_configured'):
return qapplication
qapplication.setProperty('_labscript_qapplication_configured', True)
return qapplication


class Splash(QtWidgets.QFrame):
w = 250
h = 230
Expand All @@ -53,6 +79,8 @@ def __init__(self, imagepath):
self.qapplication = QtWidgets.QApplication.instance()
if self.qapplication is None:
self.qapplication = QtWidgets.QApplication(sys.argv)
self.qapplication.setProperty('_labscript_icon_path', imagepath)
configure_qapplication(self.qapplication)
super().__init__()
self.icon = QtGui.QPixmap()
self.icon.load(imagepath)
Expand Down