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

List:       kde-commits
Subject:    kdelibs/kdeui
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2003-06-30 19:18:24
[Download RAW message or body]

CVS commit by bmeyer: 

As Waldo pointed out to me out of shear luck in a few cases
the toolbar default settings are not read.  Tested and with comments.


  M +14 -1     ktoolbar.cpp   1.348


--- kdelibs/kdeui/ktoolbar.cpp  #1.347:1.348
@@ -230,4 +230,6 @@ void KToolBar::init( bool readConfig, bo
 {
     d = new KToolBarPrivate;
+    // Get the default iconSize sense m_iconSize == 0 which isn't the default
+    d->IconSizeDefault = iconSize();
     setFullSize( TRUE );
     d->m_honorStyle = honorStyle;
@@ -1602,4 +1604,10 @@ void KToolBar::applySettings(KConfig *co
         bool hidden = config->readBoolEntry(attrHidden, d->HiddenDefault);
 
+        // Store the default values.
+        d->IndexDefault = index;
+        d->OffsetDefault = offset;
+        d->NewLineDefault = newLine;
+        d->HiddenDefault = hidden;
+
         Dock pos(DockTop);
         if ( position == "Top" )
@@ -1637,4 +1645,9 @@ void KToolBar::applySettings(KConfig *co
             if ( doHide )
                 hide();
+            // Get the possably new default index value
+            QString tempDock;
+            QString tempIconText;
+            getAttributes( tempDock, tempIconText, d->IndexDefault );
+
         }
         if (isVisible ())


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