From ee8d53b96e3e7d3254fc60873e247fdddf5f642c Mon Sep 17 00:00:00 2001 From: f321x Date: Thu, 24 Apr 2025 09:32:29 +0200 Subject: [PATCH] fix OverlayControlMixin.add_menu_button type error, fix type hints --- electrum/gui/qt/util.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/electrum/gui/qt/util.py b/electrum/gui/qt/util.py index 1b3862b2d..09f6201e1 100644 --- a/electrum/gui/qt/util.py +++ b/electrum/gui/qt/util.py @@ -698,12 +698,12 @@ def filename_field(parent, config, defaultname, select_msg): return vbox, filename_e, b1 -def get_icon_qrcode() -> str: +def get_icon_qrcode() -> QIcon: name = "qrcode_white.png" if ColorScheme.dark_scheme else "qrcode.png" return read_QIcon(name) -def get_icon_camera() -> str: +def get_icon_camera() -> QIcon: name = "camera_white.png" if ColorScheme.dark_scheme else "camera_dark.png" return read_QIcon(name) @@ -1023,7 +1023,7 @@ class OverlayControlMixin(GenericInputHandler): def add_menu_button( self, *, - options: Sequence[Tuple[Optional[str], str, Callable[[], None]]], # list of (icon, text, cb) + options: Sequence[Tuple[Optional[Union[str, QIcon]], str, Callable[[], None]]], # list of (icon, text, cb) icon: Optional[QIcon] = None, tooltip: Optional[str] = None, ): @@ -1038,7 +1038,8 @@ class OverlayControlMixin(GenericInputHandler): if opt_icon is None: menu.addAction(opt_text, opt_cb) else: - menu.addAction(read_QIcon(opt_icon), opt_text, opt_cb) + opt_icon = read_QIcon(opt_icon) if isinstance(opt_icon, str) else opt_icon + menu.addAction(opt_icon, opt_text, opt_cb) btn.setMenu(menu)