X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=f51f6b2caf04e2bc83f37ab0a3c1be8aff85057d;hp=e160c18ea4d8dd5d5bbc41053f18b8436fd5e445;hb=6f534b8338f9e6cba5bfe7e8183d3a688075f428;hpb=52380175425bdab29f825c9cd17a0e4c1952c2db diff --git a/src/common/main.cpp b/src/common/main.cpp index e160c18e..f51f6b2c 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,29 +18,34 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "settings.h" +#include #include +#include #include +#include "global.h" +#include "logger.h" +#include "network.h" +#include "settings.h" +#include "cliparser.h" + #if defined BUILD_CORE #include #include #include "core.h" #include "message.h" -#elif defined BUILD_QTGUI +#elif defined BUILD_QTUI #include #include "client.h" -#include "qtgui.h" -#include "style.h" +#include "qtui.h" #elif defined BUILD_MONO #include #include "client.h" #include "core.h" #include "coresession.h" -#include "qtgui.h" -#include "style.h" +#include "qtui.h" #else #error "Something is wrong - you need to #define a build mode!" @@ -50,7 +55,7 @@ //! Signal handler for graceful shutdown. void handle_signal(int sig) { - qWarning(QString("Caught signal %1 - exiting.").arg(sig).toAscii()); + qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig))); QCoreApplication::quit(); } @@ -59,17 +64,15 @@ int main(int argc, char **argv) { signal(SIGTERM, handle_signal); signal(SIGINT, handle_signal); - qRegisterMetaType("QVariant"); - qRegisterMetaType("Message"); - qRegisterMetaType("BufferInfo"); - qRegisterMetaTypeStreamOperators("QVariant"); - qRegisterMetaTypeStreamOperators("Message"); - qRegisterMetaTypeStreamOperators("BufferInfo"); + // Logger logger; + + Global::registerMetaTypes(); + Global::setupVersion(); #if defined BUILD_CORE Global::runMode = Global::CoreOnly; QCoreApplication app(argc, argv); -#elif defined BUILD_QTGUI +#elif defined BUILD_QTUI Global::runMode = Global::ClientOnly; QApplication app(argc, argv); #else @@ -77,32 +80,72 @@ int main(int argc, char **argv) { QApplication app(argc, argv); #endif - //Just for testing - //QTranslator translator; - //translator.load(":i18n/quassel_de"); - //app.installTranslator(&translator); + Global::parser = CliParser(QCoreApplication::arguments()); + +#ifndef BUILD_QTUI +// put core-only arguments here + Global::parser.addOption("port",'p',"The port quasselcore will listen at",QString("4242")); + Global::parser.addSwitch("norestore", 'n', "Don't restore last core's state"); +#endif // BUILD_QTUI +#ifndef BUILD_CORE +// put client-only arguments here +#endif // BUILD_QTCORE +// put shared client&core arguments here + Global::parser.addSwitch("debug",'d',"Enable debug output"); + Global::parser.addSwitch("help",'h', "Display this help and exit"); + + if(!Global::parser.parse() || Global::parser.isSet("help")) { + Global::parser.usage(); + return 1; + } + + qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); + + // Set up i18n support + QLocale locale = QLocale::system(); + + QTranslator qtTranslator; + qtTranslator.load(QString(":i18n/qt_%1").arg(locale.name())); + app.installTranslator(&qtTranslator); + + QTranslator quasselTranslator; + quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name())); + app.installTranslator(&quasselTranslator); + + Network::setDefaultCodecForServer("ISO-8859-1"); + Network::setDefaultCodecForEncoding("UTF-8"); + Network::setDefaultCodecForDecoding("ISO-8859-15"); - QCoreApplication::setOrganizationDomain("quassel-irc.org"); QCoreApplication::setApplicationName("Quassel IRC"); - QCoreApplication::setOrganizationName("Quassel IRC Development Team"); + QCoreApplication::setOrganizationName("Quassel Project"); - Global::quasselDir = QDir::homePath() + "/.quassel"; -#ifndef BUILD_QTGUI +#ifndef BUILD_QTUI Core::instance(); // create and init the core #endif //Settings::init(); #ifndef BUILD_CORE - Style::init(); - QtGui *gui = new QtGui(); + QtUi *gui = new QtUi(); Client::init(gui); - gui->init(); + // init gui only after the event loop has started + QTimer::singleShot(0, gui, SLOT(init())); + //gui->init(); +#endif + +#ifndef BUILD_QTUI + if(!Global::parser.isSet("norestore")) { + Core::restoreState(); + } #endif int exitCode = app.exec(); +#ifndef BUILD_QTUI + Core::saveState(); +#endif + #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 @@ -110,35 +153,9 @@ int main(int argc, char **argv) { delete gui; Client::destroy(); #endif -#ifndef BUILD_QTGUI +#ifndef BUILD_QTUI Core::destroy(); #endif return exitCode; } - -#ifdef BUILD_QTGUI -QVariant Client::connectToLocalCore(QString, QString) { return QVariant(); } -void Client::disconnectFromLocalCore() {} - -#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; - */ - return QVariant(); -} - -void Client::disconnectFromLocalCore() { - /* - disconnect(Core::localSession(), 0, ClientProxy::instance(), 0); - disconnect(ClientProxy::instance(), 0, Core::localSession(), 0); - Core::disconnectLocalClient(); - */ -} - -#endif