resloved conflict

onionshare_gui/onionshare_gui.py

@@ -3,9 +3,18 @@ from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from PyQt4.QtWebKit import *
 
-from os import path
-sys.path.append(path.dirname(path.dirname(path.abspath(__file__))))
-import onionshare, webapp
+<<<<<<< HEAD
+=======
+onionshare_gui_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+
+try:
+    import onionshare
+except ImportError:
+    sys.path.append(os.path.abspath(onionshare_gui_dir+"/.."))
+    import onionshare
+
+import webapp
+>>>>>>> 272092f877ade0ada63fc1b7b43f7837e73adede
 
 window_icon = None
 
@@ -81,8 +90,7 @@ def main():
         return
 
     # create the onionshare icon
-    global window_icon
-    onionshare_gui_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+    global window_icon, onionshare_gui_dir
     window_icon = QIcon("{0}/onionshare-icon.png".format(onionshare_gui_dir))
 
     # try starting hidden service

onionshare_gui/static/onionshare.js

@@ -3,7 +3,7 @@ $(function(){
 
   function update($msg) {
     var $line = $('<li>').append($msg);
-    $('#log').append($line);
+    $('#log').prepend($line);
   }
 
   function copy_to_clipboard() {

onionshare_gui/webapp.py

@@ -65,8 +65,22 @@ def start_onionshare():
 
 @app.route("/copy_url")
 def copy_url():
-    global clipboard
-    clipboard.setText(url)
+    if platform.system() == 'Windows':
+        # Qt's QClipboard isn't working in Windows
+        # https://github.com/micahflee/onionshare/issues/46
+        import ctypes
+        GMEM_DDESHARE = 0x2000
+        ctypes.windll.user32.OpenClipboard(None)
+        ctypes.windll.user32.EmptyClipboard()
+        hcd = ctypes.windll.kernel32.GlobalAlloc(GMEM_DDESHARE, len(bytes(url))+1)
+        pch_data = ctypes.windll.kernel32.GlobalLock(hcd)
+        ctypes.cdll.msvcrt.strcpy(ctypes.c_char_p(pch_data), bytes(url))
+        ctypes.windll.kernel32.GlobalUnlock(hcd)
+        ctypes.windll.user32.SetClipboardData(1, hcd)
+        ctypes.windll.user32.CloseClipboard()
+    else:
+        global clipboard
+        clipboard.setText(url)
     return ''
 
 @app.route("/heartbeat")