diff --git a/scripts/qweboobcfg b/scripts/qweboobcfg index 47c0610a..6fae7bef 100755 --- a/scripts/qweboobcfg +++ b/scripts/qweboobcfg @@ -17,21 +17,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from weboob.tools.application.qt.backendcfg import BackendCfg -from weboob.tools.application import QtApplication -class QWeboobCfg(QtApplication): - APPNAME = 'qweboobcfg' - VERSION = '0.1' - COPYRIGHT = 'Copyright(C) 2010 Romain Bignon' +from weboob.applications.qweboobcfg import QWeboobCfg - def main(self, argv): - self.load_backends() - - self.dlg = BackendCfg(self.weboob) - self.dlg.show() - - return self.weboob.loop() if __name__ == '__main__': QWeboobCfg.run() diff --git a/tools/all_packages.sh b/tools/all_packages.sh index efefd166..3ad77392 100755 --- a/tools/all_packages.sh +++ b/tools/all_packages.sh @@ -23,6 +23,7 @@ $SCRIPT_DIRNAME/setup.py.d/setup-monboob.py $SCRIPT_DIRNAME/setup.py.d/setup-qboobmsg.py $SCRIPT_DIRNAME/setup.py.d/setup-qhavesex.py $SCRIPT_DIRNAME/setup.py.d/setup-qvideoob.py +$SCRIPT_DIRNAME/setup.py.d/setup-qweboobcfg.py $SCRIPT_DIRNAME/setup.py.d/setup-travel.py $SCRIPT_DIRNAME/setup.py.d/setup-videoob.py $SCRIPT_DIRNAME/setup.py.d/setup-videoob_web.py diff --git a/tools/setup.py.d/setup-core.py b/tools/setup.py.d/setup-core.py index 1d1158c5..e785a77f 100755 --- a/tools/setup.py.d/setup-core.py +++ b/tools/setup.py.d/setup-core.py @@ -53,13 +53,11 @@ setup( 'weboob.tools', 'weboob.tools.application', 'weboob.tools.application.formatters', - 'weboob.tools.application.qt', 'weboob.tools.browser', 'weboob.tools.config', 'weboob.tools.parsers', ], scripts=[ - 'scripts/qweboobcfg', 'scripts/weboobcfg', 'scripts/weboob-debug', 'scripts/weboob-tests', diff --git a/tools/setup.py.d/setup-qweboobcfg.py b/tools/setup.py.d/setup-qweboobcfg.py new file mode 100755 index 00000000..3dab2be4 --- /dev/null +++ b/tools/setup.py.d/setup-qweboobcfg.py @@ -0,0 +1,49 @@ +#! /usr/bin/env python +# -*- coding: utf-8 -*- + +# Copyright(C) 2010 Christophe Benz +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +from setuptools import setup + +import os + + +os.system('make -C weboob/applications/qweboobcfg/ui') + +setup( + name='weboob-qweboobcfg', + version='0.1', + description='QWeboobCfg, the Weboob GUI configuration tool', + long_description='Configure backends', + author='Romain Bignon', + author_email='weboob@lists.symlink.me', + license='GPLv3', + url='http://weboob.org/QWeboobCfg', + namespace_packages = ['weboob', 'weboob.applications'], + packages=[ + 'weboob', + 'weboob.applications', + 'weboob.applications.qweboobcfg', + 'weboob.applications.qweboobcfg.ui', + ], + scripts=[ + 'scripts/qweboobcfg', + ], + install_requires=[ + 'weboob-core', + ], +) diff --git a/weboob/applications/qweboobcfg/__init__.py b/weboob/applications/qweboobcfg/__init__.py new file mode 100644 index 00000000..92bef969 --- /dev/null +++ b/weboob/applications/qweboobcfg/__init__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +# Copyright(C) 2010 Romain Bignon +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +from .qweboobcfg import QWeboobCfg diff --git a/weboob/tools/application/qt/backendcfg.py b/weboob/applications/qweboobcfg/backendcfg.py similarity index 99% rename from weboob/tools/application/qt/backendcfg.py rename to weboob/applications/qweboobcfg/backendcfg.py index d8af23ba..ebf6991d 100644 --- a/weboob/tools/application/qt/backendcfg.py +++ b/weboob/applications/qweboobcfg/backendcfg.py @@ -23,7 +23,7 @@ from PyQt4.QtCore import SIGNAL, Qt, QVariant, QUrl import re from logging import warning -from weboob.tools.application.qt.backendcfg_ui import Ui_BackendCfg +from .ui.backendcfg_ui import Ui_BackendCfg class BackendCfg(QDialog): def __init__(self, weboob, caps=None, parent=None): diff --git a/weboob/applications/qweboobcfg/backendcfg.ui b/weboob/applications/qweboobcfg/backendcfg.ui new file mode 100644 index 00000000..e69de29b diff --git a/weboob/applications/qweboobcfg/qweboobcfg.py b/weboob/applications/qweboobcfg/qweboobcfg.py new file mode 100644 index 00000000..6ff37501 --- /dev/null +++ b/weboob/applications/qweboobcfg/qweboobcfg.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# vim: ft=python et softtabstop=4 cinoptions=4 shiftwidth=4 ts=4 ai + +# Copyright(C) 2010 Romain Bignon +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +from weboob.tools.application.qt import QtApplication + +from .backendcfg import BackendCfg + + +class QWeboobCfg(QtApplication): + APPNAME = 'qweboobcfg' + VERSION = '0.1' + COPYRIGHT = 'Copyright(C) 2010 Romain Bignon' + + def main(self, argv): + self.load_backends() + + self.dlg = BackendCfg(self.weboob) + self.dlg.show() + + return self.weboob.loop() diff --git a/weboob/tools/application/qt/Makefile b/weboob/applications/qweboobcfg/ui/Makefile similarity index 100% rename from weboob/tools/application/qt/Makefile rename to weboob/applications/qweboobcfg/ui/Makefile diff --git a/weboob/applications/qweboobcfg/ui/__init__.py b/weboob/applications/qweboobcfg/ui/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/weboob/tools/application/qt/backendcfg.ui b/weboob/applications/qweboobcfg/ui/backendcfg.ui similarity index 100% rename from weboob/tools/application/qt/backendcfg.ui rename to weboob/applications/qweboobcfg/ui/backendcfg.ui diff --git a/weboob/tools/application/qt/qt.py b/weboob/tools/application/qt.py similarity index 99% rename from weboob/tools/application/qt/qt.py rename to weboob/tools/application/qt.py index e6150462..b03e24db 100644 --- a/weboob/tools/application/qt/qt.py +++ b/weboob/tools/application/qt.py @@ -24,7 +24,7 @@ from PyQt4.QtGui import QMainWindow, QApplication, QStyledItemDelegate, \ from weboob.core.engine import Weboob from weboob.core.scheduler import IScheduler -from ..base import BaseApplication +from .base import BaseApplication __all__ = ['QtApplication', 'QtMainWindow', 'QtDo', 'HTMLDelegate'] diff --git a/weboob/tools/application/qt/__init__.py b/weboob/tools/application/qt/__init__.py deleted file mode 100644 index 21f12540..00000000 --- a/weboob/tools/application/qt/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .qt import QtApplication, QtMainWindow, QtDo, HTMLDelegate