rename fee to fee_per_kb
This commit is contained in:
parent
29b9ffac4a
commit
3ad453fafb
|
@ -1936,7 +1936,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
+ _('Recommended value') + ': 0.0001'
|
+ _('Recommended value') + ': 0.0001'
|
||||||
grid_wallet.addWidget(HelpButton(msg), 0, 3)
|
grid_wallet.addWidget(HelpButton(msg), 0, 3)
|
||||||
fee_e.textChanged.connect(lambda: numbify(fee_e,False))
|
fee_e.textChanged.connect(lambda: numbify(fee_e,False))
|
||||||
if not self.config.is_modifiable('fee'):
|
if not self.config.is_modifiable('fee_per_kb'):
|
||||||
for w in [fee_e, fee_label]: w.setEnabled(False)
|
for w in [fee_e, fee_label]: w.setEnabled(False)
|
||||||
|
|
||||||
usechange_label = QLabel(_('Use change addresses'))
|
usechange_label = QLabel(_('Use change addresses'))
|
||||||
|
|
|
@ -318,14 +318,14 @@ class ElectrumGui:
|
||||||
def settings_dialog(self):
|
def settings_dialog(self):
|
||||||
out = self.run_dialog('Settings', [
|
out = self.run_dialog('Settings', [
|
||||||
{'label':'Default GUI', 'type':'list', 'choices':['classic','lite','gtk','text'], 'value':self.config.get('gui')},
|
{'label':'Default GUI', 'type':'list', 'choices':['classic','lite','gtk','text'], 'value':self.config.get('gui')},
|
||||||
{'label':'Default fee', 'type':'satoshis', 'value': format_satoshis(self.config.get('fee')).strip() }
|
{'label':'Default fee', 'type':'satoshis', 'value': format_satoshis(self.config.get('fee_per_kb')).strip() }
|
||||||
], buttons = 1)
|
], buttons = 1)
|
||||||
if out:
|
if out:
|
||||||
if out.get('Default GUI'):
|
if out.get('Default GUI'):
|
||||||
self.config.set_key('gui', out['Default GUI'], True)
|
self.config.set_key('gui', out['Default GUI'], True)
|
||||||
if out.get('Default fee'):
|
if out.get('Default fee'):
|
||||||
fee = int ( Decimal( out['Default fee']) *10000000 )
|
fee = int ( Decimal( out['Default fee']) *10000000 )
|
||||||
self.config.set_key('fee', fee, True)
|
self.config.set_key('fee_per_kb', fee, True)
|
||||||
|
|
||||||
|
|
||||||
def password_dialog(self):
|
def password_dialog(self):
|
||||||
|
|
|
@ -74,7 +74,7 @@ class Wallet:
|
||||||
self.seed_version = config.get('seed_version', SEED_VERSION)
|
self.seed_version = config.get('seed_version', SEED_VERSION)
|
||||||
self.gap_limit = config.get('gap_limit', 5)
|
self.gap_limit = config.get('gap_limit', 5)
|
||||||
self.use_change = config.get('use_change',True)
|
self.use_change = config.get('use_change',True)
|
||||||
self.fee = int(config.get('fee',10000))
|
self.fee = int(config.get('fee_per_kb',10000))
|
||||||
self.num_zeros = int(config.get('num_zeros',0))
|
self.num_zeros = int(config.get('num_zeros',0))
|
||||||
self.use_encryption = config.get('use_encryption', False)
|
self.use_encryption = config.get('use_encryption', False)
|
||||||
self.seed = config.get('seed', '') # encrypted
|
self.seed = config.get('seed', '') # encrypted
|
||||||
|
@ -831,7 +831,7 @@ class Wallet:
|
||||||
s = {
|
s = {
|
||||||
'use_encryption': self.use_encryption,
|
'use_encryption': self.use_encryption,
|
||||||
'use_change': self.use_change,
|
'use_change': self.use_change,
|
||||||
'fee': self.fee,
|
'fee_per_kb': self.fee,
|
||||||
'accounts': self.accounts,
|
'accounts': self.accounts,
|
||||||
'addr_history': self.history,
|
'addr_history': self.history,
|
||||||
'labels': self.labels,
|
'labels': self.labels,
|
||||||
|
|
Loading…
Reference in New Issue