From kde-commits  Fri Mar 26 06:36:21 2004
From: Klas Kalass <klas.kalass () gmx ! de>
Date: Fri, 26 Mar 2004 06:36:21 +0000
To: kde-commits
Subject: KDE_3_2_BRANCH: kdelibs/kdeui
Message-Id: <20040326063621.0DCF89672 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=108028298601581

CVS commit by kalass: 

honor icon style. As discussed with David Faure on kde-cvs


  M +4 -1      ktoolbar.cpp   1.369.2.5


--- kdelibs/kdeui/ktoolbar.cpp  #1.369.2.4:1.369.2.5
@@ -1823,5 +1823,8 @@ void KToolBar::loadState( const QDomElem
             //kdDebug(220) << name() << " loadState no iconText attribute in XML, using iconTextSetting=" << iconTextSetting() << endl;
             // Use global setting
+            if (d->m_honorStyle) 
             setIconText( iconTextSetting() );
+            else
+                setIconText( d->IconTextDefault);
         }
     }