tMerge pull request #1257 from kyuupichan/update_fee - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 3195b94f2868107bc97949475ec5a8cf3d73e535
DIR parent aa4ced7a26f6da2463849b392df2cead205b51fb
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Thu, 28 May 2015 19:34:04 +0200
Merge pull request #1257 from kyuupichan/update_fee
Fix calls to update_fee
Diffstat:
M gui/qt/main_window.py | 12 ++++++++----
M gui/qt/paytoedit.py | 2 --
M lib/wallet.py | 7 +++----
3 files changed, 11 insertions(+), 10 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -1445,6 +1445,7 @@ class ElectrumWindow(QMainWindow):
def send_from_addresses(self, addrs):
self.set_pay_from( addrs )
self.tabs.setCurrentIndex(1)
+ self.update_fee(False)
def paytomany(self):
self.tabs.setCurrentIndex(1)
t@@ -2527,10 +2528,13 @@ class ElectrumWindow(QMainWindow):
fee_e.setAmount(self.wallet.fee_per_kb)
if not self.config.is_modifiable('fee_per_kb'):
for w in [fee_e, fee_label]: w.setEnabled(False)
- def on_fee():
- fee = fee_e.get_amount()
- self.wallet.set_fee(fee)
- fee_e.editingFinished.connect(on_fee)
+ def on_fee(is_done):
+ self.wallet.set_fee(fee_e.get_amount(), is_done)
+ if not is_done:
+ self.update_fee(False)
+ fee_e.editingFinished.connect(lambda: on_fee(True))
+ fee_e.textEdited.connect(lambda: on_fee(False))
+
widgets.append((fee_label, fee_e, fee_help))
units = ['BTC', 'mBTC', 'bits']
DIR diff --git a/gui/qt/paytoedit.py b/gui/qt/paytoedit.py
t@@ -135,8 +135,6 @@ class PayToEdit(ScanQRTextEdit):
else:
self.amount_edit.setText("")
- self.amount_edit.textEdited.emit("")
-
if total or len(lines)>1:
self.lock_amount()
else:
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -634,10 +634,9 @@ class Abstract_Wallet(object):
xx += x
return cc, uu, xx
- def set_fee(self, fee):
- if self.fee_per_kb != fee:
- self.fee_per_kb = fee
- self.storage.put('fee_per_kb', self.fee_per_kb, True)
+ def set_fee(self, fee, save = True):
+ self.fee_per_kb = fee
+ self.storage.put('fee_per_kb', self.fee_per_kb, save)
def get_address_history(self, address):
with self.lock: