improve fee tooltips
This commit is contained in:
parent
aafd3b929b
commit
f5d557cae9
|
@ -18,7 +18,17 @@ Builder.load_string('''
|
||||||
orientation: 'horizontal'
|
orientation: 'horizontal'
|
||||||
size_hint: 1, 0.5
|
size_hint: 1, 0.5
|
||||||
Label:
|
Label:
|
||||||
id: fee_per_kb
|
text: (_('Target') if dynfees.active else _('Fixed rate')) + ':'
|
||||||
|
Label:
|
||||||
|
id: fee_target
|
||||||
|
text: ''
|
||||||
|
BoxLayout:
|
||||||
|
orientation: 'horizontal'
|
||||||
|
size_hint: 1, 0.5
|
||||||
|
Label:
|
||||||
|
text: (_('Current rate') if dynfees.active else _('Estimate')) + ':'
|
||||||
|
Label:
|
||||||
|
id: fee_estimate
|
||||||
text: ''
|
text: ''
|
||||||
Slider:
|
Slider:
|
||||||
id: slider
|
id: slider
|
||||||
|
@ -77,7 +87,9 @@ class FeeDialog(Factory.Popup):
|
||||||
|
|
||||||
def update_text(self):
|
def update_text(self):
|
||||||
value = int(self.ids.slider.value)
|
value = int(self.ids.slider.value)
|
||||||
self.ids.fee_per_kb.text = self.get_fee_text(value)
|
target, estimate = self.get_fee_text(value)
|
||||||
|
self.ids.fee_target.text = target
|
||||||
|
self.ids.fee_estimate.text = estimate
|
||||||
|
|
||||||
def update_slider(self):
|
def update_slider(self):
|
||||||
slider = self.ids.slider
|
slider = self.ids.slider
|
||||||
|
@ -93,8 +105,7 @@ class FeeDialog(Factory.Popup):
|
||||||
fee_rate = self.config.depth_to_fee(pos) if mempool else self.config.eta_to_fee(pos)
|
fee_rate = self.config.depth_to_fee(pos) if mempool else self.config.eta_to_fee(pos)
|
||||||
else:
|
else:
|
||||||
fee_rate = self.config.static_fee(pos)
|
fee_rate = self.config.static_fee(pos)
|
||||||
target, tooltip = self.config.get_fee_text(pos, dyn, mempool, fee_rate)
|
return self.config.get_fee_text(pos, dyn, mempool, fee_rate)
|
||||||
return target
|
|
||||||
|
|
||||||
def on_ok(self):
|
def on_ok(self):
|
||||||
value = int(self.ids.slider.value)
|
value = int(self.ids.slider.value)
|
||||||
|
|
|
@ -31,8 +31,11 @@ class FeeSlider(QSlider):
|
||||||
|
|
||||||
def get_tooltip(self, pos, fee_rate):
|
def get_tooltip(self, pos, fee_rate):
|
||||||
mempool = self.config.get('mempool_fees')
|
mempool = self.config.get('mempool_fees')
|
||||||
text, tooltip = self.config.get_fee_text(pos, self.dyn, mempool, fee_rate)
|
target, estimate = self.config.get_fee_text(pos, self.dyn, mempool, fee_rate)
|
||||||
return text + '\n' + tooltip
|
if self.dyn:
|
||||||
|
return _('Target') + ': ' + target + '\n' + _('Current rate') + ': ' + estimate
|
||||||
|
else:
|
||||||
|
return _('Fixed rate') + ': ' + target + '\n' + _('Estimate') + ': ' + estimate
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
with self.lock:
|
with self.lock:
|
||||||
|
|
Loading…
Reference in New Issue