author | zautrix <zautrix> | 2005-04-08 10:54:05 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-08 10:54:05 (UTC) |
commit | 59fb8a0ac35bf3b81f1c4e2e4fc6b61356d064ef (patch) (unidiff) | |
tree | ab604082029c081fa8725c5535a51a23bb963ef2 /korganizer/komonthview.cpp | |
parent | c82f9b40f6023dc7b39ac555cba8c4c313f15ca8 (diff) | |
download | kdepimpi-59fb8a0ac35bf3b81f1c4e2e4fc6b61356d064ef.zip kdepimpi-59fb8a0ac35bf3b81f1c4e2e4fc6b61356d064ef.tar.gz kdepimpi-59fb8a0ac35bf3b81f1c4e2e4fc6b61356d064ef.tar.bz2 |
fixes
-rw-r--r-- | korganizer/komonthview.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 4dfb9df..65d6acf 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -638,12 +638,16 @@ void MonthViewCell::startUpdateCell() | |||
638 | } | 638 | } |
639 | #endif | 639 | #endif |
640 | } | 640 | } |
641 | 641 | ||
642 | int MonthViewCell::insertEvent(Event *event) | 642 | int MonthViewCell::insertEvent(Event *event) |
643 | { | 643 | { |
644 | bool useToolTips = true; | ||
645 | #ifndef DEKSTOP_VERSION | ||
646 | useToolTips = false; | ||
647 | #endif | ||
644 | QString mToolTipText; | 648 | QString mToolTipText; |
645 | setFocusPolicy(WheelFocus); | 649 | setFocusPolicy(WheelFocus); |
646 | if ( !(event->doesRecur() == Recurrence::rNone) ) { | 650 | if ( !(event->doesRecur() == Recurrence::rNone) ) { |
647 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) | 651 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) |
648 | return mdayCount; | 652 | return mdayCount; |
649 | else | 653 | else |
@@ -684,24 +688,30 @@ int MonthViewCell::insertEvent(Event *event) | |||
684 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; | 688 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; |
685 | else if ( mDate == event->dtEnd().date () ) | 689 | else if ( mDate == event->dtEnd().date () ) |
686 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; | 690 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; |
687 | 691 | ||
688 | } | 692 | } |
689 | text = time + event->summary(); | 693 | text = time + event->summary(); |
690 | mToolTipText += prefix + text; | 694 | if ( useToolTips ) |
695 | mToolTipText += prefix + text; | ||
691 | } else { | 696 | } else { |
692 | if (event->doesFloat()) { | 697 | if (event->doesFloat()) { |
693 | text = event->summary(); | 698 | text = event->summary(); |
694 | mToolTipText += text; | 699 | if ( useToolTips ) |
700 | mToolTipText += text; | ||
695 | } | 701 | } |
696 | else { | 702 | else { |
697 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 703 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
698 | text += " " + event->summary(); | 704 | text += " " + event->summary(); |
699 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 705 | if ( useToolTips ) |
706 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | ||
700 | } | 707 | } |
701 | } | 708 | } |
709 | if ( useToolTips && ! event->location().isEmpty() ) { | ||
710 | mToolTipText += " (" + event->location() +")"; | ||
711 | } | ||
702 | MonthViewItem *item ; | 712 | MonthViewItem *item ; |
703 | 713 | ||
704 | if ( mAvailItemList.count() ) { | 714 | if ( mAvailItemList.count() ) { |
705 | item = mAvailItemList.first(); | 715 | item = mAvailItemList.first(); |
706 | mAvailItemList.remove( item ); | 716 | mAvailItemList.remove( item ); |
707 | item->recycle( event, mDate, text ); | 717 | item->recycle( event, mDate, text ); |
@@ -761,13 +771,14 @@ int MonthViewCell::insertEvent(Event *event) | |||
761 | break; | 771 | break; |
762 | } | 772 | } |
763 | ++pos; | 773 | ++pos; |
764 | } | 774 | } |
765 | insertItem( item ,pos); | 775 | insertItem( item ,pos); |
766 | } | 776 | } |
767 | mToolTip.append( mToolTipText ); | 777 | if ( useToolTips ) |
778 | mToolTip.append( mToolTipText ); | ||
768 | return mdayCount; | 779 | return mdayCount; |
769 | } | 780 | } |
770 | void MonthViewCell::insertTodo(Todo *todo) | 781 | void MonthViewCell::insertTodo(Todo *todo) |
771 | { | 782 | { |
772 | setFocusPolicy(WheelFocus); | 783 | setFocusPolicy(WheelFocus); |
773 | QString text; | 784 | QString text; |
@@ -813,13 +824,15 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
813 | } | 824 | } |
814 | item->setPalette( pal ); | 825 | item->setPalette( pal ); |
815 | item->setRecur( todo->recurrence()->doesRecur() ); | 826 | item->setRecur( todo->recurrence()->doesRecur() ); |
816 | item->setAlarm( todo->isAlarmEnabled() ); | 827 | item->setAlarm( todo->isAlarmEnabled() ); |
817 | item->setMoreInfo( todo->description().length() > 0 ); | 828 | item->setMoreInfo( todo->description().length() > 0 ); |
818 | insertItem( item , count()); | 829 | insertItem( item , count()); |
830 | #ifdef DESKTOP_VERSION | ||
819 | mToolTip.append( text ); | 831 | mToolTip.append( text ); |
832 | #endif | ||
820 | } | 833 | } |
821 | void MonthViewCell::repaintfinishUpdateCell() | 834 | void MonthViewCell::repaintfinishUpdateCell() |
822 | { | 835 | { |
823 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | 836 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); |
824 | while ( mitem ) { | 837 | while ( mitem ) { |
825 | mitem->setBlockRepaint( false ); | 838 | mitem->setBlockRepaint( false ); |