refactor: remove mdi6 fonticon dependency (#437)

* ci(pre-commit.ci): autoupdate

updates:
- [github.com/crate-ci/typos: v1.32.0 → v1](crate-ci/typos@v1.32.0...v1)
- [github.com/astral-sh/ruff-pre-commit: v0.11.8 → v0.11.12](astral-sh/ruff-pre-commit@v0.11.8...v0.11.12)
- [github.com/pre-commit/mirrors-mypy: v1.15.0 → v1.16.0](pre-commit/mirrors-mypy@v1.15.0...v1.16.0)

* refactor: remove fonticons

* fix docstring

* update pre-commit

* update pymmcore-plus typing

* fix: fix property widget for pymmcore-plus 0.15.0

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: tlambert03

pyproject.toml

@@ -48,7 +48,6 @@ classifiers = [
 ]
 dynamic = ["version"]
 dependencies = [
-    'fonticon-materialdesignicons6 >=6.9.96',
     'pymmcore-plus[cli] >=0.14.0',
     'qtpy >=2.0',
     'superqt[quantity,cmap,iconify] >=0.7.1',

src/pymmcore_widgets/_icons.py

@@ -1,24 +1,23 @@
 from __future__ import annotations
 
-from fonticon_mdi6 import MDI6
 from pymmcore_plus import DeviceType
 
 ICONS: dict[DeviceType, str] = {
-    DeviceType.Any: MDI6.devices,
-    DeviceType.AutoFocus: MDI6.auto_upload,
-    DeviceType.Camera: MDI6.camera,
-    DeviceType.Core: MDI6.checkbox_blank_circle_outline,
-    DeviceType.Galvo: MDI6.mirror_variant,
-    DeviceType.Generic: MDI6.dev_to,
-    DeviceType.Hub: MDI6.hubspot,
-    DeviceType.ImageProcessor: MDI6.image_auto_adjust,
-    DeviceType.Magnifier: MDI6.magnify_plus,
-    DeviceType.Shutter: MDI6.camera_iris,
-    DeviceType.SignalIO: MDI6.signal,
-    DeviceType.SLM: MDI6.view_comfy,
-    DeviceType.Stage: MDI6.arrow_up_down,
-    DeviceType.State: MDI6.state_machine,
-    DeviceType.Unknown: MDI6.dev_to,
-    DeviceType.XYStage: MDI6.arrow_all,
-    DeviceType.Serial: MDI6.serial_port,
+    DeviceType.Any: "mdi:devices",
+    DeviceType.AutoFocus: "mdi:auto-upload",
+    DeviceType.Camera: "mdi:camera",
+    DeviceType.Core: "mdi:checkbox-blank-circle-outline",
+    DeviceType.Galvo: "mdi:mirror-variant",
+    DeviceType.Generic: "mdi:dev-to",
+    DeviceType.Hub: "mdi:hubspot",
+    DeviceType.ImageProcessor: "mdi:image-auto-adjust",
+    DeviceType.Magnifier: "mdi:magnify-plus",
+    DeviceType.Shutter: "mdi:camera-iris",
+    DeviceType.SignalIO: "mdi:signal",
+    DeviceType.SLM: "mdi:view-comfy",
+    DeviceType.Stage: "mdi:arrow-up-down",
+    DeviceType.State: "mdi:state-machine",
+    DeviceType.Unknown: "mdi:dev-to",
+    DeviceType.XYStage: "mdi:arrow-all",
+    DeviceType.Serial: "mdi:serial-port",
 }

src/pymmcore_widgets/control/_camera_roi_widget.py

@@ -3,7 +3,6 @@
 from dataclasses import dataclass
 from typing import Any, NamedTuple
 
-from fonticon_mdi6 import MDI6
 from pymmcore_plus import CMMCorePlus, DeviceType
 from qtpy.QtCore import QSize, Qt, Signal
 from qtpy.QtWidgets import (
@@ -21,7 +20,7 @@
     QVBoxLayout,
     QWidget,
 )
-from superqt.fonticon import icon
+from superqt.iconify import QIconifyIcon
 from superqt.utils import signals_blocked
 
 fixed_sizepolicy = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
@@ -180,7 +179,7 @@ def __init__(
 
         self.crop_btn = QPushButton("Crop")
         self.crop_btn.setMinimumWidth(100)
-        self.crop_btn.setIcon(icon(MDI6.crop, color=(0, 255, 0)))
+        self.crop_btn.setIcon(QIconifyIcon("mdi:crop", color="green"))
         self.crop_btn.setIconSize(QSize(30, 30))
 
         _bottom_layout.addWidget(self.snap_checkbox)

src/pymmcore_widgets/control/_live_button_widget.py

@@ -2,12 +2,11 @@
 
 from typing import Union
 
-from fonticon_mdi6 import MDI6
 from pymmcore_plus import CMMCorePlus
 from qtpy.QtCore import QSize, Qt
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QPushButton, QWidget
-from superqt.fonticon import icon
+from superqt.iconify import QIconifyIcon
 
 COLOR_TYPE = Union[
     QColor,
@@ -57,7 +56,7 @@ def __init__(
         self._mmc = mmcore or CMMCorePlus.instance()
         self._button_text_on: str = "Live"
         self._button_text_off: str = "Stop"
-        self._icon_color_on: COLOR_TYPE = (0, 255, 0)
+        self._icon_color_on: COLOR_TYPE = "green"
         self._icon_color_off: COLOR_TYPE = "magenta"
 
         self.streaming_timer = None
@@ -118,7 +117,7 @@ def icon_color_on(self) -> COLOR_TYPE:
     @icon_color_on.setter
     def icon_color_on(self, color: COLOR_TYPE) -> None:
         if not self._mmc.isSequenceRunning():
-            self.setIcon(icon(MDI6.video_outline, color=color))
+            self.setIcon(QIconifyIcon("mdi:video-outline", color=color))
         self._icon_color_on = color
 
     @property
@@ -133,7 +132,7 @@ def icon_color_off(self) -> COLOR_TYPE:
     @icon_color_off.setter
     def icon_color_off(self, color: COLOR_TYPE) -> None:
         if self._mmc.isSequenceRunning():
-            self.setIcon(icon(MDI6.video_off_outline, color=color))
+            self.setIcon(QIconifyIcon("mdi:video-off-outline", color=color))
         self._icon_color_off = color
 
     def _create_button(self) -> None:
@@ -158,10 +157,12 @@ def _toggle_live_mode(self) -> None:
     def _set_icon_state(self, state: bool) -> None:
         """Set the icon in the on or off state."""
         if state:  # set in the off mode
-            self.setIcon(icon(MDI6.video_off_outline, color=self._icon_color_off))
+            self.setIcon(
+                QIconifyIcon("mdi:video-off-outline", color=self._icon_color_off)
+            )
             self.setText(self._button_text_off)
         else:  # set in the on mode
-            self.setIcon(icon(MDI6.video_outline, color=self._icon_color_on))
+            self.setIcon(QIconifyIcon("mdi:video-outline", color=self._icon_color_on))
             self.setText(self._button_text_on)
 
     def _on_sequence_started(self) -> None:

src/pymmcore_widgets/control/_shutter_widget.py

@@ -3,16 +3,15 @@
 import warnings
 from typing import Any, Union
 
-from fonticon_mdi6 import MDI6
 from pymmcore_plus import CMMCorePlus, DeviceType
 from qtpy.QtCore import QSize, Qt
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QCheckBox, QHBoxLayout, QPushButton, QSizePolicy, QWidget
-from superqt.fonticon import icon
+from superqt.iconify import QIconifyIcon
 from superqt.utils import signals_blocked
 
-GRAY = (183, 183, 183)
-GREEN = (0, 255, 0)
+GRAY = "gray"
+GREEN = "green"
 
 COLOR_TYPE = Union[
     QColor,
@@ -60,8 +59,8 @@ def __init__(
         self._is_multiShutter = False
         self.autoshutter = autoshutter
 
-        self._icon_open: str = MDI6.hexagon_outline
-        self._icon_closed: str = MDI6.hexagon_slice_6
+        self._icon_open: str = "mdi:hexagon-outline"
+        self._icon_closed: str = "mdi:hexagon-slice-6"
         self._icon_color_open: COLOR_TYPE = GREEN
         self._icon_color_closed: COLOR_TYPE = GRAY
         self._icon_size: int = 25
@@ -92,7 +91,7 @@ def icon_open(self) -> str:
 
         The icon_open.setter icon string should be any key recognizable as
         a superqt fonticon (e.g. mdi6.abacus).
-        Default = MDI6.hexagon_outline (https://github.com/templarian/MaterialDesign).
+        Default = 'mdi:hexagon-outline' (https://github.com/templarian/MaterialDesign).
         Note that MDI6 is installed by default, you must install other fonts
         if you want to use them.
         """
@@ -101,7 +100,9 @@ def icon_open(self) -> str:
     @icon_open.setter
     def icon_open(self, icon_o: str) -> None:
         if self._mmc.getShutterOpen(self.shutter_device):
-            self.shutter_button.setIcon(icon(icon_o, color=self._icon_color_open))
+            self.shutter_button.setIcon(
+                QIconifyIcon(icon_o, color=self._icon_color_open)
+            )
         self._icon_open = icon_o
 
     @property
@@ -111,7 +112,7 @@ def icon_closed(self) -> str:
 
         The icon_closed.setter icon string should be any key recognizable as
         a superqt fonticon (e.g. mdi6.abacus).
-        Default = MDI6.hexagon_slice_6 (https://github.com/templarian/MaterialDesign).
+        Default = 'mdi:hexagon-slice-6' (https://github.com/templarian/MaterialDesign).
         Note that MDI6 is installed by default, you must install other fonts
         if you want to use them.
         """
@@ -120,15 +121,17 @@ def icon_closed(self) -> str:
     @icon_closed.setter
     def icon_closed(self, icon_c: str) -> None:
         if not self._mmc.getShutterOpen(self.shutter_device):
-            self.shutter_button.setIcon(icon(icon_c, color=self._icon_color_closed))
+            self.shutter_button.setIcon(
+                QIconifyIcon(icon_c, color=self._icon_color_closed)
+            )
         self._icon_closed = icon_c
 
     @property
     def icon_color_open(self) -> COLOR_TYPE:
         """
         Set the button icon color for when the shutter is open.
 
-        Default = (0, 255, 0)
+        Default = "green"
 
         COLOR_TYPE = Union[QColor, int, str, Qt.GlobalColor, tuple[int, int, int, int],
         tuple[int, int, int]]
@@ -138,7 +141,7 @@ def icon_color_open(self) -> COLOR_TYPE:
     @icon_color_open.setter
     def icon_color_open(self, color: COLOR_TYPE) -> None:
         if self._mmc.getShutterOpen(self.shutter_device):
-            self.shutter_button.setIcon(icon(self._icon_open, color=color))
+            self.shutter_button.setIcon(QIconifyIcon(self._icon_open, color=color))
         self._icon_color_open = color
 
     @property
@@ -156,7 +159,7 @@ def icon_color_closed(self) -> COLOR_TYPE:
     @icon_color_closed.setter
     def icon_color_closed(self, color: COLOR_TYPE) -> None:
         if not self._mmc.getShutterOpen(self.shutter_device):
-            self.shutter_button.setIcon(icon(self._icon_closed, color=color))
+            self.shutter_button.setIcon(QIconifyIcon(self._icon_closed, color=color))
         self._icon_color_closed = color
 
     @property
@@ -212,7 +215,7 @@ def _create_wdg(self) -> None:
         sizepolicy_btn = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
         self.shutter_button.setSizePolicy(sizepolicy_btn)
         self.shutter_button.setIcon(
-            icon(self._icon_closed, color=self._icon_color_closed)
+            QIconifyIcon(self._icon_closed, color=self._icon_color_closed)
         )
         self.shutter_button.setIconSize(QSize(self._icon_size, self._icon_size))
         self.shutter_button.clicked.connect(self._on_shutter_btn_clicked)
@@ -345,12 +348,14 @@ def _on_shutter_checkbox_toggled(self, state: bool) -> None:
 
     def _set_shutter_wdg_to_opened(self) -> None:
         self.shutter_button.setText(self._button_text_open)
-        self.shutter_button.setIcon(icon(self._icon_open, color=self._icon_color_open))
+        self.shutter_button.setIcon(
+            QIconifyIcon(self._icon_open, color=self._icon_color_open)
+        )
 
     def _set_shutter_wdg_to_closed(self) -> None:
         self.shutter_button.setText(self._button_text_closed)
         self.shutter_button.setIcon(
-            icon(self._icon_closed, color=self._icon_color_closed)
+            QIconifyIcon(self._icon_closed, color=self._icon_color_closed)
         )
 
     def _disconnect(self) -> None:

src/pymmcore_widgets/control/_snap_button_widget.py

@@ -2,12 +2,11 @@
 
 from typing import Union
 
-from fonticon_mdi6 import MDI6
 from pymmcore_plus import CMMCorePlus
 from qtpy.QtCore import QSize, Qt
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QPushButton, QSizePolicy, QWidget
-from superqt.fonticon import icon
+from superqt.iconify import QIconifyIcon
 from superqt.utils import create_worker
 
 COLOR_TYPES = Union[
@@ -71,7 +70,7 @@ def __init__(
 
     def _create_button(self) -> None:
         self.setText("Snap")
-        self.setIcon(icon(MDI6.camera_outline, color=(0, 255, 0)))
+        self.setIcon(QIconifyIcon("mdi:camera-outline", color="green"))
         self.setIconSize(QSize(30, 30))
         self.clicked.connect(self._snap)
 

src/pymmcore_widgets/control/_stage_widget.py

@@ -3,9 +3,9 @@
 from itertools import product
 from typing import TYPE_CHECKING, cast
 
-from fonticon_mdi6 import MDI6
+from pyconify import svg_path
 from pymmcore_plus import CMMCorePlus, DeviceType, Keyword
-from qtpy.QtCore import QEvent, QObject, Qt, QTimerEvent, Signal
+from qtpy.QtCore import QEvent, QObject, QSize, Qt, QTimerEvent, Signal
 from qtpy.QtGui import QContextMenuEvent
 from qtpy.QtWidgets import (
     QCheckBox,
@@ -20,7 +20,7 @@
     QVBoxLayout,
     QWidget,
 )
-from superqt.fonticon import icon, setTextIcon
+from superqt.iconify import QIconifyIcon
 from superqt.utils import signals_blocked
 
 from ._q_stage_controller import QStageMoveAccumulator
@@ -34,18 +34,18 @@
 
 MOVE_BUTTONS: dict[str, tuple[int, int, int, int]] = {
     # btn glyph                (r, c, xmag, ymag)
-    MDI6.chevron_triple_up: (0, 3, 0, 3),
-    MDI6.chevron_double_up: (1, 3, 0, 2),
-    MDI6.chevron_up: (2, 3, 0, 1),
-    MDI6.chevron_down: (4, 3, 0, -1),
-    MDI6.chevron_double_down: (5, 3, 0, -2),
-    MDI6.chevron_triple_down: (6, 3, 0, -3),
-    MDI6.chevron_triple_left: (3, 0, -3, 0),
-    MDI6.chevron_double_left: (3, 1, -2, 0),
-    MDI6.chevron_left: (3, 2, -1, 0),
-    MDI6.chevron_right: (3, 4, 1, 0),
-    MDI6.chevron_double_right: (3, 5, 2, 0),
-    MDI6.chevron_triple_right: (3, 6, 3, 0),
+    "mdi:chevron-triple-up": (0, 3, 0, 3),
+    "mdi:chevron-double-up": (1, 3, 0, 2),
+    "mdi:chevron-up": (2, 3, 0, 1),
+    "mdi:chevron-down": (4, 3, 0, -1),
+    "mdi:chevron-double-down": (5, 3, 0, -2),
+    "mdi:chevron-triple-down": (6, 3, 0, -3),
+    "mdi:chevron-triple-left": (3, 0, -3, 0),
+    "mdi:chevron-double-left": (3, 1, -2, 0),
+    "mdi:chevron-left": (3, 2, -1, 0),
+    "mdi:chevron-right": (3, 4, 1, 0),
+    "mdi:chevron-double-right": (3, 5, 2, 0),
+    "mdi:chevron-triple-right": (3, 6, 3, 0),
 }
 
 
@@ -58,21 +58,20 @@ def __init__(self, glyph: str, xmag: int, ymag: int, parent: QWidget | None = No
         self.setFlat(True)
         self.setFocusPolicy(Qt.FocusPolicy.NoFocus)
         self.setCursor(Qt.CursorShape.PointingHandCursor)
-        setTextIcon(self, glyph)
         self.setStyleSheet(
-            """
-            MoveStageButton {
+            f"""
+            MoveStageButton {{
                 border: none;
                 background: transparent;
-                color: rgb(0, 180, 0);
+                image: url({svg_path(glyph, color="rgb(0, 180, 0)")});
                 font-size: 36px;
-            }
-            MoveStageButton:hover:!pressed {
-                color: rgb(0, 255, 0);
-            }
-            MoveStageButton:pressed {
-                color: rgb(0, 100, 0);
-            }
+            }}
+            MoveStageButton:hover:!pressed {{
+                image: url({svg_path(glyph, color="lime")});
+            }}
+            MoveStageButton:pressed {{
+                image: url({svg_path(glyph, color="green")});
+            }}
             """
         )
 
@@ -107,7 +106,8 @@ def __init__(self, device: str, core: CMMCorePlus, parent: QWidget | None = None
         super().__init__(parent=parent)
         self._device = device
         self._core = core
-        self.setIcon(icon(MDI6.close_octagon, color=(255, 0, 0)))
+        self.setIcon(QIconifyIcon("bi:sign-stop-fill", color="red"))
+        self.setIconSize(QSize(24, 24))
         self.setToolTip("Halt stage movement")
         self.setText("STOP!")
         self.clicked.connect(self._on_clicked)

src/pymmcore_widgets/device_properties/_device_property_table.py

@@ -7,7 +7,7 @@
 from qtpy.QtCore import Qt
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QAbstractScrollArea, QTableWidget, QTableWidgetItem, QWidget
-from superqt.fonticon import icon
+from superqt.iconify import QIconifyIcon
 
 from pymmcore_widgets._icons import ICONS
 from pymmcore_widgets._util import NoWheelTableWidget
@@ -130,7 +130,7 @@ def _rebuild_table(self) -> None:
             item = QTableWidgetItem(f"{prop.device}-{prop.name}{extra}")
             item.setData(self.PROP_ROLE, prop)
             if icon_string := ICONS.get(prop.deviceType()):
-                item.setIcon(icon(icon_string, color="Gray"))
+                item.setIcon(QIconifyIcon(icon_string, color="Gray"))
             self.setItem(i, 0, item)
 
             try: