Skip to content

[WIP] feat: update icons #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[WIP] feat: update icons #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e6fe540
update icons
fdrgsp Feb 16, 2025
1e392e8
video-off
fdrgsp Feb 16, 2025
1dc2c0a
style toolbuttons
fdrgsp Feb 16, 2025
285786c
PROP_BROWSER and CONFIG_GROUPS icons
fdrgsp Feb 16, 2025
6b12e0e
update color
fdrgsp Feb 16, 2025
92834ba
Merge remote-tracking branch 'upstream/main' into update-icons
fdrgsp Feb 16, 2025
ca9c513
style(pre-commit.ci): auto fixes [...]
pre-commit-ci[bot] Feb 16, 2025
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
23 changes: 22 additions & 1 deletion src/pymmcore_gui/_main_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,25 @@
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(0, 174, 0, 255);
border: 2px solid rgba(0, 174, 0, 255);
}
QToolButton:checked:hover {
background-color: rgba(0, 174, 0, 80);
border: 2px solid rgba(0, 174, 0, 80);
}
QToolButton:!checked:hover {
background-color: rgba(0, 174, 0, 80);
border: 2px solid rgba(0, 174, 0, 100);
}
"""


class Menu(str, Enum):
"""Menu names."""
Expand Down Expand Up @@ -95,11 +114,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
Expand Down Expand Up @@ -179,6 +199,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())
Expand Down
9 changes: 7 additions & 2 deletions src/pymmcore_gui/actions/core_actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

from typing import TYPE_CHECKING

from superqt import QIconifyIcon

from ._action_info import ActionInfo, ActionKey

if TYPE_CHECKING:
Expand Down Expand Up @@ -43,7 +45,10 @@
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))

Check warning on line 51 in src/pymmcore_gui/actions/core_actions.py

View check run for this annotation

Codecov / codecov/patch

src/pymmcore_gui/actions/core_actions.py#L48-L51 

Added lines #L48 - L51 were not covered by tests

mmc.events.sequenceAcquisitionStarted.connect(_on_change)
mmc.events.continuousSequenceAcquisitionStarted.connect(_on_change)
Expand All @@ -56,7 +61,7 @@
key=CoreAction.SNAP,
shortcut="Ctrl+K",
auto_repeat=True,
icon="mdi-light:camera",
icon="mdi:camera-outline",
on_triggered=snap_image,
)

Expand Down
18 changes: 9 additions & 9 deletions src/pymmcore_gui/actions/widget_actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,69 +189,69 @@ 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,
)

show_property_browser = WidgetActionInfo(
key=WidgetAction.PROP_BROWSER,
shortcut="Ctrl+Shift+P",
icon="mdi-light:format-list-bulleted",
icon="mdi:view-sequential",
create_widget=create_property_browser,
dock_area=None,
)

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,
)

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,
)

show_config_groups = WidgetActionInfo(
key=WidgetAction.CONFIG_GROUPS,
shortcut="Ctrl+Shift+G",
icon="mdi-light:format-list-bulleted",
icon="mdi:view-list",
create_widget=create_config_groups,
dock_area=Qt.DockWidgetArea.LeftDockWidgetArea,
)

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,
)

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,
)
Expand Down