X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=198e76be4b8fb6d1cbfd29c99d5644da2efef6f8;hp=eef7947444aa64fbe8ec0d0009083e857940bfb5;hb=4df8d4afa450d4686bc4321b399bcb244f04d220;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c diff --git a/src/common/main.cpp b/src/common/main.cpp index eef79474..198e76be 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2013 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * 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 @@ -41,65 +41,88 @@ # include "kcmdlinewrapper.h" #endif +#if !defined(BUILD_CORE) && defined(STATIC) +#include +Q_IMPORT_PLUGIN(qjpeg) +Q_IMPORT_PLUGIN(qgif) +#endif + #include "cliparser.h" #include "quassel.h" -int main(int argc, char **argv) { - Q_INIT_RESOURCE(i18n); - - // Setup build information and version string +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); + 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; + 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.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); - KCmdLineArgs::init(argc, argv, &aboutData); - - cliParser = new KCmdLineWrapper(); + // 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 - cliParser = new CliParser(); + cliParser = new CliParser(); #endif - Quassel::setCliParser(cliParser); + Quassel::setCliParser(cliParser); - // Initialize CLI arguments - // NOTE: We can't use tr() at this point, since app is not yet created + // 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"); + // 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 - // put client-only arguments here - cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); - cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); + // 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 -#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"); + 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"); #endif #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; - } + // the KDE version needs this extra call to parse argc/argv before app is instantiated + if (!cliParser->init()) { + cliParser->usage(); + return EXIT_FAILURE; + } #endif # if defined BUILD_CORE @@ -111,13 +134,13 @@ int main(int argc, char **argv) { # endif #ifndef HAVE_KDE - // the non-KDE version parses after app has been instantiated - if(!cliParser->init(app.arguments())) { - cliParser->usage(); - return false; - } + // 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(); + if (!app.init()) return EXIT_FAILURE; + return app.exec(); }