Get URIs working properly for multiple windows

gui/qt/__init__.py

@@ -17,7 +17,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import sys
-import os.path
+import os
+import re
 import signal
 
 try:
@@ -199,13 +200,13 @@ class ElectrumGui:
             return
         wallet = wizard.run(action, wallet_type)
         if wallet:
-            self.start_new_window(full_path)
+            self.start_new_window(full_path, None)
 
-    def new_window(self, path):
+    def new_window(self, path, uri):
         # Use a signal as can be called from daemon thread
-        self.app.emit(SIGNAL('new_window'), path)
+        self.app.emit(SIGNAL('new_window'), path, uri)
 
-    def start_new_window(self, path):
+    def start_new_window(self, path, uri):
         for w in self.windows:
             if w.wallet.storage.path == path:
                 w.bring_to_top()
@@ -228,9 +229,17 @@ class ElectrumGui:
             self.windows.append(w)
             self.build_tray_menu()
 
-        url = self.config.get('url')
-        if url:
-            w.pay_to_URI(url)
+        if uri:
+            print "URI: ", uri
+            if os.path.exists(uri):
+                # assume this is a payment request
+                uri = "bitcoin:?r=file://"+ os.path.join(os.getcwd(), uri)
+            if re.match('^bitcoin:', uri):
+                w.pay_to_URI(uri)
+            else:
+                QMessageBox.critical(None, "Error",
+                                     _("bad bitcoin URI: %s") % uri)
+
         return w
 
     def close_window(self, window):
@@ -246,7 +255,8 @@ class ElectrumGui:
                 self.config.cmdline_options['default_wallet_path'] = last_wallet
 
         # main window
-        self.main_window = self.start_new_window(self.config.get_wallet_path())
+        self.main_window = self.start_new_window(self.config.get_wallet_path(),
+                                                 self.config.get('url'))
         if not self.main_window:
             return