Merge branch 'master' of github.com:spesmilo/electrum
This commit is contained in:
commit
8fe315beab
|
@ -136,6 +136,8 @@ class HistoryList(MyTreeWidget, AcceptFileDragDrop):
|
|||
vbox.addLayout(Buttons(OkButton(d), CancelButton(d)))
|
||||
d.setLayout(vbox)
|
||||
if d.exec_():
|
||||
if d.date is None:
|
||||
return None
|
||||
button.setText(d.date.toString())
|
||||
return time.mktime(d.date.toPyDate().timetuple())
|
||||
|
||||
|
|
|
@ -22,21 +22,13 @@ from .password_dialog import PasswordLayout, PasswordLayoutForHW, PW_NEW
|
|||
class GoBack(Exception):
|
||||
pass
|
||||
|
||||
MSG_GENERATING_WAIT = _("Electrum is generating your addresses, please wait...")
|
||||
MSG_ENTER_ANYTHING = _("Please enter a seed phrase, a master key, a list of "
|
||||
"Bitcoin addresses, or a list of private keys")
|
||||
MSG_ENTER_SEED_OR_MPK = _("Please enter a seed phrase or a master key (xpub or xprv):")
|
||||
MSG_COSIGNER = _("Please enter the master public key of cosigner #{}:")
|
||||
|
||||
MSG_ENTER_PASSWORD = _("Choose a password to encrypt your wallet keys.") + '\n'\
|
||||
+ _("Leave this field empty if you want to disable encryption.")
|
||||
MSG_HW_STORAGE_ENCRYPTION = _("Set wallet file encryption.") + '\n'\
|
||||
+ _("Your wallet file does not contain secrets, mostly just metadata. ") \
|
||||
+ _("It also contains your master public key that allows watching your addresses.") + '\n\n'\
|
||||
+ _("Note: If you enable this setting, you will need your hardware device to open your wallet.")
|
||||
MSG_RESTORE_PASSPHRASE = \
|
||||
_("Please enter your seed derivation passphrase. "
|
||||
"Note: this is NOT your encryption password. "
|
||||
"Leave this field empty if you did not use one or are unsure.")
|
||||
|
||||
|
||||
class CosignWidget(QWidget):
|
||||
|
@ -478,7 +470,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
|
|||
self.accept_signal.emit()
|
||||
|
||||
def waiting_dialog(self, task, msg):
|
||||
self.please_wait.setText(MSG_GENERATING_WAIT)
|
||||
self.please_wait.setText(msg)
|
||||
self.refresh_gui()
|
||||
t = threading.Thread(target = task)
|
||||
t.start()
|
||||
|
|
|
@ -3151,7 +3151,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
|||
self.wallet.save_transactions(write=True)
|
||||
# need to update at least: history_list, utxo_list, address_list
|
||||
self.need_update.set()
|
||||
self.show_message(_("Transaction saved successfully"))
|
||||
self.msg_box(QPixmap(":icons/offline_tx.png"), None, _('Success'), _("Transaction saved successfully"))
|
||||
return True
|
||||
|
||||
|
||||
|
|
|
@ -202,7 +202,11 @@ class MessageBoxMixin(object):
|
|||
def msg_box(self, icon, parent, title, text, buttons=QMessageBox.Ok,
|
||||
defaultButton=QMessageBox.NoButton):
|
||||
parent = parent or self.top_level_window()
|
||||
d = QMessageBox(icon, title, str(text), buttons, parent)
|
||||
if type(icon) is QPixmap:
|
||||
d = QMessageBox(QMessageBox.Information, title, str(text), buttons, parent)
|
||||
d.setIconPixmap(icon)
|
||||
else:
|
||||
d = QMessageBox(icon, title, str(text), buttons, parent)
|
||||
d.setWindowModality(Qt.WindowModal)
|
||||
d.setDefaultButton(defaultButton)
|
||||
return d.exec_()
|
||||
|
|
|
@ -516,5 +516,5 @@ class BaseWizard(object):
|
|||
self.wallet.synchronize()
|
||||
self.wallet.storage.write()
|
||||
self.terminate()
|
||||
msg = _("Electrum is generating your addresses, please wait.")
|
||||
msg = _("Electrum is generating your addresses, please wait...")
|
||||
self.waiting_dialog(task, msg)
|
||||
|
|
Loading…
Reference in New Issue