From 69060874fd8282f1616d6b9755c46ee1daf465e4 Mon Sep 17 00:00:00 2001 From: spielman Date: Thu, 26 Mar 2026 09:14:10 -0400 Subject: [PATCH 1/2] Set macOS lyse app icons --- lyse/analysis_subprocess.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lyse/analysis_subprocess.py b/lyse/analysis_subprocess.py index 89f79a1..e9e2dfe 100644 --- a/lyse/analysis_subprocess.py +++ b/lyse/analysis_subprocess.py @@ -15,6 +15,7 @@ import labscript_utils.excepthook # I do magic stuff, so import must be in place import labscript_utils.h5_lock, h5py +import labscript_utils.splash from labscript_utils.ls_zprocess import ProcessTree @@ -509,6 +510,12 @@ def reset_figs(self): qapplication = QtWidgets.QApplication.instance() if qapplication is None: qapplication = QtWidgets.QApplication(sys.argv) + qapplication.setProperty( + '_labscript_icon_path', os.path.join(lyse.utils.LYSE_DIR, 'lyse.svg') + ) + qapplication.setApplicationName('lyse') + qapplication.setApplicationDisplayName('lyse') + labscript_utils.splash.configure_qapplication(qapplication) worker = AnalysisWorker(filepath, to_parent, from_parent) qapplication.exec_() From 48f0a2d5964207ca68815de2a4a0e95a08ee2619 Mon Sep 17 00:00:00 2001 From: spielman Date: Tue, 12 May 2026 12:01:46 -0400 Subject: [PATCH 2/2] Set macOS application display name --- lyse/__main__.py | 13 +++++++++---- lyse/desktop-app.json | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lyse/__main__.py b/lyse/__main__.py index 5633cc4..f922725 100644 --- a/lyse/__main__.py +++ b/lyse/__main__.py @@ -16,13 +16,18 @@ import labscript_utils.excepthook import importlib.metadata +APPLICATION_NAME = 'lyse' +LYSE_DIR = os.path.dirname(__file__) + # Associate app windows with OS menu shortcuts, must be before any GUI calls, apparently import desktop_app -desktop_app.set_process_appid('lyse') +desktop_app.set_process_appid(APPLICATION_NAME) # Splash screen import labscript_utils.splash -splash = labscript_utils.splash.Splash(os.path.join(os.path.dirname(__file__), 'lyse.svg')) +splash = labscript_utils.splash.Splash( + os.path.join(LYSE_DIR, 'lyse.svg'), application_name=APPLICATION_NAME +) splash.show() splash.update_text('importing standard library modules') @@ -118,7 +123,7 @@ class Lyse(object): def __init__(self, qapplication): # First: Start logging - self.logger = setup_logging('lyse') + self.logger = setup_logging(APPLICATION_NAME) labscript_utils.excepthook.set_logger(self.logger) self.logger.info('\n\n===============starting===============\n') self.logger.info(f'Qt Environment: {QT_ENV}') @@ -130,7 +135,7 @@ def __init__(self, qapplication): # Third: connect to zprocess and set a meaningful name for zlock client id: self.process_tree = ProcessTree.instance() - self.process_tree.zlock_client.set_process_name('lyse') + self.process_tree.zlock_client.set_process_name(APPLICATION_NAME) # Forth: start remote communication server self.port = int(self.exp_config.get('ports', 'lyse')) diff --git a/lyse/desktop-app.json b/lyse/desktop-app.json index fb8ac60..2162f80 100644 --- a/lyse/desktop-app.json +++ b/lyse/desktop-app.json @@ -1,4 +1,4 @@ { "product_name": "Labscript Suite", - "modules": {"lyse": {"display_name": "lyse - the labscript suite"}} + "modules": {"lyse": {"display_name": "lyse - the labscript suite", "short_display_name": "lyse"}} }