X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=8ed40da47947e740ed916f5b90dc52de6255fd9d;hp=48760d2dcd40157149c8c8839ed13ae9429c0f2b;hb=91a0c4e08ea7da4264245de2b41f40f11846c2c4;hpb=6869909402a4dc807ee5261cc2a0999ac33053ee diff --git a/src/common/main.cpp b/src/common/main.cpp index 48760d2d..8ed40da4 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-2013 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 * @@ -15,93 +15,136 @@ * 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. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include - -#include "global.h" -#include "settings.h" - -#if defined BUILD_CORE -#include -#include "core.h" - -#elif defined BUILD_QTGUI -#include -#include "style.h" -#include "client.h" -#include "clientproxy.h" -#include "mainwin.h" +#include +#ifdef BUILD_CORE +# include "coreapplication.h" +#elif defined BUILD_QTUI +# include "qtuiapplication.h" #elif defined BUILD_MONO -#include -#include "core.h" -#include "coreproxy.h" -#include "style.h" -#include "client.h" -#include "clientproxy.h" -#include "mainwin.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); +// We don't want quasselcore to depend on KDE +#if defined HAVE_KDE && defined BUILD_CORE +# undef HAVE_KDE #endif - QCoreApplication::setOrganizationDomain("quassel-irc.org"); - QCoreApplication::setApplicationName("Quassel IRC"); - QCoreApplication::setOrganizationName("Quassel IRC Development Team"); +#ifdef HAVE_KDE +# include +# include "kcmdlinewrapper.h" +#endif - Global::quasselDir = QDir::homePath() + "/.quassel"; - Core::instance(); -#ifdef BUILD_MONO - 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))); +#if !defined(BUILD_CORE) && defined(STATIC) +#include +Q_IMPORT_PLUGIN(qjpeg) +Q_IMPORT_PLUGIN(qgif) #endif - Settings::init(); +#include "cliparser.h" +#include "quassel.h" -#ifndef BUILD_CORE - Style::init(); - MainWin *mainWin = new MainWin(); - Client::init(mainWin); - mainWin->init(); +int main(int argc, char **argv) +{ + // 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); + + AbstractCliParser *cliParser; + +#ifdef HAVE_KDE + // We need to init KCmdLineArgs first + // TODO: build an AboutData compat class to replace our aboutDlg strings + KAboutData aboutData("quassel", "kdelibs4", ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(), + ki18n("A modern, distributed IRC client")); + aboutData.addLicense(KAboutData::License_GPL_V2); + aboutData.addLicense(KAboutData::License_GPL_V3); + aboutData.setBugAddress("http://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); + aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); + KCmdLineArgs::init(argc, argv, &aboutData); + + cliParser = new KCmdLineWrapper(); #else - Core::instance(); // create and init the core object + cliParser = new CliParser(); #endif + Quassel::setCliParser(cliParser); - int exitCode = app.exec(); + // Initialize CLI arguments + // NOTE: We can't use tr() at this point, since app is not yet created + + // put shared client&core arguments here + cliParser->addSwitch("debug", 'd', "Enable debug output"); + cliParser->addSwitch("help", 'h', "Display this help and exit"); + cliParser->addSwitch("version", 'v', "Display version information"); +#ifdef BUILD_QTUI + cliParser->addOption("configdir ", 'c', "Specify the directory holding the client configuration"); +#else + cliParser->addOption("configdir ", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate"); +#endif + cliParser->addOption("datadir ", 0, "DEPRECATED - Use --configdir instead"); #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 mainWin; - Client::destroy(); + // put client-only arguments here + cliParser->addOption("qss ", 0, "Load a custom application stylesheet"); + cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); + cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); + cliParser->addSwitch("hidewindow", 0, "Start the client minimized to the system tray"); +#endif +#ifndef BUILD_QTUI + // put core-only arguments here + cliParser->addOption("listen
[,", 0, "The address(es) quasselcore will listen on", "::,0.0.0.0"); + 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("loglevel ", 'L', "Loglevel Debug|Info|Warning|Error", "Info"); +#ifdef HAVE_SYSLOG + cliParser->addSwitch("syslog", 0, "Log to syslog"); +#endif + cliParser->addOption("logfile ", 'l', "Log to a file"); + cliParser->addOption("select-backend ", 0, "Switch storage backend (migrating data if possible)"); + cliParser->addSwitch("add-user", 0, "Starts an interactive session to add a new core user"); + cliParser->addOption("change-userpass ", 0, "Starts an interactive session to change the password of the user identified by username"); + cliParser->addSwitch("oidentd", 0, "Enable oidentd integration"); + cliParser->addOption("oidentd-conffile ", 0, "Set path to oidentd configuration file"); +#ifdef HAVE_SSL + cliParser->addSwitch("require-ssl", 0, "Require SSL for client connections"); #endif -#ifndef BUILD_QTGUI - Core::destroy(); + cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)"); #endif - return exitCode; -} +#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 -#ifndef BUILD_CORE -void Client::syncToCore() { - //Q_ASSERT(Global::data("CoreReady").toBool()); - coreBuffers = Core::localSession()->buffers(); - // NOTE: We don't need to request server states, because in the monolithic version there can't be - // any servers connected at this stage... -} +# 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 + + if (!app.init()) return EXIT_FAILURE; + return app.exec(); +}