refactor qt.util.ChoiceWidget: rename arg to default_key

electrum/gui/qt/main_window.py

@@ -1332,10 +1332,10 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
             _("Note that fees may be updated frequently.")
         ])
         choice = self.query_choice(
-            msg = msg,
+            msg=msg,
-            choices = server_keys,
+            choices=server_keys,
-            title = _("Choose Swap Server"),
+            title=_("Choose Swap Server"),
-            default_choice = self.config.SWAPSERVER_NPUB
+            default_key=self.config.SWAPSERVER_NPUB,
         )
         if choice is None:
             return False

electrum/gui/qt/receive_tab.py

@@ -197,7 +197,7 @@ class ReceiveTab(QWidget, MessageBoxMixin, Logger):
         expiry = self.config.WALLET_PAYREQ_EXPIRY_SECONDS
         choices = [ChoiceItem(key=exptime, label=label)
                    for (exptime, label) in pr_expiration_values().items()]
-        v = self.window.query_choice(msg, choices, title=_('Expiry'), default_choice=expiry)
+        v = self.window.query_choice(msg, choices, title=_('Expiry'), default_key=expiry)
         if v is None:
             return
         self.config.WALLET_PAYREQ_EXPIRY_SECONDS = v

electrum/gui/qt/seed_dialog.py

@@ -209,7 +209,7 @@ class SeedWidget(QWidget):
             self.initialize_completer()
 
         if len(self.seed_types) > 1:
-            seed_type_choice = ChoiceWidget(message=_('Seed type'), choices=self.seed_types, selected=self.seed_type)
+            seed_type_choice = ChoiceWidget(message=_('Seed type'), choices=self.seed_types, default_key=self.seed_type)
             seed_type_choice.itemSelected.connect(on_selected)
             vbox.addWidget(seed_type_choice)
 

electrum/gui/qt/util.py

@@ -321,7 +321,7 @@ class MessageBoxMixin(object):
         choices: Sequence['ChoiceItem'],
         *,
         title: Optional[str] = None,
-        default_choice: Optional[Any] = None,
+        default_key: Optional[Any] = None,
     ) -> Optional[Any]:
         """Returns ChoiceItem.key (for selected item), or None if the user cancels the dialog.
 
@@ -331,7 +331,7 @@ class MessageBoxMixin(object):
             title = _('Question')
         dialog = WindowModalDialog(self.top_level_window(), title=title)
         dialog.setMinimumWidth(400)
-        choice_widget = ChoiceWidget(message=msg, choices=choices, selected=default_choice)
+        choice_widget = ChoiceWidget(message=msg, choices=choices, default_key=default_key)
         vbox = QVBoxLayout(dialog)
         vbox.addWidget(choice_widget)
         cancel_button = CancelButton(dialog)
@@ -513,7 +513,7 @@ def text_dialog(
 
 class ChoiceWidget(QWidget):
     """Renders a list of ChoiceItems as a radiobuttons group.
-    Callers can pre-select an item by key, through the 'selected' parameter.
+    Callers can pre-select an item by key, through the 'default_key' parameter.
     The selected item is made available by index (selected_index),
     by key (selected_key) and by Choice (selected_item).
     """
@@ -525,7 +525,7 @@ class ChoiceWidget(QWidget):
         *,
         message: Optional[str] = None,
         choices: Sequence[ChoiceItem] = None,
-        selected: Optional[Any] = None,
+        default_key: Optional[Any] = None,
     ):
         QWidget.__init__(self)
         vbox = QVBoxLayout()
@@ -555,7 +555,7 @@ class ChoiceWidget(QWidget):
             vbox2.addWidget(button)
             group.addButton(button)
             group.setId(button, i)
-            if (i == 0 and selected is None) or c.key == selected:
+            if (i == 0 and default_key is None) or c.key == default_key:
                 self.selected_index = i
                 self.selected_item = c
                 self.selected_key = c.key

electrum/gui/qt/wizard/wallet.py

@@ -406,7 +406,7 @@ class WCWalletType(WalletWizardComponent):
         ]
         choices = [c for c in wallet_kinds if c.key in wallet_types]
 
-        self.choice_w = ChoiceWidget(message=message, choices=choices, selected='standard')
+        self.choice_w = ChoiceWidget(message=message, choices=choices, default_key='standard')
         self.layout().addWidget(self.choice_w)
         self.layout().addStretch(1)
         self._valid = True
@@ -729,7 +729,7 @@ class WCScriptAndDerivation(WalletWizardComponent, Logger):
 
         def on_choice_click(index):
             self.derivation_path_edit.setText(self.choice_w.selected_item.extra_data)
-        self.choice_w = ChoiceWidget(message=message1, choices=choices, selected=default_choice)
+        self.choice_w = ChoiceWidget(message=message1, choices=choices, default_key=default_choice)
         self.choice_w.itemSelected.connect(on_choice_click)
 
         if not hide_choices: