all: Add --version and --help support and unify output formats

2 files changed, 25 insertions, 1 deletions

diff --git a/ui/qt5/CMakeLists.txt b/ui/qt5/CMakeLists.txt
index 8dbf4a8..f8bdb56 100644
--- a/ui/qt5/CMakeLists.txt
+++ b/ui/qt5/CMakeLists.txt
@@ -84,6 +84,6 @@ IF(INSTALL)
     ENDIF()
     install(TARGETS horizon-run-qt5 DESTINATION bin)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/horizon-run-qt5.8 DESTINATION share/man/man8)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/horizon-ppc64-detect DESTINATION bin)
+    install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/horizon-ppc64-detect DESTINATION bin)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/horizon-ppc64-detect.1 DESTINATION share/man/man1)
 ENDIF(INSTALL)
diff --git a/ui/qt5/main.cc b/ui/qt5/main.cc
index 330311f..22ef39e 100644
--- a/ui/qt5/main.cc
+++ b/ui/qt5/main.cc
@@ -11,6 +11,7 @@
  */
 
 #include <QApplication>
+#include <QCommandLineParser>
 #include <QDialog>
 #include <QIcon>
 #include <QLabel>
@@ -44,6 +45,9 @@ void WaitDialog::reject() { return; }
 
 int main(int argc, char *argv[]) {
     QApplication app(argc, argv);
+    app.setOrganizationName("Adélie Linux");
+    app.setApplicationName("Horizon Qt UI");
+    app.setApplicationVersion(VERSTR);
 
     QString translatorFileName = QLatin1String("qt_");
     translatorFileName += QLocale::system().name();
@@ -62,6 +66,26 @@ int main(int argc, char *argv[]) {
 
     app.setWindowIcon(QIcon(":/horizon-256.png"));
 
+    QCommandLineParser parser;
+    parser.setApplicationDescription(app.tr("Guides the user through creation of a HorizonScript."));
+    QCommandLineOption help = parser.addHelpOption();
+    QCommandLineOption version = parser.addVersionOption();
+
+    if(!parser.parse(app.arguments())) {
+        parser.showHelp(1);
+        return 1;
+    }
+
+    if(parser.isSet(help)) {
+        parser.showHelp();
+        return 0;
+    }
+
+    if(parser.isSet(version)) {
+        parser.showVersion();
+        return 0;
+    }
+
     HorizonWizard wizard;
     d.hide();
     app.restoreOverrideCursor();