From 1f6564c50096d1ced48bb24f1aec4637ba0cb8d7 Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Tue, 6 Jul 2010 17:46:38 +0200 Subject: [PATCH] put back backendcfg to tools --- weboob/applications/qweboobcfg/backendcfg.ui | 0 weboob/applications/qweboobcfg/qweboobcfg.py | 4 +--- weboob/applications/qweboobcfg/ui/__init__.py | 0 .../qweboobcfg/ui => tools/application/qt}/Makefile | 1 - weboob/tools/application/qt/__init__.py | 1 + .../qweboobcfg => tools/application/qt}/backendcfg.py | 2 +- .../qweboobcfg/ui => tools/application/qt}/backendcfg.ui | 0 weboob/tools/application/{ => qt}/qt.py | 6 +++--- 8 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 weboob/applications/qweboobcfg/backendcfg.ui delete mode 100644 weboob/applications/qweboobcfg/ui/__init__.py rename weboob/{applications/qweboobcfg/ui => tools/application/qt}/Makefile (99%) create mode 100644 weboob/tools/application/qt/__init__.py rename weboob/{applications/qweboobcfg => tools/application/qt}/backendcfg.py (99%) rename weboob/{applications/qweboobcfg/ui => tools/application/qt}/backendcfg.ui (100%) rename weboob/tools/application/{ => qt}/qt.py (97%) diff --git a/weboob/applications/qweboobcfg/backendcfg.ui b/weboob/applications/qweboobcfg/backendcfg.ui deleted file mode 100644 index e69de29b..00000000 diff --git a/weboob/applications/qweboobcfg/qweboobcfg.py b/weboob/applications/qweboobcfg/qweboobcfg.py index 6ff37501..d269dbf1 100644 --- a/weboob/applications/qweboobcfg/qweboobcfg.py +++ b/weboob/applications/qweboobcfg/qweboobcfg.py @@ -18,9 +18,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from weboob.tools.application.qt import QtApplication - -from .backendcfg import BackendCfg +from weboob.tools.application.qt import BackendCfg, QtApplication class QWeboobCfg(QtApplication): diff --git a/weboob/applications/qweboobcfg/ui/__init__.py b/weboob/applications/qweboobcfg/ui/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/weboob/applications/qweboobcfg/ui/Makefile b/weboob/tools/application/qt/Makefile similarity index 99% rename from weboob/applications/qweboobcfg/ui/Makefile rename to weboob/tools/application/qt/Makefile index f0db5154..9ec35f9a 100644 --- a/weboob/applications/qweboobcfg/ui/Makefile +++ b/weboob/tools/application/qt/Makefile @@ -10,4 +10,3 @@ all: $(UI_PY_FILES) clean: rm -f *.pyc rm -f $(UI_PY_FILES) - diff --git a/weboob/tools/application/qt/__init__.py b/weboob/tools/application/qt/__init__.py new file mode 100644 index 00000000..21f12540 --- /dev/null +++ b/weboob/tools/application/qt/__init__.py @@ -0,0 +1 @@ +from .qt import QtApplication, QtMainWindow, QtDo, HTMLDelegate diff --git a/weboob/applications/qweboobcfg/backendcfg.py b/weboob/tools/application/qt/backendcfg.py similarity index 99% rename from weboob/applications/qweboobcfg/backendcfg.py rename to weboob/tools/application/qt/backendcfg.py index ebf6991d..d8af23ba 100644 --- a/weboob/applications/qweboobcfg/backendcfg.py +++ b/weboob/tools/application/qt/backendcfg.py @@ -23,7 +23,7 @@ from PyQt4.QtCore import SIGNAL, Qt, QVariant, QUrl import re from logging import warning -from .ui.backendcfg_ui import Ui_BackendCfg +from weboob.tools.application.qt.backendcfg_ui import Ui_BackendCfg class BackendCfg(QDialog): def __init__(self, weboob, caps=None, parent=None): diff --git a/weboob/applications/qweboobcfg/ui/backendcfg.ui b/weboob/tools/application/qt/backendcfg.ui similarity index 100% rename from weboob/applications/qweboobcfg/ui/backendcfg.ui rename to weboob/tools/application/qt/backendcfg.ui diff --git a/weboob/tools/application/qt.py b/weboob/tools/application/qt/qt.py similarity index 97% rename from weboob/tools/application/qt.py rename to weboob/tools/application/qt/qt.py index b03e24db..334d93f6 100644 --- a/weboob/tools/application/qt.py +++ b/weboob/tools/application/qt/qt.py @@ -21,10 +21,10 @@ from PyQt4.QtGui import QMainWindow, QApplication, QStyledItemDelegate, \ QStyleOptionViewItemV4, QTextDocument, QStyle, \ QAbstractTextDocumentLayout, QPalette -from weboob.core.engine import Weboob -from weboob.core.scheduler import IScheduler +from weboob import Weboob +from weboob.scheduler import IScheduler -from .base import BaseApplication +from ..base import BaseApplication __all__ = ['QtApplication', 'QtMainWindow', 'QtDo', 'HTMLDelegate']