diff --git a/src/platformtheme/khintssettings.h b/src/platformtheme/khintssettings.h --- a/src/platformtheme/khintssettings.h +++ b/src/platformtheme/khintssettings.h @@ -76,6 +76,7 @@ void loadPalettes(); void iconChanged(int group); void updateQtSettings(KConfigGroup &cg); + void updateShowIconsInMenuItems(KConfigGroup &cg); Qt::ToolButtonStyle toolButtonStyle(const KConfigGroup &cg) const; void updateCursorTheme(); diff --git a/src/platformtheme/khintssettings.cpp b/src/platformtheme/khintssettings.cpp --- a/src/platformtheme/khintssettings.cpp +++ b/src/platformtheme/khintssettings.cpp @@ -120,8 +120,7 @@ QApplication::setWheelScrollLines(cg.readEntry("WheelScrollLines", 3)); } - bool showIcons = cg.readEntry("ShowIconsInMenuItems", !QApplication::testAttribute(Qt::AA_DontShowIconsInMenus)); - QCoreApplication::setAttribute(Qt::AA_DontShowIconsInMenus, !showIcons); + updateShowIconsInMenuItems(cg); QMetaObject::invokeMethod(this, "delayedDBusConnects", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "setupIconLoader", Qt::QueuedConnection); @@ -250,6 +249,8 @@ } else if (category == SETTINGS_STYLE) { m_hints[QPlatformTheme::DialogButtonBoxButtonsHaveIcons] = cg.readEntry("ShowIconsOnPushButtons", true); m_hints[QPlatformTheme::UiEffects] = cg.readEntry("GraphicEffectsLevel", 0) != 0 ? QPlatformTheme::GeneralUiEffect : 0; + + updateShowIconsInMenuItems(cg); } break; } @@ -341,8 +342,7 @@ m_hints[QPlatformTheme::ItemViewActivateItemOnSingleClick] = cg.readEntry("SingleClick", true); - bool showIcons = cg.readEntry("ShowIconsInMenuItems", !QApplication::testAttribute(Qt::AA_DontShowIconsInMenus)); - QCoreApplication::setAttribute(Qt::AA_DontShowIconsInMenus, !showIcons); + updateShowIconsInMenuItems(cg); int wheelScrollLines = cg.readEntry("WheelScrollLines", 3); m_hints[QPlatformTheme::WheelScrollLines] = wheelScrollLines; @@ -352,6 +352,12 @@ } } +void KHintsSettings::updateShowIconsInMenuItems(KConfigGroup &cg) +{ + bool showIcons = cg.readEntry("ShowIconsInMenuItems", true); + QCoreApplication::setAttribute(Qt::AA_DontShowIconsInMenus, !showIcons); +} + Qt::ToolButtonStyle KHintsSettings::toolButtonStyle(const KConfigGroup &cg) const { const QString buttonStyle = cg.readEntry("ToolButtonStyle", "TextBesideIcon").toLower();