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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kcontrol/kicker
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2006-08-23 18:52:02
Message-ID: 1156359122.499602.11721.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 576302 by helio:

- Fix compilation

 M  +10 -9     hidingtab_impl.cpp  
 M  +0 -1      hidingtab_impl.h  
 M  +1 -2      lookandfeeltab_impl.cpp  
 M  +2 -1      menutab_impl.cpp  


--- branches/KDE/3.5/kdebase/kcontrol/kicker/hidingtab_impl.cpp #576301:576302
@@ -68,18 +68,10 @@
 
 void HidingTab::load()
 {
-   load( false );
-}
-
-void HidingTab::load(bool useDefaults )
-{
-    m_panelInfo = 0;
     KickerConfig::the()->populateExtensionInfoList(m_panelList);
     m_panelsGroupBox->setHidden(m_panelList->count() < 2);
 
     switchPanel(KickerConfig::the()->currentPanelIndex());
-
-    emit changed( useDefaults );
 }
 
 void HidingTab::extensionAdded(ExtensionInfo* info)
@@ -204,7 +196,16 @@
 
 void HidingTab::defaults()
 {
-   load( true );
+   m_manual->setChecked( true );
+   m_delaySpinBox->setValue( 3 );
+   m_autoHideSwitch->setChecked( false );
+   m_lHB->setChecked(  false );
+   m_rHB->setChecked(  true );
+   m_animateHiding->setChecked( true );
+   m_hideSlider->setValue( 10 );
+   m_delaySpinBox->setValue( 3 );
+   m_backgroundPos->setCurrentItem( triggerConfigToCombo( BottomLeft ) );
+   m_backgroundRaise->setChecked(  false );
 }
 
 void HidingTab::panelPositionChanged(int position)
--- branches/KDE/3.5/kdebase/kcontrol/kicker/hidingtab_impl.h #576301:576302
@@ -32,7 +32,6 @@
     HidingTab(QWidget *parent = 0, const char* name = 0);
 
     void load();
-    void load(bool useDefaults);
     void save();
     void defaults();
 
--- branches/KDE/3.5/kdebase/kcontrol/kicker/lookandfeeltab_impl.cpp #576301:576302
@@ -156,7 +156,7 @@
 {
     KConfig config(KickerConfig::the()->configName(), false, false);
 
-    config->setReadDefaults( useDefaults );
+    config.setReadDefaults( useDefaults );
 
     config.setGroup("General");
 
@@ -223,7 +223,6 @@
         }
     }
     enableTransparency( transparent );
-    emit changed( useDefaults );
 }
 
 void LookAndFeelTab::save()
--- branches/KDE/3.5/kdebase/kcontrol/kicker/menutab_impl.cpp #576301:576302
@@ -125,7 +125,8 @@
 
     m_showFrequent->setChecked(true);
 
-    emit changed( useDefaults );
+    if ( useDefaults )
+       emit changed();
 }
 
 void MenuTab::save()
[prev in list] [next in list] [prev in thread] [next in thread]