1 files changed, 54 insertions, 41 deletions

diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 20118aa..1335d7e 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -134,26 +134,9 @@ void KOCalEditView::selectCal(int id ,bool b)
 }
-void KOCalEditView::selectStdCal( int id, bool b )
+void KOCalEditView::selectStdCal( int id  )
 {
-
-    if ( !b ) {
-        KOCalCheckButton* it = (KOCalCheckButton*) sender();
-        if ( it ) {
-            it->blockSignals( true );
-            it->setChecked( true );
-            it->blockSignals( false );
-            return;
-        }
-        return;
-    }
-    KOCalRadioButton* sen = (KOCalRadioButton*) sender();
     KOCalRadioButton* it = mStdandardB.first();
     while ( it ) {
-        if ( it->isChecked() ) {
-            if ( it != sen ) {
-                it->blockSignals( true );
-                it->setChecked( false );
-                it->blockSignals( false );
-                break;
-            }
-        }
+        it->blockSignals( true );
+        it->setChecked( it->num() == id );
+        it->blockSignals( false );
         it = mStdandardB.next();
@@ -162,6 +145,5 @@ void KOCalEditView::selectStdCal( int id, bool b )
     while ( kkf ) {
-        kkf->isStandard = false;
+        kkf->isStandard = (kkf->mCalNumber == id );
         kkf = KOPrefs::instance()->mCalendars.next();
     }
-    KOPrefs::instance()->getCalendar( id )->isStandard = true;
     emit setCalendarDefault ( id );
@@ -179,8 +161,15 @@ void KOCalEditView::selectReadOnly(int id ,bool b )
     emit calendarReadonly ( id , b );
-    if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) {
-        KOPrefs::instance()->getCalendar( id )->isStandard = false;
-        KOPrefs::instance()->getCalendar( 1 )->isStandard = true;
-        mStdandardB.at(0)->setChecked( true );
-        mStdandardB.at(id-1)->setChecked( false );
-        emit setCalendarDefault ( 1 );
+    if ( KOPrefs::instance()->getCalendar( id )->isStandard && b ) {
+        findNewStandard(); 
+    } else {
+        if ( !b ){
+            KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+            while ( kkf ) {
+                if (kkf->isReadOnly && kkf->isStandard ) {
+                    selectStdCal( id );
+                    break;
+                }
+                kkf = KOPrefs::instance()->mCalendars.next();
+            }
+        }
     }
@@ -190,2 +179,21 @@ void KOCalEditView::selectReadOnly(int id ,bool b )
 }
+void KOCalEditView::findNewStandard()
+{ 
+    bool found = false;
+    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+    while ( kkf ) {
+        if (!kkf->isReadOnly && !kkf->mErrorOnLoad ) {
+            found = true;
+            selectStdCal( kkf->mCalNumber );
+            break;
+        }
+        kkf = KOPrefs::instance()->mCalendars.next();
+    }
+    if ( !found ) {
+        KMessageBox::error( this,i18n("\nNO\n WRITEABLE\n   CALENDAR\n      FOUND!\n\nPlease fix your calendar settings!\n"),
+                    i18n("Houston, we have a problem!") );
+
+    }
+}
+
 void KOCalEditView::setColor( const QColor& c, int id )
@@ -201,6 +209,6 @@ void KOCalEditView::deleteCal( int id )
     if ( KMessageBox::warningContinueCancel( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return;
-    if ( kkf->isStandard )
-        selectStdCal( 1, true );
+    bool findnewstd =  kkf->isStandard;
     emit removeCalendar ( id );
     KOPrefs::instance()->mCalendars.remove ( kkf );
+    if ( findnewstd  ) findNewStandard();
     emit needsUpdate();
@@ -286,2 +294,3 @@ void KOCalEditView::readConfig()
     int row = 1;
+    bool errorLoadStandard = false;
     while ( kkf ) {
@@ -291,4 +300,6 @@ void KOCalEditView::readConfig()
         rb->setChecked( kkf->isStandard );
+        if ( kkf->isStandard && ( kkf->mErrorOnLoad || kkf->isReadOnly ) )
+            errorLoadStandard = true;
         rb->setNum( kkf->mCalNumber );
-        connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
+        connect (rb, SIGNAL (selectNum(int)), SLOT ( selectStdCal(int) ) );
         if ( kkf->mErrorOnLoad ||  kkf->isReadOnly )
@@ -297,3 +308,3 @@ void KOCalEditView::readConfig()
         mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb );
-        cb->setChecked( kkf->isEnabled );
+        cb->setChecked( kkf->isEnabled && !kkf->mErrorOnLoad );
         cb->setNum( kkf->mCalNumber );
@@ -311,3 +322,3 @@ void KOCalEditView::readConfig()
         mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb );
-        cb->setChecked( kkf->isAlarmEnabled );
+        cb->setChecked( kkf->isAlarmEnabled && !kkf->mErrorOnLoad);
         cb->setNum( kkf->mCalNumber );
@@ -340,2 +351,4 @@ void KOCalEditView::readConfig()
     }
+    if ( errorLoadStandard ) 
+        findNewStandard();
     lab = new QLabel (  "", mw );
@@ -346,3 +359,2 @@ void KOCalEditView::readConfig()
 
-
 void KOCalEditView::defaultInfo()
@@ -433,11 +445,11 @@ void KOCalEditView::disableRO()
 {
-    toggleList( mROB );
+    toggleList( mROB, false );
 }
-void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list )
+void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list , bool enable )
 {
-    bool dis = false;
+    bool dis = !enable;
     KOCalCheckButton* it = list.first();
     while ( it ) {
-        if ( !it->isChecked() ) {
-            dis = true;
+        if ( !it->isChecked() == enable && it->isEnabled() ) {
+            dis = !dis;
             break;
@@ -448,3 +460,4 @@ void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list )
     while ( it ) {
-        it->setChecked(dis);
+        if ( it->isEnabled() )
+            it->setChecked(dis);
         it = list.next();