-rw-r--r-- | microkde/kdialogbase.cpp | 5 | ||||
-rw-r--r-- | microkde/kdialogbase.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp index 11635e1..d5c7e61 100644 --- a/microkde/kdialogbase.cpp +++ b/microkde/kdialogbase.cpp | |||
@@ -241,56 +241,61 @@ void KDialogBase::showButton( ButtonCode id, bool show ) | |||
241 | if ( show ) button->show(); | 241 | if ( show ) button->show(); |
242 | else button->hide(); | 242 | else button->hide(); |
243 | } | 243 | } |
244 | } | 244 | } |
245 | 245 | ||
246 | int KDialogBase::pageIndex( QWidget *widget ) const | 246 | int KDialogBase::pageIndex( QWidget *widget ) const |
247 | { | 247 | { |
248 | return 0; | 248 | return 0; |
249 | } | 249 | } |
250 | 250 | ||
251 | 251 | ||
252 | bool KDialogBase::showPage( int index ) | 252 | bool KDialogBase::showPage( int index ) |
253 | { | 253 | { |
254 | tabWidget()->setCurrentPage( index );return false; | 254 | tabWidget()->setCurrentPage( index );return false; |
255 | } | 255 | } |
256 | 256 | ||
257 | QFrame *KDialogBase::plainPage() | 257 | QFrame *KDialogBase::plainPage() |
258 | { | 258 | { |
259 | if ( !mPlainPage ) { | 259 | if ( !mPlainPage ) { |
260 | mPlainPage = new QFrame( this ); | 260 | mPlainPage = new QFrame( this ); |
261 | setMainWidget( mPlainPage ); | 261 | setMainWidget( mPlainPage ); |
262 | } | 262 | } |
263 | return mPlainPage; | 263 | return mPlainPage; |
264 | } | 264 | } |
265 | 265 | ||
266 | void KDialogBase::slotOk() | 266 | void KDialogBase::slotOk() |
267 | { | 267 | { |
268 | emit okClicked(); | 268 | emit okClicked(); |
269 | accept(); | 269 | accept(); |
270 | } | 270 | } |
271 | 271 | ||
272 | void KDialogBase::slotApply() | 272 | void KDialogBase::slotApply() |
273 | { | 273 | { |
274 | emit applyClicked(); | 274 | emit applyClicked(); |
275 | } | 275 | } |
276 | 276 | ||
277 | void KDialogBase::slotCancel() | 277 | void KDialogBase::slotCancel() |
278 | { | 278 | { |
279 | emit cancelClicked(); | 279 | emit cancelClicked(); |
280 | reject(); | 280 | reject(); |
281 | } | 281 | } |
282 | 282 | ||
283 | void KDialogBase::slotClose() | 283 | void KDialogBase::slotClose() |
284 | { | 284 | { |
285 | emit closeClicked(); | 285 | emit closeClicked(); |
286 | reject(); | 286 | reject(); |
287 | } | 287 | } |
288 | 288 | ||
289 | void KDialogBase::accept () | ||
290 | { | ||
291 | emit acceptClicked(); | ||
292 | KDialog::accept(); | ||
293 | } | ||
289 | void KDialogBase::slotUser1() | 294 | void KDialogBase::slotUser1() |
290 | { | 295 | { |
291 | emit user1Clicked(); | 296 | emit user1Clicked(); |
292 | } | 297 | } |
293 | void KDialogBase::slotUser2() | 298 | void KDialogBase::slotUser2() |
294 | { | 299 | { |
295 | emit user2Clicked(); | 300 | emit user2Clicked(); |
296 | } | 301 | } |
diff --git a/microkde/kdialogbase.h b/microkde/kdialogbase.h index a2fc2dc..17c186b 100644 --- a/microkde/kdialogbase.h +++ b/microkde/kdialogbase.h | |||
@@ -62,80 +62,82 @@ class KDialogBase : public KDialog | |||
62 | QFrame *addPage( const QString & ); | 62 | QFrame *addPage( const QString & ); |
63 | QFrame *addPage( const QString &, int, const QPixmap & ); | 63 | QFrame *addPage( const QString &, int, const QPixmap & ); |
64 | 64 | ||
65 | void setMainWidget( QWidget *widget ); | 65 | void setMainWidget( QWidget *widget ); |
66 | 66 | ||
67 | void setButtonText( ButtonCode id, const QString &text ); | 67 | void setButtonText( ButtonCode id, const QString &text ); |
68 | 68 | ||
69 | void enableButton( ButtonCode id, bool state ); | 69 | void enableButton( ButtonCode id, bool state ); |
70 | void enableButtonOK( bool state ); | 70 | void enableButtonOK( bool state ); |
71 | void enableButtonApply( bool state ); | 71 | void enableButtonApply( bool state ); |
72 | 72 | ||
73 | void showButton( ButtonCode, bool show ); | 73 | void showButton( ButtonCode, bool show ); |
74 | 74 | ||
75 | int pageIndex( QWidget *widget ) const; | 75 | int pageIndex( QWidget *widget ) const; |
76 | 76 | ||
77 | bool showPage( int index ); | 77 | bool showPage( int index ); |
78 | void hideButtons(); | 78 | void hideButtons(); |
79 | 79 | ||
80 | QFrame *plainPage(); | 80 | QFrame *plainPage(); |
81 | 81 | ||
82 | signals: | 82 | signals: |
83 | void user1Clicked(); | 83 | void user1Clicked(); |
84 | void user2Clicked(); | 84 | void user2Clicked(); |
85 | /** | 85 | /** |
86 | * The Apply button was pressed. This signal is only emitted if | 86 | * The Apply button was pressed. This signal is only emitted if |
87 | * @ref slotApply() is not replaced. | 87 | * @ref slotApply() is not replaced. |
88 | */ | 88 | */ |
89 | void applyClicked(); | 89 | void applyClicked(); |
90 | 90 | ||
91 | /** | 91 | /** |
92 | * The OK button was pressed. This signal is only emitted if | 92 | * The OK button was pressed. This signal is only emitted if |
93 | * @ref slotOk() is not replaced. | 93 | * @ref slotOk() is not replaced. |
94 | */ | 94 | */ |
95 | void okClicked(); | 95 | void okClicked(); |
96 | 96 | ||
97 | /** | 97 | /** |
98 | * The Cancel button was pressed. This signal is only emitted if | 98 | * The Cancel button was pressed. This signal is only emitted if |
99 | * @ref slotCancel() is not replaced. | 99 | * @ref slotCancel() is not replaced. |
100 | */ | 100 | */ |
101 | void cancelClicked(); | 101 | void cancelClicked(); |
102 | 102 | ||
103 | /** | 103 | /** |
104 | * The Close button was pressed. This signal is only emitted if | 104 | * The Close button was pressed. This signal is only emitted if |
105 | * @ref slotClose() is not replaced. | 105 | * @ref slotClose() is not replaced. |
106 | */ | 106 | */ |
107 | void closeClicked(); | 107 | void closeClicked(); |
108 | void defaultClicked(); | 108 | void defaultClicked(); |
109 | 109 | ||
110 | void acceptClicked(); | ||
111 | |||
110 | protected slots: | 112 | protected slots: |
111 | virtual void slotOk(); | 113 | virtual void slotOk(); |
112 | virtual void slotApply(); | 114 | virtual void slotApply(); |
113 | virtual void slotCancel(); | 115 | virtual void slotCancel(); |
114 | virtual void slotClose(); | 116 | virtual void slotClose(); |
115 | virtual void slotUser1(); | 117 | virtual void slotUser1(); |
116 | virtual void slotUser2(); | 118 | virtual void slotUser2(); |
117 | 119 | virtual void accept (); | |
118 | protected: | 120 | protected: |
119 | QPushButton *findButton( ButtonCode ); | 121 | QPushButton *findButton( ButtonCode ); |
120 | QTabWidget *tabWidget(); | 122 | QTabWidget *tabWidget(); |
121 | 123 | ||
122 | private: | 124 | private: |
123 | void init( const QString &caption, int buttonMask, | 125 | void init( const QString &caption, int buttonMask, |
124 | const QString &user1=QString::null, const QString &user2=QString::null ); | 126 | const QString &user1=QString::null, const QString &user2=QString::null ); |
125 | void initLayout(); | 127 | void initLayout(); |
126 | 128 | ||
127 | QWidget *mMainWidget; | 129 | QWidget *mMainWidget; |
128 | QTabWidget *mTabWidget; | 130 | QTabWidget *mTabWidget; |
129 | QFrame *mPlainPage; | 131 | QFrame *mPlainPage; |
130 | QBoxLayout *mTopLayout; | 132 | QBoxLayout *mTopLayout; |
131 | 133 | ||
132 | QPushButton *mUser1Button; | 134 | QPushButton *mUser1Button; |
133 | QPushButton *mUser2Button; | 135 | QPushButton *mUser2Button; |
134 | QPushButton *mCloseButton; | 136 | QPushButton *mCloseButton; |
135 | QPushButton *mOkButton; | 137 | QPushButton *mOkButton; |
136 | QPushButton *mApplyButton; | 138 | QPushButton *mApplyButton; |
137 | QPushButton *mCancelButton; | 139 | QPushButton *mCancelButton; |
138 | QPushButton *mDefaultButton; | 140 | QPushButton *mDefaultButton; |
139 | }; | 141 | }; |
140 | 142 | ||
141 | #endif | 143 | #endif |