[Pkg-anonymity-tools] [onionshare] 24/140: Merge branch 'master' of https://github.com/canerbasaran/onionshare into canerbasaran-master

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch master
in repository onionshare.

commit 805522be361fa207922ef2a8befc9f94d08e91ff
Merge: 0f75e0e 85c72f1
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Aug 26 16:59:48 2014 -0700

    Merge branch 'master' of https://github.com/canerbasaran/onionshare into canerbasaran-master
    
    Conflicts:
    	onionshare_gui/onionshare_gui.py

 onionshare/onionshare.py         |  2 +-
 onionshare/strings.json          | 21 +++++++++++++++++++++
 onionshare_gui/onionshare_gui.py |  4 ++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --cc onionshare_gui/onionshare_gui.py
index 36081b8,d034655..efa0d56
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@@ -30,24 -22,23 +30,24 @@@ class Application(QtGui.QApplication)
      def __init__(self):
          platform = onionshare.get_platform()
          if platform == 'Tails' or platform == 'Linux':
 -            self.setAttribute(Qt.AA_X11InitThreads, True)
 -
 -        QApplication.__init__(self, sys.argv)
 +            self.setAttribute(QtCore.Qt.AA_X11InitThreads, True)
 +        QtGui.QApplication.__init__(self, sys.argv)
  
 -class WebAppThread(QThread):
 -    def __init__(self, webapp_port):
 -        QThread.__init__(self)
 -        self.webapp_port = webapp_port
 +class OnionShareGui(QtGui.QWidget):
 +    def __init__(self, filename, basename):
 +        super(OnionShareGui, self).__init__()
 +        # initialize ui
 +        self.init_ui(filename, basename)
 +        # check for requests every 1000ms
 +        self.timer = QtCore.QTimer()
 +        QtCore.QObject.connect(self.timer, QtCore.SIGNAL("timeout()"), self.check_for_requests)
 +        self.timer.start(1000)
 +        # copy url to clipboard
 +        self.copy_to_clipboard()
  
 -    def run(self):
 -        webapp.app.run(port=self.webapp_port)
 -
 -class Window(QWebView):
 -    def __init__(self, basename, webapp_port):
 -        global window_icon
 -        QWebView.__init__(self)
 +    def init_ui(self, filename, basename):
 +        # window
-         self.setWindowTitle("{0} | OnionShare".format(basename))
+         self.setWindowTitle(u"{0} | OnionShare".format(basename.decode("utf-8")))
          self.resize(580, 400)
          self.setMinimumSize(580, 400)
          self.setMaximumSize(580, 400)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/onionshare.git