AaronFiore/electrum
1
0
Fork 0
Code Activity

follow-up prev

Browse Source
This commit is contained in:
SomberNight
2019-03-22 18:52:57 +01:00
parent d79992b125
commit 6311aa24a8
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/exchange_rate.py
View File

@@ -513,8 +513,8 @@ class FxThread(ThreadJob):
self.config.set_key('use_exchange_rate', bool(b))
self.trigger_update()
def get_history_config(self):
return bool(self.config.get('history_rates'))
def get_history_config(self, *, default=False):
return bool(self.config.get('history_rates', default))
def set_history_config(self, b):
self.config.set_key('history_rates', bool(b))

22
electrum/gui/kivy/uix/dialogs/fx_dialog.py
View File

@@ -1,6 +1,6 @@
from kivy.app import App
from kivy.factory import Factory
from kivy.properties import ObjectProperty
from kivy.properties import ObjectProperty, BooleanProperty
from kivy.lang import Builder
Builder.load_string('''
@@ -36,6 +36,7 @@ Builder.load_string('''
text: _('History rates')
CheckBox:
id:hist
active: popup.has_history_rates
on_active: popup.on_checkbox_history(self.active)
Widget:
@@ -84,18 +85,22 @@ from functools import partial
class FxDialog(Factory.Popup):
def __init__(self, app, plugins, config, callback):
Factory.Popup.__init__(self)
self.app = app
self.config = config
self.callback = callback
self.fx = self.app.fx
self.fx.set_history_config(False)
self.ids.hist.active = False
self.has_history_rates = self.fx.get_history_config(default=True)
Factory.Popup.__init__(self)
self.add_currencies()
def add_exchanges(self):
exchanges = sorted(self.fx.get_exchanges_by_ccy(self.fx.get_currency(), self.ids.hist.active)) if self.fx.is_enabled() else []
mx = self.fx.exchange.name() if self.fx.is_enabled() else ''
if self.fx.is_enabled():
exchanges = sorted(self.fx.get_exchanges_by_ccy(self.fx.get_currency(), self.has_history_rates))
mx = self.fx.exchange.name()
else:
exchanges = []
mx = ''
ex = self.ids.exchanges
ex.values = exchanges
ex.text = (mx if mx in exchanges else exchanges[0]) if self.fx.is_enabled() else ''
@@ -107,15 +112,16 @@ class FxDialog(Factory.Popup):
self.fx.set_exchange(text)
def add_currencies(self):
currencies = [_('None')] + self.fx.get_currencies(self.ids.hist.active)
currencies = [_('None')] + self.fx.get_currencies(self.has_history_rates)
my_ccy = self.fx.get_currency() if self.fx.is_enabled() else _('None')
self.ids.ccy.values = currencies
self.ids.ccy.text = my_ccy
def on_checkbox_history(self, checked):
self.fx.set_history_config(checked)
self.ids.hist.active = checked
self.has_history_rates = checked
self.add_currencies()
self.on_currency(self.ids.ccy.text)
def on_currency(self, ccy):
b = (ccy != _('None'))