unify util.parse_URI

[electrum-nvc.git] / gui / qt / __init__.py

diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
index 169c05f..1acdca5 100644 (file)
--- a/gui/qt/__init__.py
+++ b/gui/qt/__init__.py
@@ -18,7 +18,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
 from electrum.plugins import run_hook
 import os.path, json, ast, traceback
 import shutil
@@ -128,8 +128,6 @@ class ElectrumGui:
                 self.config.set_key('lite_mode', False, True)
                 sys.exit(0)
             self.lite_window = None
-            self.main_window.show()
-            self.main_window.raise_()
             return
 
         actuator = lite_window.MiniActuator(self.main_window)
@@ -137,10 +135,6 @@ class ElectrumGui:
         self.lite_window = lite_window.MiniWindow(actuator, self.go_full, self.config)
         driver = lite_window.MiniDriver(self.main_window, self.lite_window)
 
-        if self.config.get('lite_mode') is True:
-            self.go_lite()
-        else:
-            self.go_full()
 
 
     def check_qt_version(self):
@@ -148,44 +142,8 @@ class ElectrumGui:
         return int(qtVersion[0]) >= 4 and int(qtVersion[2]) >= 7
 
 
-    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:
-            QMessageBox.warning(self.main_window, _('Error'), _('Invalid bitcoin URL'), _('OK'))
-            return
-
-        if amount:
-            try:
-                if self.main_window.base_unit() == 'mBTC': 
-                    amount = str( 1000* Decimal(amount))
-                else: 
-                    amount = str(Decimal(amount))
-            except Exception:
-                amount = "0.0"
-                QMessageBox.warning(self.main_window, _('Error'), _('Invalid Amount'), _('OK'))
-
-        if request_url:
-            from electrum import paymentrequest
-
-        if not request_url:
-            self.main_window.set_send(address, amount, label, message)
-            self.lite_window.set_payment_fields(address, amount)
-            return
-
-        def payment_request():
-            self.payment_request = paymentrequest.PaymentRequest(self.config)
-            self.payment_request.read(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 set_url(self, uri):
+        self.current_window.pay_from_URI(uri)
 
 
     def main(self, url):
@@ -222,6 +180,16 @@ class ElectrumGui:
         #lite window
         self.init_lite()
 
+        # initial configuration
+        if self.config.get('hide_gui') is True and self.tray.isVisible():
+            self.main_window.hide()
+            self.lite_window.hide()
+        else:
+            if self.config.get('lite_mode') is True:
+                self.go_lite()
+            else:
+                self.go_full()
+
         # plugins that need to change the GUI do it here
         run_hook('init')