Merge pull request #408 from wozz/URI-update
Mac OSX bitcoin: URI updates
This commit is contained in:
commit
75ab583962
|
@ -60,7 +60,7 @@ class OpenFileEventFilter(QObject):
|
||||||
def eventFilter(self, obj, event):
|
def eventFilter(self, obj, event):
|
||||||
if event.type() == QtCore.QEvent.FileOpen:
|
if event.type() == QtCore.QEvent.FileOpen:
|
||||||
if len(self.windows) >= 1:
|
if len(self.windows) >= 1:
|
||||||
self.windows[0].set_url(event.url().toString())
|
self.windows[0].set_url(event.url().toEncoded())
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
|
@ -923,7 +923,12 @@ class ElectrumWindow(QMainWindow):
|
||||||
def set_url(self, url):
|
def set_url(self, url):
|
||||||
address, amount, label, message, signature, identity, url = util.parse_url(url)
|
address, amount, label, message, signature, identity, url = util.parse_url(url)
|
||||||
|
|
||||||
|
try:
|
||||||
if amount and self.base_unit() == 'mBTC': amount = str( 1000* Decimal(amount))
|
if amount and self.base_unit() == 'mBTC': amount = str( 1000* Decimal(amount))
|
||||||
|
elif amount: amount = str(Decimal(amount))
|
||||||
|
except Exception:
|
||||||
|
amount = "0.0"
|
||||||
|
QMessageBox.warning(self, _('Error'), _('Invalid Amount'), _('OK'))
|
||||||
|
|
||||||
if self.mini:
|
if self.mini:
|
||||||
self.mini.set_payment_fields(address, amount)
|
self.mini.set_payment_fields(address, amount)
|
||||||
|
|
|
@ -155,6 +155,7 @@ _ud = re.compile('%([0-9a-hA-H]{2})', re.MULTILINE)
|
||||||
urldecode = lambda x: _ud.sub(lambda m: chr(int(m.group(1), 16)), x)
|
urldecode = lambda x: _ud.sub(lambda m: chr(int(m.group(1), 16)), x)
|
||||||
|
|
||||||
def parse_url(url):
|
def parse_url(url):
|
||||||
|
url = str(url)
|
||||||
o = url[8:].split('?')
|
o = url[8:].split('?')
|
||||||
address = o[0]
|
address = o[0]
|
||||||
if len(o)>1:
|
if len(o)>1:
|
||||||
|
|
|
@ -35,11 +35,11 @@ if sys.platform == 'darwin':
|
||||||
extra_options = dict(
|
extra_options = dict(
|
||||||
setup_requires=['py2app'],
|
setup_requires=['py2app'],
|
||||||
app=[mainscript],
|
app=[mainscript],
|
||||||
options=dict(py2app=dict(argv_emulation=True,
|
options=dict(py2app=dict(argv_emulation=False,
|
||||||
includes=['PyQt4.QtCore', 'PyQt4.QtGui', 'sip'],
|
includes=['PyQt4.QtCore', 'PyQt4.QtGui', 'sip'],
|
||||||
packages=['lib', 'gui', 'plugins'],
|
packages=['lib', 'gui', 'plugins'],
|
||||||
iconfile='electrum.icns',
|
iconfile='electrum.icns',
|
||||||
#plist=plist,
|
plist=plist,
|
||||||
resources=["data", "icons"])),
|
resources=["data", "icons"])),
|
||||||
)
|
)
|
||||||
elif sys.platform == 'win32':
|
elif sys.platform == 'win32':
|
||||||
|
|
Loading…
Reference in New Issue