| -rw-r--r-- | microkde/kdialogbase.cpp | 25 | ||||
| -rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 23 |
2 files changed, 25 insertions, 23 deletions
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp index c953058..d1f7630 100644 --- a/microkde/kdialogbase.cpp +++ b/microkde/kdialogbase.cpp @@ -17,5 +17,5 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal, const QString &caption, int buttonMask, ButtonCode defaultButton, - bool separator, + bool separator, const QString &user1, const QString &user2, @@ -29,7 +29,7 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal, } -KDialogBase::KDialogBase( int dialogFace, const QString &caption, - int buttonMask, ButtonCode defaultButton, - QWidget *parent, const char *name, bool modal, +KDialogBase::KDialogBase( int dialogFace, const QString &caption, + int buttonMask, ButtonCode defaultButton, + QWidget *parent, const char *name, bool modal, bool separator, const QString &user1, @@ -79,5 +79,4 @@ void KDialogBase::init( const QString &caption, int buttonMask, } if ( buttonMask & Default ) { - qDebug("buttonMask & Default "); mDefaultButton = new QPushButton( i18n("Default"), this ); connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); @@ -105,5 +104,5 @@ void KDialogBase::init( const QString &caption, int buttonMask, } else { mCloseButton = 0; - } + } } @@ -126,19 +125,19 @@ void KDialogBase::hideButtons() if ( mCancelButton ) mCancelButton->hide() ; if ( mCloseButton ) mCloseButton->hide() ; - + } void KDialogBase::initLayout() { - + delete mTopLayout; mTopLayout = new QVBoxLayout( this ); mTopLayout->setMargin( marginHint() ); mTopLayout->setSpacing( spacingHint() ); - + mTopLayout->addWidget( mMainWidget ); - + QBoxLayout *buttonLayout = new QHBoxLayout; mTopLayout->addLayout( buttonLayout ); - + if ( mUser1Button ) buttonLayout->addWidget( mUser1Button ); if ( mUser2Button ) buttonLayout->addWidget( mUser2Button ); @@ -206,5 +205,5 @@ QPushButton *KDialogBase::findButton( ButtonCode id ) case Cancel: button = mCancelButton; - break; + break; case Default: button = mDefaultButton; @@ -214,5 +213,5 @@ QPushButton *KDialogBase::findButton( ButtonCode id ) break; default: - break; + break; } return button; diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp index 4136622..13be2ce 100644 --- a/microkde/kutils/kcmultidialog.cpp +++ b/microkde/kutils/kcmultidialog.cpp @@ -44,4 +44,7 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch enableButton(Apply, false); //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); + + connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); + _baseGroup = baseGroup; mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed ); @@ -50,9 +53,9 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch resize(640,480); #else - resize(640,480); + resize(640,480); setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480)); //showMaximized(); #endif - + } @@ -66,5 +69,5 @@ void KCMultiDialog::slotDefault() int curPageIndex = mMainWidget->activePageIndex(); - + QPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) @@ -77,5 +80,5 @@ void KCMultiDialog::slotDefault() } } - + } @@ -90,5 +93,5 @@ qDebug("KCMultiDialog::slotApply clicked"); emit applyClicked(); - + } @@ -97,5 +100,5 @@ void KCMultiDialog::slotOk() { qDebug("KCMultiDialog::slotOk clicked"); - + QPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) @@ -120,5 +123,5 @@ void KCMultiDialog::slotHelp() new KRun(url); } -*/ +*/ } @@ -128,5 +131,5 @@ void KCMultiDialog::clientChanged(bool state) } -/*US +/*US void KCMultiDialog::addModule(const QString& path, bool withfallback) { @@ -158,5 +161,5 @@ void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, modules.append(module); connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); - + } @@ -198,4 +201,4 @@ void KCMultiDialog::slotAboutToShow(QWidget *page) */ -qDebug("KCMultiDialog::slotAboutToShow not implemented"); +qDebug("KCMultiDialog::slotAboutToShow not implemented"); } |