From 3ce8bd4d8f8a9b7fb7aea4de03e27ec727e2e48f Mon Sep 17 00:00:00 2001 From: SomberNight Date: Tue, 27 Feb 2018 16:40:11 +0100 Subject: [PATCH 1/3] fix #3983 --- gui/qt/history_list.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gui/qt/history_list.py b/gui/qt/history_list.py index c5364cf2a..9edbd61d4 100644 --- a/gui/qt/history_list.py +++ b/gui/qt/history_list.py @@ -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()) From a821a3504e9172fafa39550f9fedada53e41fe0c Mon Sep 17 00:00:00 2001 From: SomberNight Date: Tue, 27 Feb 2018 16:52:28 +0100 Subject: [PATCH 2/3] wizard: remove unused strings --- gui/qt/installwizard.py | 12 ++---------- lib/base_wizard.py | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index d23631aca..a6e335125 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -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() diff --git a/lib/base_wizard.py b/lib/base_wizard.py index ab18b7617..d4222b7f0 100644 --- a/lib/base_wizard.py +++ b/lib/base_wizard.py @@ -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) From 540b230c8a19a488b24f4b0707098a5ca748bf3d Mon Sep 17 00:00:00 2001 From: Johann Bauer Date: Tue, 27 Feb 2018 16:54:35 +0100 Subject: [PATCH 3/3] Use icon for tx saving success message --- gui/qt/main_window.py | 2 +- gui/qt/util.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index 944ca4df9..65906dabf 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -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 diff --git a/gui/qt/util.py b/gui/qt/util.py index 2010b51b1..3312afb7f 100644 --- a/gui/qt/util.py +++ b/gui/qt/util.py @@ -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_()