-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 | |||
@@ -270,4 +270,5 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s) | |||
270 | mReply = false; | 270 | mReply = false; |
271 | mInfo = false; | 271 | mInfo = false; |
272 | mdayPos = 0; | ||
272 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; | 273 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; |
273 | //qDebug("NEWWWWWWWWWWWWW "); | 274 | //qDebug("NEWWWWWWWWWWWWW "); |
@@ -283,4 +284,5 @@ void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) | |||
283 | mReply = false; | 284 | mReply = false; |
284 | mInfo = false; | 285 | mInfo = false; |
286 | mdayPos = 0; | ||
285 | //qDebug("recucleeeeeeeeeeeeeeeee "); | 287 | //qDebug("recucleeeeeeeeeeeeeeeee "); |
286 | } | 288 | } |
@@ -571,5 +573,5 @@ void MonthViewCell::setHoliday( const QString &holiday ) | |||
571 | void MonthViewCell::startUpdateCell() | 573 | void MonthViewCell::startUpdateCell() |
572 | { | 574 | { |
573 | 575 | mdayCount = 0; | |
574 | setFocusPolicy(NoFocus); | 576 | setFocusPolicy(NoFocus); |
575 | if ( !mMonthView->isUpdatePossible() ) | 577 | if ( !mMonthView->isUpdatePossible() ) |
@@ -622,5 +624,5 @@ void MonthViewCell::startUpdateCell() | |||
622 | } | 624 | } |
623 | 625 | ||
624 | void MonthViewCell::insertEvent(Event *event) | 626 | int MonthViewCell::insertEvent(Event *event) |
625 | { | 627 | { |
626 | QString mToolTipText; | 628 | QString mToolTipText; |
@@ -628,8 +630,8 @@ void MonthViewCell::insertEvent(Event *event) | |||
628 | if ( !(event->doesRecur() == Recurrence::rNone) ) { | 630 | if ( !(event->doesRecur() == Recurrence::rNone) ) { |
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 | } |
635 | 637 | ||
@@ -731,6 +733,22 @@ void MonthViewCell::insertEvent(Event *event) | |||
731 | #endif | 733 | #endif |
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 | } |
736 | void MonthViewCell::insertTodo(Todo *todo) | 754 | void MonthViewCell::insertTodo(Todo *todo) |
@@ -782,5 +800,5 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
782 | item->setAlarm( todo->isAlarmEnabled() ); | 800 | item->setAlarm( todo->isAlarmEnabled() ); |
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 ); |
786 | } | 804 | } |
@@ -805,5 +823,5 @@ void MonthViewCell::finishUpdateCell() | |||
805 | } | 823 | } |
806 | #endif | 824 | #endif |
807 | sort(); | 825 | //sort(); |
808 | //setMyPalette(); | 826 | //setMyPalette(); |
809 | setMyPalette(); | 827 | setMyPalette(); |