add version and help commandline options

kiwix · May 19, 2021 · a225fa4 · a225fa4
1 parent e8b2e9f
commit a225fa4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/about.cpp b/src/about.cpp
@@ -2,9 +2,6 @@
 #include "ui_about.h"
 #include "kiwixapp.h"
 
-#define _STR(...) # __VA_ARGS__
-#define STR(X) _STR(X)
-
 About::About(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::AboutDialog)
@@ -23,7 +20,7 @@ About::About(QWidget *parent) :
     htmlText = htmlText.replace("{{LIBRARIES}}", gt("about-libraries-title"));
 
     htmlText = htmlText.replace("{{GITHUB_URL}}", "https://github.com/kiwix/kiwix-desktop");
-    htmlText = htmlText.replace("{{VERSION}}", STR(VERSION));
+    htmlText = htmlText.replace("{{VERSION}}", version);
     htmlText = htmlText.replace("{{TRACKER_URL}}", "https://github.com/kiwix/kiwix-desktop/issues");
     ui->aboutText->setHtml(htmlText);
 }

diff --git a/src/kiwixapp.h b/src/kiwixapp.h
@@ -122,5 +122,7 @@ public slots:
 };
 
 QString gt(const QString &key);
-
+#define _STR(...) # __VA_ARGS__
+#define STR(X) _STR(X)
+static QString version = STR(VERSION);
 #endif // KIWIXAPP_H
diff --git a/src/main.cpp b/src/main.cpp
@@ -7,7 +7,6 @@
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
   #include <QWebEngineUrlScheme>
 #endif
-
 int main(int argc, char *argv[])
 {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
@@ -16,9 +15,12 @@ int main(int argc, char *argv[])
     QWebEngineUrlScheme::registerScheme(scheme);
 #endif
     KiwixApp a(argc, argv);
+    a.setApplicationVersion(version);
     QCommandLineParser parser;
     QString zimfile;
-
+    parser.setApplicationDescription(QStringLiteral("The Kiwix Desktop is a viewer/manager of ZIM files for GNU/Linux and Microsoft Windows OSes."));
+    parser.addHelpOption();
+    parser.addVersionOption();
     parser.addPositionalArgument("zimfile", "The zim file");
     parser.process(a);
     auto positionalArguments = parser.positionalArguments();