author | zautrix <zautrix> | 2005-06-16 06:30:09 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-16 06:30:09 (UTC) |
commit | 9f60da2b6768e94d2aeb2f94a4479b6678f2aa76 (patch) (unidiff) | |
tree | eea4e7ee02afc86a543c142efa7b5c8c83e0f1f8 /korganizer/kofilterview.cpp | |
parent | b8b1547f1f4ae54ace16e5faf55aad1274ec2e57 (diff) | |
download | kdepimpi-9f60da2b6768e94d2aeb2f94a4479b6678f2aa76.zip kdepimpi-9f60da2b6768e94d2aeb2f94a4479b6678f2aa76.tar.gz kdepimpi-9f60da2b6768e94d2aeb2f94a4479b6678f2aa76.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/kofilterview.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 36ee2eb..e4dc751 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -175,69 +175,69 @@ void KOCalEditView::selectCalAlarm(int id ,bool b ) | |||
175 | } | 175 | } |
176 | void KOCalEditView::selectReadOnly(int id ,bool b ) | 176 | void 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 | emit setCalendarDefault ( 1 ); | 183 | emit setCalendarDefault ( 1 ); |
184 | } | 184 | } |
185 | emit needsUpdate(); | 185 | emit needsUpdate(); |
186 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 186 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
187 | 187 | ||
188 | } | 188 | } |
189 | void KOCalEditView::setColor( const QColor& c, int id ) | 189 | void KOCalEditView::setColor( const QColor& c, int id ) |
190 | { | 190 | { |
191 | KOPrefs::instance()->getCalendar( id )->mDefaultColor = c; | 191 | KOPrefs::instance()->getCalendar( id )->mDefaultColor = c; |
192 | emit needsUpdate(); | 192 | emit needsUpdate(); |
193 | } | 193 | } |
194 | void KOCalEditView::deleteCal( int id ) | 194 | void KOCalEditView::deleteCal( int id ) |
195 | { | 195 | { |
196 | KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id ); | 196 | KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id ); |
197 | QString name = kkf->mName; | 197 | QString name = kkf->mName; |
198 | QString file = kkf->mFileName; | 198 | QString file = kkf->mFileName; |
199 | if ( KMessageBox::warningContinueCancel( this, i18n("The calendar<tr><b>%1</b><tr>is displaying file<tr><b>%2</b><tr>Do you want to remove<tr>this calendar from KO/Pi?<tr>(The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return; | 199 | 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; |
200 | if ( kkf->isStandard ) | 200 | if ( kkf->isStandard ) |
201 | selectStdCal( 1, true ); | 201 | selectStdCal( 1, true ); |
202 | emit removeCalendar ( id ); | 202 | emit removeCalendar ( id ); |
203 | KOPrefs::instance()->mCalendars.remove ( kkf ); | 203 | KOPrefs::instance()->mCalendars.remove ( kkf ); |
204 | emit needsUpdate(); | 204 | emit needsUpdate(); |
205 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 205 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
206 | } | 206 | } |
207 | void KOCalEditView::infoCal( int id ) | 207 | void KOCalEditView::infoCal( int id ) |
208 | { | 208 | { |
209 | QString name = KOPrefs::instance()->getCalendar( id )->mName; | 209 | QString name = KOPrefs::instance()->getCalendar( id )->mName; |
210 | QString file = KOPrefs::instance()->getCalendar( id )->mFileName; | 210 | QString file = KOPrefs::instance()->getCalendar( id )->mFileName; |
211 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { | 211 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { |
212 | if ( KMessageBox::Yes == KMessageBox::questionYesNo( this, i18n("The calendar <tr><b>%1</b><tr> is not loaded! Loading of file <tr><b>%2</b><tr>failed!<tr><b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) { | 212 | 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) ) ) { |
213 | emit calendarAdded( id ); | 213 | emit calendarAdded( id ); |
214 | emit needsUpdate(); | 214 | emit needsUpdate(); |
215 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 215 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
216 | } | 216 | } |
217 | } | 217 | } |
218 | else | 218 | else |
219 | KMessageBox::information( this, i18n("The calendar <tr><b>%1</b><tr>is displaying file<tr><b>%2</b>").arg(name).arg(file) ); | 219 | KMessageBox::information( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) ); |
220 | } | 220 | } |
221 | void KOCalEditView::readConfig() | 221 | void KOCalEditView::readConfig() |
222 | { | 222 | { |
223 | 223 | ||
224 | mStdandardB.clear(); | 224 | mStdandardB.clear(); |
225 | mEnabledB.clear(); | 225 | mEnabledB.clear(); |
226 | mAlarmB.clear(); | 226 | mAlarmB.clear(); |
227 | mROB.clear(); | 227 | mROB.clear(); |
228 | 228 | ||
229 | if ( mw ) delete mw; | 229 | if ( mw ) delete mw; |
230 | mw = new QWidget ( viewport() ); | 230 | mw = new QWidget ( viewport() ); |
231 | addChild(mw); | 231 | addChild(mw); |
232 | 232 | ||
233 | mainLayout = new QGridLayout ( mw , 2, 8 ); | 233 | mainLayout = new QGridLayout ( mw , 2, 8 ); |
234 | mainLayout->setMargin( 3); | 234 | mainLayout->setMargin( 3); |
235 | mainLayout->setSpacing( 2); | 235 | mainLayout->setSpacing( 2); |
236 | QPushButton * addBut = new QPushButton ( mw ); | 236 | QPushButton * addBut = new QPushButton ( mw ); |
237 | addBut->setFocusPolicy(NoFocus); | 237 | addBut->setFocusPolicy(NoFocus); |
238 | mainLayout->addWidget( addBut,0,0 ); | 238 | mainLayout->addWidget( addBut,0,0 ); |
239 | addBut->setPixmap ( SmallIcon("plus")); | 239 | addBut->setPixmap ( SmallIcon("plus")); |
240 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); | 240 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); |
241 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 241 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
242 | 242 | ||
243 | addBut = new QPushButton ( mw ); | 243 | addBut = new QPushButton ( mw ); |
@@ -323,78 +323,79 @@ void KOCalEditView::readConfig() | |||
323 | colb->setColor( kkf->mDefaultColor ); | 323 | colb->setColor( kkf->mDefaultColor ); |
324 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); | 324 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); |
325 | KOCalButton* calb = new KOCalButton( mw ); | 325 | KOCalButton* calb = new KOCalButton( mw ); |
326 | mainLayout->addWidget( calb,row,++iii ); | 326 | mainLayout->addWidget( calb,row,++iii ); |
327 | calb->setNum( kkf->mCalNumber ); | 327 | calb->setNum( kkf->mCalNumber ); |
328 | calb->setPixmap ( SmallIcon("minus")); | 328 | calb->setPixmap ( SmallIcon("minus")); |
329 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); | 329 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); |
330 | int hei = calb->sizeHint().height(); | 330 | int hei = calb->sizeHint().height(); |
331 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); | 331 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); |
332 | } | 332 | } |
333 | ++row; | 333 | ++row; |
334 | kkf = KOPrefs::instance()->mCalendars.next(); | 334 | kkf = KOPrefs::instance()->mCalendars.next(); |
335 | } | 335 | } |
336 | lab = new QLabel ( "", mw ); | 336 | lab = new QLabel ( "", mw ); |
337 | mainLayout->addWidget( lab,row,0 ); | 337 | mainLayout->addWidget( lab,row,0 ); |
338 | mw->show(); | 338 | mw->show(); |
339 | 339 | ||
340 | } | 340 | } |
341 | void KOCalEditView::addCal() | 341 | void KOCalEditView::addCal() |
342 | { | 342 | { |
343 | bool tryagain = true; | 343 | bool tryagain = true; |
344 | QString name, file; | 344 | QString name, file; |
345 | while ( tryagain ) { | 345 | while ( tryagain ) { |
346 | KONewCalPrefs prefs ( this ); | 346 | KONewCalPrefs prefs ( this ); |
347 | if ( !name.isEmpty() ) prefs.nameE->setText( name ); | 347 | prefs.nameE->setText( name ); |
348 | if ( !file.isEmpty() ) prefs.url->setURL( file ); | 348 | prefs.url->setURL( file ); |
349 | if ( ! prefs.exec() ) | 349 | if ( ! prefs.exec() ) |
350 | return; | 350 | return; |
351 | name = prefs.calName(); | 351 | name = prefs.calName(); |
352 | file = prefs.calFileName(); | 352 | file = prefs.calFileName(); |
353 | tryagain = false; | 353 | tryagain = false; |
354 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 354 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
355 | while ( kkf ) { | 355 | while ( kkf ) { |
356 | if ( kkf->mName == name ) { | 356 | if ( kkf->mName == name ) { |
357 | KMessageBox::information( this, i18n("Sorry, the calendar name already exists!\nPlease choose another name!") ); | 357 | KMessageBox::information( this, i18n("Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!").arg( name ) ); |
358 | name = ""; | 358 | name = ""; |
359 | tryagain = true; | ||
359 | break; | 360 | break; |
360 | tryagain = true; | ||
361 | } | 361 | } |
362 | if ( kkf->mFileName == file ) { | 362 | if ( kkf->mFileName == file ) { |
363 | 363 | KMessageBox::information( this, i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg( file) ); | |
364 | break; | ||
365 | tryagain = true; | 364 | tryagain = true; |
365 | file = ""; | ||
366 | break; | ||
366 | } | 367 | } |
367 | kkf = KOPrefs::instance()->mCalendars.next(); | 368 | kkf = KOPrefs::instance()->mCalendars.next(); |
368 | } | 369 | } |
369 | } | 370 | } |
370 | QFileInfo fi ( file ); | 371 | QFileInfo fi ( file ); |
371 | if (!fi.exists() ) { | 372 | if (!fi.exists() ) { |
372 | if ( KMessageBox::questionYesNo(this, i18n("The file does not exist!\nShall I create it for you?")) == KMessageBox::No ) | 373 | if ( KMessageBox::questionYesNo(this, i18n("The file\n%1\ndoes not exist!\nShall I create it for you?").arg( file ) )== KMessageBox::No ) |
373 | return; | 374 | return; |
374 | QFile fileIn( file ); | 375 | QFile fileIn( file ); |
375 | if (!fileIn.open( IO_WriteOnly ) ) { | 376 | if (!fileIn.open( IO_WriteOnly ) ) { |
376 | KMessageBox::sorry( this, i18n("Sorry, cannot create the file!\nNo calendar added!") ); | 377 | KMessageBox::sorry( this, i18n("Sorry, cannot create the file\n%1!\nNo calendar added!").arg( file ) ); |
377 | return; | 378 | return; |
378 | } | 379 | } |
379 | QTextStream tsIn( &fileIn ); | 380 | QTextStream tsIn( &fileIn ); |
380 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); | 381 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); |
381 | tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n"; | 382 | tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n"; |
382 | fileIn.close(); | 383 | fileIn.close(); |
383 | } | 384 | } |
384 | KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar(); | 385 | KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar(); |
385 | kkf->mName = name; | 386 | kkf->mName = name; |
386 | kkf->mFileName = file; | 387 | kkf->mFileName = file; |
387 | emit calendarAdded( kkf->mCalNumber ); | 388 | emit calendarAdded( kkf->mCalNumber ); |
388 | emit needsUpdate(); | 389 | emit needsUpdate(); |
389 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 390 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
390 | } | 391 | } |
391 | void KOCalEditView::enableAll() | 392 | void KOCalEditView::enableAll() |
392 | { | 393 | { |
393 | toggleList( mEnabledB ); | 394 | toggleList( mEnabledB ); |
394 | } | 395 | } |
395 | void KOCalEditView::enableAlarm() | 396 | void KOCalEditView::enableAlarm() |
396 | { | 397 | { |
397 | toggleList( mAlarmB ); | 398 | toggleList( mAlarmB ); |
398 | } | 399 | } |
399 | void KOCalEditView::disableRO() | 400 | void KOCalEditView::disableRO() |
400 | { | 401 | { |