From 10e02edee52fb7ff481976638196139ad236d5f8 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 31 Jan 2023 08:02:38 +0100 Subject: [PATCH] enhance info in abouzt dialog --- src/librssguard/definitions/definitions.h | 2 +- src/librssguard/gui/dialogs/formabout.cpp | 14 ++++++++------ src/librssguard/miscellaneous/iconfactory.cpp | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index 1a11db6c4..d1b1f0553 100644 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -243,7 +243,7 @@ #define APP_THEME_DEFAULT "Breeze" #endif -#define APP_LOCAL_THEME_FOLDER "icons" +#define APP_LOCAL_ICON_THEME_FOLDER "icons" #define APP_NO_THEME "" // Indexes of columns as they are DEFINED IN THE TABLE for MESSAGES. diff --git a/src/librssguard/gui/dialogs/formabout.cpp b/src/librssguard/gui/dialogs/formabout.cpp index 944e50c13..8ab51c83c 100644 --- a/src/librssguard/gui/dialogs/formabout.cpp +++ b/src/librssguard/gui/dialogs/formabout.cpp @@ -51,9 +51,10 @@ void FormAbout::loadSettingsAndPaths() { const QString user_data_path = QDir::toNativeSeparators(qApp->userDataFolder()); m_ui.m_tbResources->setPlainText(QSL("User data folder (\"%5\") -> \"%1\"\n\n" - "Settings file (%3) -> \"%2\"\n\n" - "Skins base folder -> \"%4\"\n\n" - "Node.js package folder -> \"%6\"\n\n" + "Settings file (%3) -> \"%2\"\n" + "Skins base folder -> \"%4\"\n" + "Icon themes base folder -> \"%8\"\n" + "Node.js package folder -> \"%6\"\n" "QtWebEngine cache folder -> \"%7\"") .arg(user_data_path, QDir::toNativeSeparators(qApp->settings()->fileName()) @@ -66,11 +67,12 @@ void FormAbout::loadSettingsAndPaths() { .replace(user_data_path, QSL(USER_DATA_PLACEHOLDER)), #if defined(USE_WEBENGINE) QDir::toNativeSeparators(qApp->web()->engineProfile()->cachePath()) - .replace(user_data_path, QSL(USER_DATA_PLACEHOLDER)) + .replace(user_data_path, QSL(USER_DATA_PLACEHOLDER)), #else - QSL("-") + QSL("-"), #endif - )); + QSL(USER_DATA_PLACEHOLDER) + QDir::separator() + + QSL(APP_LOCAL_ICON_THEME_FOLDER))); } void FormAbout::loadLicenseAndInformation() { diff --git a/src/librssguard/miscellaneous/iconfactory.cpp b/src/librssguard/miscellaneous/iconfactory.cpp index 5cbda1d49..05142fd7d 100644 --- a/src/librssguard/miscellaneous/iconfactory.cpp +++ b/src/librssguard/miscellaneous/iconfactory.cpp @@ -62,8 +62,8 @@ void IconFactory::setupSearchPaths() { auto paths = QIcon::themeSearchPaths(); paths << APP_THEME_PATH - << qApp->userDataFolder() + QDir::separator() + APP_LOCAL_THEME_FOLDER - << qApp->applicationDirPath() + QDir::separator() + APP_LOCAL_THEME_FOLDER; + << qApp->userDataFolder() + QDir::separator() + APP_LOCAL_ICON_THEME_FOLDER + << qApp->applicationDirPath() + QDir::separator() + APP_LOCAL_ICON_THEME_FOLDER; QIcon::setThemeSearchPaths(paths); qDebugNN << LOGSEC_GUI