-rw-r--r-- | korganizer/kofilterview.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 361eec8..19d731f 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -222,25 +222,33 @@ void KOCalEditView::deleteCal( int id ) | |||
222 | if ( KMessageBox::warningContinueCancel( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b><tr> Do you want to remove this calendar from KO/Pi? (The file is not removed, of course!)").arg(name).arg(file) ) != KMessageBox::Continue ) return; | 222 | if ( KMessageBox::warningContinueCancel( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b><tr> Do you want to remove this calendar from KO/Pi? (The file is not removed, of course!)").arg(name).arg(file) ) != KMessageBox::Continue ) return; |
223 | if ( kkf->isStandard ) | 223 | if ( kkf->isStandard ) |
224 | selectStdCal( 1, true ); | 224 | selectStdCal( 1, true ); |
225 | emit removeCalendar ( id ); | 225 | emit removeCalendar ( id ); |
226 | KOPrefs::instance()->mCalendars.remove ( kkf ); | 226 | KOPrefs::instance()->mCalendars.remove ( kkf ); |
227 | emit needsUpdate(); | 227 | emit needsUpdate(); |
228 | readConfig(); | 228 | readConfig(); |
229 | } | 229 | } |
230 | void KOCalEditView::infoCal( int id ) | 230 | void KOCalEditView::infoCal( int id ) |
231 | { | 231 | { |
232 | QString name = KOPrefs::instance()->getCalendar( id )->mName; | 232 | QString name = KOPrefs::instance()->getCalendar( id )->mName; |
233 | QString file = KOPrefs::instance()->getCalendar( id )->mFileName; | 233 | QString file = KOPrefs::instance()->getCalendar( id )->mFileName; |
234 | KMessageBox::information( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) ); | 234 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { |
235 | if ( KMessageBox::Yes == KMessageBox::questionYesNo( this, i18n("The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) { | ||
236 | emit calendarAdded( id ); | ||
237 | readConfig(); | ||
238 | emit needsUpdate(); | ||
239 | } | ||
240 | } | ||
241 | else | ||
242 | KMessageBox::information( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) ); | ||
235 | } | 243 | } |
236 | void KOCalEditView::readConfig() | 244 | void KOCalEditView::readConfig() |
237 | { | 245 | { |
238 | 246 | ||
239 | mStdandardB.clear(); | 247 | mStdandardB.clear(); |
240 | mEnabledB.clear(); | 248 | mEnabledB.clear(); |
241 | mAlarmB.clear(); | 249 | mAlarmB.clear(); |
242 | mROB.clear(); | 250 | mROB.clear(); |
243 | 251 | ||
244 | if ( mw ) delete mw; | 252 | if ( mw ) delete mw; |
245 | mw = new QWidget ( this ); | 253 | mw = new QWidget ( this ); |
246 | ml->addWidget ( mw ); | 254 | ml->addWidget ( mw ); |
@@ -285,44 +293,52 @@ void KOCalEditView::readConfig() | |||
285 | #endif | 293 | #endif |
286 | 294 | ||
287 | 295 | ||
288 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 296 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
289 | int row = 1; | 297 | int row = 1; |
290 | while ( kkf ) { | 298 | while ( kkf ) { |
291 | 299 | ||
292 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); | 300 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); |
293 | mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); | 301 | mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); |
294 | cb->setChecked( kkf->isStandard ); | 302 | cb->setChecked( kkf->isStandard ); |
295 | cb->setNum( kkf->mCalNumber ); | 303 | cb->setNum( kkf->mCalNumber ); |
296 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); | 304 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); |
305 | if ( kkf->mErrorOnLoad ) | ||
306 | cb->setEnabled( false ); | ||
297 | cb = new KOCalCheckButton( mw ); | 307 | cb = new KOCalCheckButton( mw ); |
298 | mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb ); | 308 | mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb ); |
299 | cb->setChecked( kkf->isEnabled ); | 309 | cb->setChecked( kkf->isEnabled ); |
300 | cb->setNum( kkf->mCalNumber ); | 310 | cb->setNum( kkf->mCalNumber ); |
311 | if ( kkf->mErrorOnLoad ) | ||
312 | cb->setEnabled( false ); | ||
301 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); | 313 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); |
302 | KOCalButton* name = new KOCalButton( mw ); | 314 | KOCalButton* name = new KOCalButton( mw ); |
303 | name->setNum( kkf->mCalNumber ); | 315 | name->setNum( kkf->mCalNumber ); |
304 | name->setText( kkf->mName ); | 316 | name->setText( kkf->mName ); |
305 | mainLayout->addWidget( name,row,2 ); | 317 | mainLayout->addWidget( name,row,2 ); |
306 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); | 318 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); |
307 | cb = new KOCalCheckButton( mw ); | 319 | cb = new KOCalCheckButton( mw ); |
308 | mainLayout->addWidget( cb,row,3 );mAlarmB.append( cb ); | 320 | mainLayout->addWidget( cb,row,3 );mAlarmB.append( cb ); |
309 | cb->setChecked( kkf->isAlarmEnabled ); | 321 | cb->setChecked( kkf->isAlarmEnabled ); |
310 | cb->setNum( kkf->mCalNumber ); | 322 | cb->setNum( kkf->mCalNumber ); |
311 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) ); | 323 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) ); |
324 | if ( kkf->mErrorOnLoad ) | ||
325 | cb->setEnabled( false ); | ||
312 | cb = new KOCalCheckButton( mw ); | 326 | cb = new KOCalCheckButton( mw ); |
313 | mainLayout->addWidget( cb,row,4 );mROB.append( cb ); | 327 | mainLayout->addWidget( cb,row,4 );mROB.append( cb ); |
314 | cb->setChecked( kkf->isReadOnly ); | 328 | cb->setChecked( kkf->isReadOnly ); |
315 | cb->setNum( kkf->mCalNumber ); | 329 | cb->setNum( kkf->mCalNumber ); |
316 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) ); | 330 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) ); |
331 | if ( kkf->mErrorOnLoad ) | ||
332 | cb->setEnabled( false ); | ||
317 | KColorButton *colb = new KColorButton( mw ); | 333 | KColorButton *colb = new KColorButton( mw ); |
318 | mainLayout->addWidget( colb,row,5 ); | 334 | mainLayout->addWidget( colb,row,5 ); |
319 | colb->setID( kkf->mCalNumber ); | 335 | colb->setID( kkf->mCalNumber ); |
320 | colb->setColor( kkf->mDefaultColor ); | 336 | colb->setColor( kkf->mDefaultColor ); |
321 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); | 337 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); |
322 | if ( row > 1) { | 338 | if ( row > 1) { |
323 | KOCalButton* calb = new KOCalButton( mw ); | 339 | KOCalButton* calb = new KOCalButton( mw ); |
324 | mainLayout->addWidget( calb,row,6 ); | 340 | mainLayout->addWidget( calb,row,6 ); |
325 | calb->setNum( kkf->mCalNumber ); | 341 | calb->setNum( kkf->mCalNumber ); |
326 | calb->setPixmap ( SmallIcon("minus")); | 342 | calb->setPixmap ( SmallIcon("minus")); |
327 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); | 343 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); |
328 | int hei = calb->sizeHint().height(); | 344 | int hei = calb->sizeHint().height(); |