AaronFiore/electrum
1
0
Fork 0
Code Activity

fix OverlayControlMixin.add_menu_button type error, fix type hints

Browse Source
This commit is contained in:
f321x
2025-04-24 09:32:29 +02:00
parent 37f0f539c8
commit ee8d53b96e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/gui/qt/util.py
View File

@@ -698,12 +698,12 @@ def filename_field(parent, config, defaultname, select_msg):
return vbox, filename_e, b1 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" name = "qrcode_white.png" if ColorScheme.dark_scheme else "qrcode.png"
return read_QIcon(name) 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" name = "camera_white.png" if ColorScheme.dark_scheme else "camera_dark.png"
return read_QIcon(name) return read_QIcon(name)
@@ -1023,7 +1023,7 @@ class OverlayControlMixin(GenericInputHandler):
def add_menu_button( def add_menu_button(
self, 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, icon: Optional[QIcon] = None,
tooltip: Optional[str] = None, tooltip: Optional[str] = None,
): ):
@@ -1038,7 +1038,8 @@ class OverlayControlMixin(GenericInputHandler):
if opt_icon is None: if opt_icon is None:
menu.addAction(opt_text, opt_cb) menu.addAction(opt_text, opt_cb)
else: 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) btn.setMenu(menu)