AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of https://github.com/spesmilo/electrum

Browse Source
This commit is contained in:
Anwesh
2015-12-24 06:59:16 +05:30
parent b23c22b29d fb8f9e55ef
commit 93bcd98763
70 changed files with 2153 additions and 3432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/exchange_rate/exchange_rate.py
View File

@@ -346,13 +346,18 @@ class FxPlugin(BasePlugin, ThreadJob):
return _("No data")
@hook
def historical_value_str(self, satoshis, d_t):
def history_rate(self, d_t):
rate = self.exchange.historical_rate(self.ccy, d_t)
# Frequently there is no rate for today, until tomorrow :)
# Use spot quotes in that case
if rate is None and (datetime.today().date() - d_t.date()).days <= 2:
rate = self.exchange.quotes.get(self.ccy)
self.history_used_spot = True
return rate
@hook
def historical_value_str(self, satoshis, d_t):
rate = self.history_rate(d_t)
return self.value_str(satoshis, rate)
@hook

7
plugins/exchange_rate/qt.py
View File

@@ -128,11 +128,10 @@ class Plugin(FxPlugin):
window.connect(window.app, SIGNAL('refresh_headers'), window.history_list.refresh_headers)
def settings_widget(self, window):
return EnterButton(_('Settings'), self.settings_dialog)
return EnterButton(_('Settings'), partial(self.settings_dialog, window))
def settings_dialog(self):
d = QDialog()
d.setWindowTitle("Settings")
def settings_dialog(self, window):
d = WindowModalDialog(window, _("Exchange Rate Settings"))
layout = QGridLayout(d)
layout.addWidget(QLabel(_('Exchange rate API: ')), 0, 0)
layout.addWidget(QLabel(_('Currency: ')), 1, 0)