#include <QString>
#include <QTimer>
#include <QTranslator>
+#include <QFile>
#include "global.h"
#include "logger.h"
#include "cliparser.h"
#if defined BUILD_CORE
-#include <QCoreApplication>
#include <QDir>
#include "core.h"
#include "message.h"
#elif defined BUILD_QTUI
-#include <QApplication>
#include "client.h"
+#include "qtuiapplication.h"
#include "qtui.h"
#elif defined BUILD_MONO
-#include <QApplication>
#include "client.h"
#include "core.h"
#include "coresession.h"
+#include "qtuiapplication.h"
#include "qtui.h"
#else
#error "Something is wrong - you need to #define a build mode!"
#endif
+
#include <signal.h>
//! Signal handler for graceful shutdown.
signal(SIGTERM, handle_signal);
signal(SIGINT, handle_signal);
- // Logger logger;
-
Global::registerMetaTypes();
Global::setupVersion();
+/*
#if defined BUILD_CORE
Global::runMode = Global::CoreOnly;
QCoreApplication app(argc, argv);
Global::runMode = Global::Monolithic;
QApplication app(argc, argv);
#endif
+*/
+#if defined BUILD_CORE
+ Global::runMode = Global::CoreOnly;
+ QCoreApplication app(argc, argv);
+#elif defined BUILD_QTUI
+ Global::runMode = Global::ClientOnly;
+ QtUiApplication app(argc, argv);
+#else
+ Global::runMode = Global::Monolithic;
+ QtUiApplication app(argc, argv);
+#endif
+
+
Global::parser = CliParser(QCoreApplication::arguments());
// 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");
+ Global::parser.addOption("logfile",'l',"Path to logfile");
+ Global::parser.addOption("loglevel",'L',"Loglevel Debug|Info|Warning|Error","Info");
+ Global::parser.addOption("datadir", 0, "Specify the directory holding datafiles like the Sqlite DB and the SSL Cert");
#endif // BUILD_QTUI
#ifndef BUILD_CORE
// put client-only arguments here
return 1;
}
+ /*
+ This is an initial check if logfile is writable since the warning would spam stdout if done
+ in current Logger implementation. Can be dropped whenever the logfile is only opened once.
+ */
+ if(Global::runMode != Global::ClientOnly) {
+ QFile logFile;
+ if(!Global::parser.value("logfile").isEmpty()) {
+ logFile.setFileName(Global::parser.value("logfile"));
+ if(!logFile.open(QIODevice::Append | QIODevice::Text))
+ qWarning("Warning: Couldn't open logfile '%s' - will log to stdout instead",qPrintable(logFile.fileName()));
+ else logFile.close();
+ }
+ }
+
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
// Set up i18n support
QLocale locale = QLocale::system();
- QTranslator qtTranslator;
+ QTranslator qtTranslator(&app);
+ qtTranslator.setObjectName("QtTr");
qtTranslator.load(QString(":i18n/qt_%1").arg(locale.name()));
app.installTranslator(&qtTranslator);
- QTranslator quasselTranslator;
+ QTranslator quasselTranslator(&app);
+ quasselTranslator.setObjectName("QuasselTr");
quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name()));
app.installTranslator(&quasselTranslator);
QCoreApplication::setApplicationName("Quassel IRC");
QCoreApplication::setOrganizationName("Quassel Project");
+
#ifndef BUILD_QTUI
Core::instance(); // create and init the core
#endif
//Settings::init();
#ifndef BUILD_CORE
+ // session resume
QtUi *gui = new QtUi();
Client::init(gui);
// init gui only after the event loop has started
}
#endif
+#ifndef BUILD_CORE
+ app.resumeSessionIfPossible();
+#endif
+
int exitCode = app.exec();
#ifndef BUILD_QTUI