From d24166c3255ee9e11f33cf19e5389d054dc85aa4 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 17 Sep 2014 16:26:31 +0200 Subject: [PATCH] Fixed #64. --- resources/text/CHANGELOG | 2 +- src/gui/formabout.cpp | 12 ++++ src/gui/formabout.ui | 97 ++++++++++++++++++--------- src/miscellaneous/databasefactory.cpp | 6 +- src/miscellaneous/settings.h | 8 +-- 5 files changed, 81 insertions(+), 44 deletions(-) diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 6a74f0912..326b6f151 100644 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -4,7 +4,7 @@ Fixed: diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp index ae6fc2f9d..c6d174c7f 100755 --- a/src/gui/formabout.cpp +++ b/src/gui/formabout.cpp @@ -102,6 +102,18 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) QString::number(QDateTime::currentDateTime().date().year()), APP_AUTHOR, APP_NAME)); + + // Load additional paths information. + if (qApp->settings()->type() == Settings::Portable) { + m_ui->m_txtPathsSettingsType->setText(tr("FULLY portable")); + m_ui->m_txtPathsDatabaseRoot->setText(QDir::toNativeSeparators(qApp->applicationDirPath() + QDir::separator() + QString(APP_DB_SQLITE_PATH))); + } + else { + m_ui->m_txtPathsSettingsType->setText(tr("PARTIALLY portable")); + m_ui->m_txtPathsDatabaseRoot->setText(QDir::toNativeSeparators(QDir::homePath() + QDir::separator() + QString(APP_LOW_H_NAME) + QDir::separator() + QString(APP_DB_SQLITE_PATH))); + } + + m_ui->m_txtPathsSettingsFile->setText(QDir::toNativeSeparators(qApp->settings()->fileName())); } FormAbout::~FormAbout() { diff --git a/src/gui/formabout.ui b/src/gui/formabout.ui index bc94feaac..6766514a0 100644 --- a/src/gui/formabout.ui +++ b/src/gui/formabout.ui @@ -132,8 +132,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> false @@ -166,12 +166,12 @@ p, li { white-space: pre-wrap; } 0 0 - 685 - 184 + 693 + 196 - true + false GNU GPL License (applies to RSS Guard source code) @@ -180,16 +180,7 @@ p, li { white-space: pre-wrap; } GNU GPL License - - 0 - - - 0 - - - 0 - - + 0 @@ -224,8 +215,8 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html> +</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"><br /></p></body></html> Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -242,24 +233,15 @@ p, li { white-space: pre-wrap; } 0 0 - 98 - 69 + 83 + 72 BSD License (applies to QtSingleApplication source code) - - 0 - - - 0 - - - 0 - - + 0 @@ -294,8 +276,8 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html> +</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"><br /></p></body></html> Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -335,8 +317,8 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> false @@ -358,6 +340,55 @@ p, li { white-space: pre-wrap; } + + + Paths + + + + + + Settings type + + + + + + + true + + + + + + + Settings file + + + + + + + true + + + + + + + Database root path + + + + + + + true + + + + + diff --git a/src/miscellaneous/databasefactory.cpp b/src/miscellaneous/databasefactory.cpp index 0c3f56713..af9e1953f 100755 --- a/src/miscellaneous/databasefactory.cpp +++ b/src/miscellaneous/databasefactory.cpp @@ -129,16 +129,14 @@ QSqlDatabase DatabaseFactory::sqliteInitializeInMemoryDatabase() { qPrintable(APP_MISC_PATH)); } - QStringList statements = QString(file_init.readAll()).split(APP_DB_COMMENT_SPLIT, - QString::SkipEmptyParts); + QStringList statements = QString(file_init.readAll()).split(APP_DB_COMMENT_SPLIT, QString::SkipEmptyParts); database.transaction(); foreach(const QString &statement, statements) { query_db.exec(statement); if (query_db.lastError().isValid()) { - qFatal("In-memory SQLite database initialization failed. Initialization script '%s' is not correct.", - APP_DB_SQLITE_INIT); + qFatal("In-memory SQLite database initialization failed. Initialization script '%s' is not correct.", APP_DB_SQLITE_INIT); } } diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h index f74142d9b..6111a495e 100755 --- a/src/miscellaneous/settings.h +++ b/src/miscellaneous/settings.h @@ -42,15 +42,11 @@ class Settings : public QSettings { } // Getter/setter for settings values. - inline QVariant value(const QString §ion, - const QString &key, - const QVariant &default_value = QVariant()) { + inline QVariant value(const QString §ion, const QString &key, const QVariant &default_value = QVariant()) { return QSettings::value(QString("%1/%2").arg(section, key), default_value); } - inline void setValue(const QString §ion, - const QString &key, - const QVariant &value) { + inline void setValue(const QString §ion, const QString &key, const QVariant &value) { QSettings::setValue(QString("%1/%2").arg(section, key), value); }