author | zautrix <zautrix> | 2005-10-27 23:22:36 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-27 23:22:36 (UTC) |
commit | cbda16d4966c7483d20d1b6b5a64c8af367ea732 (patch) (unidiff) | |
tree | 47099fd5b318c47eb1d8fff3d8a3eef6e34f6f23 /korganizer | |
parent | d6d384e50cfd511866958e58cdd3adeb35ed1c4e (diff) | |
download | kdepimpi-cbda16d4966c7483d20d1b6b5a64c8af367ea732.zip kdepimpi-cbda16d4966c7483d20d1b6b5a64c8af367ea732.tar.gz kdepimpi-cbda16d4966c7483d20d1b6b5a64c8af367ea732.tar.bz2 |
us fix
-rw-r--r-- | korganizer/komonthview.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 610aae6..85e9166 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -692,103 +692,111 @@ int MonthViewCell::insertEvent(Event *event) | |||
692 | useToolTips = false; | 692 | useToolTips = false; |
693 | #endif | 693 | #endif |
694 | QString mToolTipText; | 694 | QString mToolTipText; |
695 | setFocusPolicy(WheelFocus); | 695 | setFocusPolicy(WheelFocus); |
696 | if ( !(event->doesRecur() == Recurrence::rNone) ) { | 696 | if ( !(event->doesRecur() == Recurrence::rNone) ) { |
697 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) | 697 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) |
698 | return mdayCount; | 698 | return mdayCount; |
699 | else | 699 | else |
700 | if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) | 700 | if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) |
701 | return mdayCount; | 701 | return mdayCount; |
702 | } | 702 | } |
703 | 703 | ||
704 | if ( event->isHoliday()) { | 704 | if ( event->isHoliday()) { |
705 | setHoliday( true ); | 705 | setHoliday( true ); |
706 | if ( mDate.dayOfWeek() == 7 ) | 706 | if ( mDate.dayOfWeek() == 7 ) |
707 | setLineWidth( 3 ); | 707 | setLineWidth( 3 ); |
708 | } | 708 | } |
709 | QString text; | 709 | QString text; |
710 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day | 710 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day |
711 | if (event->isMultiDay()) { | 711 | if (event->isMultiDay()) { |
712 | QString prefix = "<->";multiday = 2; | 712 | QString prefix = "<->";multiday = 2; |
713 | QString time; | 713 | QString time; |
714 | if ( event->doesRecur() ) { | 714 | if ( event->doesRecur() ) { |
715 | if ( event->recursOn( mDate) ) { | 715 | if ( event->recursOn( mDate) ) { |
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 | |||
741 | int dur = 0; | ||
742 | if ( event->doesFloat() ) { | ||
743 | dur = event->dtStart().daysTo(event->dtEnd())+1; | ||
744 | |||
745 | } | ||
740 | if ( useToolTips ) { | 746 | if ( useToolTips ) { |
741 | mToolTipText += prefix + text; | 747 | mToolTipText += prefix + text; |
742 | if ( event->doesFloat() ) { | 748 | if ( dur ) { |
743 | mToolTipText += i18n(" (Duration: %1 days)" ).arg ( event->dtStart().daysTo(event->dtEnd())+1); | 749 | mToolTipText += i18n(" (Duration: %1 days)" ).arg ( dur ); |
744 | |||
745 | } | 750 | } |
746 | } | 751 | } |
752 | if ( dur ) { | ||
753 | text += " ("+ QString::number( dur ) + i18n(" days" ) + ")"; | ||
754 | } | ||
747 | } else { | 755 | } else { |
748 | if (event->doesFloat()) { | 756 | if (event->doesFloat()) { |
749 | text = event->summary(); | 757 | text = event->summary(); |
750 | if ( useToolTips ) | 758 | if ( useToolTips ) |
751 | mToolTipText += text; | 759 | mToolTipText += text; |
752 | } | 760 | } |
753 | else { | 761 | else { |
754 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 762 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
755 | text += " " + event->summary(); | 763 | text += " " + event->summary(); |
756 | if ( useToolTips ) | 764 | if ( useToolTips ) |
757 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 765 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
758 | } | 766 | } |
759 | } | 767 | } |
760 | if ( useToolTips && ! event->location().isEmpty() ) { | 768 | if ( useToolTips && ! event->location().isEmpty() ) { |
761 | mToolTipText += " (" + event->location() +")"; | 769 | mToolTipText += " (" + event->location() +")"; |
762 | } | 770 | } |
763 | MonthViewItem *item ; | 771 | MonthViewItem *item ; |
764 | 772 | ||
765 | if ( mAvailItemList.count() ) { | 773 | if ( mAvailItemList.count() ) { |
766 | item = mAvailItemList.first(); | 774 | item = mAvailItemList.first(); |
767 | mAvailItemList.remove( item ); | 775 | mAvailItemList.remove( item ); |
768 | item->recycle( event, text ); | 776 | item->recycle( event, text ); |
769 | } else { | 777 | } else { |
770 | item = new MonthViewItem( event, text ); | 778 | item = new MonthViewItem( event, text ); |
771 | } | 779 | } |
772 | 780 | ||
773 | QPalette pal; | 781 | QPalette pal; |
774 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor) { | 782 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor) { |
775 | QStringList categories = event->categories(); | 783 | QStringList categories = event->categories(); |
776 | QString cat = categories.first(); | 784 | QString cat = categories.first(); |
777 | if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { | 785 | if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { |
778 | pal = getPalette(); | 786 | pal = getPalette(); |
779 | if (cat.isEmpty()) { | 787 | if (cat.isEmpty()) { |
780 | //pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); | 788 | //pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); |
781 | pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->defaultColor( event->calID() )); | 789 | pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->defaultColor( event->calID() )); |
782 | } else { | 790 | } else { |
783 | pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); | 791 | pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); |
784 | } | 792 | } |
785 | 793 | ||
786 | } else { | 794 | } else { |
787 | if (cat.isEmpty()) { | 795 | if (cat.isEmpty()) { |
788 | //pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); | 796 | //pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); |
789 | pal = QPalette( KOPrefs::instance()->defaultColor( event->calID() ), KOPrefs::instance()->defaultColor( event->calID() )); | 797 | pal = QPalette( KOPrefs::instance()->defaultColor( event->calID() ), KOPrefs::instance()->defaultColor( event->calID() )); |
790 | } else { | 798 | } else { |
791 | pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); | 799 | pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); |
792 | } | 800 | } |
793 | } | 801 | } |
794 | 802 | ||