[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] staging/frameworkintegration: Use the iconSize from MainToolbar instead of Tool
From:       Àlex_Fiestas <afiestas () kde ! org>
Date:       2013-08-29 1:54:53
Message-ID: E1VErRl-0003mC-Ra () scm ! kde ! org
[Download RAW message or body]

Git commit 38ee9812d3eae9d20304d3ec79a0129c2d824214 by Àlex Fiestas.
Committed on 29/08/2013 at 00:42.
Pushed by afiestas into branch 'frameworks'.

Use the iconSize from MainToolbar instead of Toolbar

We are using the ToolButtomStyle from it and in KDE4 we use it as well
so there is no reason to change.

M  +1    -1    staging/frameworkintegration/autotests/kdeplatformtheme_changed_kdeglobals
 M  +1    -1    staging/frameworkintegration/autotests/kdeplatformtheme_kdeglobals
M  +1    -1    staging/frameworkintegration/autotests/kdeplatformtheme_unittest.cpp
M  +3    -3    staging/frameworkintegration/src/platformtheme/khintssettings.cpp

http://commits.kde.org/kdelibs/38ee9812d3eae9d20304d3ec79a0129c2d824214

diff --git a/staging/frameworkintegration/autotests/kdeplatformtheme_changed_kdeglobals \
b/staging/frameworkintegration/autotests/kdeplatformtheme_changed_kdeglobals index \
                b313f9a..cc2bb2b 100644
--- a/staging/frameworkintegration/autotests/kdeplatformtheme_changed_kdeglobals
+++ b/staging/frameworkintegration/autotests/kdeplatformtheme_changed_kdeglobals
@@ -13,7 +13,7 @@ GraphicEffectsLevel=0
 WheelScrollLines=122
 ShowIconsInMenuItems=false
 
-[ToolbarIcons]
+[MainToolbarIcons]
 Size=11
 
 [ColorEffects:Active]
diff --git a/staging/frameworkintegration/autotests/kdeplatformtheme_kdeglobals \
b/staging/frameworkintegration/autotests/kdeplatformtheme_kdeglobals index \
                981e751..351074b 100644
--- a/staging/frameworkintegration/autotests/kdeplatformtheme_kdeglobals
+++ b/staging/frameworkintegration/autotests/kdeplatformtheme_kdeglobals
@@ -13,7 +13,7 @@ GraphicEffectsLevel=0
 WheelScrollLines=1234
 ShowIconsInMenuItems=true
 
-[ToolbarIcons]
+[MainToolbarIcons]
 Size=2
 
 [ColorEffects:Active]
diff --git a/staging/frameworkintegration/autotests/kdeplatformtheme_unittest.cpp \
b/staging/frameworkintegration/autotests/kdeplatformtheme_unittest.cpp index \
                46156a4..b425e18 100644
--- a/staging/frameworkintegration/autotests/kdeplatformtheme_unittest.cpp
+++ b/staging/frameworkintegration/autotests/kdeplatformtheme_unittest.cpp
@@ -172,7 +172,7 @@ class KdePlatformTheme_UnitTest : public QObject
                                                    "iconChanged",  &m_loop, \
SLOT(quit()));  
             QDBusMessage message = QDBusMessage::createSignal("/KIconLoader", \
                "org.kde.KIconLoader", "iconChanged" );
-            message.setArguments(QList<QVariant>() << int(KIconLoader::Toolbar));
+            message.setArguments(QList<QVariant>() << \
int(KIconLoader::MainToolbar));  QDBusConnection::sessionBus().send(message);
             m_loop.exec();
 
diff --git a/staging/frameworkintegration/src/platformtheme/khintssettings.cpp \
b/staging/frameworkintegration/src/platformtheme/khintssettings.cpp index \
                63703fb..4e20af5 100644
--- a/staging/frameworkintegration/src/platformtheme/khintssettings.cpp
+++ b/staging/frameworkintegration/src/platformtheme/khintssettings.cpp
@@ -53,7 +53,7 @@ KHintsSettings::KHintsSettings() : QObject(0)
 
     m_hints[QPlatformTheme::ToolButtonStyle] = toolButtonStyle(cg);
 
-    KConfigGroup cgToolbarIcon(ptr, "ToolbarIcons");
+    KConfigGroup cgToolbarIcon(ptr, "MainToolbarIcons");
     m_hints[QPlatformTheme::ToolBarIconSize] = cgToolbarIcon.readEntry("Size", 22);
     m_hints[QPlatformTheme::ItemViewActivateItemOnSingleClick] = \
                cg.readEntry("SingleClick", true);
     m_hints[QPlatformTheme::SystemIconThemeName] = cg.readEntry("IconsTheme", \
"oxygen"); @@ -148,11 +148,11 @@ void KHintsSettings::slotNotifyChange(int type, int \
arg)  void KHintsSettings::iconChanged(int group)
 {
     KIconLoader::Group iconGroup = (KIconLoader::Group) group;
-    if (iconGroup != KIconLoader::Toolbar) {
+    if (iconGroup != KIconLoader::MainToolbar) {
         return;
     }
 
-    const int currentSize = \
KIconLoader::global()->currentSize(KIconLoader::Toolbar); +    const int currentSize \
= KIconLoader::global()->currentSize(KIconLoader::MainToolbar);  if \
(m_hints[QPlatformTheme::ToolBarIconSize] == currentSize) {  return;
     }


[prev in list] [next in list] [prev in thread] [next in thread]