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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kcontrol/background
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2006-08-22 4:36:07
Message-ID: 1156221367.042037.2756.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 575787 by helio:

- Setting module to use system defaults

 M  +4 -47     bgdialog.cpp  
 M  +1 -1      bgdialog.h  
 M  +1 -0      bgsettings.h  
 M  +6 -2      main.cpp  
 M  +1 -0      main.h  


--- branches/KDE/3.5/kdebase/kcontrol/background/bgdialog.cpp #575786:575787
@@ -288,8 +288,9 @@
     m_buttonGetNew->setEnabled( false );
 }
 
-void BGDialog::load()
+void BGDialog::load( bool useDefaults )
 {
+   m_pGlobals->getConfig()->setReadDefaults( useDefaults );
    m_pGlobals->readSettings();
    m_eDesk = m_pGlobals->commonDeskBackground() ? 0 : m_desk;
    getEScreen();
@@ -321,7 +322,7 @@
       m_wallpaperPos = KBackgroundSettings::Centred; // Default
 
    updateUI();
-   emit changed(false);
+   emit changed(useDefaults);
 }
 
 void BGDialog::save()
@@ -358,51 +359,7 @@
 
 void BGDialog::defaults()
 {
-   m_pGlobals->setCommonScreenBackground(_defCommonScreen);
-   m_pGlobals->setCommonDeskBackground(_defCommonDesk);
-   m_pGlobals->setLimitCache(_defLimitCache);
-   m_pGlobals->setCacheSize(_defCacheSize);
-   m_comboWallpaperPos->setCurrentItem( 0 );
-   m_eDesk = _defCommonDesk ? 0 : m_desk;
-   getEScreen();
-   
-   for ( unsigned i = 0; i < m_numDesks; ++i )
-      m_pGlobals->setDrawBackgroundPerScreen( i, false );
-
-   KBackgroundRenderer *r = eRenderer();
-
-   if (r->isActive())
-      r->stop();
-
-   if (QPixmap::defaultDepth() > 8)
-   {
-      r->setBackgroundMode(_defBackgroundMode);
-   }
-   else
-   {
-      r->setBackgroundMode(KBackgroundSettings::Flat);
-   }
-
-   r->setColorA(_defColorA);
-   r->setColorB(_defColorB);
-   r->setWallpaperMode(_defWallpaperMode);
-   r->setMultiWallpaperMode(_defMultiMode);
-
-   m_slideShowRandom = _defMultiMode;
-   if (m_slideShowRandom == KBackgroundSettings::NoMultiRandom)
-      m_slideShowRandom = KBackgroundSettings::Random;
-   if (m_slideShowRandom == KBackgroundSettings::NoMulti)
-      m_slideShowRandom = KBackgroundSettings::InOrder;
-
-   r->setBlendMode(_defBlendMode);
-   r->setBlendBalance(_defBlendBalance);
-   r->setReverseBlending(_defReverseBlending);
-
-   updateUI();
-
-   m_copyAllDesktops = true;
-   m_copyAllScreens = true;
-   emit changed(true);
+	load( true );
 }
 
 QString BGDialog::quickHelp() const
--- branches/KDE/3.5/kdebase/kcontrol/background/bgdialog.h #575786:575787
@@ -39,7 +39,7 @@
    BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop = true);
    ~BGDialog();
 
-   void load();
+   void load( bool useDefaults );
    void save();
    void defaults();
 
--- branches/KDE/3.5/kdebase/kcontrol/background/bgsettings.h #575786:575787
@@ -347,6 +347,7 @@
 
     void readSettings();
     void writeSettings();
+    KConfig* getConfig() { return m_pConfig; }
 
 private:
     bool dirty;
--- branches/KDE/3.5/kdebase/kcontrol/background/main.cpp #575786:575787
@@ -83,13 +83,17 @@
     setAboutData( about );
 }
 
-
 void KBackground::load()
 {
-    m_base->load();
+    load( false );
 }
 
+void KBackground::load( bool useDefaults )
+{
+    m_base->load( useDefaults );
+}
 
+
 void KBackground::save()
 {
     m_base->save();
--- branches/KDE/3.5/kdebase/kcontrol/background/main.h #575786:575787
@@ -27,6 +27,7 @@
     ~KBackground();
 
     virtual void load();
+    virtual void load( bool useDefaults );
     virtual void save();
     virtual void defaults();
 
[prev in list] [next in list] [prev in thread] [next in thread]