AaronFiore/electrum
1
0
Fork 0
Code Activity

send error messages for payment requests

Browse Source
This commit is contained in:
ThomasV
2014-05-07 18:10:14 +02:00
parent 89849c7d52
commit ec234105a5
3 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gui/qt/__init__.py
View File

@@ -172,22 +172,22 @@ class ElectrumGui:
from electrum import paymentrequest
except:
print "cannot import paymentrequest"
return
def payment_request():
pr = paymentrequest.PaymentRequest(request_url)
if pr.verify() or 1:
self.main_window.payment_request = pr
self.main_window.emit(SIGNAL('payment_request_ok'))
else:
self.main_window.emit(SIGNAL('payment_request_failed'))
request_url = None
threading.Thread(target=payment_request).start()
self.main_window.tabs.setCurrentIndex(1)
else:
if not request_url:
self.main_window.set_send(address, amount, label, message)
if self.lite_window:
self.lite_window.set_payment_fields(address, amount)
return
def payment_request():
self.payment_request = paymentrequest.PaymentRequest(request_url)
if self.payment_request.verify():
self.main_window.emit(SIGNAL('payment_request_ok'))
else:
self.main_window.emit(SIGNAL('payment_request_error'))
threading.Thread(target=payment_request).start()
self.main_window.prepare_for_payment_request()
def main(self, url):

16
gui/qt/main_window.py
View File

@@ -107,6 +107,7 @@ class ElectrumWindow(QMainWindow):
self.config = config
self.network = network
self.gui_object = gui_object
self.tray = gui_object.tray
self.go_lite = gui_object.go_lite
self.lite = None
@@ -157,6 +158,7 @@ class ElectrumWindow(QMainWindow):
self.connect(self, QtCore.SIGNAL('send_tx2'), self.send_tx2)
self.connect(self, QtCore.SIGNAL('send_tx3'), self.send_tx3)
self.connect(self, QtCore.SIGNAL('payment_request_ok'), self.payment_request_ok)
self.connect(self, QtCore.SIGNAL('payment_request_error'), self.payment_request_error)
self.history_list.setFocus(True)
@@ -896,14 +898,22 @@ class ElectrumWindow(QMainWindow):
def payment_request_ok(self):
def prepare_for_payment_request(self):
style = "QWidget { background-color:none;border:none;}"
self.payto_e.setText(self.payment_request.domain)
self.tabs.setCurrentIndex(1)
self.payto_e.setReadOnly(True)
self.payto_e.setStyleSheet(style)
self.amount_e.setText(self.format_amount(self.payment_request.get_amount()))
self.amount_e.setReadOnly(True)
self.payto_e.setText(_("please wait..."))
self.amount_e.setStyleSheet(style)
return True
def payment_request_ok(self):
self.payto_e.setText(self.gui_object.payment_request.domain)
self.amount_e.setText(self.format_amount(self.gui_object.payment_request.get_amount()))
def payment_request_error(self):
self.payto_e.setText(self.gui_object.payment_request.error)
def set_send(self, address, amount, label, message):