Browse Source

wallet: rm electrum_version field

3.3.3.1
SomberNight 6 years ago
parent
commit
150e27608b
No known key found for this signature in database GPG Key ID: B33B5F232C6271E9
  1. 5
      electrum/gui/qt/main_window.py
  2. 1
      electrum/wallet.py

5
electrum/gui/qt/main_window.py

@ -57,6 +57,7 @@ from electrum.util import (format_time, format_satoshis, format_fee_satoshis,
from electrum.transaction import Transaction, TxOutput from electrum.transaction import Transaction, TxOutput
from electrum.address_synchronizer import AddTransactionException from electrum.address_synchronizer import AddTransactionException
from electrum.wallet import Multisig_Wallet, CannotBumpFee from electrum.wallet import Multisig_Wallet, CannotBumpFee
from electrum.version import ELECTRUM_VERSION
from .exception_window import Exception_Hook from .exception_window import Exception_Hook
from .amountedit import AmountEdit, BTCAmountEdit, MyLineEdit, FeerateEdit from .amountedit import AmountEdit, BTCAmountEdit, MyLineEdit, FeerateEdit
@ -399,7 +400,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
def watching_only_changed(self): def watching_only_changed(self):
name = "Electrum Testnet" if constants.net.TESTNET else "Electrum" name = "Electrum Testnet" if constants.net.TESTNET else "Electrum"
title = '%s %s - %s' % (name, self.wallet.electrum_version, title = '%s %s - %s' % (name, ELECTRUM_VERSION,
self.wallet.basename()) self.wallet.basename())
extra = [self.wallet.storage.get('wallet_type', '?')] extra = [self.wallet.storage.get('wallet_type', '?')]
if self.wallet.is_watching_only(): if self.wallet.is_watching_only():
@ -584,7 +585,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
def show_about(self): def show_about(self):
QMessageBox.about(self, "Electrum", QMessageBox.about(self, "Electrum",
(_("Version")+" %s" % self.wallet.electrum_version + "\n\n" + (_("Version")+" %s" % ELECTRUM_VERSION + "\n\n" +
_("Electrum's focus is speed, with low resource usage and simplifying Bitcoin.") + " " + _("Electrum's focus is speed, with low resource usage and simplifying Bitcoin.") + " " +
_("You do not need to perform regular backups, because your wallet can be " _("You do not need to perform regular backups, because your wallet can be "
"recovered from a secret phrase that you can memorize or write on paper.") + " " + "recovered from a secret phrase that you can memorize or write on paper.") + " " +

1
electrum/wallet.py

@ -167,7 +167,6 @@ class Abstract_Wallet(AddressSynchronizer):
def __init__(self, storage): def __init__(self, storage):
AddressSynchronizer.__init__(self, storage) AddressSynchronizer.__init__(self, storage)
self.electrum_version = ELECTRUM_VERSION
# saved fields # saved fields
self.use_change = storage.get('use_change', True) self.use_change = storage.get('use_change', True)
self.multiple_change = storage.get('multiple_change', False) self.multiple_change = storage.get('multiple_change', False)

Loading…
Cancel
Save