X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=d0dde88a0c7f6b5ccbe2e77fe591e2d93ffe934e;hp=21d066ef79ce9a58fffc51bbe59bf33bed3bcaa2;hb=f9a73e3ad8142212028a39b26ced62456e575b7a;hpb=fbea3b379a5e2a21b343037ac96d106ad1fe5c63 diff --git a/src/common/main.cpp b/src/common/main.cpp index 21d066ef..d0dde88a 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -69,6 +69,7 @@ int main(int argc, char **argv) { 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); @@ -84,23 +85,35 @@ int main(int argc, char **argv) { // put shared client&core arguments here cliParser->addSwitch("debug",'d', "Enable debug output"); cliParser->addSwitch("help",'h', "Display this help and exit"); - cliParser->addOption("configdir ", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL Cert"); + 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->addOption("qss ", 0, "Load a custom application stylesheet"); cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); #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("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("logfile ", 'l', "Path to logfile"); cliParser->addOption("loglevel ", 'L', "Loglevel Debug|Info|Warning|Error", "Info"); - cliParser->addOption("select-backend ", 0, "Starts an interactive session and switches your current storage backend to the new one. Attempts a merge if the new backend is uninitialized and the old backend supports migration. Otherwise prompts for new user credentials!"); +#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, "change path to oidentd configuration file"); #endif #ifdef HAVE_KDE