-rw-r--r-- | korganizer/komonthview.cpp | 14 | ||||
-rw-r--r-- | korganizer/komonthview.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 9b0389d..00e5a6f 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -286,48 +286,60 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s) | |||
286 | setText( s ); | 286 | setText( s ); |
287 | mMultiday = 0; | 287 | mMultiday = 0; |
288 | mIncidence = incidence; | 288 | mIncidence = incidence; |
289 | mDate = qd; | 289 | mDate = qd; |
290 | mRecur = false; | 290 | mRecur = false; |
291 | mAlarm = false; | 291 | mAlarm = false; |
292 | mReply = false; | 292 | mReply = false; |
293 | mInfo = false; | 293 | mInfo = false; |
294 | mdayPos = 0; | 294 | mdayPos = 0; |
295 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; | 295 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; |
296 | } | 296 | } |
297 | void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) | 297 | void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) |
298 | { | 298 | { |
299 | mDisplayHightlighted = false; | 299 | mDisplayHightlighted = false; |
300 | setText( s ); | 300 | setText( s ); |
301 | mMultiday = 0; | 301 | mMultiday = 0; |
302 | mIncidence = incidence; | 302 | mIncidence = incidence; |
303 | mDate = qd; | 303 | mDate = qd; |
304 | mRecur = false; | 304 | mRecur = false; |
305 | mAlarm = false; | 305 | mAlarm = false; |
306 | mReply = false; | 306 | mReply = false; |
307 | mInfo = false; | 307 | mInfo = false; |
308 | mdayPos = 0; | 308 | mdayPos = 0; |
309 | } | 309 | } |
310 | void MonthViewItem::clearData() | ||
311 | { | ||
312 | mDisplayHightlighted = false; | ||
313 | setText( "" ); | ||
314 | mMultiday = 0; | ||
315 | mIncidence = 0; | ||
316 | mRecur = false; | ||
317 | mAlarm = false; | ||
318 | mReply = false; | ||
319 | mInfo = false; | ||
320 | mdayPos = 0; | ||
321 | } | ||
310 | bool MonthViewItem::setHighlightedFalse() | 322 | bool MonthViewItem::setHighlightedFalse() |
311 | { | 323 | { |
312 | if ( !mDisplayHightlighted ) | 324 | if ( !mDisplayHightlighted ) |
313 | return false; | 325 | return false; |
314 | mDisplayHightlighted = false; | 326 | mDisplayHightlighted = false; |
315 | return true; | 327 | return true; |
316 | } | 328 | } |
317 | 329 | ||
318 | bool MonthViewItem::setHighlighted( Incidence * inc ) | 330 | bool MonthViewItem::setHighlighted( Incidence * inc ) |
319 | { | 331 | { |
320 | if ( inc == mIncidence ) { | 332 | if ( inc == mIncidence ) { |
321 | if ( mDisplayHightlighted ) | 333 | if ( mDisplayHightlighted ) |
322 | return false; | 334 | return false; |
323 | mDisplayHightlighted = true; | 335 | mDisplayHightlighted = true; |
324 | return true; | 336 | return true; |
325 | } else { | 337 | } else { |
326 | if ( !mDisplayHightlighted ) | 338 | if ( !mDisplayHightlighted ) |
327 | return false; | 339 | return false; |
328 | mDisplayHightlighted = false; | 340 | mDisplayHightlighted = false; |
329 | return true; | 341 | return true; |
330 | } | 342 | } |
331 | return false; | 343 | return false; |
332 | } | 344 | } |
333 | void MonthViewItem::paint(QPainter *p) | 345 | void MonthViewItem::paint(QPainter *p) |
@@ -634,48 +646,50 @@ void MonthViewCell::startUpdateCell() | |||
634 | return; | 646 | return; |
635 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | 647 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); |
636 | while ( mitem ) { | 648 | while ( mitem ) { |
637 | mitem->setBlockRepaint( true ); | 649 | mitem->setBlockRepaint( true ); |
638 | mitem = (MonthViewItem *)mitem->next(); | 650 | mitem = (MonthViewItem *)mitem->next(); |
639 | } | 651 | } |
640 | if ( mAvailItemList.count() > 20 ) { | 652 | if ( mAvailItemList.count() > 20 ) { |
641 | mAvailItemList.setAutoDelete( true ); | 653 | mAvailItemList.setAutoDelete( true ); |
642 | mAvailItemList.clear(); | 654 | mAvailItemList.clear(); |
643 | mAvailItemList.setAutoDelete( false ); | 655 | mAvailItemList.setAutoDelete( false ); |
644 | clear(); | 656 | clear(); |
645 | } | 657 | } |
646 | 658 | ||
647 | setPrimary( mDate.month()%2 ); | 659 | setPrimary( mDate.month()%2 ); |
648 | setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays); | 660 | setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays); |
649 | if ( mDate == QDate::currentDate() ) { | 661 | if ( mDate == QDate::currentDate() ) { |
650 | setLineWidth( 3 ); | 662 | setLineWidth( 3 ); |
651 | } else { | 663 | } else { |
652 | setLineWidth( 1 ); | 664 | setLineWidth( 1 ); |
653 | } | 665 | } |
654 | MonthViewItem* CurrentAvailItem = (MonthViewItem*) firstItem (); | 666 | MonthViewItem* CurrentAvailItem = (MonthViewItem*) firstItem (); |
655 | //clear(); | 667 | //clear(); |
656 | while ( CurrentAvailItem ) { | 668 | while ( CurrentAvailItem ) { |
657 | MonthViewItem *item = CurrentAvailItem; | 669 | MonthViewItem *item = CurrentAvailItem; |
670 | //item->setHighlightedFalse(); | ||
671 | item->clearData(); | ||
658 | CurrentAvailItem = (MonthViewItem *)item->next(); | 672 | CurrentAvailItem = (MonthViewItem *)item->next(); |
659 | mAvailItemList.append( item ); | 673 | mAvailItemList.append( item ); |
660 | takeItem ( item ); | 674 | takeItem ( item ); |
661 | } | 675 | } |
662 | 676 | ||
663 | #ifdef DESKTOP_VERSION | 677 | #ifdef DESKTOP_VERSION |
664 | QToolTip::remove(this); | 678 | QToolTip::remove(this); |
665 | #endif | 679 | #endif |
666 | mToolTip.clear(); | 680 | mToolTip.clear(); |
667 | //qApp->processEvents(); | 681 | //qApp->processEvents(); |
668 | #if 0 | 682 | #if 0 |
669 | if ( !mHolidayString.isEmpty() ) { | 683 | if ( !mHolidayString.isEmpty() ) { |
670 | MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString ); | 684 | MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString ); |
671 | item->setPalette( mHolidayPalette ); | 685 | item->setPalette( mHolidayPalette ); |
672 | insertItem( item ); | 686 | insertItem( item ); |
673 | mToolTip.append ( mHolidayString ); | 687 | mToolTip.append ( mHolidayString ); |
674 | } | 688 | } |
675 | #endif | 689 | #endif |
676 | } | 690 | } |
677 | 691 | ||
678 | int MonthViewCell::insertEvent(Event *event) | 692 | int MonthViewCell::insertEvent(Event *event) |
679 | { | 693 | { |
680 | bool useToolTips = true; | 694 | bool useToolTips = true; |
681 | #ifndef DESKTOP_VERSION | 695 | #ifndef DESKTOP_VERSION |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 159af16..ac97860 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -86,48 +86,49 @@ class KNoScrollListBox: public QListBox | |||
86 | void rightClick(); | 86 | void rightClick(); |
87 | void nextCell(); | 87 | void nextCell(); |
88 | void prevCell(); | 88 | void prevCell(); |
89 | void highligtIncidence( Incidence * , MonthViewCell*, int ); | 89 | void highligtIncidence( Incidence * , MonthViewCell*, int ); |
90 | 90 | ||
91 | protected slots: | 91 | protected slots: |
92 | void oneDown(); | 92 | void oneDown(); |
93 | void keyPressEvent(QKeyEvent *); | 93 | void keyPressEvent(QKeyEvent *); |
94 | void keyReleaseEvent(QKeyEvent *); | 94 | void keyReleaseEvent(QKeyEvent *); |
95 | void mousePressEvent(QMouseEvent *); | 95 | void mousePressEvent(QMouseEvent *); |
96 | void focusInEvent ( QFocusEvent * ); | 96 | void focusInEvent ( QFocusEvent * ); |
97 | void focusOutEvent ( QFocusEvent * ); | 97 | void focusOutEvent ( QFocusEvent * ); |
98 | 98 | ||
99 | private: | 99 | private: |
100 | bool resetOnFocusIn; | 100 | bool resetOnFocusIn; |
101 | KNOWhatsThis * mWT; | 101 | KNOWhatsThis * mWT; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | 104 | ||
105 | class MonthViewItem: public QListBoxItem | 105 | class MonthViewItem: public QListBoxItem |
106 | { | 106 | { |
107 | public: | 107 | public: |
108 | MonthViewItem( Incidence *, QDate qd, const QString & title ); | 108 | MonthViewItem( Incidence *, QDate qd, const QString & title ); |
109 | void recycle( Incidence *incidence, QDate qd, const QString & s); | 109 | void recycle( Incidence *incidence, QDate qd, const QString & s); |
110 | void clearData(); | ||
110 | void setRecur(bool on) { mRecur = on; } | 111 | void setRecur(bool on) { mRecur = on; } |
111 | void setAlarm(bool on) { mAlarm = on; } | 112 | void setAlarm(bool on) { mAlarm = on; } |
112 | void setReply(bool on) { mReply = on; } | 113 | void setReply(bool on) { mReply = on; } |
113 | void setMoreInfo(bool on) { mInfo = on; } | 114 | void setMoreInfo(bool on) { mInfo = on; } |
114 | void setMultiDay(int type) { mMultiday = type; } | 115 | void setMultiDay(int type) { mMultiday = type; } |
115 | int multiDay() { return mMultiday; } | 116 | int multiDay() { return mMultiday; } |
116 | void setMultiDayPos(int type) { mdayPos = type; } | 117 | void setMultiDayPos(int type) { mdayPos = type; } |
117 | int gettMultiDayPos() { return mdayPos; } | 118 | int gettMultiDayPos() { return mdayPos; } |
118 | void setBlockRepaint(bool on) { mblockRepaint = on; } | 119 | void setBlockRepaint(bool on) { mblockRepaint = on; } |
119 | bool setHighlighted( Incidence * ); | 120 | bool setHighlighted( Incidence * ); |
120 | 121 | ||
121 | void setPalette(const QPalette &p) { mPalette = p; } | 122 | void setPalette(const QPalette &p) { mPalette = p; } |
122 | QPalette palette() const { return mPalette; } | 123 | QPalette palette() const { return mPalette; } |
123 | bool setHighlightedFalse(); | 124 | bool setHighlightedFalse(); |
124 | Incidence *incidence() const { return mIncidence; } | 125 | Incidence *incidence() const { return mIncidence; } |
125 | QDate incidenceDate() { return mDate; } | 126 | QDate incidenceDate() { return mDate; } |
126 | 127 | ||
127 | protected: | 128 | protected: |
128 | virtual void paint(QPainter *); | 129 | virtual void paint(QPainter *); |
129 | virtual int height(const QListBox *) const; | 130 | virtual int height(const QListBox *) const; |
130 | virtual int width(const QListBox *) const; | 131 | virtual int width(const QListBox *) const; |
131 | 132 | ||
132 | private: | 133 | private: |
133 | int mdayPos; | 134 | int mdayPos; |