From 69235a1a5650ad952b1fb52102736cc38a987406 Mon Sep 17 00:00:00 2001 From: FriedrichFroebel Date: Thu, 27 Jul 2017 14:31:55 +0200 Subject: [PATCH 1/2] Add commandline argument for version output --- src/Application.cpp | 5 +++++ src/translations/sqlb_de.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Application.cpp b/src/Application.cpp index ea2549c788..15de56d0ac 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -9,6 +9,7 @@ #include "Application.h" #include "MainWindow.h" #include "Settings.h" +#include "version.h" Application::Application(int& argc, char** argv) : QApplication(argc, argv) @@ -71,11 +72,15 @@ Application::Application(int& argc, char** argv) : qWarning() << qPrintable(tr("Usage: %1 [options] [db]\n").arg(argv[0])); qWarning() << qPrintable(tr("Possible command line arguments:")); qWarning() << qPrintable(tr(" -h, --help\t\tShow command line options")); + qWarning() << qPrintable(tr(" -v, --version\t\tDisplay the current version")); qWarning() << qPrintable(tr(" -s, --sql [file]\tExecute this SQL file after opening the DB")); qWarning() << qPrintable(tr(" -t, --table [table]\tBrowse this table after opening the DB")); qWarning() << qPrintable(tr(" -q, --quit\t\tExit application after running scripts")); qWarning() << qPrintable(tr(" [file]\t\tOpen this SQLite database")); m_dontShowMainWindow = true; + } else if(arguments().at(i) == "-v" || arguments().at(i) == "--version") { + qWarning() << qPrintable(tr("This is DB Browser for SQLite version %1.").arg(APP_VERSION)); + m_dontShowMainWindow = true; } else if(arguments().at(i) == "-s" || arguments().at(i) == "--sql") { // Run SQL file: If file exists add it to list of scripts to execute if(++i >= arguments().size()) diff --git a/src/translations/sqlb_de.ts b/src/translations/sqlb_de.ts index 52cf5c8ae3..a70a98d053 100644 --- a/src/translations/sqlb_de.ts +++ b/src/translations/sqlb_de.ts @@ -77,7 +77,7 @@ -s, --sql [file] Execute this SQL file after opening the DB - -s, --sql [Datei] Führe nach dem Öffnen der Datenbank diese SQL-Datei aus + -s, --sql [Datei] Führe nach dem Öffnen der Datenbank diese SQL-Datei aus From fa058d54b8e9437226480823b2aa1f09ec3323b2 Mon Sep 17 00:00:00 2001 From: FriedrichFroebel Date: Thu, 27 Jul 2017 14:56:32 +0200 Subject: [PATCH 2/2] Alphabetical order inside the help list --- src/Application.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index 15de56d0ac..512340cd4a 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -72,10 +72,10 @@ Application::Application(int& argc, char** argv) : qWarning() << qPrintable(tr("Usage: %1 [options] [db]\n").arg(argv[0])); qWarning() << qPrintable(tr("Possible command line arguments:")); qWarning() << qPrintable(tr(" -h, --help\t\tShow command line options")); - qWarning() << qPrintable(tr(" -v, --version\t\tDisplay the current version")); + qWarning() << qPrintable(tr(" -q, --quit\t\tExit application after running scripts")); qWarning() << qPrintable(tr(" -s, --sql [file]\tExecute this SQL file after opening the DB")); qWarning() << qPrintable(tr(" -t, --table [table]\tBrowse this table after opening the DB")); - qWarning() << qPrintable(tr(" -q, --quit\t\tExit application after running scripts")); + qWarning() << qPrintable(tr(" -v, --version\t\tDisplay the current version")); qWarning() << qPrintable(tr(" [file]\t\tOpen this SQLite database")); m_dontShowMainWindow = true; } else if(arguments().at(i) == "-v" || arguments().at(i) == "--version") {