summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kofilterview.cpp13
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
@@ -171,28 +171,30 @@ void KOCalEditView::selectCalAlarm(int id ,bool b )
171{ 171{
172 KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b; 172 KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b;
173 emit alarmEnabled ( id , b ); 173 emit alarmEnabled ( id , b );
174 emit needsUpdate(); 174 emit needsUpdate();
175} 175}
176void KOCalEditView::selectReadOnly(int id ,bool b ) 176void KOCalEditView::selectReadOnly(int id ,bool b )
177{ 177{
178 KOPrefs::instance()->getCalendar( id )->isReadOnly = b; 178 KOPrefs::instance()->getCalendar( id )->isReadOnly = b;
179 emit calendarReadonly ( id , b ); 179 emit calendarReadonly ( id , b );
180 if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) { 180 if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) {
181 KOPrefs::instance()->getCalendar( id )->isStandard = false; 181 KOPrefs::instance()->getCalendar( id )->isStandard = false;
182 KOPrefs::instance()->getCalendar( 1 )->isStandard = true; 182 KOPrefs::instance()->getCalendar( 1 )->isStandard = true;
183 mStdandardB.at(0)->setChecked( true );
184 mStdandardB.at(id-1)->setChecked( false );
183 emit setCalendarDefault ( 1 ); 185 emit setCalendarDefault ( 1 );
184 } 186 }
187 mStdandardB.at(id-1)->setEnabled( !b );
185 emit needsUpdate(); 188 emit needsUpdate();
186 QTimer::singleShot( 0, this, SLOT ( readConfig() ) );
187 189
188} 190}
189void KOCalEditView::setColor( const QColor& c, int id ) 191void KOCalEditView::setColor( const QColor& c, int id )
190{ 192{
191 KOPrefs::instance()->getCalendar( id )->mDefaultColor = c; 193 KOPrefs::instance()->getCalendar( id )->mDefaultColor = c;
192 emit needsUpdate(); 194 emit needsUpdate();
193} 195}
194void KOCalEditView::deleteCal( int id ) 196void KOCalEditView::deleteCal( int id )
195{ 197{
196 KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id ); 198 KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id );
197 QString name = kkf->mName; 199 QString name = kkf->mName;
198 QString file = KGlobal::formatMessage ( kkf->mFileName ,0 ); 200 QString file = KGlobal::formatMessage ( kkf->mFileName ,0 );
@@ -270,33 +272,24 @@ void KOCalEditView::readConfig()
270 mainLayout->addWidget( lab,0,++ii ); 272 mainLayout->addWidget( lab,0,++ii );
271 273
272 addBut = new QPushButton ( mw ); 274 addBut = new QPushButton ( mw );
273 addBut->setFocusPolicy(NoFocus); 275 addBut->setFocusPolicy(NoFocus);
274 mainLayout->addWidget( addBut,0,++ii ); 276 mainLayout->addWidget( addBut,0,++ii );
275 addBut->setPixmap ( SmallIcon("plus")); 277 addBut->setPixmap ( SmallIcon("plus"));
276 connect(addBut,SIGNAL(clicked()),SLOT(addCal())); 278 connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
277 279
278 lab = new QLabel ( " ", mw ); 280 lab = new QLabel ( " ", mw );
279 mainLayout->addWidget( lab,0,++ii ); 281 mainLayout->addWidget( lab,0,++ii );
280 282
281 283
282#if 0
283 addBut = new QPushButton ( mw );
284 mainLayout->addWidget( addBut,0,6 );
285 addBut->setPixmap ( SmallIcon("minus"));
286 connect(addBut,SIGNAL(clicked()),SLOT(deleteAll()));
287 addBut->setMaximumWidth( addBut->sizeHint().height() );
288#endif
289
290
291 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); 284 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
292 int row = 1; 285 int row = 1;
293 while ( kkf ) { 286 while ( kkf ) {
294 int iii = 0; 287 int iii = 0;
295 KOCalRadioButton* rb = new KOCalRadioButton( mw ); 288 KOCalRadioButton* rb = new KOCalRadioButton( mw );
296 mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb ); 289 mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb );
297 rb->setChecked( kkf->isStandard ); 290 rb->setChecked( kkf->isStandard );
298 rb->setNum( kkf->mCalNumber ); 291 rb->setNum( kkf->mCalNumber );
299 connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); 292 connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
300 if ( kkf->mErrorOnLoad || kkf->isReadOnly ) 293 if ( kkf->mErrorOnLoad || kkf->isReadOnly )
301 rb->setEnabled( false ); 294 rb->setEnabled( false );
302 KOCalCheckButton* cb = new KOCalCheckButton( mw ); 295 KOCalCheckButton* cb = new KOCalCheckButton( mw );