1
0

changes to make kivy branch with master

This commit is contained in:
akshayaurora
2014-07-01 04:59:25 +05:30
committed by ThomasV
parent f442cc31e4
commit f2fc18fe32
3 changed files with 14 additions and 69 deletions

View File

@@ -21,7 +21,7 @@
import sys
#, time, datetime, re, threading
#from electrum.i18n import _, set_language
from electrum.util import print_error, print_msg, parse_url
from electrum.util import print_error, print_msg
#:TODO: replace this with kivy's own plugin managment
#from electrum.plugins import run_hook
@@ -73,46 +73,8 @@ class ElectrumGui:
#init_plugins(self)
def set_url(self, url):
from electrum import util
from decimal import Decimal
try:
address, amount, label, message,\
request_url, url = util.parse_url(url)
except Exception:
self.main_window.show_error(_('Invalid bitcoin URL'))
return
if amount:
try:
if main_window.base_unit == 'mBTC':
amount = str( 1000* Decimal(amount))
else:
amount = str(Decimal(amount))
except Exception:
amount = "0.0"
self.main_window.show_error(_('Invalid Amount'))
if request_url:
try:
from electrum import paymentrequest
except:
self.main_window.show_error("cannot import payment request")
request_url = None
if not request_url:
self.main_window.set_send(address, amount, label, message)
return
def payment_request():
self.payment_request = paymentrequest.PaymentRequest(request_url)
if self.payment_request.verify():
Clock.schedule_once(self.main_window.payment_request_ok)
else:
Clock.schedule_once(self.main_window.payment_request_error)
threading.Thread(target=payment_request).start()
self.main_window.prepare_for_payment_request()
#self.current_window.pary_from_URI
pass
def main(self, url):
''' The main entry point of the kivy ux