summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-27 18:45:56 (UTC)
committer zautrix <zautrix>2005-06-27 18:45:56 (UTC)
commit427221638f1e652bd57a37835a1de0134266c3f7 (patch) (unidiff)
tree5ce070815756cdaccd6c2f0cd6a02e54a1052675
parent2a6c47afc7688923f427f4a38e3353e3503ab09a (diff)
downloadkdepimpi-427221638f1e652bd57a37835a1de0134266c3f7.zip
kdepimpi-427221638f1e652bd57a37835a1de0134266c3f7.tar.gz
kdepimpi-427221638f1e652bd57a37835a1de0134266c3f7.tar.bz2
fixx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/komonthview.cpp14
-rw-r--r--korganizer/komonthview.h1
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
@@ -298,24 +298,36 @@ 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}
310void 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}
310bool MonthViewItem::setHighlightedFalse() 322bool 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
318bool MonthViewItem::setHighlighted( Incidence * inc ) 330bool MonthViewItem::setHighlighted( Incidence * inc )
319{ 331{
320 if ( inc == mIncidence ) { 332 if ( inc == mIncidence ) {
321 if ( mDisplayHightlighted ) 333 if ( mDisplayHightlighted )
@@ -646,24 +658,26 @@ void MonthViewCell::startUpdateCell()
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() ) {
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 159af16..ac97860 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -98,24 +98,25 @@ class KNoScrollListBox: public QListBox
98 98
99 private: 99 private:
100 bool resetOnFocusIn; 100 bool resetOnFocusIn;
101 KNOWhatsThis * mWT; 101 KNOWhatsThis * mWT;
102}; 102};
103 103
104 104
105class MonthViewItem: public QListBoxItem 105class 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; }