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

List:       kde-commits
Subject:    kdelibs/kutils
From:       Stephan Binner <binner () kde ! org>
Date:       2005-02-06 18:39:41
Message-ID: 20050206183941.9803D1BAD3 () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

fix empty User3 button showing for usermask=User2 (#97143)
fix User2 button not showing
fix User2 button being disabled for non-root modules


  M +11 -12    kcmultidialog.cpp   1.57


--- kdelibs/kutils/kcmultidialog.cpp  #1.56:1.57
@@ -78,5 +78,5 @@ KCMultiDialog::KCMultiDialog( int dialog
         QWidget *parent, const char *name, bool modal )
     : KDialogBase( dialogFace, caption, buttonMask | Help | Default | Cancel |
-            Apply | Ok | User1 | User2 | User3, Ok, parent, name, modal, true,
+            Apply | Ok | User1, Ok, parent, name, modal, true,
             KStdGuiItem::reset(), user2, user3 )
     , dialogface( dialogFace ), d( new KCMultiDialogPrivate )
@@ -89,6 +89,4 @@ inline void KCMultiDialog::init()
 {
     connect( this, SIGNAL( finished()), SLOT( dialogClosed()));
-    showButton( User1, false );
-    showButton( User2, false );
     enableButton(Apply, false);
     connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *)));
@@ -369,6 +367,7 @@ void KCMultiDialog::slotAboutToShow(QWid
     disconnect( this, SIGNAL(user2Clicked()), 0, 0 );
 
-    if (d->currentModule->moduleInfo().needsRootPrivileges() &&
-            !d->currentModule->rootMode() )
+    if (d->currentModule->moduleInfo().needsRootPrivileges())
+    {
+        if ( !d->currentModule->rootMode() )
     { /* Enable the Admin Mode button */
         enableButton( User2, true );
@@ -378,5 +377,5 @@ void KCMultiDialog::slotAboutToShow(QWid
     else
         enableButton( User2, false);
-
+    }
 }
 


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