-rw-r--r-- | korganizer/koagendaitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 0f9a38f..d38cb00 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -91,65 +91,66 @@ KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool | |||
91 | mKOAgendaItemWhatsThis = new KOAgendaItemWhatsThis(this); | 91 | mKOAgendaItemWhatsThis = new KOAgendaItemWhatsThis(this); |
92 | Qt::WindowFlags wflags = windowFlags() |Qt::WRepaintNoErase;// WResizeNoErase | 92 | Qt::WindowFlags wflags = windowFlags() |Qt::WRepaintNoErase;// WResizeNoErase |
93 | setWindowFlags ( wflags); | 93 | setWindowFlags ( wflags); |
94 | mAllDay = allday; | 94 | mAllDay = allday; |
95 | init ( incidence, qd ); | 95 | init ( incidence, qd ); |
96 | //setMouseTracking(true); | 96 | //setMouseTracking(true); |
97 | //setAcceptDrops(true); | 97 | //setAcceptDrops(true); |
98 | xPaintCoord = -1; | 98 | xPaintCoord = -1; |
99 | yPaintCoord = -1; | 99 | yPaintCoord = -1; |
100 | } | 100 | } |
101 | QString KOAgendaItem::getWhatsThisText() | 101 | QString KOAgendaItem::getWhatsThisText() |
102 | { | 102 | { |
103 | if ( mIncidence ) | 103 | if ( mIncidence ) |
104 | return KIncidenceFormatter::instance()->getFormattedText( mIncidence, | 104 | return KIncidenceFormatter::instance()->getFormattedText( mIncidence, |
105 | KOPrefs::instance()->mWTshowDetails, | 105 | KOPrefs::instance()->mWTshowDetails, |
106 | KOPrefs::instance()->mWTshowCreated, | 106 | KOPrefs::instance()->mWTshowCreated, |
107 | KOPrefs::instance()->mWTshowChanged); | 107 | KOPrefs::instance()->mWTshowChanged); |
108 | return "KOAgendaItem::getWhatsThisText()::internal error"; | 108 | return "KOAgendaItem::getWhatsThisText()::internal error"; |
109 | } | 109 | } |
110 | 110 | ||
111 | void KOAgendaItem::initColor () | 111 | void KOAgendaItem::initColor () |
112 | { | 112 | { |
113 | if ( (mIncidence->typeID() == todoID ) && | 113 | if ( (mIncidence->typeID() == todoID ) && |
114 | ( !((static_cast<Todo*>(mIncidence))->isCompleted()) && | 114 | ( !((static_cast<Todo*>(mIncidence))->isCompleted()) && |
115 | ((static_cast<Todo*>(mIncidence))->dtDue().date() <= QDate::currentDate()) ) ) { | 115 | ((static_cast<Todo*>(mIncidence))->dtDue().date() <= QDate::currentDate()) ) ) { |
116 | if ( (static_cast<Todo*>(mIncidence))->dtDue() < (QDateTime)QDateTime::currentDateTime().date()) | 116 | if ( (static_cast<Todo*>(mIncidence))->dtDue() < (QDateTime)QDateTime::currentDateTime().date()) |
117 | mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ; | 117 | mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ; |
118 | else | 118 | else |
119 | mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor; | 119 | mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor; |
120 | } | 120 | } |
121 | else { | 121 | else { |
122 | QStringList categories = mIncidence->categories(); | 122 | QStringList categories = mIncidence->categories(); |
123 | QString cat = categories.first(); | 123 | QString cat; |
124 | if(!categories.isEmpty()) cat = categories.first(); | ||
124 | if (cat.isEmpty()) { | 125 | if (cat.isEmpty()) { |
125 | if ( (mIncidence->typeID() == todoID ) &&((static_cast<Todo*>(mIncidence))->isCompleted()) ) | 126 | if ( (mIncidence->typeID() == todoID ) &&((static_cast<Todo*>(mIncidence))->isCompleted()) ) |
126 | mBackgroundColor =KOPrefs::instance()->mTodoDoneColor; | 127 | mBackgroundColor =KOPrefs::instance()->mTodoDoneColor; |
127 | else | 128 | else |
128 | mBackgroundColor =KOPrefs::instance()->defaultColor( mIncidence->calID() ); | 129 | mBackgroundColor =KOPrefs::instance()->defaultColor( mIncidence->calID() ); |
129 | } else { | 130 | } else { |
130 | mBackgroundColor = *KOPrefs::instance()->categoryColor(cat); | 131 | mBackgroundColor = *KOPrefs::instance()->categoryColor(cat); |
131 | if ( (mIncidence->typeID() == todoID ) &&((static_cast<Todo*>(mIncidence))->isCompleted()) ) { | 132 | if ( (mIncidence->typeID() == todoID ) &&((static_cast<Todo*>(mIncidence))->isCompleted()) ) { |
132 | if ( mBackgroundColor == KOPrefs::instance()->mEventColor ) | 133 | if ( mBackgroundColor == KOPrefs::instance()->mEventColor ) |
133 | mBackgroundColor = KOPrefs::instance()->mTodoDoneColor; | 134 | mBackgroundColor = KOPrefs::instance()->mTodoDoneColor; |
134 | } | 135 | } |
135 | } | 136 | } |
136 | 137 | ||
137 | } | 138 | } |
138 | 139 | ||
139 | QColor BackgroundColor ( mBackgroundColor ); | 140 | QColor BackgroundColor ( mBackgroundColor ); |
140 | if ( mIncidence->calID() > 1 ) { | 141 | if ( mIncidence->calID() > 1 ) { |
141 | //BackgroundColor = KOPrefs::instance()->defaultColor( mIncidence->calID() ); | 142 | //BackgroundColor = KOPrefs::instance()->defaultColor( mIncidence->calID() ); |
142 | } | 143 | } |
143 | mColorGroup = QColorGroup( BackgroundColor.light(), | 144 | mColorGroup = QColorGroup( BackgroundColor.light(), |
144 | BackgroundColor.dark(),BackgroundColor.light(), | 145 | BackgroundColor.dark(),BackgroundColor.light(), |
145 | BackgroundColor.dark(),BackgroundColor, Qt::black, BackgroundColor) ; | 146 | BackgroundColor.dark(),BackgroundColor, Qt::black, BackgroundColor) ; |
146 | setBackgroundColor( mBackgroundColor ); | 147 | setBackgroundColor( mBackgroundColor ); |
147 | mWhiteText = (mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue() < 250); | 148 | mWhiteText = (mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue() < 250); |
148 | } | 149 | } |
149 | void KOAgendaItem::init ( Incidence *incidence, QDate qd ) | 150 | void KOAgendaItem::init ( Incidence *incidence, QDate qd ) |
150 | { | 151 | { |
151 | mIncidence = incidence; | 152 | mIncidence = incidence; |
152 | mDate = qd; | 153 | mDate = qd; |
153 | mFirstMultiItem = 0; | 154 | mFirstMultiItem = 0; |
154 | mNextMultiItem = 0; | 155 | mNextMultiItem = 0; |
155 | mLastMultiItem = 0; | 156 | mLastMultiItem = 0; |