AaronFiore/electrum
1
0
Fork 0
Code Activity

fix qt wizard (follow-up 693210edbe)

Browse Source
This commit is contained in:
ThomasV
2025-01-06 11:46:20 +01:00
parent ebff5b545d
commit d2fa65b9aa
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -991,9 +991,7 @@ class WCWalletPassword(WalletWizardComponent):
msg=MSG_ENTER_PASSWORD, msg=MSG_ENTER_PASSWORD,
kind=PW_NEW, kind=PW_NEW,
OK_button=self.next_button, OK_button=self.next_button,
# force_disable_encrypt_cb=force_disable_encrypt_cb
) )
self.pw_layout.encrypt_cb.setChecked(True)
self.layout().addLayout(self.pw_layout.layout()) self.layout().addLayout(self.pw_layout.layout())
self.layout().addStretch(1) self.layout().addStretch(1)
@@ -1002,7 +1000,7 @@ class WCWalletPassword(WalletWizardComponent):
def apply(self): def apply(self):
self.wizard_data['password'] = self.pw_layout.new_password() self.wizard_data['password'] = self.pw_layout.new_password()
self.wizard_data['encrypt'] = self.pw_layout.encrypt_cb.isChecked() self.wizard_data['encrypt'] = True
class SeedExtensionEdit(QWidget): class SeedExtensionEdit(QWidget):
@@ -1240,22 +1238,20 @@ class WCWalletPasswordHardware(WalletWizardComponent):
self.plugins = wizard.plugins self.plugins = wizard.plugins
self.playout = PasswordLayoutForHW(MSG_HW_STORAGE_ENCRYPTION) self.playout = PasswordLayoutForHW(MSG_HW_STORAGE_ENCRYPTION)
self.playout.encrypt_cb.setChecked(True)
self.layout().addLayout(self.playout.layout()) self.layout().addLayout(self.playout.layout())
self.layout().addStretch(1) self.layout().addStretch(1)
self._valid = True self._valid = True
def apply(self): def apply(self):
self.wizard_data['encrypt'] = self.playout.encrypt_cb.isChecked() self.wizard_data['encrypt'] = True
if self.playout.encrypt_cb.isChecked(): _name, _info = self.wizard_data['hardware_device']
_name, _info = self.wizard_data['hardware_device'] device_id = _info.device.id_
device_id = _info.device.id_ client = self.plugins.device_manager.client_by_id(device_id, scan_now=False)
client = self.plugins.device_manager.client_by_id(device_id, scan_now=False) # client.handler = self.plugin.create_handler(self.wizard)
# client.handler = self.plugin.create_handler(self.wizard) # FIXME client can be None if it was recently disconnected.
# FIXME client can be None if it was recently disconnected. # also, even if not None, this might raise (e.g. if it disconnected *just now*):
# also, even if not None, this might raise (e.g. if it disconnected *just now*): self.wizard_data['password'] = client.get_password_for_storage_encryption()
self.wizard_data['password'] = client.get_password_for_storage_encryption()
class WCHWUnlock(WalletWizardComponent, Logger): class WCHWUnlock(WalletWizardComponent, Logger):