FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-01 02:48:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved flags into main icon theme mini-kfaenza.

Browse Source
This commit is contained in:
Martin Rotter 2013-12-27 14:58:40 +01:00
parent c04805a6f7
commit a0d2e9de00
6 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -461,8 +461,6 @@ if(WIN32 OR OS2)
DESTINATION ./icons)
endif(BUNDLE_ICON_THEMES)
install(DIRECTORY resources/graphics/flags
DESTINATION ./)
install(DIRECTORY resources/skins/base
DESTINATION ./skins)
install(DIRECTORY resources/misc
@ -489,8 +487,6 @@ elseif(UNIX)
DESTINATION share/${APP_LOW_NAME}/icons)
endif(BUNDLE_ICON_THEMES)
install(DIRECTORY resources/graphics/flags
DESTINATION share/${APP_LOW_NAME}/)
install(DIRECTORY resources/skins/base
DESTINATION share/${APP_LOW_NAME}/skins)
install(DIRECTORY resources/misc

0
resources/graphics/flags/cs.png → resources/graphics/icons/mini-kfaenza/cs.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
resources/graphics/flags/en.png → resources/graphics/icons/mini-kfaenza/en.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
resources/graphics/flags/nl.png → resources/graphics/icons/mini-kfaenza/nl.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 824 B

After

Width:  |  Height:  |  Size: 824 B

2
src/core/defs.h.in
View File

@ -104,7 +104,6 @@
#define APP_THEME_PATH APP_PREFIX + QString("/share/rssguard/icons")
#define APP_MISC_PATH APP_PREFIX + QString("/share/rssguard/misc")
#define APP_HTML_PATH APP_PREFIX + QString("/share/rssguard/html")
#define APP_FLAGS_PATH APP_PREFIX + QString("/share/rssguard/flags")
#define APP_ICON_PATH APP_PREFIX + QString("/share/icons/hicolor/128x128/apps/@APP_LOW_NAME@.png")
#define APP_ICON_PLAIN_PATH APP_PREFIX + QString("/share/icons/hicolor/128x128/apps/@APP_LOW_NAME@_plain.png")
#elif defined(Q_OS_WIN) || defined(Q_OS_OS2)
@ -114,7 +113,6 @@
#define APP_THEME_PATH QApplication::applicationDirPath() + QString("/icons")
#define APP_MISC_PATH QApplication::applicationDirPath() + QString("/misc")
#define APP_HTML_PATH QApplication::applicationDirPath() + QString("/html")
#define APP_FLAGS_PATH QApplication::applicationDirPath() + QString("/flags")
#define APP_ICON_PATH QApplication::applicationDirPath() + QString("/@APP_LOW_NAME@.png")
#define APP_ICON_PLAIN_PATH QApplication::applicationDirPath() + QString("/@APP_LOW_NAME@_plain.png")
#endif

2
src/gui/formsettings.cpp
View File

@ -375,7 +375,7 @@ void FormSettings::loadLanguage() {
item->setText(2, language.m_version);
item->setText(3, language.m_author);
item->setText(4, language.m_email);
item->setIcon(0, QIcon(APP_FLAGS_PATH + '/' + language.m_code + ".png"));
item->setIcon(0, IconThemeFactory::getInstance()->fromTheme(language.m_code));
}
QList<QTreeWidgetItem*> matching_items = m_ui->m_treeLanguages->findItems(Settings::getInstance()->value(APP_CFG_GEN,