seedless wallets
This commit is contained in:
parent
8340339678
commit
416a3bad09
40
lib/gui.py
40
lib/gui.py
|
@ -563,7 +563,9 @@ class ElectrumWindow:
|
||||||
self.funds_error = False # True if not enough funds
|
self.funds_error = False # True if not enough funds
|
||||||
|
|
||||||
self.window = MyWindow(gtk.WINDOW_TOPLEVEL)
|
self.window = MyWindow(gtk.WINDOW_TOPLEVEL)
|
||||||
self.window.set_title(APP_NAME + " " + self.wallet.electrum_version)
|
title = 'Electrum ' + self.wallet.electrum_version + ' - ' + self.wallet.path
|
||||||
|
if not self.wallet.seed: title += ' [seedless]'
|
||||||
|
self.window.set_title(title)
|
||||||
self.window.connect("destroy", gtk.main_quit)
|
self.window.connect("destroy", gtk.main_quit)
|
||||||
self.window.set_border_width(0)
|
self.window.set_border_width(0)
|
||||||
self.window.connect('mykeypress', gtk.main_quit)
|
self.window.connect('mykeypress', gtk.main_quit)
|
||||||
|
@ -595,17 +597,18 @@ class ElectrumWindow:
|
||||||
self.network_button.show()
|
self.network_button.show()
|
||||||
self.status_bar.pack_end(self.network_button, False, False)
|
self.status_bar.pack_end(self.network_button, False, False)
|
||||||
|
|
||||||
def seedb(w, wallet):
|
if self.wallet.seed:
|
||||||
if wallet.use_encryption:
|
def seedb(w, wallet):
|
||||||
password = password_dialog(self.window)
|
if wallet.use_encryption:
|
||||||
if not password: return
|
password = password_dialog(self.window)
|
||||||
else: password = None
|
if not password: return
|
||||||
show_seed_dialog(wallet, password, self.window)
|
else: password = None
|
||||||
button = gtk.Button('S')
|
show_seed_dialog(wallet, password, self.window)
|
||||||
button.connect("clicked", seedb, wallet )
|
button = gtk.Button('S')
|
||||||
button.set_relief(gtk.RELIEF_NONE)
|
button.connect("clicked", seedb, wallet )
|
||||||
button.show()
|
button.set_relief(gtk.RELIEF_NONE)
|
||||||
self.status_bar.pack_end(button,False, False)
|
button.show()
|
||||||
|
self.status_bar.pack_end(button,False, False)
|
||||||
|
|
||||||
settings_icon = gtk.Image()
|
settings_icon = gtk.Image()
|
||||||
settings_icon.set_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU)
|
settings_icon.set_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU)
|
||||||
|
@ -627,12 +630,13 @@ class ElectrumWindow:
|
||||||
pw_icon.set_size_request(16,16 )
|
pw_icon.set_size_request(16,16 )
|
||||||
pw_icon.show()
|
pw_icon.show()
|
||||||
|
|
||||||
password_button = gtk.Button()
|
if self.wallet.seed:
|
||||||
password_button.connect("clicked", lambda x: change_password_dialog(self.wallet, self.window, pw_icon))
|
password_button = gtk.Button()
|
||||||
password_button.add(pw_icon)
|
password_button.connect("clicked", lambda x: change_password_dialog(self.wallet, self.window, pw_icon))
|
||||||
password_button.set_relief(gtk.RELIEF_NONE)
|
password_button.add(pw_icon)
|
||||||
password_button.show()
|
password_button.set_relief(gtk.RELIEF_NONE)
|
||||||
self.status_bar.pack_end(password_button,False,False)
|
password_button.show()
|
||||||
|
self.status_bar.pack_end(password_button,False,False)
|
||||||
|
|
||||||
self.window.add(vbox)
|
self.window.add(vbox)
|
||||||
self.window.show_all()
|
self.window.show_all()
|
||||||
|
|
|
@ -166,7 +166,9 @@ class ElectrumWindow(QMainWindow):
|
||||||
self.setCentralWidget(tabs)
|
self.setCentralWidget(tabs)
|
||||||
self.create_status_bar()
|
self.create_status_bar()
|
||||||
self.setGeometry(100,100,840,400)
|
self.setGeometry(100,100,840,400)
|
||||||
self.setWindowTitle( 'Electrum ' + self.wallet.electrum_version )
|
title = 'Electrum ' + self.wallet.electrum_version + ' - ' + self.wallet.path
|
||||||
|
if not self.wallet.seed: title += ' [seedless]'
|
||||||
|
self.setWindowTitle( title )
|
||||||
self.show()
|
self.show()
|
||||||
|
|
||||||
QShortcut(QKeySequence("Ctrl+W"), self, self.close)
|
QShortcut(QKeySequence("Ctrl+W"), self, self.close)
|
||||||
|
@ -674,9 +676,11 @@ class ElectrumWindow(QMainWindow):
|
||||||
def create_status_bar(self):
|
def create_status_bar(self):
|
||||||
sb = QStatusBar()
|
sb = QStatusBar()
|
||||||
sb.setFixedHeight(35)
|
sb.setFixedHeight(35)
|
||||||
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/lock.png"), "Password", lambda: self.change_password_dialog(self.wallet, self) ) )
|
if self.wallet.seed:
|
||||||
|
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/lock.png"), "Password", lambda: self.change_password_dialog(self.wallet, self) ) )
|
||||||
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/preferences.png"), "Preferences", self.settings_dialog ) )
|
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/preferences.png"), "Preferences", self.settings_dialog ) )
|
||||||
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/seed.png"), "Seed", lambda: self.show_seed_dialog(self.wallet, self) ) )
|
if self.wallet.seed:
|
||||||
|
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/seed.png"), "Seed", lambda: self.show_seed_dialog(self.wallet, self) ) )
|
||||||
self.status_button = StatusBarButton( QIcon(":icons/status_disconnected.png"), "Network", lambda: self.network_dialog(self.wallet, self) )
|
self.status_button = StatusBarButton( QIcon(":icons/status_disconnected.png"), "Network", lambda: self.network_dialog(self.wallet, self) )
|
||||||
sb.addPermanentWidget( self.status_button )
|
sb.addPermanentWidget( self.status_button )
|
||||||
self.setStatusBar(sb)
|
self.setStatusBar(sb)
|
||||||
|
|
Loading…
Reference in New Issue