1 files changed, 3 insertions, 10 deletions

diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 9709324..a8a3052 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -87,300 +87,293 @@ CalFilter *KOFilterView::selectedFilter()
 {
   CalFilter *f = mFilters->at(mSelectionCombo->currentItem());
   return f;
 }
 
 void KOFilterView::setSelectedFilter(QString filterName)
 {
   int filter_num = mSelectionCombo->count();
   int i;
   for (i=0;i<filter_num;i++) {
     if (mSelectionCombo->text(i)==filterName)
       mSelectionCombo->setCurrentItem(i);
   }
   emit filterChanged();
 }
 void KOFilterView::setSelectedFilter( int fil )
 { 
   if ( fil >= mSelectionCombo->count() )
       return;
   mSelectionCombo->setCurrentItem( fil );
   emit filterChanged();
 }
 
 
 
 KOCalEditView::KOCalEditView(QWidget* parent,
                            const char* name )
   : QScrollView(parent,name)
 {
     mw = 0; 
     setResizePolicy( AutoOneFit );
     setFrameStyle ( QFrame::Panel | QFrame::Plain );
     setLineWidth ( 1 ); 
     setMidLineWidth ( 1 ); 
     setFocusPolicy(NoFocus); 
 }
 
 KOCalEditView::~KOCalEditView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 void KOCalEditView::selectCal(int id ,bool b)
 {
     KOPrefs::instance()->getCalendar( id )->isEnabled = b;
     emit calendarEnabled ( id, b );
     emit needsUpdate();
 
 }
 void KOCalEditView::selectStdCal( int id, bool b )
 {
 
     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 = mStdandardB.next();
     }
    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     while ( kkf ) {
         kkf->isStandard = false;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     KOPrefs::instance()->getCalendar( id )->isStandard = true;
     emit setCalendarDefault ( id );
 }
 
 void KOCalEditView::selectCalAlarm(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b;
     emit alarmEnabled ( id , b );
     emit needsUpdate();
 }
 void KOCalEditView::selectReadOnly(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isReadOnly = 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 );
     }
+    mStdandardB.at(id-1)->setEnabled( !b );
     emit needsUpdate();
-    QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
     
 }
 void KOCalEditView::setColor( const QColor& c, int id )
 {
     KOPrefs::instance()->getCalendar( id )->mDefaultColor = c;
     emit needsUpdate();
 }
 void KOCalEditView::deleteCal( int id )
 {
     KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id );
     QString name = kkf->mName;
     QString file = KGlobal::formatMessage ( kkf->mFileName ,0 );
     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 );
     emit removeCalendar ( id );
     KOPrefs::instance()->mCalendars.remove ( kkf );
     emit needsUpdate();
     QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
 }
 void KOCalEditView::infoCal( int id )
 {
     QString name = KOPrefs::instance()->getCalendar( id )->mName;
     QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 );
     if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) {
         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) ) ) {
             emit calendarAdded( id );
             emit needsUpdate();
             QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
         }
     }
     else
         KMessageBox::information( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) );
 }
 void KOCalEditView::readConfig() 
 {
     
     mStdandardB.clear();
     mEnabledB.clear();
     mAlarmB.clear();
     mROB.clear();
 
     if ( mw ) delete mw;
     mw = new QWidget ( viewport() );
     addChild(mw);
     int ii = 0;
     mainLayout = new QGridLayout ( mw , 2, 8 );
     mainLayout->setMargin( 2 );
     mainLayout->setSpacing( 2 );
     QPushButton * addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,0 );
     addBut->setText( "D");
     connect(addBut,SIGNAL(clicked()),SLOT(defaultInfo()));
     //addBut->setPixmap ( SmallIcon("greenhook16"));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
     int max = addBut->sizeHint().height();
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("eye"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAll()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw );
     mainLayout->addWidget( lab,0,++ii ); 
     //lab = new QLabel ( i18n(" "), mw );
     //mainLayout->addWidget( lab,0,++ii );
     //lab->setFixedWidth( 1 );
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("bell"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("pencil"));
     connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
     lab = new QLabel ( "", mw );
     mainLayout->addWidget( lab,0,++ii );
 
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("plus"));
     connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
 
     lab = new QLabel ( " ", mw );
     mainLayout->addWidget( lab,0,++ii );
 
 
-#if 0
-    addBut = new QPushButton ( mw );
-    mainLayout->addWidget( addBut,0,6 );
-    addBut->setPixmap ( SmallIcon("minus"));
-    connect(addBut,SIGNAL(clicked()),SLOT(deleteAll()));
-    addBut->setMaximumWidth( addBut->sizeHint().height() );
-#endif
-
-
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     int row = 1;
     while ( kkf ) {
         int iii = 0;
         KOCalRadioButton* rb = new KOCalRadioButton( mw );
         mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb );
         rb->setChecked( kkf->isStandard );
         rb->setNum( kkf->mCalNumber );
         connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
         if ( kkf->mErrorOnLoad ||  kkf->isReadOnly )
             rb->setEnabled( false );
         KOCalCheckButton* cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb );
         cb->setChecked( kkf->isEnabled );
         cb->setNum( kkf->mCalNumber );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) );
         KOCalButton* name = new KOCalButton( mw );
         name->setNum( kkf->mCalNumber );
         name->setText(  kkf->mName );
         mainLayout->addWidget( name,row,++iii );
         connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) );
         //lab = new QLabel (" ", mw );
         //mainLayout->addWidget( lab,row,++iii );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb );
         cb->setChecked( kkf->isAlarmEnabled );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mROB.append( cb );
         cb->setChecked( kkf->isReadOnly );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         if ( row > 1) {
             KColorButton *colb = new KColorButton( mw );
             mainLayout->addWidget( colb,row,++iii );
             colb->setID( kkf->mCalNumber );
             colb->setColor( kkf->mDefaultColor );
             connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) );
             KOCalButton* calb = new KOCalButton( mw );
             mainLayout->addWidget( calb,row,++iii );
             calb->setNum( kkf->mCalNumber );
             calb->setPixmap ( SmallIcon("minus"));
             connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) );
             int hei = calb->sizeHint().height();
             //calb->setMaximumSize( hei*9/10, hei*9/10 );
         }
         ++row;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     lab = new QLabel (  "", mw );
     mainLayout->addWidget( lab,row,0 );
     mw->show();
 
 }
 
 
 void KOCalEditView::defaultInfo()
 {
     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.") ); 
 }
 void KOCalEditView::addCal()
 {
     bool tryagain = true;
     QString name, file;
     while ( tryagain ) {
         KONewCalPrefs prefs ( this ); 
          prefs.nameE->setText( name );
         prefs.url->setURL( file );
         if ( !  prefs.exec() )
             return;
         name = prefs.calName();
         file = prefs.calFileName();
         tryagain = false;
         KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
         while ( kkf ) {
             if ( kkf->mName == name ) {
                 KMessageBox::information( this,  i18n("Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!").arg( name ) ); 
                 name = "";
                 tryagain = true;  
                 break;
             }
             if ( kkf->mFileName == file ) {
                 KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg(  KGlobal::formatMessage (file, 0 )) ); 
                 tryagain = true;  
                 file = "";
                 break;
             }
             kkf = KOPrefs::instance()->mCalendars.next();
         }