AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard: add missing keepkey porting, fix password focus for default and picked wallets,

Browse Source 
add abstract method decl HW_PluginBase.wizard_entry_for_device
This commit is contained in:
Sander van Grieken
2023-09-14 10:37:32 +02:00
parent 7fd3b6c91d
commit 60d1d1e599
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qt/wizard/wallet.py
View File

@@ -366,6 +366,8 @@ class WCWalletName(WizardComponent, Logger):
if user_needs_to_enter_password: if user_needs_to_enter_password:
pw_label.show() pw_label.show()
self.pw_e.show() self.pw_e.show()
if not self.name_e.hasFocus():
self.pw_e.setFocus(True)
else: else:
pw_label.hide() pw_label.hide()
self.pw_e.hide() self.pw_e.hide()

6
electrum/plugins/hw_wallet/plugin.py
View File

@@ -182,6 +182,12 @@ class HW_PluginBase(BasePlugin):
""" """
return device.product_key in self.DEVICE_IDS return device.product_key in self.DEVICE_IDS
@abstractmethod
def wizard_entry_for_device(self, device_info: 'DeviceInfo', *, new_wallet: bool) -> str:
"""Return view name for device
"""
pass
class HardwareClientBase(ABC): class HardwareClientBase(ABC):
handler = None # type: Optional['HardwareHandlerBase'] handler = None # type: Optional['HardwareHandlerBase']

15
electrum/plugins/keepkey/qt.py
View File

@@ -231,6 +231,7 @@ class KeepkeyInitLayout(QVBoxLayout):
validChanged = pyqtSignal([bool], arguments=['valid']) validChanged = pyqtSignal([bool], arguments=['valid'])
def __init__(self, method, device): def __init__(self, method, device):
QVBoxLayout.__init__(self)
self.method = method self.method = method
label = QLabel(_("Enter a label to name your device:")) label = QLabel(_("Enter a label to name your device:"))
@@ -257,8 +258,8 @@ class KeepkeyInitLayout(QVBoxLayout):
self.bg.setId(rb, i) self.bg.setId(rb, i)
hbox1.addWidget(rb) hbox1.addWidget(rb)
rb.setChecked(True) rb.setChecked(True)
cb_pin = QCheckBox(_('Enable PIN protection')) self.cb_pin = QCheckBox(_('Enable PIN protection'))
cb_pin.setChecked(True) self.cb_pin.setChecked(True)
else: else:
self.text_e = QTextEdit() self.text_e = QTextEdit()
self.text_e.setMaximumHeight(60) self.text_e.setMaximumHeight(60)
@@ -285,7 +286,7 @@ class KeepkeyInitLayout(QVBoxLayout):
if method in [TIM_NEW, TIM_RECOVER]: if method in [TIM_NEW, TIM_RECOVER]:
self.addWidget(WWLabel(RECOMMEND_PIN)) self.addWidget(WWLabel(RECOMMEND_PIN))
self.addWidget(cb_pin) self.addWidget(self.cb_pin)
else: else:
self.addLayout(hbox_pin) self.addLayout(hbox_pin)
@@ -331,9 +332,9 @@ class Plugin(KeepKeyPlugin, QtPlugin):
views = { views = {
'keepkey_start': {'gui': WCScriptAndDerivation}, 'keepkey_start': {'gui': WCScriptAndDerivation},
'keepkey_xpub': {'gui': WCHWXPub}, 'keepkey_xpub': {'gui': WCHWXPub},
'safet_not_initialized': {'gui': WCKeepkeyInitMethod}, 'keepkey_not_initialized': {'gui': WCKeepkeyInitMethod},
'safet_choose_new_recover': {'gui': WCKeepkeyInitParams}, 'keepkey_choose_new_recover': {'gui': WCKeepkeyInitParams},
'safet_do_init': {'gui': WCKeepkeyInit}, 'keepkey_do_init': {'gui': WCKeepkeyInit},
'keepkey_unlock': {'gui': WCHWUnlock} 'keepkey_unlock': {'gui': WCHWUnlock}
} }
wizard.navmap_merge(views) wizard.navmap_merge(views)
@@ -640,7 +641,7 @@ class WCKeepkeyInitParams(WizardComponent):
def on_ready(self): def on_ready(self):
_name, _info = self.wizard_data['hardware_device'] _name, _info = self.wizard_data['hardware_device']
self.settings_layout = KeepkeyInitLayout(self.plugins.device_manager, self.wizard_data['keepkey_init'], _info.device.id_) self.settings_layout = KeepkeyInitLayout(self.wizard_data['keepkey_init'], _info.device.id_)
self.layout().addLayout(self.settings_layout) self.layout().addLayout(self.settings_layout)
self.layout().addStretch(1) self.layout().addStretch(1)

2
electrum/plugins/safe_t/qt.py
View File

@@ -573,7 +573,7 @@ class WCSafeTInitParams(WizardComponent):
def on_ready(self): def on_ready(self):
_name, _info = self.wizard_data['hardware_device'] _name, _info = self.wizard_data['hardware_device']
self.settings_layout = SafeTInitLayout(self.plugins.device_manager, self.wizard_data['safe_t_init'], _info.device.id_) self.settings_layout = SafeTInitLayout(self.wizard_data['safe_t_init'], _info.device.id_)
self.layout().addLayout(self.settings_layout) self.layout().addLayout(self.settings_layout)
self.layout().addStretch(1) self.layout().addStretch(1)