X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=207b672b0a2ee51335af39e4ebe2789efaaf792a;hp=c53daabced754923fef1dc0caacf746a1f74eea9;hb=44797cbb82853f2f5a9013cf31dd489bb52f5ae5;hpb=0ac9ce4d7cf768d13993d6aa1d6b791c4149a843 diff --git a/src/common/main.cpp b/src/common/main.cpp index c53daabc..207b672b 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel IRC Development Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * 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; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -18,94 +18,91 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "settings.h" +#include -#if defined BUILD_CORE -#include -#include "core.h" - -#elif defined BUILD_QTGUI -#include -#include "client.h" -#include "clientproxy.h" -#include "qtgui.h" -#include "style.h" +#ifdef HAVE_KDE +# include +# include +#endif +#ifdef BUILD_CORE +# include "coreapplication.h" +#elif defined BUILD_QTUI +# include "qtuiapplication.h" #elif defined BUILD_MONO -#include -#include "client.h" -#include "clientproxy.h" -#include "core.h" -#include "coresession.h" -#include "qtgui.h" -#include "style.h" +# include "monoapplication.h" #else #error "Something is wrong - you need to #define a build mode!" #endif -int main(int argc, char **argv) { -#if defined BUILD_CORE - Global::runMode = Global::CoreOnly; - QCoreApplication app(argc, argv); -#elif defined BUILD_QTGUI - Global::runMode = Global::ClientOnly; - QApplication app(argc, argv); -#else - Global::runMode = Global::Monolithic; - QApplication app(argc, argv); -#endif - QCoreApplication::setOrganizationDomain("quassel-irc.org"); - QCoreApplication::setApplicationName("Quassel IRC"); - QCoreApplication::setOrganizationName("Quassel IRC Development Team"); +#include "quassel.h" - Global::quasselDir = QDir::homePath() + "/.quassel"; -#ifndef BUILD_QTGUI - Core::instance(); // create and init the core +int main(int argc, char **argv) { + Q_INIT_RESOURCE(i18n); + + // Setup build information and version string + # include "version.gen" + buildinfo.append(QString(",%1,%2").arg(__DATE__, __TIME__)); + Quassel::setupBuildInfo(buildinfo); + QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName); + QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName); + QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain); + +#ifdef HAVE_KDE + // We need to init KCmdLineArgs first + // TODO: build an AboutData compat class to replace our aboutDlg strings + KAboutData aboutData("quassel", 0, ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8()); + aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); + KCmdLineArgs::init(argc, argv, &aboutData); #endif - Settings::init(); - -#ifndef BUILD_CORE - Style::init(); - QtGui *gui = new QtGui(); - Client::init(gui); - gui->init(); -#endif + // Initialize CLI arguments + // NOTE: We can't use tr() at this point, since app is not yet created + CliParser *cliParser = Quassel::cliParser(); - int exitCode = app.exec(); + // put shared client&core arguments here + cliParser->addSwitch("debug",'d', "Enable debug output"); + cliParser->addSwitch("help",'h', "Display this help and exit"); #ifndef BUILD_CORE - // the mainWin has to be deleted before the Core - // if not Quassel will crash on exit under certain conditions since the gui - // still wants to access clientdata - delete gui; - Client::destroy(); + // put client-only arguments here + cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); + cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); #endif -#ifndef BUILD_QTGUI - Core::destroy(); +#ifndef BUILD_QTCLIENT + // put core-only arguments here + cliParser->addOption("port ",'p', "The port quasselcore will listen at", QString("4242")); + cliParser->addSwitch("norestore", 'n', "Don't restore last core's state"); + cliParser->addOption("logfile ", 'l', "Path to logfile"); + cliParser->addOption("loglevel ", 'L', "Loglevel Debug|Info|Warning|Error", "Info"); + cliParser->addOption("datadir ", 0, "Specify the directory holding datafiles like the Sqlite DB and the SSL Cert"); #endif - return exitCode; -} - -#ifdef BUILD_QTGUI -QVariant Client::connectToLocalCore(QString, QString) { return QVariant(); } -void Client::disconnectFromLocalCore() {} +#ifdef HAVE_KDE + // the KDE version needs this extra call to parse argc/argv before app is instantiated + if(!cliParser->init()) { + cliParser->usage(); + return EXIT_FAILURE; + } +#endif -#elif defined BUILD_MONO -QVariant Client::connectToLocalCore(QString user, QString passwd) { - // TODO catch exceptions - QVariant reply = Core::connectLocalClient(user, passwd); - QObject::connect(Core::localSession(), SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), ClientProxy::instance(), SLOT(recv(CoreSignal, QVariant, QVariant, QVariant))); - QObject::connect(ClientProxy::instance(), SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), Core::localSession(), SLOT(processSignal(ClientSignal, QVariant, QVariant, QVariant))); - return reply; -} +# if defined BUILD_CORE + CoreApplication app(argc, argv); +# elif defined BUILD_QTUI + QtUiApplication app(argc, argv); +# elif defined BUILD_MONO + MonolithicApplication app(argc, argv); +# endif + +#ifndef HAVE_KDE + // the non-KDE version parses after app has been instantiated + if(!cliParser->init(app.arguments())) { + cliParser->usage(); + return false; + } +#endif -void Client::disconnectFromLocalCore() { - disconnect(Core::localSession(), 0, ClientProxy::instance(), 0); - disconnect(ClientProxy::instance(), 0, Core::localSession(), 0); - Core::disconnectLocalClient(); + if(!app.init()) return EXIT_FAILURE; + return app.exec(); } - -#endif