-rw-r--r-- | korganizer/calendarview.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9674921..3ab4bb4 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -722,49 +722,49 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
722 | cE2 = test2; | 722 | cE2 = test2; |
723 | } | 723 | } |
724 | } | 724 | } |
725 | } | 725 | } |
726 | } | 726 | } |
727 | test2 = testlist2.next(); | 727 | test2 = testlist2.next(); |
728 | } | 728 | } |
729 | } | 729 | } |
730 | test->setTagged( true ); | 730 | test->setTagged( true ); |
731 | test = testlist.next(); | 731 | test = testlist.next(); |
732 | } | 732 | } |
733 | //qDebug("Search time : %d", tm.elapsed()); | 733 | //qDebug("Search time : %d", tm.elapsed()); |
734 | if ( found ) { | 734 | if ( found ) { |
735 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) | 735 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) |
736 | mViewManager->showDayView(); | 736 | mViewManager->showDayView(); |
737 | mNavigator->slotDaySelect( conflict.date() ); | 737 | mNavigator->slotDaySelect( conflict.date() ); |
738 | int hour = conflict.time().hour(); | 738 | int hour = conflict.time().hour(); |
739 | mViewManager->agendaView()->setStartHour( hour ); | 739 | mViewManager->agendaView()->setStartHour( hour ); |
740 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) ); | 740 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) ); |
741 | block = false; | 741 | block = false; |
742 | return; | 742 | return; |
743 | } | 743 | } |
744 | 744 | ||
745 | topLevelWidget()->setCaption( i18n("No conflict found") ); | 745 | topLevelWidget()->setCaption( i18n("No conflict found") ); |
746 | qDebug("No conflict found "); | 746 | //qDebug("No conflict found "); |
747 | block = false; | 747 | block = false; |
748 | return; | 748 | return; |
749 | } | 749 | } |
750 | 750 | ||
751 | void CalendarView::conflictAll() | 751 | void CalendarView::conflictAll() |
752 | { | 752 | { |
753 | nextConflict ( true, true ); | 753 | nextConflict ( true, true ); |
754 | } | 754 | } |
755 | void CalendarView::conflictAllday() | 755 | void CalendarView::conflictAllday() |
756 | { | 756 | { |
757 | nextConflict ( false, true ); | 757 | nextConflict ( false, true ); |
758 | } | 758 | } |
759 | void CalendarView::conflictNotAll() | 759 | void CalendarView::conflictNotAll() |
760 | { | 760 | { |
761 | nextConflict ( false, false ); | 761 | nextConflict ( false, false ); |
762 | } | 762 | } |
763 | 763 | ||
764 | void CalendarView::setCalReadOnly( int id, bool readO ) | 764 | void CalendarView::setCalReadOnly( int id, bool readO ) |
765 | { | 765 | { |
766 | if ( readO ) { | 766 | if ( readO ) { |
767 | emit save(); | 767 | emit save(); |
768 | } | 768 | } |
769 | mCalendar->setReadOnly( id, readO ); | 769 | mCalendar->setReadOnly( id, readO ); |
770 | } | 770 | } |
@@ -2807,56 +2807,57 @@ void CalendarView::checkConflictForEvent() | |||
2807 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); | 2807 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |
2808 | while ( test ) { | 2808 | while ( test ) { |
2809 | qApp->processEvents(); | 2809 | qApp->processEvents(); |
2810 | bool skip = false; | 2810 | bool skip = false; |
2811 | if ( found ) | 2811 | if ( found ) |
2812 | skip = !test->matchTime( ¤t, &conflict ); | 2812 | skip = !test->matchTime( ¤t, &conflict ); |
2813 | else | 2813 | else |
2814 | skip = !test->matchTime( ¤t, 0 ); | 2814 | skip = !test->matchTime( ¤t, 0 ); |
2815 | if ( !skip && !test->doesFloat() ) { | 2815 | if ( !skip && !test->doesFloat() ) { |
2816 | if ( mConflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { | 2816 | if ( mConflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { |
2817 | if ( ! found ) { | 2817 | if ( ! found ) { |
2818 | conflict = retVal; | 2818 | conflict = retVal; |
2819 | cE = test; | 2819 | cE = test; |
2820 | } else { | 2820 | } else { |
2821 | if ( retVal < conflict ) { | 2821 | if ( retVal < conflict ) { |
2822 | conflict = retVal; | 2822 | conflict = retVal; |
2823 | cE = test; | 2823 | cE = test; |
2824 | } | 2824 | } |
2825 | } | 2825 | } |
2826 | found = true; | 2826 | found = true; |
2827 | } | 2827 | } |
2828 | } | 2828 | } |
2829 | test = testlist.next(); | 2829 | test = testlist.next(); |
2830 | } | 2830 | } |
2831 | topLevelWidget()->setCaption( i18n("KO/Pi") ); | ||
2831 | if ( found ) { | 2832 | if ( found ) { |
2832 | QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ; | 2833 | QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ; |
2833 | qApp->processEvents(); | 2834 | qApp->processEvents(); |
2834 | int km = KMessageBox::warningContinueCancel(this,mess, | 2835 | int km = KMessageBox::warningContinueCancel(this,mess, |
2835 | i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!")); | 2836 | i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!")); |
2836 | if ( km != KMessageBox::Continue ) | 2837 | if ( km != KMessageBox::Continue ) { |
2837 | return; | 2838 | return; |
2838 | 2839 | } | |
2839 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) | 2840 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) |
2840 | mViewManager->showDayView(); | 2841 | mViewManager->showDayView(); |
2841 | mNavigator->slotDaySelect( conflict.date() ); | 2842 | mNavigator->slotDaySelect( conflict.date() ); |
2842 | int hour = conflict.time().hour(); | 2843 | int hour = conflict.time().hour(); |
2843 | mViewManager->agendaView()->setStartHour( hour ); | 2844 | mViewManager->agendaView()->setStartHour( hour ); |
2844 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) ); | 2845 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) ); |
2845 | } else | 2846 | } else |
2846 | topLevelWidget()->setCaption( i18n("No conflict found") ); | 2847 | topLevelWidget()->setCaption( i18n("No conflict found") ); |
2847 | mConflictingEvent = 0; | 2848 | mConflictingEvent = 0; |
2848 | return; | 2849 | return; |
2849 | 2850 | ||
2850 | } | 2851 | } |
2851 | 2852 | ||
2852 | void CalendarView::updateTodoViews() | 2853 | void CalendarView::updateTodoViews() |
2853 | { | 2854 | { |
2854 | mTodoList->updateView(); | 2855 | mTodoList->updateView(); |
2855 | mViewManager->currentView()->updateView(); | 2856 | mViewManager->currentView()->updateView(); |
2856 | 2857 | ||
2857 | } | 2858 | } |
2858 | 2859 | ||
2859 | 2860 | ||
2860 | 2861 | ||
2861 | void CalendarView::clearAllViews() | 2862 | void CalendarView::clearAllViews() |
2862 | { | 2863 | { |