-rw-r--r-- | korganizer/kofilterview.cpp | 28 | ||||
-rw-r--r-- | korganizer/kofilterview.h | 32 |
2 files changed, 49 insertions, 11 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index ce2880a..9709324 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -146,6 +146,6 @@ void KOCalEditView::selectStdCal( int id, bool b ) | |||
146 | return; | 146 | return; |
147 | } | 147 | } |
148 | KOCalCheckButton* sen = (KOCalCheckButton*) sender(); | 148 | KOCalRadioButton* sen = (KOCalRadioButton*) sender(); |
149 | KOCalCheckButton* it = mStdandardB.first(); | 149 | KOCalRadioButton* it = mStdandardB.first(); |
150 | while ( it ) { | 150 | while ( it ) { |
151 | if ( it->isChecked() ) { | 151 | if ( it->isChecked() ) { |
@@ -237,5 +237,7 @@ void KOCalEditView::readConfig() | |||
237 | addBut->setFocusPolicy(NoFocus); | 237 | addBut->setFocusPolicy(NoFocus); |
238 | mainLayout->addWidget( addBut,0,0 ); | 238 | mainLayout->addWidget( addBut,0,0 ); |
239 | addBut->setPixmap ( SmallIcon("greenhook16")); | 239 | addBut->setText( "D"); |
240 | connect(addBut,SIGNAL(clicked()),SLOT(defaultInfo())); | ||
241 | //addBut->setPixmap ( SmallIcon("greenhook16")); | ||
240 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 242 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
241 | int max = addBut->sizeHint().height(); | 243 | int max = addBut->sizeHint().height(); |
@@ -291,12 +293,12 @@ void KOCalEditView::readConfig() | |||
291 | while ( kkf ) { | 293 | while ( kkf ) { |
292 | int iii = 0; | 294 | int iii = 0; |
293 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); | 295 | KOCalRadioButton* rb = new KOCalRadioButton( mw ); |
294 | mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); | 296 | mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb ); |
295 | cb->setChecked( kkf->isStandard ); | 297 | rb->setChecked( kkf->isStandard ); |
296 | cb->setNum( kkf->mCalNumber ); | 298 | rb->setNum( kkf->mCalNumber ); |
297 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); | 299 | connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); |
298 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) | 300 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) |
299 | cb->setEnabled( false ); | 301 | rb->setEnabled( false ); |
300 | cb = new KOCalCheckButton( mw ); | 302 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); |
301 | mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb ); | 303 | mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb ); |
302 | cb->setChecked( kkf->isEnabled ); | 304 | cb->setChecked( kkf->isEnabled ); |
@@ -348,4 +350,10 @@ void KOCalEditView::readConfig() | |||
348 | 350 | ||
349 | } | 351 | } |
352 | |||
353 | |||
354 | void KOCalEditView::defaultInfo() | ||
355 | { | ||
356 | KMessageBox::information( this, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") ); | ||
357 | } | ||
350 | void KOCalEditView::addCal() | 358 | void KOCalEditView::addCal() |
351 | { | 359 | { |
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index 5495d60..b57a6e9 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h | |||
@@ -26,4 +26,5 @@ | |||
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | #include <qcheckbox.h> | 27 | #include <qcheckbox.h> |
28 | #include <qradiobutton.h> | ||
28 | #include <qlayout.h> | 29 | #include <qlayout.h> |
29 | #include <qlabel.h> | 30 | #include <qlabel.h> |
@@ -149,4 +150,32 @@ private slots : | |||
149 | }; | 150 | }; |
150 | 151 | ||
152 | class KOCalRadioButton : public QRadioButton | ||
153 | { | ||
154 | Q_OBJECT | ||
155 | public: | ||
156 | KOCalRadioButton( QWidget *parent=0, const char *name=0 ) : | ||
157 | QRadioButton( parent, name) | ||
158 | { | ||
159 | connect( this, SIGNAL( toggled ( bool ) ), | ||
160 | SLOT( bottonClicked( bool ) )); | ||
161 | mNumber = -1; | ||
162 | setFocusPolicy(NoFocus); | ||
163 | //setMaximumWidth( 10 ); | ||
164 | |||
165 | } | ||
166 | void setNum ( int num ) {mNumber = num; } | ||
167 | signals: | ||
168 | void selectNum ( int, bool ); | ||
169 | private: | ||
170 | int mNumber; | ||
171 | void keyPressEvent ( QKeyEvent * e ) | ||
172 | { | ||
173 | e->ignore(); | ||
174 | } | ||
175 | |||
176 | private slots : | ||
177 | void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); } | ||
178 | }; | ||
179 | |||
151 | 180 | ||
152 | 181 | ||
@@ -195,4 +224,5 @@ class KOCalEditView : public QScrollView | |||
195 | void infoCal(int) ; | 224 | void infoCal(int) ; |
196 | void readConfig(); | 225 | void readConfig(); |
226 | void defaultInfo(); | ||
197 | signals: | 227 | signals: |
198 | void alarmEnabled ( int cal, bool enable ); | 228 | void alarmEnabled ( int cal, bool enable ); |
@@ -207,5 +237,5 @@ class KOCalEditView : public QScrollView | |||
207 | QWidget *mw; | 237 | QWidget *mw; |
208 | void toggleList ( QPtrList<KOCalCheckButton> ); | 238 | void toggleList ( QPtrList<KOCalCheckButton> ); |
209 | QPtrList<KOCalCheckButton> mStdandardB; | 239 | QPtrList<KOCalRadioButton> mStdandardB; |
210 | QPtrList<KOCalCheckButton> mEnabledB; | 240 | QPtrList<KOCalCheckButton> mEnabledB; |
211 | QPtrList<KOCalCheckButton> mAlarmB; | 241 | QPtrList<KOCalCheckButton> mAlarmB; |