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

List:       kde-commits
Subject:    kdebase/kcontrol/background
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-02-20 18:04:07
Message-ID: 20050220180407.A2B3B1BC44 () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

hum. so if you have a background program selected but a picture selected
in the main dialog, the picture overrides the background program. 
however, the background program selection causes the options box to 
remain unselected. this correctly fixes the issue i was seeing in my last
commit, though i didn't realize it was because peyton had gone in and
selected a program in the advanced options. and it was peyton who
complained about the options being turned off in the first place. =P
BUG:99813


  M +8 -10     bgdialog.cpp   1.63


--- kdebase/kcontrol/background/bgdialog.cpp  #1.62:1.63
@@ -545,12 +545,13 @@ void BGDialog::updateUI()
    m_colorSecondary->setColor(r->colorB());
 
-   if (r->backgroundMode() == KBackgroundSettings::Program)
+   int wallpaperMode = r->wallpaperMode();
+   int multiMode = r->multiWallpaperMode();
+
+   if (r->backgroundMode() == KBackgroundSettings::Program &&
+       wallpaperMode == KBackgroundSettings::NoWallpaper)
       groupBox3->setEnabled( false );
    else
       groupBox3->setEnabled( true );
 
-   int wallpaperMode = r->wallpaperMode();
-   int multiMode = r->multiWallpaperMode();
-
    if ((multiMode == KBackgroundSettings::NoMultiRandom) ||
        (multiMode == KBackgroundSettings::NoMulti))
@@ -688,5 +689,4 @@ void BGDialog::slotWallpaperTypeChanged(
    if (i == m_buttonGroupBackground->id(m_radioNoPicture))  //None
    {
-      groupBox3->setEnabled(false);
       m_urlWallpaperBox->setEnabled(false);
       m_urlWallpaperButton->setEnabled(false);
@@ -707,5 +707,4 @@ void BGDialog::slotWallpaperTypeChanged(
    else if (i == m_buttonGroupBackground->id(m_radioSlideShow))
    {
-      groupBox3->setEnabled(true);
       m_urlWallpaperBox->setEnabled(false);
       m_urlWallpaperButton->setEnabled(false);
@@ -732,5 +731,4 @@ void BGDialog::slotWallpaperTypeChanged(
    else if (i == m_buttonGroupBackground->id(m_radioPicture))
    {
-      groupBox3->setEnabled(true);
       m_urlWallpaperBox->setEnabled(true);
       m_urlWallpaperButton->setEnabled(true);


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