BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some bugs in last push

This commit is contained in:
Neil Booth 2015-09-05 01:24:16 +09:00
parent 08f1e56cef
commit 8d046c7919
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/exchange_rate.py
View File

@ -22,7 +22,7 @@ class ExchangeBase:
headers={'User-Agent' : 'Electrum'}) headers={'User-Agent' : 'Electrum'})
return response.json() return response.json()
def name(): def name(self):
return self.__class__.__name__ return self.__class__.__name__
def update(self, ccy): def update(self, ccy):
@ -132,7 +132,7 @@ class LocalBitcoins(ExchangeBase):
class Winkdex(ExchangeBase): class Winkdex(ExchangeBase):
def update(self, ccy): def update(self, ccy):
json = self.get_json('winkdex.com', '/api/v0/price') json = self.get_json('winkdex.com', '/api/v0/price')
return {'USD': Decimal(winkresp['price'] / 100.0)} return {'USD': Decimal(json['price'] / 100.0)}
def history_ccys(self): def history_ccys(self):
return ['USD'] return ['USD']
@ -344,7 +344,7 @@ class Plugin(BasePlugin):
window.history_list.setHeaderLabels([ '', '', _('Date'), _('Description') , _('Amount'), _('Balance'), _('Fiat Amount')] ) window.history_list.setHeaderLabels([ '', '', _('Date'), _('Description') , _('Amount'), _('Balance'), _('Fiat Amount')] )
root = window.history_list.invisibleRootItem() root = window.history_list.invisibleRootItem()
childcount = root.childCount() childcount = root.childCount()
exchange = self.exchange.__class__.__name__ exchange = self.exchange.name()
for i in range(childcount): for i in range(childcount):
item = root.child(i) item = root.child(i)
try: try:
@ -403,7 +403,7 @@ class Plugin(BasePlugin):
layout.addWidget(QLabel(_('History Rates: ')), 2, 0) layout.addWidget(QLabel(_('History Rates: ')), 2, 0)
combo = QComboBox() combo = QComboBox()
combo_ex = QComboBox() combo_ex = QComboBox()
combo_ex.addItems(self.exchanges.keys()) combo_ex.addItems(sorted(self.exchanges.keys()))
combo_ex.setCurrentIndex(combo_ex.findText(self.config_exchange())) combo_ex.setCurrentIndex(combo_ex.findText(self.config_exchange()))
hist_checkbox = QCheckBox() hist_checkbox = QCheckBox()
@ -425,9 +425,9 @@ class Plugin(BasePlugin):
for window in self.parent.windows: for window in self.parent.windows:
window.update_status() window.update_status()
def on_change_ex(exchange): def on_change_ex(idx):
exchange = str(exchange) exchange = str(combo_ex.currentText())
if exchange != self.exchange.__name__: if exchange != self.exchange.name():
self.set_exchange(exchange) self.set_exchange(exchange)
self.currencies = [] self.currencies = []
combo.clear() combo.clear()