renamed QtBCallCb to QtDo (and change the behavior)
This commit is contained in:
parent
84937667a3
commit
121ab66b41
2 changed files with 23 additions and 6 deletions
|
|
@ -1 +1 @@
|
||||||
from .qt import QtApplication, QtMainWindow, QtBCallCb
|
from .qt import QtApplication, QtMainWindow, QtDo
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ from weboob.scheduler import IScheduler
|
||||||
|
|
||||||
from ..base import BaseApplication
|
from ..base import BaseApplication
|
||||||
|
|
||||||
__all__ = ['QtApplication', 'QtMainWindow', 'QtBCallCb']
|
__all__ = ['QtApplication', 'QtMainWindow', 'QtDo']
|
||||||
|
|
||||||
class QtScheduler(IScheduler):
|
class QtScheduler(IScheduler):
|
||||||
def __init__(self, app):
|
def __init__(self, app):
|
||||||
|
|
@ -70,21 +70,38 @@ class QtMainWindow(QMainWindow):
|
||||||
def __init__(self, parent=None):
|
def __init__(self, parent=None):
|
||||||
QMainWindow.__init__(self, parent)
|
QMainWindow.__init__(self, parent)
|
||||||
|
|
||||||
class QtBCallCb(QObject):
|
class QtDo(QObject):
|
||||||
def __init__(self, process, cb, eb=None):
|
def __init__(self, weboob, cb, eb=None):
|
||||||
QObject.__init__(self)
|
QObject.__init__(self)
|
||||||
|
|
||||||
if not eb:
|
if not eb:
|
||||||
eb = self.default_eb
|
eb = self.default_eb
|
||||||
|
|
||||||
self.process = process
|
self.weboob = weboob
|
||||||
|
self.process = None
|
||||||
self.cb = cb
|
self.cb = cb
|
||||||
self.eb = eb
|
self.eb = eb
|
||||||
|
|
||||||
self.connect(self, SIGNAL('cb'), self.cb)
|
self.connect(self, SIGNAL('cb'), self.cb)
|
||||||
self.connect(self, SIGNAL('eb'), self.eb)
|
self.connect(self, SIGNAL('eb'), self.eb)
|
||||||
|
|
||||||
self.process.callback_thread(self.thread_cb, self.thread_eb)
|
def run_thread(func):
|
||||||
|
def inner(self, *args, **kwargs):
|
||||||
|
self.process = func(self, *args, **kwargs)
|
||||||
|
self.process.callback_thread(self.thread_cb, self.thread_eb)
|
||||||
|
return inner
|
||||||
|
|
||||||
|
@run_thread
|
||||||
|
def do(self, *args, **kwargs):
|
||||||
|
return self.weboob.do(*args, **kwargs)
|
||||||
|
|
||||||
|
@run_thread
|
||||||
|
def do_caps(self, *args, **kwargs):
|
||||||
|
return self.weboob.do_caps(*args, **kwargs)
|
||||||
|
|
||||||
|
@run_thread
|
||||||
|
def do_backends(self, *args, **kwargs):
|
||||||
|
return self.weboob.do_backends(*args, **kwargs)
|
||||||
|
|
||||||
def default_eb(self, backend, error, backtrace):
|
def default_eb(self, backend, error, backtrace):
|
||||||
# TODO display a messagebox
|
# TODO display a messagebox
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue