mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-02-09 13:18:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Unify message in About dialog and version argument

Browse Source 
And avoid removing extension when printing command name in help message.

See issue #1069
This commit is contained in:
mgrojo
2020-09-02 21:35:37 +02:00
parent 0963cacc04
commit fd54bf1ad2
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/AboutDialog.cpp
View File

@@ -1,6 +1,5 @@
#include "AboutDialog.h"
#include "ui_AboutDialog.h"
#include "sqlitedb.h"
#include "Application.h"
AboutDialog::AboutDialog(QWidget *parent) :
@@ -10,19 +9,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
ui->setupUi(this);
this->setFixedSize(this->width(), this->height());
this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
QString sqlite_version, sqlcipher_version;
DBBrowserDB::getSqliteVersion(sqlite_version, sqlcipher_version);
if(sqlcipher_version.isNull())
sqlite_version = tr("SQLite Version ") + sqlite_version;
else
sqlite_version = tr("SQLCipher Version %1 (based on SQLite %2)").arg(sqlcipher_version, sqlite_version);
ui->label_version->setText(tr("Version ") + Application::versionString() + "\n\n" +
tr("Built for %1, running on %2").arg(QSysInfo::buildAbi(), QSysInfo::currentCpuArchitecture()) + "\n\n" +
tr("Qt Version ") + QT_VERSION_STR + "\n\n" +
sqlite_version
);
ui->label_version->setText(Application::versionInformation());
}
AboutDialog::~AboutDialog()

22
src/Application.cpp
View File

@@ -13,6 +13,7 @@
#include "RemoteNetwork.h"
#include "Settings.h"
#include "version.h"
#include "sqlitedb.h"
Application::Application(int& argc, char** argv) :
QApplication(argc, argv)
@@ -90,7 +91,7 @@ Application::Application(int& argc, char** argv) :
{
// Help
qWarning() << qPrintable(tr("Usage: %1 [options] [<database>|<project>]\n").
arg(QFileInfo(argv[0]).baseName()));
arg(QFileInfo(argv[0]).fileName()));
qWarning() << qPrintable(tr("Possible command line arguments:"));
qWarning() << qPrintable(tr(" -h, --help Show command line options"));
qWarning() << qPrintable(tr(" -q, --quit Exit application after running scripts"));
@@ -106,7 +107,7 @@ Application::Application(int& argc, char** argv) :
qWarning() << qPrintable(tr(" <project> Open this project file (*.sqbpro)"));
m_dontShowMainWindow = true;
} else if(arguments().at(i) == "-v" || arguments().at(i) == "--version") {
qWarning() << qPrintable(tr("DB Browser for SQLite version %1.").arg(versionString()));
qWarning() << qPrintable(versionInformation());
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
@@ -227,6 +228,23 @@ QString Application::versionString()
#endif
}
QString Application::versionInformation()
{
QString sqlite_version, sqlcipher_version;
DBBrowserDB::getSqliteVersion(sqlite_version, sqlcipher_version);
if(sqlcipher_version.isNull())
sqlite_version = tr("SQLite Version ") + sqlite_version;
else
sqlite_version = tr("SQLCipher Version %1 (based on SQLite %2)").arg(sqlcipher_version, sqlite_version);
return
tr("DB Browser for SQLite Version %1.").arg(versionString() + "\n\n" +
tr("Built for %1, running on %2").arg(QSysInfo::buildAbi(), QSysInfo::currentCpuArchitecture()) + "\n" +
tr("Qt Version %1").arg(QT_VERSION_STR) + "\n" +
sqlite_version
);
}
void Application::reloadSettings()
{
// Network settings

3
src/Application.h
View File

@@ -21,7 +21,10 @@ public:
MainWindow* mainWindow() { return m_mainWindow; }
// DB4S version number as string
static QString versionString();
// Version of DB4S and dependencies as string
static QString versionInformation();
static void reloadSettings();