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

List:       kde-commits
Subject:    kdebase/kcontrol
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2004-07-16 13:17:49
Message-ID: 20040716131749.870FC16AF5 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

read-only mode fixes


  M +6 -0      background/bgadvanced.cpp   1.15
  M +2 -0      background/bgadvanced.h   1.6
  M +19 -3     background/bgdialog.cpp   1.44
  M +4 -3      kdm/kdm-conv.cpp   1.28
  M +4 -1      kdm/kdm-font.cpp   1.43


--- kdebase/kcontrol/kdm/kdm-conv.cpp  #1.27:1.28
@@ -154,7 +154,8 @@ KDMConvenienceWidget::KDMConvenienceWidg
 void KDMConvenienceWidget::makeReadOnly()
 {
-    alGroup->setEnabled(false);
-    npGroup->setEnabled(false);
-    pl_label->setEnabled(false);
+    ((QWidget*)alGroup->child("qt_groupbox_checkbox"))->setEnabled(false);
+    userlb->setEnabled(false);
+    ((QWidget*)npGroup->child("qt_groupbox_checkbox"))->setEnabled(false);
+    npuserlv->setEnabled(false);
     cbarlen->setEnabled(false);
     npRadio->setEnabled(false);

--- kdebase/kcontrol/kdm/kdm-font.cpp  #1.42:1.43
@@ -78,5 +78,8 @@ KDMFontWidget::KDMFontWidget(QWidget *pa
 void KDMFontWidget::makeReadOnly()
 {
-    setEnabled(false);
+  stdFontChooser->button()->setEnabled(false);
+  failFontChooser->button()->setEnabled(false);
+  greetingFontChooser->button()->setEnabled(false);
+  aacb->setEnabled(false);
 }
 

--- kdebase/kcontrol/background/bgadvanced.cpp  #1.14:1.15
@@ -131,4 +131,10 @@ BGAdvancedDialog::BGAdvancedDialog(KBack
 }
 
+void BGAdvancedDialog::makeReadOnly()
+{
+   dlg->m_cbProgram->setEnabled(false);
+   dlg->m_listPrograms->setEnabled(false);
+}
+
 void BGAdvancedDialog::setCacheSize(int s)
 {

--- kdebase/kcontrol/background/bgadvanced.h  #1.5:1.6
@@ -54,4 +54,6 @@ public:
    void updateUI();
 
+   void makeReadOnly();
+
 public slots:
    void slotAdd();

--- kdebase/kcontrol/background/bgdialog.cpp  #1.43:1.44
@@ -175,7 +175,17 @@ void BGDialog::makeReadOnly()
     m_pMonitor->setEnabled( false );
     m_comboDesktop->setEnabled( false );
-    m_buttonAdvanced->setEnabled( false );
-    m_buttonGroupBackground->setEnabled( false );
-    groupBox3->setEnabled( false );
+    m_colorPrimary->setEnabled( false );
+    m_colorSecondary->setEnabled( false );
+    m_comboPattern->setEnabled( false );
+    m_radioNoPicture->setEnabled( false );
+    m_radioPicture->setEnabled( false );
+    m_radioSlideShow->setEnabled( false );
+    m_urlWallpaperBox->setEnabled( false );
+    m_urlWallpaperButton->setEnabled( false );
+    m_comboWallpaperPos->setEnabled( false );
+    m_buttonSetupWallpapers->setEnabled( false );
+    m_comboBlend->setEnabled( false );
+    m_sliderBlend->setEnabled( false );
+    m_cbBlendReverse->setEnabled( false );
 }
 
@@ -846,4 +856,10 @@ void BGDialog::slotAdvanced()
     BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);
 
+    if (!m_pMonitor->isEnabled()) {
+       dlg.makeReadOnly();
+       dlg.exec();
+       return;
+    }
+
     dlg.setTextColor(m_pGlobals->textColor());
     dlg.setTextBackgroundColor(m_pGlobals->textBackgroundColor());


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