-rw-r--r-- | korganizer/kodaymatrix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index a886f4a..17a8546 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -156,97 +156,97 @@ KODayMatrix::~KODayMatrix() | |||
156 | 156 | ||
157 | /* | 157 | /* |
158 | void KODayMatrix::setStartDate(QDate start) | 158 | void KODayMatrix::setStartDate(QDate start) |
159 | { | 159 | { |
160 | updateView(start); | 160 | updateView(start); |
161 | } | 161 | } |
162 | */ | 162 | */ |
163 | 163 | ||
164 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) | 164 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) |
165 | { | 165 | { |
166 | 166 | ||
167 | if (mSelStart == NOSELECTION) { | 167 | if (mSelStart == NOSELECTION) { |
168 | return; | 168 | return; |
169 | } | 169 | } |
170 | 170 | ||
171 | //cope with selection being out of matrix limits at top (< 0) | 171 | //cope with selection being out of matrix limits at top (< 0) |
172 | int i0 = mSelStart; | 172 | int i0 = mSelStart; |
173 | if (i0 < 0) { | 173 | if (i0 < 0) { |
174 | for (int i = i0; i < 0; i++) { | 174 | for (int i = i0; i < 0; i++) { |
175 | selDays.append(days[0].addDays(i)); | 175 | selDays.append(days[0].addDays(i)); |
176 | } | 176 | } |
177 | i0 = 0; | 177 | i0 = 0; |
178 | } | 178 | } |
179 | 179 | ||
180 | //cope with selection being out of matrix limits at bottom (> NUMDAYS-1) | 180 | //cope with selection being out of matrix limits at bottom (> NUMDAYS-1) |
181 | if (mSelEnd > NUMDAYS-1) { | 181 | if (mSelEnd > NUMDAYS-1) { |
182 | for (int i = i0; i <= NUMDAYS-1; i++) { | 182 | for (int i = i0; i <= NUMDAYS-1; i++) { |
183 | selDays.append(days[i]); | 183 | selDays.append(days[i]); |
184 | } | 184 | } |
185 | for (int i = NUMDAYS; i < mSelEnd; i++) { | 185 | for (int i = NUMDAYS; i < mSelEnd; i++) { |
186 | selDays.append(days[0].addDays(i)); | 186 | selDays.append(days[0].addDays(i)); |
187 | } | 187 | } |
188 | 188 | ||
189 | // apply normal routine to selection being entirely within matrix limits | 189 | // apply normal routine to selection being entirely within matrix limits |
190 | } else { | 190 | } else { |
191 | for (int i = i0; i <= mSelEnd; i++) { | 191 | for (int i = i0; i <= mSelEnd; i++) { |
192 | selDays.append(days[i]); | 192 | selDays.append(days[i]); |
193 | } | 193 | } |
194 | } | 194 | } |
195 | } | 195 | } |
196 | 196 | ||
197 | void KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end) | 197 | void KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end) |
198 | { | 198 | { |
199 | mSelStart = startdate.daysTo(start); | 199 | mSelStart = startdate.daysTo(start); |
200 | mSelEnd = startdate.daysTo(end); | 200 | mSelEnd = startdate.daysTo(end); |
201 | } | 201 | } |
202 | void KODayMatrix::clearSelection() | 202 | void KODayMatrix::clearSelection() |
203 | { | 203 | { |
204 | mSelEnd = mSelStart = NOSELECTION; | 204 | mSelEnd = mSelStart = NOSELECTION; |
205 | } | 205 | } |
206 | 206 | ||
207 | 207 | ||
208 | void KODayMatrix::recalculateToday() | 208 | void KODayMatrix::recalculateToday() |
209 | { | 209 | { |
210 | today = -1; | 210 | today = -1; |
211 | for (int i=0; i<NUMDAYS; i++) { | 211 | for (int i=0; i<NUMDAYS; i++) { |
212 | events[i] = 0; | 212 | events[i] = 0; |
213 | days[i] = startdate.addDays(i); | 213 | days[i] = startdate.addDays(i); |
214 | daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] )); | 214 | daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] )); |
215 | 215 | ||
216 | // if today is in the currently displayed month, hilight today | 216 | // if today is in the currently displayed month, hilight today |
217 | if (days[i].year() == QDate::currentDate().year() && | 217 | if (days[i].year() == QDate::currentDate().year() && |
218 | days[i].month() == QDate::currentDate().month() && | 218 | days[i].month() == QDate::currentDate().month() && |
219 | days[i].day() == QDate::currentDate().day()) { | 219 | days[i].day() == QDate::currentDate().day()) { |
220 | today = i; | 220 | today = i; |
221 | } | 221 | } |
222 | } | 222 | } |
223 | // qDebug(QString("Today is visible at %1.").arg(today)); | 223 | // qDebug(QString("Today is visible at %1.").arg(today)); |
224 | } | 224 | } |
225 | 225 | ||
226 | void KODayMatrix::updateView() | 226 | void KODayMatrix::updateView() |
227 | { | 227 | { |
228 | updateView(startdate); | 228 | updateView(startdate); |
229 | } | 229 | } |
230 | void KODayMatrix::repaintViewTimed() | 230 | void KODayMatrix::repaintViewTimed() |
231 | { | 231 | { |
232 | mRepaintTimer->stop(); | 232 | mRepaintTimer->stop(); |
233 | repaint(false); | 233 | repaint(false); |
234 | } | 234 | } |
235 | void KODayMatrix::updateViewTimed() | 235 | void KODayMatrix::updateViewTimed() |
236 | { | 236 | { |
237 | mUpdateTimer->stop(); | 237 | mUpdateTimer->stop(); |
238 | if ( !mCalendar ) { | 238 | if ( !mCalendar ) { |
239 | qDebug("NOT CAL "); | 239 | qDebug("NOT CAL "); |
240 | return; | 240 | return; |
241 | } | 241 | } |
242 | //qDebug("KODayMatrix::updateViewTimed "); | 242 | //qDebug("KODayMatrix::updateViewTimed "); |
243 | for(int i = 0; i < NUMDAYS; i++) { | 243 | for(int i = 0; i < NUMDAYS; i++) { |
244 | // if events are set for the day then remember to draw it bold | 244 | // if events are set for the day then remember to draw it bold |
245 | QPtrList<Event> eventlist = mCalendar->events(days[i]); | 245 | QPtrList<Event> eventlist = mCalendar->events(days[i]); |
246 | Event *event; | 246 | Event *event; |
247 | int numEvents = eventlist.count(); | 247 | int numEvents = eventlist.count(); |
248 | QString holiStr = ""; | 248 | QString holiStr = ""; |
249 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 249 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
250 | ushort recurType = event->recurrence()->doesRecur(); | 250 | ushort recurType = event->recurrence()->doesRecur(); |
251 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 251 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
252 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 252 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |