-rw-r--r-- | korganizer/calendarview.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 5a2482e..17f1659 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -610,96 +610,103 @@ void CalendarView::init() | |||
610 | 610 | ||
611 | mDateFrame = new QVBox(0,0,WType_Popup); | 611 | mDateFrame = new QVBox(0,0,WType_Popup); |
612 | //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); | 612 | //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); |
613 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); | 613 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); |
614 | mDateFrame->setLineWidth(3); | 614 | mDateFrame->setLineWidth(3); |
615 | mDateFrame->hide(); | 615 | mDateFrame->hide(); |
616 | mDateFrame->setCaption( i18n( "Pick a date to display")); | 616 | mDateFrame->setCaption( i18n( "Pick a date to display")); |
617 | mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() ); | 617 | mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() ); |
618 | 618 | ||
619 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate))); | 619 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate))); |
620 | 620 | ||
621 | mEventEditor = mDialogManager->getEventEditor(); | 621 | mEventEditor = mDialogManager->getEventEditor(); |
622 | mTodoEditor = mDialogManager->getTodoEditor(); | 622 | mTodoEditor = mDialogManager->getTodoEditor(); |
623 | 623 | ||
624 | mFlagEditDescription = false; | 624 | mFlagEditDescription = false; |
625 | 625 | ||
626 | mSuspendTimer = new QTimer( this ); | 626 | mSuspendTimer = new QTimer( this ); |
627 | mAlarmTimer = new QTimer( this ); | 627 | mAlarmTimer = new QTimer( this ); |
628 | mRecheckAlarmTimer = new QTimer( this ); | 628 | mRecheckAlarmTimer = new QTimer( this ); |
629 | connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); | 629 | connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); |
630 | connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); | 630 | connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); |
631 | connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); | 631 | connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); |
632 | mAlarmDialog = new AlarmDialog( this ); | 632 | mAlarmDialog = new AlarmDialog( this ); |
633 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); | 633 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); |
634 | mAlarmDialog->setServerNotification( false ); | 634 | mAlarmDialog->setServerNotification( false ); |
635 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); | 635 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); |
636 | 636 | ||
637 | 637 | ||
638 | #ifndef DESKTOP_VERSION | 638 | #ifndef DESKTOP_VERSION |
639 | //US listen for arriving address resultsets | 639 | //US listen for arriving address resultsets |
640 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), | 640 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), |
641 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); | 641 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); |
642 | #endif | 642 | #endif |
643 | mDateNavigator->setCalendar( mCalendar ); | 643 | mDateNavigator->setCalendar( mCalendar ); |
644 | } | 644 | } |
645 | 645 | ||
646 | 646 | ||
647 | CalendarView::~CalendarView() | 647 | CalendarView::~CalendarView() |
648 | { | 648 | { |
649 | // kdDebug() << "~CalendarView()" << endl; | 649 | // kdDebug() << "~CalendarView()" << endl; |
650 | //qDebug("CalendarView::~CalendarView() "); | 650 | //qDebug("CalendarView::~CalendarView() "); |
651 | delete mDialogManager; | 651 | delete mDialogManager; |
652 | delete mViewManager; | 652 | delete mViewManager; |
653 | delete mStorage; | 653 | delete mStorage; |
654 | delete mDateFrame ; | 654 | delete mDateFrame ; |
655 | delete mEventViewerDialog; | 655 | delete mEventViewerDialog; |
656 | //kdDebug() << "~CalendarView() done" << endl; | 656 | //kdDebug() << "~CalendarView() done" << endl; |
657 | } | 657 | } |
658 | |||
659 | void CalendarView::slotResetFocus() | ||
660 | { | ||
661 | qDebug(" CalendarView::slotResetFocus() %x", qApp->focusWidget()); | ||
662 | |||
663 | } | ||
664 | |||
658 | void CalendarView::nextConflict( bool all, bool allday ) | 665 | void CalendarView::nextConflict( bool all, bool allday ) |
659 | { | 666 | { |
660 | 667 | ||
661 | QPtrList<Event> testlist = mCalendar->events(); | 668 | QPtrList<Event> testlist = mCalendar->events(); |
662 | Event * test = testlist.first(); | 669 | Event * test = testlist.first(); |
663 | while ( test ) { | 670 | while ( test ) { |
664 | test->setTagged( false ); | 671 | test->setTagged( false ); |
665 | test = testlist.next(); | 672 | test = testlist.next(); |
666 | } | 673 | } |
667 | QTime st ( 0,0,0); | 674 | QTime st ( 0,0,0); |
668 | if ( mViewManager->currentView() == mViewManager->agendaView() ) | 675 | if ( mViewManager->currentView() == mViewManager->agendaView() ) |
669 | st = mViewManager->agendaView()->agenda()->getEndTime(); | 676 | st = mViewManager->agendaView()->agenda()->getEndTime(); |
670 | //qDebug("time %s ", st.toString().latin1()); | 677 | //qDebug("time %s ", st.toString().latin1()); |
671 | QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st); | 678 | QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st); |
672 | QDateTime conflict; | 679 | QDateTime conflict; |
673 | QDateTime retVal; | 680 | QDateTime retVal; |
674 | bool found = false; | 681 | bool found = false; |
675 | Event * cE = 0; | 682 | Event * cE = 0; |
676 | Event * cE2 = 0; | 683 | Event * cE2 = 0; |
677 | QPtrList<Event> testlist2 = testlist; | 684 | QPtrList<Event> testlist2 = testlist; |
678 | test = testlist.first(); | 685 | test = testlist.first(); |
679 | bool skip = false; | 686 | bool skip = false; |
680 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); | 687 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |
681 | while ( test ) { | 688 | while ( test ) { |
682 | qApp->processEvents(); | 689 | qApp->processEvents(); |
683 | skip = false; | 690 | skip = false; |
684 | if ( !all ) skip = ( allday != test->doesFloat() ); | 691 | if ( !all ) skip = ( allday != test->doesFloat() ); |
685 | if ( !skip ) { | 692 | if ( !skip ) { |
686 | Event * test2 = testlist2.first(); | 693 | Event * test2 = testlist2.first(); |
687 | while ( test2 ) { | 694 | while ( test2 ) { |
688 | skip = false; | 695 | skip = false; |
689 | if ( !all ) skip = ( allday != test2->doesFloat() ); | 696 | if ( !all ) skip = ( allday != test2->doesFloat() ); |
690 | if ( !skip ) { | 697 | if ( !skip ) { |
691 | if ( !test2->isTagged() ) { | 698 | if ( !test2->isTagged() ) { |
692 | if ( test->isOverlapping ( test2, &retVal, &startDT ) ) { | 699 | if ( test->isOverlapping ( test2, &retVal, &startDT ) ) { |
693 | //qDebug("overlap "); | 700 | //qDebug("overlap "); |
694 | if ( ! found ) { | 701 | if ( ! found ) { |
695 | if ( retVal >= startDT ) { | 702 | if ( retVal >= startDT ) { |
696 | conflict = retVal; | 703 | conflict = retVal; |
697 | cE = test; | 704 | cE = test; |
698 | cE2 = test2; | 705 | cE2 = test2; |
699 | found = true; | 706 | found = true; |
700 | } | 707 | } |
701 | } else { | 708 | } else { |
702 | if ( retVal >= startDT && retVal < conflict ) { | 709 | if ( retVal >= startDT && retVal < conflict ) { |
703 | conflict = retVal; | 710 | conflict = retVal; |
704 | cE = test; | 711 | cE = test; |
705 | cE2 = test2; | 712 | cE2 = test2; |