From a0d2e9de004d82bd6987c2abb6d4f5e2a96a14e4 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 27 Dec 2013 14:58:40 +0100 Subject: [PATCH] Moved flags into main icon theme mini-kfaenza. --- CMakeLists.txt | 4 ---- .../graphics/{flags => icons/mini-kfaenza}/cs.png | Bin .../graphics/{flags => icons/mini-kfaenza}/en.png | Bin .../graphics/{flags => icons/mini-kfaenza}/nl.png | Bin src/core/defs.h.in | 2 -- src/gui/formsettings.cpp | 2 +- 6 files changed, 1 insertion(+), 7 deletions(-) rename resources/graphics/{flags => icons/mini-kfaenza}/cs.png (100%) rename resources/graphics/{flags => icons/mini-kfaenza}/en.png (100%) rename resources/graphics/{flags => icons/mini-kfaenza}/nl.png (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e363760b..d7ceafa71 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/resources/graphics/flags/cs.png b/resources/graphics/icons/mini-kfaenza/cs.png similarity index 100% rename from resources/graphics/flags/cs.png rename to resources/graphics/icons/mini-kfaenza/cs.png diff --git a/resources/graphics/flags/en.png b/resources/graphics/icons/mini-kfaenza/en.png similarity index 100% rename from resources/graphics/flags/en.png rename to resources/graphics/icons/mini-kfaenza/en.png diff --git a/resources/graphics/flags/nl.png b/resources/graphics/icons/mini-kfaenza/nl.png similarity index 100% rename from resources/graphics/flags/nl.png rename to resources/graphics/icons/mini-kfaenza/nl.png diff --git a/src/core/defs.h.in b/src/core/defs.h.in index fad59d37f..3ca112357 100755 --- a/src/core/defs.h.in +++ b/src/core/defs.h.in @@ -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 diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index aec4e3535..9f8c6cf60 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -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 matching_items = m_ui->m_treeLanguages->findItems(Settings::getInstance()->value(APP_CFG_GEN,