Added base unit 'bits'.
This commit is contained in:
parent
2efad717d8
commit
a97a0629dd
|
@ -63,8 +63,14 @@ class BTCAmountEdit(AmountEdit):
|
||||||
|
|
||||||
def _base_unit(self):
|
def _base_unit(self):
|
||||||
p = self.decimal_point()
|
p = self.decimal_point()
|
||||||
assert p in [5,8]
|
assert p in [2, 5, 8]
|
||||||
return "BTC" if p == 8 else "mBTC"
|
if p == 8:
|
||||||
|
return 'BTC'
|
||||||
|
if p == 5:
|
||||||
|
return 'mBTC'
|
||||||
|
if p == 2:
|
||||||
|
return 'bits'
|
||||||
|
raise Exception('Unknown base unit')
|
||||||
|
|
||||||
def get_amount(self):
|
def get_amount(self):
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -444,9 +444,14 @@ class ElectrumWindow(QMainWindow):
|
||||||
|
|
||||||
|
|
||||||
def base_unit(self):
|
def base_unit(self):
|
||||||
assert self.decimal_point in [5,8]
|
assert self.decimal_point in [2, 5, 8]
|
||||||
return "BTC" if self.decimal_point == 8 else "mBTC"
|
if self.decimal_point == 2:
|
||||||
|
return 'bits'
|
||||||
|
if self.decimal_point == 5:
|
||||||
|
return 'mBTC'
|
||||||
|
if self.decimal_point == 8:
|
||||||
|
return 'BTC'
|
||||||
|
raise Exception('Unknown base unit')
|
||||||
|
|
||||||
def update_status(self):
|
def update_status(self):
|
||||||
if self.network is None or not self.network.is_running():
|
if self.network is None or not self.network.is_running():
|
||||||
|
@ -2486,7 +2491,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
if not self.config.is_modifiable('fee_per_kb'):
|
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)
|
||||||
|
|
||||||
units = ['BTC', 'mBTC']
|
units = ['BTC', 'mBTC', 'bits']
|
||||||
unit_label = QLabel(_('Base unit') + ':')
|
unit_label = QLabel(_('Base unit') + ':')
|
||||||
grid.addWidget(unit_label, 3, 0)
|
grid.addWidget(unit_label, 3, 0)
|
||||||
unit_combo = QComboBox()
|
unit_combo = QComboBox()
|
||||||
|
@ -2557,7 +2562,14 @@ class ElectrumWindow(QMainWindow):
|
||||||
|
|
||||||
unit_result = units[unit_combo.currentIndex()]
|
unit_result = units[unit_combo.currentIndex()]
|
||||||
if self.base_unit() != unit_result:
|
if self.base_unit() != unit_result:
|
||||||
self.decimal_point = 8 if unit_result == 'BTC' else 5
|
if unit_result == 'BTC':
|
||||||
|
self.decimal_point = 8
|
||||||
|
elif unit_result == 'mBTC':
|
||||||
|
self.decimal_point = 5
|
||||||
|
elif unit_result == 'bits':
|
||||||
|
self.decimal_point = 2
|
||||||
|
else:
|
||||||
|
raise Exception('Unknown base unit')
|
||||||
self.config.set_key('decimal_point', self.decimal_point, True)
|
self.config.set_key('decimal_point', self.decimal_point, True)
|
||||||
self.update_history_tab()
|
self.update_history_tab()
|
||||||
self.update_status()
|
self.update_status()
|
||||||
|
|
Loading…
Reference in New Issue