Skip to content

Add commandline argument for version output #1065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinclift merged 2 commits into from
Jul 27, 2017
Merged

Add commandline argument for version output #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69235a1
Add commandline argument for version output
FriedrichFroebel Jul 27, 2017
fa058d5
Alphabetical order inside the help list
FriedrichFroebel Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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(" -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") {
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())
Expand Down
2 changes: 1 addition & 1 deletion src/translations/sqlb_de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<message>
<location filename="../Application.cpp" line="74"/>
<source> -s, --sql [file] Execute this SQL file after opening the DB</source>
<translation> -s, --sql [Datei] Führe nach dem Öffnen der Datenbank diese SQL-Datei aus</translation>
<translation> -s, --sql [Datei] Führe nach dem Öffnen der Datenbank diese SQL-Datei aus</translation>
</message>
<message>
<location filename="../Application.cpp" line="75"/>
Expand Down