summaryrefslogtreecommitdiffabout
path: root/microkde
Side-by-side diff
Diffstat (limited to 'microkde') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdialogbase.cpp25
-rw-r--r--microkde/kutils/kcmultidialog.cpp23
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
@@ -15,9 +15,9 @@ KDialogBase::KDialogBase()
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,
const QString &user3) :
KDialog( parent, name, modal )
@@ -27,11 +27,11 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
(findButton( defaultButton ) )->setFocus();
}
-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,
const QString &user2,
const QString &user3) :
@@ -77,9 +77,8 @@ void KDialogBase::init( const QString &caption, int buttonMask,
} else {
mOkButton = 0;
}
if ( buttonMask & Default ) {
- qDebug("buttonMask & Default ");
mDefaultButton = new QPushButton( i18n("Default"), this );
connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) );
} else {
mDefaultButton = 0;
@@ -103,9 +102,9 @@ void KDialogBase::init( const QString &caption, int buttonMask,
mCloseButton = new QPushButton( i18n("Close"), this );
connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) );
} else {
mCloseButton = 0;
- }
+ }
}
QTabWidget *KDialogBase::tabWidget()
{
@@ -124,23 +123,23 @@ void KDialogBase::hideButtons()
if ( mApplyButton ) mApplyButton->hide() ;
if ( mDefaultButton ) mDefaultButton->hide();
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 );
if ( mOkButton ) buttonLayout->addWidget( mOkButton );
if ( mApplyButton ) buttonLayout->addWidget( mApplyButton );
@@ -204,17 +203,17 @@ QPushButton *KDialogBase::findButton( ButtonCode id )
button = mUser2Button;
break;
case Cancel:
button = mCancelButton;
- break;
+ break;
case Default:
button = mDefaultButton;
break;
case Close:
button = mCloseButton;
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
@@ -42,19 +42,22 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch
parent, name, modal, true), d(0L)
{
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 );
setMainWidget(mMainWidget );
#ifdef DESKTOP_VERSION
resize(640,480);
#else
- resize(640,480);
+ resize(640,480);
setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480));
//showMaximized();
#endif
-
+
}
KCMultiDialog::~KCMultiDialog()
{
@@ -64,9 +67,9 @@ KCMultiDialog::~KCMultiDialog()
void KCMultiDialog::slotDefault()
{
int curPageIndex = mMainWidget->activePageIndex();
-
+
QPtrListIterator<KCModule> it(modules);
for (; it.current(); ++it)
{
if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex)
@@ -75,9 +78,9 @@ void KCMultiDialog::slotDefault()
clientChanged(true);
return;
}
}
-
+
}
void KCMultiDialog::slotApply()
{
@@ -88,16 +91,16 @@ qDebug("KCMultiDialog::slotApply clicked");
(*it)->save();
clientChanged(false);
emit applyClicked();
-
+
}
void KCMultiDialog::slotOk()
{
qDebug("KCMultiDialog::slotOk clicked");
-
+
QPtrListIterator<KCModule> it(modules);
for (; it.current(); ++it)
(*it)->save();
accept();
@@ -118,17 +121,17 @@ void KCMultiDialog::slotHelp()
process.detach();
} else {
new KRun(url);
}
-*/
+*/
}
void KCMultiDialog::clientChanged(bool state)
{
enableButton(Apply, state);
}
-/*US
+/*US
void KCMultiDialog::addModule(const QString& path, bool withfallback)
{
kdDebug(1208) << "KCMultiDialog::addModule " << path << endl;
@@ -156,9 +159,9 @@ void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename,
{
modules.append(module);
connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
-
+
}
void KCMultiDialog::slotAboutToShow(QWidget *page)
@@ -196,6 +199,6 @@ void KCMultiDialog::slotAboutToShow(QWidget *page)
QApplication::restoreOverrideCursor();
*/
-qDebug("KCMultiDialog::slotAboutToShow not implemented");
+qDebug("KCMultiDialog::slotAboutToShow not implemented");
}