pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Icon theme tweaks.

Browse source
This commit is contained in:
Martin Rotter 2016-05-10 07:16:59 +02:00
parent 21c432f6fb
commit 4419304395
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/text/CHANGELOG
View file

@ -1,6 +1,14 @@
3.2.2 3.2.2
————— —————
Changed:
▪ Some minor tweaks for default icon theme loading.
3.2.2
—————
Added: Added:
▪ RSS Guard now supports system-wide icon themes and on Windows -> built-in Faenza theme was tweaked. ▪ RSS Guard now supports system-wide icon themes and on Windows -> built-in Faenza theme was tweaked.

2
src/definitions/definitions.h.in
View file

@ -144,7 +144,7 @@
#define APP_IS_RUNNING "app_is_running" #define APP_IS_RUNNING "app_is_running"
#define APP_SKIN_DEFAULT "base/vergilius.xml" #define APP_SKIN_DEFAULT "base/vergilius.xml"
#define APP_THEME_DEFAULT "Faenza" #define APP_THEME_DEFAULT "Faenza"
#define APP_NO_THEME "-" #define APP_NO_THEME ""
#define APP_THEME_SUFFIX ".png" #define APP_THEME_SUFFIX ".png"
#ifndef QSL #ifndef QSL

2
src/gui/dialogs/formsettings.cpp
View file

@ -718,7 +718,7 @@ void FormSettings::loadInterface() {
if (icon_theme_name == APP_NO_THEME) { if (icon_theme_name == APP_NO_THEME) {
// Add just "no theme" on other systems. // Add just "no theme" on other systems.
//: Label for disabling icon theme. //: Label for disabling icon theme.
m_ui->m_cmbIconTheme->addItem(tr("no icon theme"), APP_NO_THEME); m_ui->m_cmbIconTheme->addItem(tr("no icon theme/system icon theme"), APP_NO_THEME);
} }
else { else {
m_ui->m_cmbIconTheme->addItem(icon_theme_name, icon_theme_name); m_ui->m_cmbIconTheme->addItem(icon_theme_name, icon_theme_name);

3
src/miscellaneous/iconfactory.cpp
View file

@ -111,7 +111,7 @@ void IconFactory::loadCurrentIconTheme() {
else { else {
// Desired icon theme is not currently available. // Desired icon theme is not currently available.
// Install "default" icon theme instead. // Install "default" icon theme instead.
qDebug("Icon theme '%s' cannot be loaded because it is not installed. No icon theme is loaded now.", qDebug("Icon theme '%s' cannot be loaded because it is not installed. No icon theme (or default icon theme) is loaded now.",
qPrintable(theme_name_from_settings)); qPrintable(theme_name_from_settings));
QIcon::setThemeName(APP_NO_THEME); QIcon::setThemeName(APP_NO_THEME);
} }
@ -144,7 +144,6 @@ QStringList IconFactory::installedIconThemes() const {
} }
icon_theme_names.removeDuplicates(); icon_theme_names.removeDuplicates();
icon_theme_names.removeAll(QString());
return icon_theme_names; return icon_theme_names;
} }