From 57bd393492fde434a1e3af60b607e8e9d757b9b3 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Mon, 12 Nov 2012 21:48:22 +0900
Subject: moved thread code to gui/threads
---
src/leap/baseapp/mainwindow.py | 21 +++++----------------
src/leap/baseapp/systray.py | 3 +++
src/leap/gui/progress.py | 2 +-
src/leap/gui/threads.py | 15 +++++++++++++++
4 files changed, 24 insertions(+), 17 deletions(-)
create mode 100644 src/leap/gui/threads.py
(limited to 'src')
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()
diff --git a/src/leap/baseapp/systray.py b/src/leap/baseapp/systray.py
index 06be2975..94a7a8f2 100644
--- a/src/leap/baseapp/systray.py
+++ b/src/leap/baseapp/systray.py
@@ -1,4 +1,7 @@
import logging
+import sip
+sip.setapi('QString', 2)
+sip.setapi('QVariant', 2)
from PyQt4 import QtCore
from PyQt4 import QtGui
diff --git a/src/leap/gui/progress.py b/src/leap/gui/progress.py
index 2b1b40d9..6e8abc1f 100644
--- a/src/leap/gui/progress.py
+++ b/src/leap/gui/progress.py
@@ -13,7 +13,7 @@ import logging
from PyQt4 import QtCore
from PyQt4 import QtGui
-from leap.baseapp.mainwindow import FunThread
+from leap.gui.threads import FunThread
from leap.gui import mainwindow_rc
diff --git a/src/leap/gui/threads.py b/src/leap/gui/threads.py
new file mode 100644
index 00000000..176c19b1
--- /dev/null
+++ b/src/leap/gui/threads.py
@@ -0,0 +1,15 @@
+from PyQt4 import QtCore
+
+
+class FunThread(QtCore.QThread):
+
+ 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()
--
cgit v1.2.3