Shrink size of changes; functionality unchanged.
This commit is contained in:
parent
506ed8ee74
commit
db2517b901
|
@ -200,12 +200,6 @@ class ElectrumWindow(QMainWindow):
|
||||||
self.wallet.stop_threads()
|
self.wallet.stop_threads()
|
||||||
run_hook('close_wallet')
|
run_hook('close_wallet')
|
||||||
|
|
||||||
def title(self):
|
|
||||||
s = 'Electrum %s - %s' % (self.wallet.electrum_version, self.wallet.basename())
|
|
||||||
if self.wallet.is_watching_only():
|
|
||||||
s += ' [%s]' % (_('watching only'))
|
|
||||||
return s
|
|
||||||
|
|
||||||
def load_wallet(self, wallet):
|
def load_wallet(self, wallet):
|
||||||
import electrum
|
import electrum
|
||||||
self.wallet = wallet
|
self.wallet = wallet
|
||||||
|
@ -217,7 +211,10 @@ class ElectrumWindow(QMainWindow):
|
||||||
self.dummy_address = a[0] if a else None
|
self.dummy_address = a[0] if a else None
|
||||||
self.accounts_expanded = self.wallet.storage.get('accounts_expanded',{})
|
self.accounts_expanded = self.wallet.storage.get('accounts_expanded',{})
|
||||||
self.current_account = self.wallet.storage.get("current_account", None)
|
self.current_account = self.wallet.storage.get("current_account", None)
|
||||||
self.setWindowTitle( self.title() )
|
title = 'Electrum %s - %s' % (self.wallet.electrum_version, self.wallet.basename())
|
||||||
|
if self.wallet.is_watching_only():
|
||||||
|
title += ' [%s]' % (_('watching only'))
|
||||||
|
self.setWindowTitle( title )
|
||||||
self.update_history_tab()
|
self.update_history_tab()
|
||||||
self.update_wallet()
|
self.update_wallet()
|
||||||
# Once GUI has been initialized check if we want to announce something since the callback has been called before the GUI was initialized
|
# Once GUI has been initialized check if we want to announce something since the callback has been called before the GUI was initialized
|
||||||
|
|
|
@ -109,9 +109,6 @@ class WalletStorage(object):
|
||||||
self.data[key] = value
|
self.data[key] = value
|
||||||
self.file_exists = True
|
self.file_exists = True
|
||||||
|
|
||||||
def basename(self):
|
|
||||||
return os.path.basename(self.path)
|
|
||||||
|
|
||||||
def get(self, key, default=None):
|
def get(self, key, default=None):
|
||||||
with self.lock:
|
with self.lock:
|
||||||
v = self.data.get(key)
|
v = self.data.get(key)
|
||||||
|
@ -235,7 +232,7 @@ class Abstract_Wallet(object):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def basename(self):
|
def basename(self):
|
||||||
return self.storage.basename()
|
return os.path.basename(self.storage.path)
|
||||||
|
|
||||||
def convert_imported_keys(self, password):
|
def convert_imported_keys(self, password):
|
||||||
for k, v in self.imported_keys.items():
|
for k, v in self.imported_keys.items():
|
||||||
|
|
Loading…
Reference in New Issue