add sat/byte fee info and fee_unit pref
This commit is contained in:
parent
24442de8df
commit
7a92750ea5
|
@ -36,7 +36,7 @@ class FeeSlider(QSlider):
|
||||||
|
|
||||||
def get_tooltip(self, pos, fee_rate):
|
def get_tooltip(self, pos, fee_rate):
|
||||||
from electrum.util import fee_levels
|
from electrum.util import fee_levels
|
||||||
rate_str = self.window.format_amount(fee_rate) + ' ' + self.window.base_unit() + '/kB'
|
rate_str = self.window.format_fee_rate(fee_rate)
|
||||||
if self.dyn:
|
if self.dyn:
|
||||||
tooltip = fee_levels[pos] + '\n' + rate_str
|
tooltip = fee_levels[pos] + '\n' + rate_str
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -129,6 +129,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
||||||
self.need_update = threading.Event()
|
self.need_update = threading.Event()
|
||||||
|
|
||||||
self.decimal_point = config.get('decimal_point', 5)
|
self.decimal_point = config.get('decimal_point', 5)
|
||||||
|
self.fee_unit = config.get('fee_unit', 0)
|
||||||
self.num_zeros = int(config.get('num_zeros',0))
|
self.num_zeros = int(config.get('num_zeros',0))
|
||||||
|
|
||||||
self.completions = QStringListModel()
|
self.completions = QStringListModel()
|
||||||
|
@ -622,6 +623,12 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
||||||
text += ' (%s)'%x
|
text += ' (%s)'%x
|
||||||
return text
|
return text
|
||||||
|
|
||||||
|
def format_fee_rate(self, fee_rate):
|
||||||
|
if self.fee_unit == 0:
|
||||||
|
return format_satoshis(fee_rate/1000, False, self.num_zeros, 0, False) + ' sat/byte'
|
||||||
|
else:
|
||||||
|
return self.format_amount(fee_rate) + ' ' + self.base_unit() + '/kB'
|
||||||
|
|
||||||
def get_decimal_point(self):
|
def get_decimal_point(self):
|
||||||
return self.decimal_point
|
return self.decimal_point
|
||||||
|
|
||||||
|
@ -2464,6 +2471,18 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
||||||
rbf_combo.currentIndexChanged.connect(on_rbf)
|
rbf_combo.currentIndexChanged.connect(on_rbf)
|
||||||
fee_widgets.append((rbf_label, rbf_combo))
|
fee_widgets.append((rbf_label, rbf_combo))
|
||||||
|
|
||||||
|
self.fee_unit = self.config.get('fee_unit', 0)
|
||||||
|
fee_unit_label = HelpLabel(_('Fee Unit') + ':', '')
|
||||||
|
fee_unit_combo = QComboBox()
|
||||||
|
fee_unit_combo.addItems([_('sat/byte'), _('mBTC/kB')])
|
||||||
|
fee_unit_combo.setCurrentIndex(self.fee_unit)
|
||||||
|
def on_fee_unit(x):
|
||||||
|
self.fee_unit = x
|
||||||
|
self.config.set_key('fee_unit', x)
|
||||||
|
self.fee_slider.update()
|
||||||
|
fee_unit_combo.currentIndexChanged.connect(on_fee_unit)
|
||||||
|
fee_widgets.append((fee_unit_label, fee_unit_combo))
|
||||||
|
|
||||||
msg = _('OpenAlias record, used to receive coins and to sign payment requests.') + '\n\n'\
|
msg = _('OpenAlias record, used to receive coins and to sign payment requests.') + '\n\n'\
|
||||||
+ _('The following alias providers are available:') + '\n'\
|
+ _('The following alias providers are available:') + '\n'\
|
||||||
+ '\n'.join(['https://cryptoname.co/', 'http://xmr.link']) + '\n\n'\
|
+ '\n'.join(['https://cryptoname.co/', 'http://xmr.link']) + '\n\n'\
|
||||||
|
|
|
@ -214,7 +214,7 @@ class TxDialog(QDialog, MessageBoxMixin):
|
||||||
size_str = _("Size:") + ' %d bytes'% size
|
size_str = _("Size:") + ' %d bytes'% size
|
||||||
fee_str = _("Fee") + ': %s'% (format_amount(fee) + ' ' + base_unit if fee is not None else _('unknown'))
|
fee_str = _("Fee") + ': %s'% (format_amount(fee) + ' ' + base_unit if fee is not None else _('unknown'))
|
||||||
if fee is not None:
|
if fee is not None:
|
||||||
fee_str += ' ( %s )' % (format_amount(fee * 1000 / size) + ' ' + base_unit + '/kB')
|
fee_str += ' ( %s ) '% self.main_window.format_fee_rate(fee/size*1000)
|
||||||
self.amount_label.setText(amount_str)
|
self.amount_label.setText(amount_str)
|
||||||
self.fee_label.setText(fee_str)
|
self.fee_label.setText(fee_str)
|
||||||
self.size_label.setText(size_str)
|
self.size_label.setText(size_str)
|
||||||
|
|
Loading…
Reference in New Issue