summaryrefslogtreecommitdiffabout
path: root/microkde
Unidiff
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
@@ -18,3 +18,3 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
18 int buttonMask, ButtonCode defaultButton, 18 int buttonMask, ButtonCode defaultButton,
19 bool separator, 19 bool separator,
20 const QString &user1, 20 const QString &user1,
@@ -30,5 +30,5 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
30 30
31KDialogBase::KDialogBase( int dialogFace, const QString &caption, 31KDialogBase::KDialogBase( int dialogFace, const QString &caption,
32 int buttonMask, ButtonCode defaultButton, 32 int buttonMask, ButtonCode defaultButton,
33 QWidget *parent, const char *name, bool modal, 33 QWidget *parent, const char *name, bool modal,
34 bool separator, 34 bool separator,
@@ -80,3 +80,2 @@ void KDialogBase::init( const QString &caption, int buttonMask,
80 if ( buttonMask & Default ) { 80 if ( buttonMask & Default ) {
81 qDebug("buttonMask & Default ");
82 mDefaultButton = new QPushButton( i18n("Default"), this ); 81 mDefaultButton = new QPushButton( i18n("Default"), this );
@@ -106,3 +105,3 @@ void KDialogBase::init( const QString &caption, int buttonMask,
106 mCloseButton = 0; 105 mCloseButton = 0;
107 } 106 }
108} 107}
@@ -127,3 +126,3 @@ void KDialogBase::hideButtons()
127 if ( mCloseButton ) mCloseButton->hide() ; 126 if ( mCloseButton ) mCloseButton->hide() ;
128 127
129} 128}
@@ -131,3 +130,3 @@ void KDialogBase::initLayout()
131{ 130{
132 131
133 delete mTopLayout; 132 delete mTopLayout;
@@ -136,8 +135,8 @@ void KDialogBase::initLayout()
136 mTopLayout->setSpacing( spacingHint() ); 135 mTopLayout->setSpacing( spacingHint() );
137 136
138 mTopLayout->addWidget( mMainWidget ); 137 mTopLayout->addWidget( mMainWidget );
139 138
140 QBoxLayout *buttonLayout = new QHBoxLayout; 139 QBoxLayout *buttonLayout = new QHBoxLayout;
141 mTopLayout->addLayout( buttonLayout ); 140 mTopLayout->addLayout( buttonLayout );
142 141
143 if ( mUser1Button ) buttonLayout->addWidget( mUser1Button ); 142 if ( mUser1Button ) buttonLayout->addWidget( mUser1Button );
@@ -207,3 +206,3 @@ QPushButton *KDialogBase::findButton( ButtonCode id )
207 button = mCancelButton; 206 button = mCancelButton;
208 break; 207 break;
209 case Default: 208 case Default:
@@ -215,3 +214,3 @@ QPushButton *KDialogBase::findButton( ButtonCode id )
215 default: 214 default:
216 break; 215 break;
217 } 216 }
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
@@ -45,2 +45,5 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch
45 //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); 45 //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *)));
46
47 connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) );
48
46 _baseGroup = baseGroup; 49 _baseGroup = baseGroup;
@@ -51,3 +54,3 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch
51#else 54#else
52 resize(640,480); 55 resize(640,480);
53 setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480)); 56 setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480));
@@ -55,3 +58,3 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch
55#endif 58#endif
56 59
57} 60}
@@ -67,3 +70,3 @@ void KCMultiDialog::slotDefault()
67 int curPageIndex = mMainWidget->activePageIndex(); 70 int curPageIndex = mMainWidget->activePageIndex();
68 71
69 QPtrListIterator<KCModule> it(modules); 72 QPtrListIterator<KCModule> it(modules);
@@ -78,3 +81,3 @@ void KCMultiDialog::slotDefault()
78 } 81 }
79 82
80} 83}
@@ -91,3 +94,3 @@ qDebug("KCMultiDialog::slotApply clicked");
91 emit applyClicked(); 94 emit applyClicked();
92 95
93} 96}
@@ -98,3 +101,3 @@ void KCMultiDialog::slotOk()
98qDebug("KCMultiDialog::slotOk clicked"); 101qDebug("KCMultiDialog::slotOk clicked");
99 102
100 QPtrListIterator<KCModule> it(modules); 103 QPtrListIterator<KCModule> it(modules);
@@ -121,3 +124,3 @@ void KCMultiDialog::slotHelp()
121 } 124 }
122*/ 125*/
123} 126}
@@ -129,3 +132,3 @@ void KCMultiDialog::clientChanged(bool state)
129 132
130/*US 133/*US
131void KCMultiDialog::addModule(const QString& path, bool withfallback) 134void KCMultiDialog::addModule(const QString& path, bool withfallback)
@@ -159,3 +162,3 @@ void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename,
159 connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); 162 connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
160 163
161 164
@@ -199,3 +202,3 @@ void KCMultiDialog::slotAboutToShow(QWidget *page)
199 202
200qDebug("KCMultiDialog::slotAboutToShow not implemented"); 203qDebug("KCMultiDialog::slotAboutToShow not implemented");
201} 204}