From e6fe5408b1ffc6a8f94432432779db1cafb4d891 Mon Sep 17 00:00:00 2001 From: fdrgsp Date: Sat, 15 Feb 2025 21:04:00 -0500 Subject: [PATCH 1/6] update icons --- src/pymmcore_gui/_main_window.py | 1 + src/pymmcore_gui/actions/core_actions.py | 2 +- src/pymmcore_gui/actions/widget_actions.py | 18 +++++++++--------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/pymmcore_gui/_main_window.py b/src/pymmcore_gui/_main_window.py index a885badc..bb3a4605 100644 --- a/src/pymmcore_gui/_main_window.py +++ b/src/pymmcore_gui/_main_window.py @@ -97,6 +97,7 @@ class MicroManagerGUI(QMainWindow): Toolbar.WIDGETS: [ WidgetAction.CONSOLE, WidgetAction.PROP_BROWSER, + WidgetAction.CONFIG_GROUPS, WidgetAction.MDA_WIDGET, WidgetAction.STAGE_CONTROL, WidgetAction.CAMERA_ROI, diff --git a/src/pymmcore_gui/actions/core_actions.py b/src/pymmcore_gui/actions/core_actions.py index 4a7fae46..57c7b5ab 100644 --- a/src/pymmcore_gui/actions/core_actions.py +++ b/src/pymmcore_gui/actions/core_actions.py @@ -56,7 +56,7 @@ def _on_change() -> None: key=CoreAction.SNAP, shortcut="Ctrl+K", auto_repeat=True, - icon="mdi-light:camera", + icon="mdi:camera-outline", on_triggered=snap_image, ) diff --git a/src/pymmcore_gui/actions/widget_actions.py b/src/pymmcore_gui/actions/widget_actions.py index 377f3de7..cbce94fc 100644 --- a/src/pymmcore_gui/actions/widget_actions.py +++ b/src/pymmcore_gui/actions/widget_actions.py @@ -189,7 +189,7 @@ class WidgetActionInfo(ActionInfo, Generic[WT]): show_console = WidgetActionInfo( key=WidgetAction.CONSOLE, shortcut="Ctrl+Shift+C", - icon="iconoir:terminal", + icon="mdi:console-line", create_widget=create_mm_console, dock_area=Qt.DockWidgetArea.BottomDockWidgetArea, ) @@ -197,7 +197,7 @@ class WidgetActionInfo(ActionInfo, Generic[WT]): show_property_browser = WidgetActionInfo( key=WidgetAction.PROP_BROWSER, shortcut="Ctrl+Shift+P", - icon="mdi-light:format-list-bulleted", + icon="mdi:view-headline", create_widget=create_property_browser, dock_area=None, ) @@ -205,7 +205,7 @@ class WidgetActionInfo(ActionInfo, Generic[WT]): show_install_devices = WidgetActionInfo( key=WidgetAction.INSTALL_DEVICES, shortcut="Ctrl+Shift+I", - icon="mdi-light:download", + icon="mdi:download", create_widget=create_install_widgets, dock_area=None, ) @@ -213,14 +213,14 @@ class WidgetActionInfo(ActionInfo, Generic[WT]): show_mda_widget = WidgetActionInfo( key=WidgetAction.MDA_WIDGET, shortcut="Ctrl+Shift+M", - icon="qlementine-icons:cube-16", + icon="mdi:cube-outline", create_widget=create_mda_widget, ) show_camera_roi = WidgetActionInfo( key=WidgetAction.CAMERA_ROI, shortcut="Ctrl+Shift+R", - icon="material-symbols-light:screenshot-region-rounded", + icon="mdi:crop", create_widget=create_camera_roi, dock_area=Qt.DockWidgetArea.LeftDockWidgetArea, ) @@ -228,7 +228,7 @@ class WidgetActionInfo(ActionInfo, Generic[WT]): show_config_groups = WidgetActionInfo( key=WidgetAction.CONFIG_GROUPS, shortcut="Ctrl+Shift+G", - icon="mdi-light:format-list-bulleted", + icon="mdi:format-list-bulleted", create_widget=create_config_groups, dock_area=Qt.DockWidgetArea.LeftDockWidgetArea, ) @@ -236,14 +236,14 @@ class WidgetActionInfo(ActionInfo, Generic[WT]): show_pixel_config = WidgetActionInfo( key=WidgetAction.PIXEL_CONFIG, shortcut="Ctrl+Shift+X", - icon="mdi-light:grid", + icon="mdi:table-edit", create_widget=create_pixel_config, ) show_exception_log = WidgetActionInfo( key=WidgetAction.EXCEPTION_LOG, shortcut="Ctrl+Shift+E", - icon="mdi-light:alert", + icon="mdi:alert", create_widget=create_exception_log, dock_area=None, ) @@ -251,7 +251,7 @@ class WidgetActionInfo(ActionInfo, Generic[WT]): show_stage_control = WidgetActionInfo( key=WidgetAction.STAGE_CONTROL, shortcut="Ctrl+Shift+S", - icon="fa:arrows", + icon="mdi:arrow-all", create_widget=create_stage_widget, dock_area=Qt.DockWidgetArea.LeftDockWidgetArea, ) From 1e392e8f56ab6e132c7c336fc7556cebfdf7708c Mon Sep 17 00:00:00 2001 From: fdrgsp Date: Sat, 15 Feb 2025 21:14:16 -0500 Subject: [PATCH 2/6] video-off --- src/pymmcore_gui/actions/core_actions.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pymmcore_gui/actions/core_actions.py b/src/pymmcore_gui/actions/core_actions.py index 57c7b5ab..a6dd18f7 100644 --- a/src/pymmcore_gui/actions/core_actions.py +++ b/src/pymmcore_gui/actions/core_actions.py @@ -5,6 +5,7 @@ from typing import TYPE_CHECKING from ._action_info import ActionInfo, ActionKey +from superqt import QIconifyIcon if TYPE_CHECKING: from ._core_qaction import QCoreAction @@ -43,7 +44,10 @@ def _init_toggle_live(action: QCoreAction) -> None: mmc = action.mmc def _on_change() -> None: - action.setChecked(mmc.isSequenceRunning()) + _is_running = mmc.isSequenceRunning() + action.setChecked(_is_running) + _icon = "mdi:video-off-outline" if _is_running else "mdi:video-outline" + action.setIcon(QIconifyIcon(_icon)) mmc.events.sequenceAcquisitionStarted.connect(_on_change) mmc.events.continuousSequenceAcquisitionStarted.connect(_on_change) From 1dc2c0acb850100f99cdc5df9cbfb29875da0885 Mon Sep 17 00:00:00 2001 From: fdrgsp Date: Sat, 15 Feb 2025 21:29:56 -0500 Subject: [PATCH 3/6] style toolbuttons --- src/pymmcore_gui/_main_window.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/pymmcore_gui/_main_window.py b/src/pymmcore_gui/_main_window.py index bb3a4605..9f8bad46 100644 --- a/src/pymmcore_gui/_main_window.py +++ b/src/pymmcore_gui/_main_window.py @@ -55,6 +55,21 @@ RESOURCES = Path(__file__).parent / "resources" ICON = RESOURCES / ("icon.ico" if sys.platform.startswith("win") else "logo.png") +SS_TOOLBUTTON = """ + QToolButton { + min-height: 35px; + max-height: 35px; + } + QToolButton:checked { + background-color: rgba(51, 170, 51, 255); + } + QToolButton:checked:hover { + background-color: rgba(51, 170, 51, 180); + } + QToolButton:!checked:hover { + background-color: rgba(102, 102, 102, 100); + } +""" class Menu(str, Enum): """Menu names.""" @@ -180,6 +195,7 @@ def _add_toolbar(self, name: str, tb_entry: ToolDictValue) -> None: for action in tb_entry: tb.addAction(self.get_action(action)) tb.setObjectName(name) + tb.setStyleSheet(SS_TOOLBUTTON) def _add_menubar(self, name: str, menu_entry: MenuDictValue) -> None: mb = cast("QMenuBar", self.menuBar()) From 285786cf39d9c204f2a650e132cbcca993e03a7d Mon Sep 17 00:00:00 2001 From: fdrgsp Date: Sat, 15 Feb 2025 21:37:26 -0500 Subject: [PATCH 4/6] PROP_BROWSER and CONFIG_GROUPS icons --- src/pymmcore_gui/_main_window.py | 2 +- src/pymmcore_gui/actions/widget_actions.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pymmcore_gui/_main_window.py b/src/pymmcore_gui/_main_window.py index 9f8bad46..03921a5b 100644 --- a/src/pymmcore_gui/_main_window.py +++ b/src/pymmcore_gui/_main_window.py @@ -110,12 +110,12 @@ class MicroManagerGUI(QMainWindow): Toolbar.OPTICAL_CONFIGS: OCToolBar, Toolbar.SHUTTERS: ShuttersToolbar, Toolbar.WIDGETS: [ - WidgetAction.CONSOLE, WidgetAction.PROP_BROWSER, WidgetAction.CONFIG_GROUPS, WidgetAction.MDA_WIDGET, WidgetAction.STAGE_CONTROL, WidgetAction.CAMERA_ROI, + WidgetAction.CONSOLE, ], } # Menus are a mapping of strings to either a list of ActionKeys or a callable diff --git a/src/pymmcore_gui/actions/widget_actions.py b/src/pymmcore_gui/actions/widget_actions.py index cbce94fc..1d0a868a 100644 --- a/src/pymmcore_gui/actions/widget_actions.py +++ b/src/pymmcore_gui/actions/widget_actions.py @@ -197,7 +197,7 @@ class WidgetActionInfo(ActionInfo, Generic[WT]): show_property_browser = WidgetActionInfo( key=WidgetAction.PROP_BROWSER, shortcut="Ctrl+Shift+P", - icon="mdi:view-headline", + icon="mdi:view-sequential", create_widget=create_property_browser, dock_area=None, ) @@ -228,7 +228,7 @@ class WidgetActionInfo(ActionInfo, Generic[WT]): show_config_groups = WidgetActionInfo( key=WidgetAction.CONFIG_GROUPS, shortcut="Ctrl+Shift+G", - icon="mdi:format-list-bulleted", + icon="mdi:view-list", create_widget=create_config_groups, dock_area=Qt.DockWidgetArea.LeftDockWidgetArea, ) From 6b12e0e5301958d7ed6e3a076748e19a056ad358 Mon Sep 17 00:00:00 2001 From: fdrgsp Date: Sat, 15 Feb 2025 23:48:20 -0500 Subject: [PATCH 5/6] update color --- src/pymmcore_gui/_main_window.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pymmcore_gui/_main_window.py b/src/pymmcore_gui/_main_window.py index 03921a5b..5e08595b 100644 --- a/src/pymmcore_gui/_main_window.py +++ b/src/pymmcore_gui/_main_window.py @@ -61,13 +61,16 @@ max-height: 35px; } QToolButton:checked { - background-color: rgba(51, 170, 51, 255); + background-color: rgba(0, 174, 0, 255); + border: 2px solid rgba(0, 174, 0, 255); } QToolButton:checked:hover { - background-color: rgba(51, 170, 51, 180); + background-color: rgba(0, 174, 0, 80); + border: 2px solid rgba(0, 174, 0, 80); } QToolButton:!checked:hover { - background-color: rgba(102, 102, 102, 100); + background-color: rgba(0, 174, 0, 80); + border: 2px solid rgba(0, 174, 0, 100); } """ From ca9c5137ec2b208794a4171c0e1a603b29284c0f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 16 Feb 2025 16:25:31 +0000 Subject: [PATCH 6/6] style(pre-commit.ci): auto fixes [...] --- src/pymmcore_gui/_main_window.py | 1 + src/pymmcore_gui/actions/core_actions.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pymmcore_gui/_main_window.py b/src/pymmcore_gui/_main_window.py index 5e08595b..17ff7bd7 100644 --- a/src/pymmcore_gui/_main_window.py +++ b/src/pymmcore_gui/_main_window.py @@ -74,6 +74,7 @@ } """ + class Menu(str, Enum): """Menu names.""" diff --git a/src/pymmcore_gui/actions/core_actions.py b/src/pymmcore_gui/actions/core_actions.py index a6dd18f7..fac8240e 100644 --- a/src/pymmcore_gui/actions/core_actions.py +++ b/src/pymmcore_gui/actions/core_actions.py @@ -4,9 +4,10 @@ from typing import TYPE_CHECKING -from ._action_info import ActionInfo, ActionKey from superqt import QIconifyIcon +from ._action_info import ActionInfo, ActionKey + if TYPE_CHECKING: from ._core_qaction import QCoreAction