X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=378d8fe8d41f815cf4821d185ed53a0ca75e5b6a;hp=a35ab4cbf170c2bf4db32c0028120b76dd2aeb99;hb=dd2b40bf10da0309a72a9b2e8f49af752646fd92;hpb=8836fdc8e4107437e5fff0e10e18d581297d59e4 diff --git a/src/common/main.cpp b/src/common/main.cpp index a35ab4cb..378d8fe8 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,73 +18,125 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include +#include +#include +#include +#include #include "global.h" +#include "logger.h" +#include "network.h" #include "settings.h" -#include "quasselui.h" #if defined BUILD_CORE #include +#include #include "core.h" +#include "message.h" -#elif defined BUILD_QTGUI +#elif defined BUILD_QTUI #include -#include "style.h" #include "client.h" -#include "clientproxy.h" -#include "mainwin.h" +#include "qtui.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 "core.h" +#include "coresession.h" +#include "qtui.h" #else #error "Something is wrong - you need to #define a build mode!" #endif +#include + +//! Signal handler for graceful shutdown. +void handle_signal(int sig) { + qWarning(QString("Caught signal %1 - exiting.").arg(sig).toAscii()); + QCoreApplication::quit(); +} + int main(int argc, char **argv) { + // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel. + signal(SIGTERM, handle_signal); + signal(SIGINT, handle_signal); + + // Logger logger; + + Global::registerMetaTypes(); + +#include "../../version.inc" + #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 Global::runMode = Global::Monolithic; QApplication app(argc, argv); #endif - //AbstractUi *foo = new AbstractUi(); - //foo->init(); + + qsrand(QDateTime::currentDateTime().toTime_t()); + + // 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("UTF-8"); + 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 + // Check if a non-standard core port is requested + QStringList args = QCoreApplication::arguments(); // TODO Build a CLI parser + + Global::defaultPort = 4242; + int idx; + if((idx = args.indexOf("-p")) > 0 && idx < args.count() - 1) { + int port = args[idx+1].toInt(); + if(port >= 1024 && port < 65536) Global::defaultPort = port; + } + +#ifndef BUILD_QTUI Core::instance(); // create and init the core #endif - Settings::init(); + //Settings::init(); #ifndef BUILD_CORE - Style::init(); - AbstractUi foo; // This avoids an annoying linker error (bug?) where AbstractUi's vtable is not found. - // Yes, it's fugly. Yes, I'd like an alternative. - QtGui *gui = new QtGui(); + QtUi *gui = new QtUi(); Client::init(gui); - gui->init(); -//#else -// Core::instance(); // create and init the core object + // init gui only after the event loop has started + QTimer::singleShot(0, gui, SLOT(init())); + //gui->init(); +#endif + +#ifndef BUILD_QTUI + if(!args.contains("--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 @@ -92,30 +144,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; -} - -void Client::disconnectFromLocalCore() { - disconnect(Core::localSession(), 0, ClientProxy::instance(), 0); - disconnect(ClientProxy::instance(), 0, Core::localSession(), 0); - Core::disconnectLocalClient(); -} - -#endif