-rw-r--r-- | korganizer/komonthview.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 8d06040..610aae6 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -716,50 +716,55 @@ int MonthViewCell::insertEvent(Event *event) | |||
716 | prefix ="->" ;multiday = 1; | 716 | prefix ="->" ;multiday = 1; |
717 | } | 717 | } |
718 | else { | 718 | else { |
719 | int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); | 719 | int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); |
720 | if ( event->recursOn( mDate.addDays( -days)) ) { | 720 | if ( event->recursOn( mDate.addDays( -days)) ) { |
721 | prefix ="<-" ;multiday = 3; | 721 | prefix ="<-" ;multiday = 3; |
722 | } | 722 | } |
723 | } | 723 | } |
724 | 724 | ||
725 | } else { | 725 | } else { |
726 | if (mDate == event->dtStart().date()) { | 726 | if (mDate == event->dtStart().date()) { |
727 | prefix ="->" ;multiday = 1; | 727 | prefix ="->" ;multiday = 1; |
728 | } else if (mDate == event->dtEnd().date()) { | 728 | } else if (mDate == event->dtEnd().date()) { |
729 | prefix ="<-" ;multiday = 3; | 729 | prefix ="<-" ;multiday = 3; |
730 | } | 730 | } |
731 | } | 731 | } |
732 | if ( !event->doesFloat() ) { | 732 | if ( !event->doesFloat() ) { |
733 | if ( mDate == event->dtStart().date () ) | 733 | if ( mDate == event->dtStart().date () ) |
734 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; | 734 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; |
735 | else if ( mDate == event->dtEnd().date () ) | 735 | else if ( mDate == event->dtEnd().date () ) |
736 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; | 736 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; |
737 | 737 | ||
738 | } | 738 | } |
739 | text = time + event->summary(); | 739 | text = time + event->summary(); |
740 | if ( useToolTips ) | 740 | if ( useToolTips ) { |
741 | mToolTipText += prefix + text; | 741 | mToolTipText += prefix + text; |
742 | if ( event->doesFloat() ) { | ||
743 | mToolTipText += i18n(" (Duration: %1 days)" ).arg ( event->dtStart().daysTo(event->dtEnd())+1); | ||
744 | |||
745 | } | ||
746 | } | ||
742 | } else { | 747 | } else { |
743 | if (event->doesFloat()) { | 748 | if (event->doesFloat()) { |
744 | text = event->summary(); | 749 | text = event->summary(); |
745 | if ( useToolTips ) | 750 | if ( useToolTips ) |
746 | mToolTipText += text; | 751 | mToolTipText += text; |
747 | } | 752 | } |
748 | else { | 753 | else { |
749 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 754 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
750 | text += " " + event->summary(); | 755 | text += " " + event->summary(); |
751 | if ( useToolTips ) | 756 | if ( useToolTips ) |
752 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 757 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
753 | } | 758 | } |
754 | } | 759 | } |
755 | if ( useToolTips && ! event->location().isEmpty() ) { | 760 | if ( useToolTips && ! event->location().isEmpty() ) { |
756 | mToolTipText += " (" + event->location() +")"; | 761 | mToolTipText += " (" + event->location() +")"; |
757 | } | 762 | } |
758 | MonthViewItem *item ; | 763 | MonthViewItem *item ; |
759 | 764 | ||
760 | if ( mAvailItemList.count() ) { | 765 | if ( mAvailItemList.count() ) { |
761 | item = mAvailItemList.first(); | 766 | item = mAvailItemList.first(); |
762 | mAvailItemList.remove( item ); | 767 | mAvailItemList.remove( item ); |
763 | item->recycle( event, text ); | 768 | item->recycle( event, text ); |
764 | } else { | 769 | } else { |
765 | item = new MonthViewItem( event, text ); | 770 | item = new MonthViewItem( event, text ); |