Improve command line version info and help display to streamline gui and cmd

Signed-off-by: Michael Schuster <michael@schuster.ms>

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index be5c098fe618e98a2ed34a3461fe2acf6dd4cdb3..65539b9b5c84842bc24cc2c0d9ffafa4e3ad5acc 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -68,9 +68,9 @@ namespace {
 
     static const char optionsC[] =
         "Options:\n"
-        "  -h --help            : show this help screen.\n"
-        "  --version            : show version information.\n"
-        "  --logwindow          : open a window to show log output.\n"
+        "  --help, -h           : show this help screen.\n"
+        "  --version, -v        : show version information.\n"
+        "  --logwindow, -l      : open a window to show log output.\n"
         "  --logfile <filename> : write log output to file <filename>.\n"
         "  --logdir <name>      : write each sync log output in a new file\n"
         "                         in folder <name>.\n"
@@ -495,7 +495,7 @@ void Application::parseOptions(const QStringList &options)
             _debugMode = true;
         } else if (option == QLatin1String("--background")) {
             _backgroundMode = true;
-        } else if (option == QLatin1String("--version")) {
+        } else if (option == QLatin1String("--version") || option == QLatin1String("-v")) {
             _versionOnly = true;
         } else {
             showHint("Unrecognized option '" + option.toStdString() + "'");

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 5ad0c4363ecd53024ff479ae3beaa9080a68e707..6e0e2760ffc4c4db53e62b5de55416d698f06045 100644 (file)
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -565,7 +565,10 @@ QString Theme::versionSwitchOutput() const
     stream << "Git revision " << GIT_SHA1 << endl;
 #endif
     stream << "Using Qt " << qVersion() << ", built against Qt " << QT_VERSION_STR << endl;
-    stream << "Using Qt platform plugin '" << QGuiApplication::platformName() << "'" << endl;
+
+    if(!QGuiApplication::platformName().isEmpty())
+        stream << "Using Qt platform plugin '" << QGuiApplication::platformName() << "'" << endl;
+
     stream << "Using '" << QSslSocket::sslLibraryVersionString() << "'" << endl;
     stream << "Running on " << Utility::platformName() << ", " << QSysInfo::currentCpuArchitecture() << endl;
     return helpText;