electrum

commit da544794b7726bd6eeb5e83f7bc5465e507aa492
parent a45095ef36251d8327e9e3d469b3795e473b85ef
Author: ThomasV <thomasv@electrum.org>
Date:   Wed, 21 Sep 2016 12:40:18 +0200

improved message

Diffstat:
M
gui/qt/main_window.py
 | 
11
++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -781,7 +781,12 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
         if addr is None:
             from electrum.wallet import Imported_Wallet
             if not self.wallet.is_deterministic():
-                self.show_message(_('No more addresses in your wallet.'))
+                msg = [
+                    _('No more addresses in your wallet.'),
+                    _('You are using a non-deterministic wallet, which cannot create new addresses.'),
+                    _('If you want to create new addresses, use a deterministic wallet instead.')
+                   ]
+                self.show_message(' '.join(msg))
                 return
             if not self.question(_("Warning: The next address will not be recovered automatically if you restore your wallet from seed; you may need to add it manually.\n\nThis occurs because you have too many unused addresses in your wallet. To avoid this situation, use the existing addresses first.\n\nCreate anyway?")):
                 return
@@ -1723,14 +1728,10 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
             traceback.print_exc(file=sys.stdout)
             self.show_message(str(e))
             return
-
         d = WindowModalDialog(self, _("Public key"))
         d.setMinimumSize(600, 200)
         vbox = QVBoxLayout()
         vbox.addWidget( QLabel(_("Address") + ': ' + address))
-        #if isinstance(self.wallet, BIP32_RD_Wallet):
-        #    derivation = self.wallet.address_id(address)
-        #    vbox.addWidget(QLabel(_("Derivation") + ': ' + derivation))
         vbox.addWidget(QLabel(_("Public key") + ':'))
         keys_e = ShowQRTextEdit(text='\n'.join(pubkey_list))
         keys_e.addCopyButton(self.app)