author | zautrix <zautrix> | 2005-06-25 09:40:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-25 09:40:16 (UTC) |
commit | b81bdd12cadbae5a3ab5a7f1f689bb4ae45cf315 (patch) (unidiff) | |
tree | f56786fad0627a81fb175c363447da2c99f63429 /korganizer/kofilterview.cpp | |
parent | 5ee9f9bbbdfaa8c1bf9c07ce295fe3a6b0b49c98 (diff) | |
download | kdepimpi-b81bdd12cadbae5a3ab5a7f1f689bb4ae45cf315.zip kdepimpi-b81bdd12cadbae5a3ab5a7f1f689bb4ae45cf315.tar.gz kdepimpi-b81bdd12cadbae5a3ab5a7f1f689bb4ae45cf315.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/kofilterview.cpp | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index ce2880a..9709324 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -136,26 +136,26 @@ void KOCalEditView::selectStdCal( int id, bool b ) | |||
136 | { | 136 | { |
137 | 137 | ||
138 | if ( !b ) { | 138 | if ( !b ) { |
139 | KOCalCheckButton* it = (KOCalCheckButton*) sender(); | 139 | KOCalCheckButton* it = (KOCalCheckButton*) sender(); |
140 | if ( it ) { | 140 | if ( it ) { |
141 | it->blockSignals( true ); | 141 | it->blockSignals( true ); |
142 | it->setChecked( true ); | 142 | it->setChecked( true ); |
143 | it->blockSignals( false ); | 143 | it->blockSignals( false ); |
144 | return; | 144 | return; |
145 | } | 145 | } |
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() ) { |
152 | if ( it != sen ) { | 152 | if ( it != sen ) { |
153 | it->blockSignals( true ); | 153 | it->blockSignals( true ); |
154 | it->setChecked( false ); | 154 | it->setChecked( false ); |
155 | it->blockSignals( false ); | 155 | it->blockSignals( false ); |
156 | break; | 156 | break; |
157 | } | 157 | } |
158 | } | 158 | } |
159 | it = mStdandardB.next(); | 159 | it = mStdandardB.next(); |
160 | } | 160 | } |
161 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 161 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
@@ -227,25 +227,27 @@ void KOCalEditView::readConfig() | |||
227 | mROB.clear(); | 227 | mROB.clear(); |
228 | 228 | ||
229 | if ( mw ) delete mw; | 229 | if ( mw ) delete mw; |
230 | mw = new QWidget ( viewport() ); | 230 | mw = new QWidget ( viewport() ); |
231 | addChild(mw); | 231 | addChild(mw); |
232 | int ii = 0; | 232 | int ii = 0; |
233 | mainLayout = new QGridLayout ( mw , 2, 8 ); | 233 | mainLayout = new QGridLayout ( mw , 2, 8 ); |
234 | mainLayout->setMargin( 2 ); | 234 | mainLayout->setMargin( 2 ); |
235 | mainLayout->setSpacing( 2 ); | 235 | mainLayout->setSpacing( 2 ); |
236 | QPushButton * addBut = new QPushButton ( mw ); | 236 | QPushButton * addBut = new QPushButton ( mw ); |
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(); |
242 | addBut = new QPushButton ( mw ); | 244 | addBut = new QPushButton ( mw ); |
243 | addBut->setFocusPolicy(NoFocus); | 245 | addBut->setFocusPolicy(NoFocus); |
244 | mainLayout->addWidget( addBut,0,++ii ); | 246 | mainLayout->addWidget( addBut,0,++ii ); |
245 | addBut->setPixmap ( SmallIcon("eye")); | 247 | addBut->setPixmap ( SmallIcon("eye")); |
246 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); | 248 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); |
247 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 249 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
248 | 250 | ||
249 | QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); | 251 | QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); |
250 | mainLayout->addWidget( lab,0,++ii ); | 252 | mainLayout->addWidget( lab,0,++ii ); |
251 | //lab = new QLabel ( i18n(" "), mw ); | 253 | //lab = new QLabel ( i18n(" "), mw ); |
@@ -281,32 +283,32 @@ void KOCalEditView::readConfig() | |||
281 | addBut = new QPushButton ( mw ); | 283 | addBut = new QPushButton ( mw ); |
282 | mainLayout->addWidget( addBut,0,6 ); | 284 | mainLayout->addWidget( addBut,0,6 ); |
283 | addBut->setPixmap ( SmallIcon("minus")); | 285 | addBut->setPixmap ( SmallIcon("minus")); |
284 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); | 286 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); |
285 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 287 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
286 | #endif | 288 | #endif |
287 | 289 | ||
288 | 290 | ||
289 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 291 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
290 | int row = 1; | 292 | int row = 1; |
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 ); |
303 | cb->setNum( kkf->mCalNumber ); | 305 | cb->setNum( kkf->mCalNumber ); |
304 | if ( kkf->mErrorOnLoad ) | 306 | if ( kkf->mErrorOnLoad ) |
305 | cb->setEnabled( false ); | 307 | cb->setEnabled( false ); |
306 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); | 308 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); |
307 | KOCalButton* name = new KOCalButton( mw ); | 309 | KOCalButton* name = new KOCalButton( mw ); |
308 | name->setNum( kkf->mCalNumber ); | 310 | name->setNum( kkf->mCalNumber ); |
309 | name->setText( kkf->mName ); | 311 | name->setText( kkf->mName ); |
310 | mainLayout->addWidget( name,row,++iii ); | 312 | mainLayout->addWidget( name,row,++iii ); |
311 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); | 313 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); |
312 | //lab = new QLabel (" ", mw ); | 314 | //lab = new QLabel (" ", mw ); |
@@ -338,24 +340,30 @@ void KOCalEditView::readConfig() | |||
338 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); | 340 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); |
339 | int hei = calb->sizeHint().height(); | 341 | int hei = calb->sizeHint().height(); |
340 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); | 342 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); |
341 | } | 343 | } |
342 | ++row; | 344 | ++row; |
343 | kkf = KOPrefs::instance()->mCalendars.next(); | 345 | kkf = KOPrefs::instance()->mCalendars.next(); |
344 | } | 346 | } |
345 | lab = new QLabel ( "", mw ); | 347 | lab = new QLabel ( "", mw ); |
346 | mainLayout->addWidget( lab,row,0 ); | 348 | mainLayout->addWidget( lab,row,0 ); |
347 | mw->show(); | 349 | mw->show(); |
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 | { |
352 | bool tryagain = true; | 360 | bool tryagain = true; |
353 | QString name, file; | 361 | QString name, file; |
354 | while ( tryagain ) { | 362 | while ( tryagain ) { |
355 | KONewCalPrefs prefs ( this ); | 363 | KONewCalPrefs prefs ( this ); |
356 | prefs.nameE->setText( name ); | 364 | prefs.nameE->setText( name ); |
357 | prefs.url->setURL( file ); | 365 | prefs.url->setURL( file ); |
358 | if ( ! prefs.exec() ) | 366 | if ( ! prefs.exec() ) |
359 | return; | 367 | return; |
360 | name = prefs.calName(); | 368 | name = prefs.calName(); |
361 | file = prefs.calFileName(); | 369 | file = prefs.calFileName(); |