Diffstat (limited to 'core/pim/datebook/dateentryimpl.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index 42bdbe2..297da94 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -386,115 +386,115 @@ void DateEntry::slotRepeat() | |||
386 | 386 | ||
387 | if ( QPEApplication::execDialog( e ) ) { | 387 | if ( QPEApplication::execDialog( e ) ) { |
388 | rp = e->repeatPattern(); | 388 | rp = e->repeatPattern(); |
389 | setRepeatLabel(); | 389 | setRepeatLabel(); |
390 | } | 390 | } |
391 | // deleting sounds like a nice idea... | 391 | // deleting sounds like a nice idea... |
392 | delete e; | 392 | delete e; |
393 | } | 393 | } |
394 | 394 | ||
395 | void DateEntry::slotChangeStartOfWeek( bool onMonday ) | 395 | void DateEntry::slotChangeStartOfWeek( bool onMonday ) |
396 | { | 396 | { |
397 | startWeekOnMonday = onMonday; | 397 | startWeekOnMonday = onMonday; |
398 | } | 398 | } |
399 | 399 | ||
400 | Event DateEntry::event() | 400 | Event DateEntry::event() |
401 | { | 401 | { |
402 | Event ev; | 402 | Event ev; |
403 | Event::SoundTypeChoice st; | 403 | Event::SoundTypeChoice st; |
404 | ev.setDescription( comboDescription->currentText() ); | 404 | ev.setDescription( comboDescription->currentText() ); |
405 | ev.setLocation( comboLocation->currentText() ); | 405 | ev.setLocation( comboLocation->currentText() ); |
406 | ev.setCategories( comboCategory->currentCategories() ); | 406 | ev.setCategories( comboCategory->currentCategories() ); |
407 | ev.setType( checkAllDay->isChecked() ? Event::AllDay : Event::Normal ); | 407 | ev.setType( checkAllDay->isChecked() ? Event::AllDay : Event::Normal ); |
408 | if ( startDate > endDate ) { | 408 | if ( startDate > endDate ) { |
409 | QDate tmp = endDate; | 409 | QDate tmp = endDate; |
410 | endDate = startDate; | 410 | endDate = startDate; |
411 | startDate = tmp; | 411 | startDate = tmp; |
412 | } | 412 | } |
413 | 413 | ||
414 | // This is now done in the changed slots | 414 | // This is now done in the changed slots |
415 | // startTime = parseTime( comboStart->text(), ampm ); | 415 | // startTime = parseTime( comboStart->text(), ampm ); |
416 | //endTime = parseTime( comboEnd->text(), ampm ); | 416 | //endTime = parseTime( comboEnd->text(), ampm ); |
417 | 417 | ||
418 | if ( startTime > endTime && endDate == startDate ) { | 418 | if ( startTime > endTime && endDate == startDate ) { |
419 | QTime tmp = endTime; | 419 | QTime tmp = endTime; |
420 | endTime = startTime; | 420 | endTime = startTime; |
421 | startTime = tmp; | 421 | startTime = tmp; |
422 | } | 422 | } |
423 | // don't set the time if theres no need too | 423 | // don't set the time if theres no need too |
424 | if ( ev.type() == Event::AllDay ) { | 424 | if ( ev.type() == Event::AllDay ) { |
425 | startTime.setHMS( 0, 0, 0 ); | 425 | startTime.setHMS( 0, 0, 0 ); |
426 | endTime.setHMS( 23, 59, 59 ); | 426 | endTime.setHMS( 23, 59, 59 ); |
427 | } | 427 | } |
428 | 428 | ||
429 | // adjust start and end times based on timezone | 429 | // adjust start and end times based on timezone |
430 | QDateTime start( startDate, startTime ); | 430 | QDateTime start( startDate, startTime ); |
431 | QDateTime end( endDate, endTime ); | 431 | QDateTime end( endDate, endTime ); |
432 | time_t start_utc, end_utc; | 432 | time_t start_utc, end_utc; |
433 | 433 | ||
434 | //Opie::Core::odebug << "tz: " << timezone->currentZone() << oendl; | 434 | //odebug << "tz: " << timezone->currentZone() << oendl; |
435 | 435 | ||
436 | // get real timezone | 436 | // get real timezone |
437 | QString realTZ; | 437 | QString realTZ; |
438 | realTZ = QString::fromLocal8Bit( getenv("TZ") ); | 438 | realTZ = QString::fromLocal8Bit( getenv("TZ") ); |
439 | 439 | ||
440 | // set timezone | 440 | // set timezone |
441 | if ( setenv( "TZ", timezone->currentZone(), true ) != 0 ) | 441 | if ( setenv( "TZ", timezone->currentZone(), true ) != 0 ) |
442 | Opie::Core::owarn << "There was a problem setting the timezone." << oendl; | 442 | owarn << "There was a problem setting the timezone." << oendl; |
443 | 443 | ||
444 | // convert to UTC based on selected TZ (calling tzset internally) | 444 | // convert to UTC based on selected TZ (calling tzset internally) |
445 | start_utc = TimeConversion::toUTC( start ); | 445 | start_utc = TimeConversion::toUTC( start ); |
446 | end_utc = TimeConversion::toUTC( end ); | 446 | end_utc = TimeConversion::toUTC( end ); |
447 | 447 | ||
448 | // done playing around... put it all back | 448 | // done playing around... put it all back |
449 | unsetenv( "TZ" ); | 449 | unsetenv( "TZ" ); |
450 | if ( !realTZ.isNull() ) | 450 | if ( !realTZ.isNull() ) |
451 | if ( setenv( "TZ", realTZ, true ) != 0 ) | 451 | if ( setenv( "TZ", realTZ, true ) != 0 ) |
452 | Opie::Core::owarn << "There was a problem setting the timezone." << oendl; | 452 | owarn << "There was a problem setting the timezone." << oendl; |
453 | 453 | ||
454 | // convert UTC to local time (calling tzset internally) | 454 | // convert UTC to local time (calling tzset internally) |
455 | ev.setStart( TimeConversion::fromUTC( start_utc ) ); | 455 | ev.setStart( TimeConversion::fromUTC( start_utc ) ); |
456 | ev.setEnd( TimeConversion::fromUTC( end_utc ) ); | 456 | ev.setEnd( TimeConversion::fromUTC( end_utc ) ); |
457 | 457 | ||
458 | // we only have one type of sound at the moment... LOUD!!! | 458 | // we only have one type of sound at the moment... LOUD!!! |
459 | if ( comboSound->currentItem() != 0 ) | 459 | if ( comboSound->currentItem() != 0 ) |
460 | st = Event::Loud; | 460 | st = Event::Loud; |
461 | else | 461 | else |
462 | st = Event::Silent; | 462 | st = Event::Silent; |
463 | ev.setAlarm( checkAlarm->isChecked(), spinAlarm->value(), st ); | 463 | ev.setAlarm( checkAlarm->isChecked(), spinAlarm->value(), st ); |
464 | if ( rp.type != Event::NoRepeat ) | 464 | if ( rp.type != Event::NoRepeat ) |
465 | ev.setRepeat( TRUE, rp ); | 465 | ev.setRepeat( TRUE, rp ); |
466 | ev.setNotes( noteStr ); | 466 | ev.setNotes( noteStr ); |
467 | 467 | ||
468 | //cout << "Start: " << comboStart->currentText() << endl; | 468 | //cout << "Start: " << comboStart->currentText() << endl; |
469 | 469 | ||
470 | return ev; | 470 | return ev; |
471 | } | 471 | } |
472 | 472 | ||
473 | void DateEntry::setRepeatLabel() | 473 | void DateEntry::setRepeatLabel() |
474 | { | 474 | { |
475 | 475 | ||
476 | switch( rp.type ) { | 476 | switch( rp.type ) { |
477 | case Event::Daily: | 477 | case Event::Daily: |
478 | cmdRepeat->setText( tr("Daily...") ); | 478 | cmdRepeat->setText( tr("Daily...") ); |
479 | break; | 479 | break; |
480 | case Event::Weekly: | 480 | case Event::Weekly: |
481 | cmdRepeat->setText( tr("Weekly...") ); | 481 | cmdRepeat->setText( tr("Weekly...") ); |
482 | break; | 482 | break; |
483 | case Event::MonthlyDay: | 483 | case Event::MonthlyDay: |
484 | case Event::MonthlyDate: | 484 | case Event::MonthlyDate: |
485 | cmdRepeat->setText( tr("Monthly...") ); | 485 | cmdRepeat->setText( tr("Monthly...") ); |
486 | break; | 486 | break; |
487 | case Event::Yearly: | 487 | case Event::Yearly: |
488 | cmdRepeat->setText( tr("Yearly...") ); | 488 | cmdRepeat->setText( tr("Yearly...") ); |
489 | break; | 489 | break; |
490 | default: | 490 | default: |
491 | cmdRepeat->setText( tr("No Repeat...") ); | 491 | cmdRepeat->setText( tr("No Repeat...") ); |
492 | } | 492 | } |
493 | } | 493 | } |
494 | 494 | ||
495 | void DateEntry::setAlarmEnabled( bool alarmPreset, int presetTime, Event::SoundTypeChoice sound ) | 495 | void DateEntry::setAlarmEnabled( bool alarmPreset, int presetTime, Event::SoundTypeChoice sound ) |
496 | { | 496 | { |
497 | checkAlarm->setChecked( alarmPreset ); | 497 | checkAlarm->setChecked( alarmPreset ); |
498 | spinAlarm->setValue( presetTime ); | 498 | spinAlarm->setValue( presetTime ); |
499 | if ( sound != Event::Silent ) | 499 | if ( sound != Event::Silent ) |
500 | comboSound->setCurrentItem( 1 ); | 500 | comboSound->setCurrentItem( 1 ); |