-rw-r--r-- | korganizer/kofilterview.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 9633b2c..3333ac2 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -206,7 +206,13 @@ void KOCalEditView::selectReadOnly(int id ,bool b ) | |||
206 | { | 206 | { |
207 | KOPrefs::instance()->getCalendar( id )->isReadOnly = b; | 207 | KOPrefs::instance()->getCalendar( id )->isReadOnly = b; |
208 | emit calendarReadonly ( id , b ); | 208 | emit calendarReadonly ( id , b ); |
209 | if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) { | ||
210 | KOPrefs::instance()->getCalendar( id )->isStandard = false; | ||
211 | KOPrefs::instance()->getCalendar( 1 )->isStandard = true; | ||
212 | emit setCalendarDefault ( 1 ); | ||
213 | } | ||
209 | emit needsUpdate(); | 214 | emit needsUpdate(); |
215 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | ||
210 | 216 | ||
211 | } | 217 | } |
212 | void KOCalEditView::setColor( const QColor& c, int id ) | 218 | void KOCalEditView::setColor( const QColor& c, int id ) |
@@ -225,7 +231,7 @@ void KOCalEditView::deleteCal( int id ) | |||
225 | emit removeCalendar ( id ); | 231 | emit removeCalendar ( id ); |
226 | KOPrefs::instance()->mCalendars.remove ( kkf ); | 232 | KOPrefs::instance()->mCalendars.remove ( kkf ); |
227 | emit needsUpdate(); | 233 | emit needsUpdate(); |
228 | readConfig(); | 234 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
229 | } | 235 | } |
230 | void KOCalEditView::infoCal( int id ) | 236 | void KOCalEditView::infoCal( int id ) |
231 | { | 237 | { |
@@ -234,8 +240,8 @@ void KOCalEditView::infoCal( int id ) | |||
234 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { | 240 | 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) ) ) { | 241 | 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 ); | 242 | emit calendarAdded( id ); |
237 | readConfig(); | ||
238 | emit needsUpdate(); | 243 | emit needsUpdate(); |
244 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | ||
239 | } | 245 | } |
240 | } | 246 | } |
241 | else | 247 | else |
@@ -302,7 +308,7 @@ void KOCalEditView::readConfig() | |||
302 | cb->setChecked( kkf->isStandard ); | 308 | cb->setChecked( kkf->isStandard ); |
303 | cb->setNum( kkf->mCalNumber ); | 309 | cb->setNum( kkf->mCalNumber ); |
304 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); | 310 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); |
305 | if ( kkf->mErrorOnLoad ) | 311 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) |
306 | cb->setEnabled( false ); | 312 | cb->setEnabled( false ); |
307 | cb = new KOCalCheckButton( mw ); | 313 | cb = new KOCalCheckButton( mw ); |
308 | mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb ); | 314 | mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb ); |
@@ -368,8 +374,8 @@ void KOCalEditView::addCal() | |||
368 | kkf->mName = name; | 374 | kkf->mName = name; |
369 | kkf->mFileName = file; | 375 | kkf->mFileName = file; |
370 | emit calendarAdded( kkf->mCalNumber ); | 376 | emit calendarAdded( kkf->mCalNumber ); |
371 | readConfig(); | ||
372 | emit needsUpdate(); | 377 | emit needsUpdate(); |
378 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | ||
373 | } | 379 | } |
374 | void KOCalEditView::enableAll() | 380 | void KOCalEditView::enableAll() |
375 | { | 381 | { |