-rw-r--r-- | microkde/kdialogbase.cpp | 25 |
1 files changed, 12 insertions, 13 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() | |||
15 | 15 | ||
16 | KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal, | 16 | KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal, |
17 | const QString &caption, | 17 | const QString &caption, |
18 | int buttonMask, ButtonCode defaultButton, | 18 | int buttonMask, ButtonCode defaultButton, |
19 | bool separator, | 19 | bool separator, |
20 | const QString &user1, | 20 | const QString &user1, |
21 | const QString &user2, | 21 | const QString &user2, |
22 | const QString &user3) : | 22 | const QString &user3) : |
23 | KDialog( parent, name, modal ) | 23 | KDialog( parent, name, modal ) |
@@ -27,11 +27,11 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal, | |||
27 | (findButton( defaultButton ) )->setFocus(); | 27 | (findButton( defaultButton ) )->setFocus(); |
28 | 28 | ||
29 | } | 29 | } |
30 | 30 | ||
31 | KDialogBase::KDialogBase( int dialogFace, const QString &caption, | 31 | KDialogBase::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, |
35 | const QString &user1, | 35 | const QString &user1, |
36 | const QString &user2, | 36 | const QString &user2, |
37 | const QString &user3) : | 37 | const QString &user3) : |
@@ -77,9 +77,8 @@ void KDialogBase::init( const QString &caption, int buttonMask, | |||
77 | } else { | 77 | } else { |
78 | mOkButton = 0; | 78 | mOkButton = 0; |
79 | } | 79 | } |
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 ); |
83 | connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); | 82 | connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); |
84 | } else { | 83 | } else { |
85 | mDefaultButton = 0; | 84 | mDefaultButton = 0; |
@@ -103,9 +102,9 @@ void KDialogBase::init( const QString &caption, int buttonMask, | |||
103 | mCloseButton = new QPushButton( i18n("Close"), this ); | 102 | mCloseButton = new QPushButton( i18n("Close"), this ); |
104 | connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) ); | 103 | connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) ); |
105 | } else { | 104 | } else { |
106 | mCloseButton = 0; | 105 | mCloseButton = 0; |
107 | } | 106 | } |
108 | } | 107 | } |
109 | 108 | ||
110 | QTabWidget *KDialogBase::tabWidget() | 109 | QTabWidget *KDialogBase::tabWidget() |
111 | { | 110 | { |
@@ -124,23 +123,23 @@ void KDialogBase::hideButtons() | |||
124 | if ( mApplyButton ) mApplyButton->hide() ; | 123 | if ( mApplyButton ) mApplyButton->hide() ; |
125 | if ( mDefaultButton ) mDefaultButton->hide(); | 124 | if ( mDefaultButton ) mDefaultButton->hide(); |
126 | if ( mCancelButton ) mCancelButton->hide() ; | 125 | if ( mCancelButton ) mCancelButton->hide() ; |
127 | if ( mCloseButton ) mCloseButton->hide() ; | 126 | if ( mCloseButton ) mCloseButton->hide() ; |
128 | 127 | ||
129 | } | 128 | } |
130 | void KDialogBase::initLayout() | 129 | void KDialogBase::initLayout() |
131 | { | 130 | { |
132 | 131 | ||
133 | delete mTopLayout; | 132 | delete mTopLayout; |
134 | mTopLayout = new QVBoxLayout( this ); | 133 | mTopLayout = new QVBoxLayout( this ); |
135 | mTopLayout->setMargin( marginHint() ); | 134 | mTopLayout->setMargin( marginHint() ); |
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 ); |
144 | if ( mUser2Button ) buttonLayout->addWidget( mUser2Button ); | 143 | if ( mUser2Button ) buttonLayout->addWidget( mUser2Button ); |
145 | if ( mOkButton ) buttonLayout->addWidget( mOkButton ); | 144 | if ( mOkButton ) buttonLayout->addWidget( mOkButton ); |
146 | if ( mApplyButton ) buttonLayout->addWidget( mApplyButton ); | 145 | if ( mApplyButton ) buttonLayout->addWidget( mApplyButton ); |
@@ -204,17 +203,17 @@ QPushButton *KDialogBase::findButton( ButtonCode id ) | |||
204 | button = mUser2Button; | 203 | button = mUser2Button; |
205 | break; | 204 | break; |
206 | case Cancel: | 205 | case Cancel: |
207 | button = mCancelButton; | 206 | button = mCancelButton; |
208 | break; | 207 | break; |
209 | case Default: | 208 | case Default: |
210 | button = mDefaultButton; | 209 | button = mDefaultButton; |
211 | break; | 210 | break; |
212 | case Close: | 211 | case Close: |
213 | button = mCloseButton; | 212 | button = mCloseButton; |
214 | break; | 213 | break; |
215 | default: | 214 | default: |
216 | break; | 215 | break; |
217 | } | 216 | } |
218 | return button; | 217 | return button; |
219 | } | 218 | } |
220 | 219 | ||