author | zautrix <zautrix> | 2005-04-05 09:30:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-05 09:30:00 (UTC) |
commit | 53d7ec81939a9cf7ea2f63f133c1b61b2e2a9216 (patch) (unidiff) | |
tree | 8dfcb059271cbfd4e28425d85dea747aa998594d /korganizer/komonthview.cpp | |
parent | 768858848f466a726e2f50b777345976828cc2ff (diff) | |
download | kdepimpi-53d7ec81939a9cf7ea2f63f133c1b61b2e2a9216.zip kdepimpi-53d7ec81939a9cf7ea2f63f133c1b61b2e2a9216.tar.gz kdepimpi-53d7ec81939a9cf7ea2f63f133c1b61b2e2a9216.tar.bz2 |
fix
-rw-r--r-- | korganizer/komonthview.cpp | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 1ed288b..425496a 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -271,2 +271,3 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s) | |||
271 | mInfo = false; | 271 | mInfo = false; |
272 | mdayPos = 0; | ||
272 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; | 273 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; |
@@ -284,2 +285,3 @@ void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) | |||
284 | mInfo = false; | 285 | mInfo = false; |
286 | mdayPos = 0; | ||
285 | //qDebug("recucleeeeeeeeeeeeeeeee "); | 287 | //qDebug("recucleeeeeeeeeeeeeeeee "); |
@@ -572,3 +574,3 @@ void MonthViewCell::startUpdateCell() | |||
572 | { | 574 | { |
573 | 575 | mdayCount = 0; | |
574 | setFocusPolicy(NoFocus); | 576 | setFocusPolicy(NoFocus); |
@@ -623,3 +625,3 @@ void MonthViewCell::startUpdateCell() | |||
623 | 625 | ||
624 | void MonthViewCell::insertEvent(Event *event) | 626 | int MonthViewCell::insertEvent(Event *event) |
625 | { | 627 | { |
@@ -629,6 +631,6 @@ void MonthViewCell::insertEvent(Event *event) | |||
629 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) | 631 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) |
630 | return; | 632 | return mdayCount; |
631 | else | 633 | else |
632 | if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) | 634 | if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) |
633 | return; | 635 | return mdayCount; |
634 | } | 636 | } |
@@ -732,4 +734,20 @@ void MonthViewCell::insertEvent(Event *event) | |||
732 | item->setMultiDay( multiday ); | 734 | item->setMultiDay( multiday ); |
733 | insertItem( item ); | 735 | if ( multiday ) { |
736 | insertItem( item ,mdayCount); | ||
737 | ++mdayCount; | ||
738 | } else { | ||
739 | uint i; | ||
740 | int pos = mdayCount; | ||
741 | for ( i = mdayCount; i < count();++i ) { | ||
742 | QListBoxItem* it = this->item ( i ); | ||
743 | if ( text < it->text() ) { | ||
744 | pos = i; | ||
745 | break; | ||
746 | } | ||
747 | ++pos; | ||
748 | } | ||
749 | insertItem( item ,pos); | ||
750 | } | ||
734 | mToolTip.append( mToolTipText ); | 751 | mToolTip.append( mToolTipText ); |
752 | return mdayCount; | ||
735 | } | 753 | } |
@@ -783,3 +801,3 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
783 | item->setMoreInfo( todo->description().length() > 0 ); | 801 | item->setMoreInfo( todo->description().length() > 0 ); |
784 | insertItem( item ); | 802 | insertItem( item , count()); |
785 | mToolTip.append( text ); | 803 | mToolTip.append( text ); |
@@ -806,3 +824,3 @@ void MonthViewCell::finishUpdateCell() | |||
806 | #endif | 824 | #endif |
807 | sort(); | 825 | //sort(); |
808 | //setMyPalette(); | 826 | //setMyPalette(); |