Diffstat (limited to 'korganizer/kdatenavigator.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/kdatenavigator.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 7d0c516..b420351 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -204,100 +204,103 @@ void KDateNavigator::updateDates() | |||
204 | QDate dayone( m_MthYr.year(), m_MthYr.month(), m_MthYr.day() ); | 204 | QDate dayone( m_MthYr.year(), m_MthYr.month(), m_MthYr.day() ); |
205 | int d2 = KOGlobals::self()->calendarSystem()->day( dayone ); | 205 | int d2 = KOGlobals::self()->calendarSystem()->day( dayone ); |
206 | //int di = d1 - d2 + 1; | 206 | //int di = d1 - d2 + 1; |
207 | dayone = dayone.addDays( -d2 + 1 ); | 207 | dayone = dayone.addDays( -d2 + 1 ); |
208 | 208 | ||
209 | int m_fstDayOfWkCalsys = KOGlobals::self()->calendarSystem()->dayOfWeek( dayone ); | 209 | int m_fstDayOfWkCalsys = KOGlobals::self()->calendarSystem()->dayOfWeek( dayone ); |
210 | 210 | ||
211 | // If month begins on Monday and Monday is first day of week, | 211 | // If month begins on Monday and Monday is first day of week, |
212 | // month should begin on second line. Sunday doesn't have this problem. | 212 | // month should begin on second line. Sunday doesn't have this problem. |
213 | int nextLine = ( ( m_fstDayOfWkCalsys == 1) && | 213 | int nextLine = ( ( m_fstDayOfWkCalsys == 1) && |
214 | ( KGlobal::locale()->weekStartsMonday() == 1 ) ) ? 7 : 0; | 214 | ( KGlobal::locale()->weekStartsMonday() == 1 ) ) ? 7 : 0; |
215 | 215 | ||
216 | // update the matrix dates | 216 | // update the matrix dates |
217 | int index = (KGlobal::locale()->weekStartsMonday() ? 1 : 0) - m_fstDayOfWkCalsys - nextLine; | 217 | int index = (KGlobal::locale()->weekStartsMonday() ? 1 : 0) - m_fstDayOfWkCalsys - nextLine; |
218 | 218 | ||
219 | 219 | ||
220 | daymatrix->updateView(dayone.addDays(index)); | 220 | daymatrix->updateView(dayone.addDays(index)); |
221 | //each updateDates is followed by an updateView -> repaint is issued there ! | 221 | //each updateDates is followed by an updateView -> repaint is issued there ! |
222 | // daymatrix->repaint(); | 222 | // daymatrix->repaint(); |
223 | } | 223 | } |
224 | 224 | ||
225 | void KDateNavigator::updateDayMatrix() | 225 | void KDateNavigator::updateDayMatrix() |
226 | { | 226 | { |
227 | daymatrix->updateView(); | 227 | daymatrix->updateView(); |
228 | daymatrix->repaint(); | 228 | daymatrix->repaint(); |
229 | } | 229 | } |
230 | 230 | ||
231 | 231 | ||
232 | void KDateNavigator::updateView() | 232 | void KDateNavigator::updateView() |
233 | { | 233 | { |
234 | 234 | ||
235 | setUpdatesEnabled( false ); | 235 | setUpdatesEnabled( false ); |
236 | 236 | ||
237 | int i; | 237 | int i; |
238 | 238 | ||
239 | // kdDebug() << "updateView() -> daymatrix->updateView()" << endl; | 239 | // kdDebug() << "updateView() -> daymatrix->updateView()" << endl; |
240 | daymatrix->updateView(); | 240 | daymatrix->updateView(); |
241 | 241 | ||
242 | // set the week numbers. | 242 | // set the week numbers. |
243 | for(i = 0; i < 6; i++) { | 243 | for(i = 0; i < 6; i++) { |
244 | QString weeknum; | 244 | QString weeknum; |
245 | // remember, according to ISO 8601, the first week of the year is the | 245 | // remember, according to ISO 8601, the first week of the year is the |
246 | // first week that contains a thursday. Thus we must subtract off 4, | 246 | // first week that contains a thursday. Thus we must subtract off 4, |
247 | // not just 1. | 247 | // not just 1. |
248 | 248 | ||
249 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); | 249 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); |
250 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); | 250 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); |
251 | 251 | ||
252 | int add = 0; | ||
253 | if ( ! KGlobal::locale()->weekStartsMonday() ) | ||
254 | ++add; | ||
252 | if (dayOfYear % 7 != 0) | 255 | if (dayOfYear % 7 != 0) |
253 | weeknum.setNum(dayOfYear / 7 + 1); | 256 | weeknum.setNum(dayOfYear / 7 + 1+add); |
254 | else | 257 | else |
255 | weeknum.setNum(dayOfYear / 7); | 258 | weeknum.setNum(dayOfYear / 7 +add); |
256 | weeknos[i]->setText(weeknum); | 259 | weeknos[i]->setText(weeknum); |
257 | } | 260 | } |
258 | 261 | ||
259 | setUpdatesEnabled( true ); | 262 | setUpdatesEnabled( true ); |
260 | // kdDebug() << "updateView() -> repaint()" << endl; | 263 | // kdDebug() << "updateView() -> repaint()" << endl; |
261 | repaint(); | 264 | repaint(); |
262 | daymatrix->repaint(); | 265 | daymatrix->repaint(); |
263 | } | 266 | } |
264 | 267 | ||
265 | void KDateNavigator::updateConfig() | 268 | void KDateNavigator::updateConfig() |
266 | { | 269 | { |
267 | int day; | 270 | int day; |
268 | for(int i=0; i<7; i++) { | 271 | for(int i=0; i<7; i++) { |
269 | // take the first letter of the day name to be the abbreviation | 272 | // take the first letter of the day name to be the abbreviation |
270 | if (KGlobal::locale()->weekStartsMonday()) { | 273 | if (KGlobal::locale()->weekStartsMonday()) { |
271 | day = i+1; | 274 | day = i+1; |
272 | } else { | 275 | } else { |
273 | if (i==0) day = 7; | 276 | if (i==0) day = 7; |
274 | else day = i; | 277 | else day = i; |
275 | } | 278 | } |
276 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day, | 279 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day, |
277 | true ); | 280 | true ); |
278 | if ( KOPrefs::instance()->mCompactDialogs ) dayName = dayName.left( 1 ); | 281 | if ( KOPrefs::instance()->mCompactDialogs ) dayName = dayName.left( 1 ); |
279 | headings[i]->setText( dayName ); | 282 | headings[i]->setText( dayName ); |
280 | } | 283 | } |
281 | updateDates(); | 284 | updateDates(); |
282 | updateView(); | 285 | updateView(); |
283 | } | 286 | } |
284 | 287 | ||
285 | void KDateNavigator::setShowWeekNums(bool enabled) | 288 | void KDateNavigator::setShowWeekNums(bool enabled) |
286 | { | 289 | { |
287 | m_bShowWeekNums = enabled; | 290 | m_bShowWeekNums = enabled; |
288 | for(int i=0; i<6; i++) { | 291 | for(int i=0; i<6; i++) { |
289 | if(enabled) | 292 | if(enabled) |
290 | weeknos[i]->show(); | 293 | weeknos[i]->show(); |
291 | else | 294 | else |
292 | weeknos[i]->hide(); | 295 | weeknos[i]->hide(); |
293 | } | 296 | } |
294 | resize(size()); | 297 | resize(size()); |
295 | } | 298 | } |
296 | 299 | ||
297 | void KDateNavigator::selectDates(const DateList& dateList) | 300 | void KDateNavigator::selectDates(const DateList& dateList) |
298 | { | 301 | { |
299 | 302 | ||
300 | if (dateList.count() > 0) { | 303 | if (dateList.count() > 0) { |
301 | mNavigatorBar->selectDates( dateList ); | 304 | mNavigatorBar->selectDates( dateList ); |
302 | mSelectedDates = dateList; | 305 | mSelectedDates = dateList; |
303 | 306 | ||