X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=24a71588dda7cb4c5c2c792230152807dae7c658;hp=3bcecbbdf8ec580f9e2ebbe85b1fe5a2902e0a0b;hb=0a79f71c41f69643fdbf0c32c061f1b11d14346d;hpb=8f2a90212f31c3f8e1301fe28dfeb6ccfc753b23

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 3bcecbbd..24a71588 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -41,11 +41,16 @@
 #  include "kcmdlinewrapper.h"
 #endif
 
+#if !defined(BUILD_CORE) && defined(STATIC)
+#include <QtPlugin>
+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
   # include "version.gen"
@@ -64,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);
 
@@ -79,20 +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->addSwitch("version", 'v', "Display version information");
+#ifdef BUILD_QTUI
+  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding the client configuration");
+#else
+  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate");
+#endif
+  cliParser->addOption("datadir <path>", 0, "DEPRECATED - Use --configdir instead");
 
 #ifndef BUILD_CORE
   // put client-only arguments here
+  cliParser->addOption("qss <file.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_QTCLIENT
+#ifndef BUILD_QTUI
   // put core-only arguments here
-  cliParser->addOption("listen <address>[,<address[,...]]>", 0, "The address(es) quasselcore will listen on", "0.0.0.0,::");
+  cliParser->addOption("listen <address>[,<address[,...]]>", 0, "The address(es) quasselcore will listen on", "::,0.0.0.0");
   cliParser->addOption("port <port>",'p', "The port quasselcore will listen at", QString("4242"));
   cliParser->addSwitch("norestore", 'n', "Don't restore last core's state");
-  cliParser->addOption("logfile <path>", 'l', "Path to logfile");
   cliParser->addOption("loglevel <level>", 'L', "Loglevel Debug|Info|Warning|Error", "Info");
-  cliParser->addOption("datadir <path>", 0, "Specify the directory holding datafiles like the Sqlite DB and the SSL Cert");
+#ifdef HAVE_SYSLOG
+  cliParser->addSwitch("syslog", 0, "Log to syslog");
+#endif
+  cliParser->addOption("logfile <path>", 'l', "Log to a file");
+  cliParser->addOption("select-backend <backendidentifier>", 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 <username>", 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 <file>", 0, "Set path to oidentd configuration file");
 #endif
 
 #ifdef HAVE_KDE