summaryrefslogtreecommitdiff
path: root/src/leap/baseapp/mainwindow.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-11-12 21:48:22 +0900
committerkali <kali@leap.se>2012-11-12 21:48:22 +0900
commit57bd393492fde434a1e3af60b607e8e9d757b9b3 (patch)
treed56c19a4c8ba2dee12cb9a3601d39e01486c4b78 /src/leap/baseapp/mainwindow.py
parent42ba228eecb5726506848bd08758bd1f925905cc (diff)
moved thread code to gui/threads
Diffstat (limited to 'src/leap/baseapp/mainwindow.py')
-rw-r--r--src/leap/baseapp/mainwindow.py21
1 files changed, 5 insertions, 16 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index 8188f819..2df99074 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -2,6 +2,10 @@
#!/usr/bin/env python
import logging
+import sip
+sip.setapi('QString', 2)
+sip.setapi('QVariant', 2)
+
from PyQt4 import QtCore
from PyQt4 import QtGui
@@ -10,6 +14,7 @@ from leap.baseapp.log import LogPaneMixin
from leap.baseapp.systray import StatusAwareTrayIconMixin
from leap.baseapp.network import NetworkCheckerAppMixin
from leap.baseapp.leap_app import MainWindowMixin
+from leap.gui.threads import FunThread
logger = logging.getLogger(name=__name__)
@@ -145,19 +150,3 @@ class LeapWindow(QtGui.QMainWindow,
def runchecks_and_eipconnect(self):
self.initchecks.begin()
-
-
-class FunThread(QtCore.QThread):
- # XXX move to gui/threads
- # for code consistence
-
- def __init__(self, fun, parent=None):
- QtCore.QThread.__init__(self, parent)
- self.fun = fun
-
- def run(self):
- if self.fun:
- self.fun()
-
- def begin(self):
- self.start()