tsimplify fee preferences dialog - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 89599cf0d53f1540243be69d30fe473c24f236e1
DIR parent 0bca97dd2f8913f70c3762ae52b9469a9edbfba5
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 5 Mar 2018 10:12:44 +0100
simplify fee preferences dialog
Diffstat:
M gui/qt/main_window.py | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -2626,23 +2626,15 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
)
fee_type_label = HelpLabel(_('Fee estimation') + ':', msg)
fee_type_combo = QComboBox()
- fee_type_combo.addItems([_('Time based'), _('Mempool based')])
+ fee_type_combo.addItems([_('Static'), _('ETA'), _('Mempool')])
fee_type_combo.setCurrentIndex(1 if self.config.use_mempool_fees() else 0)
def on_fee_type(x):
- self.config.set_key('mempool_fees', x==1)
+ self.config.set_key('mempool_fees', x==2)
+ self.config.set_key('dynamic_fees', x>0)
self.fee_slider.update()
fee_type_combo.currentIndexChanged.connect(on_fee_type)
fee_widgets.append((fee_type_label, fee_type_combo))
- def on_dynfee(x):
- self.config.set_key('dynamic_fees', x == Qt.Checked)
- self.fee_slider.update()
- dynfee_cb = QCheckBox(_('Use dynamic fees'))
- dynfee_cb.setChecked(self.config.is_dynfee())
- dynfee_cb.setToolTip(_("Use fees recommended by the server."))
- fee_widgets.append((dynfee_cb, None))
- dynfee_cb.stateChanged.connect(on_dynfee)
-
feebox_cb = QCheckBox(_('Edit fees manually'))
feebox_cb.setChecked(self.config.get('show_fee', False))
feebox_cb.setToolTip(_("Show fee edit box in send tab."))