-rw-r--r-- | korganizer/kdatenavigator.cpp | 18 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 25 | ||||
-rw-r--r-- | korganizer/komonthview.h | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 28 |
4 files changed, 24 insertions, 49 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 38bddc2..2fca49e 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -301,67 +301,65 @@ void KDateNavigator::updateDates() | |||
301 | int index = (KGlobal::locale()->weekStartsMonday() ? 1 : 0) - m_fstDayOfWkCalsys - nextLine; | 301 | int index = (KGlobal::locale()->weekStartsMonday() ? 1 : 0) - m_fstDayOfWkCalsys - nextLine; |
302 | 302 | ||
303 | 303 | ||
304 | daymatrix->updateView(dayone.addDays(index)); | 304 | daymatrix->updateView(dayone.addDays(index)); |
305 | //each updateDates is followed by an updateView -> repaint is issued there ! | 305 | //each updateDates is followed by an updateView -> repaint is issued there ! |
306 | // daymatrix->repaint(); | 306 | // daymatrix->repaint(); |
307 | } | 307 | } |
308 | 308 | ||
309 | void KDateNavigator::updateDayMatrix() | 309 | void KDateNavigator::updateDayMatrix() |
310 | { | 310 | { |
311 | daymatrix->updateView(); | 311 | daymatrix->updateView(); |
312 | //daymatrix->repaint(); | 312 | //daymatrix->repaint(); |
313 | } | 313 | } |
314 | 314 | ||
315 | 315 | ||
316 | void KDateNavigator::updateView() | 316 | void KDateNavigator::updateView() |
317 | { | 317 | { |
318 | 318 | ||
319 | setUpdatesEnabled( false ); | 319 | setUpdatesEnabled( false ); |
320 | 320 | ||
321 | int i; | 321 | int i; |
322 | 322 | ||
323 | // kdDebug() << "updateView() -> daymatrix->updateView()" << endl; | 323 | // kdDebug() << "updateView() -> daymatrix->updateView()" << endl; |
324 | daymatrix->updateView(); | 324 | daymatrix->updateView(); |
325 | 325 | int sub = 4; | |
326 | if ( ! KGlobal::locale()->weekStartsMonday() ) | ||
327 | --sub; | ||
326 | // set the week numbers. | 328 | // set the week numbers. |
327 | for(i = 0; i < 6; i++) { | 329 | for(i = 0; i < 6; i++) { |
328 | QString weeknum; | ||
329 | // remember, according to ISO 8601, the first week of the year is the | 330 | // remember, according to ISO 8601, the first week of the year is the |
330 | // first week that contains a thursday. Thus we must subtract off 4, | 331 | // first week that contains a thursday. Thus we must subtract off 4, |
331 | // not just 1. | 332 | // not just 1. |
332 | 333 | ||
333 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); | 334 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); |
334 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); | 335 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-sub))); |
335 | 336 | int weekNo; | |
336 | int add = 0; | ||
337 | if ( ! KGlobal::locale()->weekStartsMonday() ) | ||
338 | ++add; | ||
339 | if (dayOfYear % 7 != 0) | 337 | if (dayOfYear % 7 != 0) |
340 | weeknum.setNum(dayOfYear / 7 + 1+add); | 338 | weekNo = (dayOfYear / 7 + 1); |
341 | else | 339 | else |
342 | weeknum.setNum(dayOfYear / 7 +add); | 340 | weekNo = (dayOfYear / 7); |
343 | weeknos[i]->setText(weeknum); | 341 | weeknos[i]->setText(QString::number( weekNo )); |
344 | } | 342 | } |
345 | 343 | ||
346 | setUpdatesEnabled( true ); | 344 | setUpdatesEnabled( true ); |
347 | // kdDebug() << "updateView() -> repaint()" << endl; | 345 | // kdDebug() << "updateView() -> repaint()" << endl; |
348 | repaint(); | 346 | repaint(); |
349 | // daymatrix->repaint(); | 347 | // daymatrix->repaint(); |
350 | } | 348 | } |
351 | 349 | ||
352 | void KDateNavigator::updateConfig() | 350 | void KDateNavigator::updateConfig() |
353 | { | 351 | { |
354 | int day; | 352 | int day; |
355 | for(int i=0; i<7; i++) { | 353 | for(int i=0; i<7; i++) { |
356 | // take the first letter of the day name to be the abbreviation | 354 | // take the first letter of the day name to be the abbreviation |
357 | if (KGlobal::locale()->weekStartsMonday()) { | 355 | if (KGlobal::locale()->weekStartsMonday()) { |
358 | day = i+1; | 356 | day = i+1; |
359 | } else { | 357 | } else { |
360 | if (i==0) day = 7; | 358 | if (i==0) day = 7; |
361 | else day = i; | 359 | else day = i; |
362 | } | 360 | } |
363 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day, | 361 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day, |
364 | true ); | 362 | true ); |
365 | if ( KOPrefs::instance()->mCompactDialogs ) dayName = dayName.left( 1 ); | 363 | if ( KOPrefs::instance()->mCompactDialogs ) dayName = dayName.left( 1 ); |
366 | headings[i]->setText( dayName ); | 364 | headings[i]->setText( dayName ); |
367 | } | 365 | } |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 9085775..d825493 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -980,52 +980,49 @@ void MonthViewCell::selection( QListBoxItem *item ) | |||
980 | 980 | ||
981 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | 981 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) |
982 | : KOEventView( calendar, parent, name ), | 982 | : KOEventView( calendar, parent, name ), |
983 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), | 983 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), |
984 | mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) | 984 | mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) |
985 | { | 985 | { |
986 | mShortDayLabelsM = false; | 986 | mShortDayLabelsM = false; |
987 | mShortDayLabelsW = false; | 987 | mShortDayLabelsW = false; |
988 | skipResize = false; | 988 | skipResize = false; |
989 | clPending = true; | 989 | clPending = true; |
990 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" ); | 990 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" ); |
991 | mWidStack = new QWidgetStack( this ); | 991 | mWidStack = new QWidgetStack( this ); |
992 | QVBoxLayout* hb = new QVBoxLayout( this ); | 992 | QVBoxLayout* hb = new QVBoxLayout( this ); |
993 | mMonthView = new QWidget( mWidStack ); | 993 | mMonthView = new QWidget( mWidStack ); |
994 | mWeekView = new QWidget( mWidStack ); | 994 | mWeekView = new QWidget( mWidStack ); |
995 | #if QT_VERSION >= 0x030000 | 995 | #if QT_VERSION >= 0x030000 |
996 | mWidStack->addWidget(mMonthView ); | 996 | mWidStack->addWidget(mMonthView ); |
997 | mWidStack->addWidget(mWeekView ); | 997 | mWidStack->addWidget(mWeekView ); |
998 | #else | 998 | #else |
999 | mWidStack->addWidget( mMonthView, 1 ); | 999 | mWidStack->addWidget( mMonthView, 1 ); |
1000 | mWidStack->addWidget( mWeekView , 1 ); | 1000 | mWidStack->addWidget( mWeekView , 1 ); |
1001 | #endif | 1001 | #endif |
1002 | hb->addWidget( mNavigatorBar ); | 1002 | hb->addWidget( mNavigatorBar ); |
1003 | hb->addWidget( mWidStack ); | 1003 | hb->addWidget( mWidStack ); |
1004 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); | ||
1005 | mShowWeekView = KOPrefs::instance()->mMonthViewWeek; | 1004 | mShowWeekView = KOPrefs::instance()->mMonthViewWeek; |
1006 | if ( mShowWeekView ) | ||
1007 | mWeekStartsMonday = true; | ||
1008 | updatePossible = false; | 1005 | updatePossible = false; |
1009 | //updatePossible = true; | 1006 | //updatePossible = true; |
1010 | mCells.setAutoDelete( true ); | 1007 | mCells.setAutoDelete( true ); |
1011 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; | 1008 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; |
1012 | mDayLabels.resize( mDaysPerWeek ); | 1009 | mDayLabels.resize( mDaysPerWeek ); |
1013 | mDayLabelsW.resize( mDaysPerWeek ); | 1010 | mDayLabelsW.resize( mDaysPerWeek ); |
1014 | QFont bfont = font(); | 1011 | QFont bfont = font(); |
1015 | if ( QApplication::desktop()->width() < 650 ) { | 1012 | if ( QApplication::desktop()->width() < 650 ) { |
1016 | bfont.setPointSize( bfont.pointSize() - 2 ); | 1013 | bfont.setPointSize( bfont.pointSize() - 2 ); |
1017 | } | 1014 | } |
1018 | bfont.setBold( true ); | 1015 | bfont.setBold( true ); |
1019 | int i; | 1016 | int i; |
1020 | 1017 | ||
1021 | for( i = 0; i < mDaysPerWeek; i++ ) { | 1018 | for( i = 0; i < mDaysPerWeek; i++ ) { |
1022 | QLabel *label = new QLabel( mMonthView ); | 1019 | QLabel *label = new QLabel( mMonthView ); |
1023 | label->setFont(bfont); | 1020 | label->setFont(bfont); |
1024 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); | 1021 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); |
1025 | label->setLineWidth(1); | 1022 | label->setLineWidth(1); |
1026 | label->setAlignment(AlignCenter); | 1023 | label->setAlignment(AlignCenter); |
1027 | mDayLabels.insert( i, label ); | 1024 | mDayLabels.insert( i, label ); |
1028 | label = new QLabel( mWeekView ); | 1025 | label = new QLabel( mWeekView ); |
1029 | label->setFont(bfont); | 1026 | label->setFont(bfont); |
1030 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); | 1027 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); |
1031 | label->setLineWidth(1); | 1028 | label->setLineWidth(1); |
@@ -1196,144 +1193,146 @@ QPtrList<Incidence> KOMonthView::selectedIncidences() | |||
1196 | 1193 | ||
1197 | DateList KOMonthView::selectedDates() | 1194 | DateList KOMonthView::selectedDates() |
1198 | { | 1195 | { |
1199 | DateList selected; | 1196 | DateList selected; |
1200 | 1197 | ||
1201 | if ( mSelectedCell ) { | 1198 | if ( mSelectedCell ) { |
1202 | QDate qd = mSelectedCell->selectedIncidenceDate(); | 1199 | QDate qd = mSelectedCell->selectedIncidenceDate(); |
1203 | if ( qd.isValid() ) selected.append( qd ); | 1200 | if ( qd.isValid() ) selected.append( qd ); |
1204 | } | 1201 | } |
1205 | 1202 | ||
1206 | return selected; | 1203 | return selected; |
1207 | } | 1204 | } |
1208 | 1205 | ||
1209 | void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd, | 1206 | void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd, |
1210 | const QDate &td) | 1207 | const QDate &td) |
1211 | { | 1208 | { |
1212 | #ifndef KORG_NOPRINTER | 1209 | #ifndef KORG_NOPRINTER |
1213 | calPrinter->preview(CalPrinter::Month, fd, td); | 1210 | calPrinter->preview(CalPrinter::Month, fd, td); |
1214 | #endif | 1211 | #endif |
1215 | } | 1212 | } |
1216 | 1213 | ||
1217 | void KOMonthView::updateConfig() | 1214 | void KOMonthView::updateConfig() |
1218 | { | 1215 | { |
1219 | 1216 | ||
1220 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); | 1217 | int mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); |
1221 | 1218 | ||
1222 | if ( mShowWeekView ) { | 1219 | if ( mShowWeekView || KOPrefs::instance()->mMonthViewSatSunTog ) { |
1223 | mWeekStartsMonday = true; | 1220 | mWeekStartsMonday = true; |
1224 | } | 1221 | } |
1225 | QFontMetrics fontmetric(mDayLabels[0]->font()); | 1222 | QFontMetrics fontmetric(mDayLabels[0]->font()); |
1226 | mWidthLongDayLabel = 0; | 1223 | mWidthLongDayLabel = 0; |
1227 | 1224 | ||
1228 | for (int i = 0; i < 7; i++) { | 1225 | for (int i = 0; i < 7; i++) { |
1229 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); | 1226 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); |
1230 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; | 1227 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; |
1231 | } | 1228 | } |
1232 | bool temp = mShowSatSunComp ; | 1229 | bool temp = mShowSatSunComp ; |
1233 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; | 1230 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; |
1234 | if ( ! mShowWeekView ) { | 1231 | if ( ! mShowWeekView ) { |
1235 | if ( temp != KOPrefs::instance()->mMonthViewSatSunTog ) | 1232 | if ( temp != KOPrefs::instance()->mMonthViewSatSunTog ) |
1236 | computeLayout(); | 1233 | computeLayout(); |
1237 | } | 1234 | } |
1238 | updateDayLabels(); | 1235 | updateDayLabels(); |
1239 | //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks); | 1236 | //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks); |
1240 | //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks; | 1237 | //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks; |
1241 | //resizeEvent( 0 ); | 1238 | //resizeEvent( 0 ); |
1242 | for (uint i = 0; i < mCells.count(); ++i) { | 1239 | for (uint i = 0; i < mCells.count(); ++i) { |
1243 | mCells[i]->updateConfig(); | 1240 | mCells[i]->updateConfig(); |
1244 | } | 1241 | } |
1245 | 1242 | ||
1246 | for (uint i = 0; i < mCellsW.count(); ++i) { | 1243 | for (uint i = 0; i < mCellsW.count(); ++i) { |
1247 | mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont); | 1244 | mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont); |
1248 | } | 1245 | } |
1249 | #ifdef DESKTOP_VERSION | 1246 | #ifdef DESKTOP_VERSION |
1250 | MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); | 1247 | MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); |
1251 | #endif | 1248 | #endif |
1252 | updateView(); | 1249 | updateView(); |
1253 | } | 1250 | } |
1254 | 1251 | ||
1255 | void KOMonthView::updateDayLabels() | 1252 | void KOMonthView::updateDayLabels() |
1256 | { | 1253 | { |
1257 | 1254 | ||
1258 | QPtrVector<QLabel> *mDayLabelsT; | 1255 | QPtrVector<QLabel> *mDayLabelsT; |
1259 | 1256 | ||
1260 | mDayLabelsT = &mDayLabelsW; | 1257 | mDayLabelsT = &mDayLabelsW; |
1261 | for (int i = 0; i < 7; i++) { | 1258 | for (int i = 0; i < 7; i++) { |
1262 | if (mWeekStartsMonday) { | 1259 | { |
1263 | bool show = mShortDayLabelsW; | 1260 | bool show = mShortDayLabelsW; |
1264 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) | 1261 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) |
1265 | show = true; | 1262 | show = true; |
1266 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); | 1263 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); |
1267 | } else { | ||
1268 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW)); | ||
1269 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW)); | ||
1270 | |||
1271 | } | 1264 | } |
1272 | } | 1265 | } |
1273 | mDayLabelsT = &mDayLabels; | 1266 | mDayLabelsT = &mDayLabels; |
1274 | for (int i = 0; i < 7; i++) { | 1267 | for (int i = 0; i < 7; i++) { |
1275 | if (mWeekStartsMonday) { | 1268 | if (KGlobal::locale()->weekStartsMonday() || KOPrefs::instance()->mMonthViewSatSunTog ) { |
1276 | bool show = mShortDayLabelsM; | 1269 | bool show = mShortDayLabelsM; |
1277 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) | 1270 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) |
1278 | show = true; | 1271 | show = true; |
1279 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); | 1272 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); |
1280 | } else { | 1273 | } else { |
1281 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM)); | 1274 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM)); |
1282 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM)); | 1275 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM)); |
1283 | 1276 | ||
1284 | } | 1277 | } |
1285 | } | 1278 | } |
1286 | 1279 | ||
1287 | } | 1280 | } |
1288 | 1281 | ||
1289 | void KOMonthView::showDates(const QDate &start, const QDate &) | 1282 | void KOMonthView::showDates(const QDate &start, const QDate &) |
1290 | { | 1283 | { |
1291 | // kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl; | 1284 | // kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl; |
1292 | 1285 | ||
1293 | QPtrVector<MonthViewCell> *cells; | 1286 | QPtrVector<MonthViewCell> *cells; |
1294 | QPtrVector<QLabel> *dayLabels; | 1287 | QPtrVector<QLabel> *dayLabels; |
1295 | QPtrVector<KOWeekButton> *weekLabels; | 1288 | QPtrVector<KOWeekButton> *weekLabels; |
1296 | int weekNum = 6; | 1289 | int weekNum = 6; |
1290 | mStartDate = start; | ||
1297 | if ( mShowWeekView ) { | 1291 | if ( mShowWeekView ) { |
1298 | weekNum = 1; | 1292 | weekNum = 1; |
1299 | cells = &mCellsW; | 1293 | cells = &mCellsW; |
1300 | dayLabels = &mDayLabelsW; | 1294 | dayLabels = &mDayLabelsW; |
1301 | weekLabels = &mWeekLabelsW; | 1295 | weekLabels = &mWeekLabelsW; |
1296 | if ( !KGlobal::locale()->weekStartsMonday() ) { | ||
1297 | mStartDate = mStartDate.addDays( 1 ); | ||
1298 | } | ||
1302 | } else { | 1299 | } else { |
1303 | cells = &mCells; | 1300 | cells = &mCells; |
1304 | dayLabels = &mDayLabels; | 1301 | dayLabels = &mDayLabels; |
1305 | weekLabels = &mWeekLabels; | 1302 | weekLabels = &mWeekLabels; |
1306 | } | 1303 | } |
1307 | 1304 | ||
1308 | mStartDate = start; | 1305 | int mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); |
1309 | 1306 | ||
1307 | if ( mShowWeekView || KOPrefs::instance()->mMonthViewSatSunTog ) { | ||
1308 | mWeekStartsMonday = true; | ||
1309 | } | ||
1310 | int startWeekDay = mWeekStartsMonday ? 1 : 7; | 1310 | int startWeekDay = mWeekStartsMonday ? 1 : 7; |
1311 | 1311 | ||
1312 | while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) { | 1312 | while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) { |
1313 | mStartDate = mStartDate.addDays( -1 ); | 1313 | mStartDate = mStartDate.addDays( -1 ); |
1314 | } | 1314 | } |
1315 | |||
1316 | bool primary = false; | 1315 | bool primary = false; |
1317 | uint i; | 1316 | uint i; |
1318 | for( i = 0; i < (*cells).size(); ++i ) { | 1317 | for( i = 0; i < (*cells).size(); ++i ) { |
1319 | QDate date = mStartDate.addDays( i ); | 1318 | QDate date = mStartDate.addDays( i ); |
1320 | (*cells)[i]->setDate( date ); | 1319 | (*cells)[i]->setDate( date ); |
1321 | 1320 | ||
1322 | #ifndef KORG_NOPLUGINS | 1321 | #ifndef KORG_NOPLUGINS |
1323 | // add holiday, if present | 1322 | // add holiday, if present |
1324 | QString hstring(KOCore::self()->holiday(date)); | 1323 | QString hstring(KOCore::self()->holiday(date)); |
1325 | (*cells)[i]->setHoliday( hstring ); | 1324 | (*cells)[i]->setHoliday( hstring ); |
1326 | #endif | 1325 | #endif |
1327 | 1326 | ||
1328 | } | 1327 | } |
1329 | QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 ); | 1328 | QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 ); |
1330 | for( i = 0; i < weekNum; ++i ) { | 1329 | for( i = 0; i < weekNum; ++i ) { |
1331 | int wno; | 1330 | int wno; |
1332 | // remember, according to ISO 8601, the first week of the year is the | 1331 | // remember, according to ISO 8601, the first week of the year is the |
1333 | // first week that contains a thursday. Thus we must subtract off 4, | 1332 | // first week that contains a thursday. Thus we must subtract off 4, |
1334 | // not just 1. | 1333 | // not just 1. |
1335 | int dayOfYear = date.dayOfYear(); | 1334 | int dayOfYear = date.dayOfYear(); |
1336 | if (dayOfYear % 7 != 0) | 1335 | if (dayOfYear % 7 != 0) |
1337 | wno = dayOfYear / 7 + 1; | 1336 | wno = dayOfYear / 7 + 1; |
1338 | else | 1337 | else |
1339 | wno =dayOfYear / 7; | 1338 | wno =dayOfYear / 7; |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index a58f6b8..9e724c7 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -265,49 +265,49 @@ class KOMonthView: public KOEventView | |||
265 | signals: | 265 | signals: |
266 | void nextMonth(); | 266 | void nextMonth(); |
267 | void prevMonth(); | 267 | void prevMonth(); |
268 | void selectWeekNum ( int ); | 268 | void selectWeekNum ( int ); |
269 | void selectMonth (); | 269 | void selectMonth (); |
270 | void showDaySignal( QDate ); | 270 | void showDaySignal( QDate ); |
271 | protected: | 271 | protected: |
272 | void resizeEvent(QResizeEvent *); | 272 | void resizeEvent(QResizeEvent *); |
273 | void viewChanged(); | 273 | void viewChanged(); |
274 | void updateDayLabels(); | 274 | void updateDayLabels(); |
275 | 275 | ||
276 | private: | 276 | private: |
277 | QTimer* mComputeLayoutTimer; | 277 | QTimer* mComputeLayoutTimer; |
278 | NavigatorBar* mNavigatorBar; | 278 | NavigatorBar* mNavigatorBar; |
279 | int currentWeek(); | 279 | int currentWeek(); |
280 | bool clPending; | 280 | bool clPending; |
281 | QWidgetStack * mWidStack; | 281 | QWidgetStack * mWidStack; |
282 | QWidget* mMonthView; | 282 | QWidget* mMonthView; |
283 | QWidget* mWeekView; | 283 | QWidget* mWeekView; |
284 | bool mShowWeekView; | 284 | bool mShowWeekView; |
285 | bool updatePossible; | 285 | bool updatePossible; |
286 | int mDaysPerWeek; | 286 | int mDaysPerWeek; |
287 | int mNumWeeks; | 287 | int mNumWeeks; |
288 | int mNumCells; | 288 | int mNumCells; |
289 | bool mWeekStartsMonday; | 289 | //bool mWeekStartsMonday; |
290 | bool mShowSatSunComp; | 290 | bool mShowSatSunComp; |
291 | void computeLayout(); | 291 | void computeLayout(); |
292 | void computeLayoutWeek(); | 292 | void computeLayoutWeek(); |
293 | 293 | ||
294 | QPtrVector<MonthViewCell> mCells; | 294 | QPtrVector<MonthViewCell> mCells; |
295 | QPtrVector<QLabel> mDayLabels; | 295 | QPtrVector<QLabel> mDayLabels; |
296 | QPtrVector<KOWeekButton> mWeekLabels; | 296 | QPtrVector<KOWeekButton> mWeekLabels; |
297 | QPtrVector<MonthViewCell> mCellsW; | 297 | QPtrVector<MonthViewCell> mCellsW; |
298 | QPtrVector<QLabel> mDayLabelsW; | 298 | QPtrVector<QLabel> mDayLabelsW; |
299 | QPtrVector<KOWeekButton> mWeekLabelsW; | 299 | QPtrVector<KOWeekButton> mWeekLabelsW; |
300 | 300 | ||
301 | bool mShortDayLabelsM; | 301 | bool mShortDayLabelsM; |
302 | bool mShortDayLabelsW; | 302 | bool mShortDayLabelsW; |
303 | int mWidthLongDayLabel; | 303 | int mWidthLongDayLabel; |
304 | 304 | ||
305 | QDate mStartDate; | 305 | QDate mStartDate; |
306 | 306 | ||
307 | MonthViewCell *mSelectedCell; | 307 | MonthViewCell *mSelectedCell; |
308 | 308 | ||
309 | KOEventPopupMenu *mContextMenu; | 309 | KOEventPopupMenu *mContextMenu; |
310 | void keyPressEvent ( QKeyEvent * ) ; | 310 | void keyPressEvent ( QKeyEvent * ) ; |
311 | 311 | ||
312 | }; | 312 | }; |
313 | 313 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 2da592b..8e52968 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1457,75 +1457,53 @@ void MainWindow::aboutKnownBugs() | |||
1457 | i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") + | 1457 | i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") + |
1458 | i18n("\nor report them in the bugtracker on\n") + | 1458 | i18n("\nor report them in the bugtracker on\n") + |
1459 | i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"), | 1459 | i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"), |
1460 | QMessageBox::NoIcon, | 1460 | QMessageBox::NoIcon, |
1461 | QMessageBox::Ok, | 1461 | QMessageBox::Ok, |
1462 | QMessageBox::NoButton, | 1462 | QMessageBox::NoButton, |
1463 | QMessageBox::NoButton); | 1463 | QMessageBox::NoButton); |
1464 | msg->exec(); | 1464 | msg->exec(); |
1465 | delete msg; | 1465 | delete msg; |
1466 | 1466 | ||
1467 | } | 1467 | } |
1468 | 1468 | ||
1469 | QString MainWindow::defaultFileName() | 1469 | QString MainWindow::defaultFileName() |
1470 | { | 1470 | { |
1471 | return locateLocal( "data", "korganizer/mycalendar.ics" ); | 1471 | return locateLocal( "data", "korganizer/mycalendar.ics" ); |
1472 | } | 1472 | } |
1473 | QString MainWindow::syncFileName() | 1473 | QString MainWindow::syncFileName() |
1474 | { | 1474 | { |
1475 | #ifdef DESKTOP_VERSION | 1475 | #ifdef DESKTOP_VERSION |
1476 | return locateLocal( "tmp", "synccalendar.ics" ); | 1476 | return locateLocal( "tmp", "synccalendar.ics" ); |
1477 | #else | 1477 | #else |
1478 | return QString( "/tmp/synccalendar.ics" ); | 1478 | return QString( "/tmp/synccalendar.ics" ); |
1479 | #endif | 1479 | #endif |
1480 | } | 1480 | } |
1481 | #include "koglobals.h" | ||
1482 | #include <kcalendarsystem.h> | ||
1481 | void MainWindow::updateWeek(QDate seda) | 1483 | void MainWindow::updateWeek(QDate seda) |
1482 | { | 1484 | { |
1483 | int weekNum = 0; | 1485 | int weekNum = KGlobal::locale()->weekNum ( seda ); |
1484 | QDate d = QDate ( seda.year(), 1,1); | ||
1485 | seda = seda.addDays( 1-seda.dayOfWeek() );//we are on monday | ||
1486 | if ( seda.addDays(6).year() != seda.year() ) { | ||
1487 | if ( seda.year() != d.year() ) { | ||
1488 | if ( d.dayOfWeek() > 4 ) | ||
1489 | d = QDate ( seda.year(), 1,1); | ||
1490 | else | ||
1491 | weekNum = 1; | ||
1492 | } else { | ||
1493 | QDate dd( seda.year()+1, 1,1); | ||
1494 | if ( dd.dayOfWeek() <= 4 ) | ||
1495 | weekNum = 1; | ||
1496 | } | ||
1497 | } | ||
1498 | if ( weekNum == 0 ){ | ||
1499 | int dow = d.dayOfWeek(); | ||
1500 | if ( dow <= 4 ) | ||
1501 | d = d.addDays( 1-dow ); | ||
1502 | else // 5,6,7 | ||
1503 | d = d.addDays( 8-dow ); | ||
1504 | // we have the first week of the year.we are on monday | ||
1505 | weekNum = d.daysTo( seda ) / 7 +1; | ||
1506 | } | ||
1507 | |||
1508 | mWeekPixmap.fill( mWeekBgColor ); | 1486 | mWeekPixmap.fill( mWeekBgColor ); |
1509 | QPainter p ( &mWeekPixmap ); | 1487 | QPainter p ( &mWeekPixmap ); |
1510 | p.setFont( mWeekFont ); | 1488 | p.setFont( mWeekFont ); |
1511 | p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) ); | 1489 | p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) ); |
1512 | p.end(); | 1490 | p.end(); |
1513 | QIconSet icon3 ( mWeekPixmap ); | 1491 | QIconSet icon3 ( mWeekPixmap ); |
1514 | mWeekAction->setIconSet ( icon3 ); | 1492 | mWeekAction->setIconSet ( icon3 ); |
1515 | 1493 | ||
1516 | } | 1494 | } |
1517 | void MainWindow::updateWeekNum(const DateList &selectedDates) | 1495 | void MainWindow::updateWeekNum(const DateList &selectedDates) |
1518 | { | 1496 | { |
1519 | updateWeek( selectedDates.first() ); | 1497 | updateWeek( selectedDates.first() ); |
1520 | } | 1498 | } |
1521 | void MainWindow::processIncidenceSelection( Incidence *incidence ) | 1499 | void MainWindow::processIncidenceSelection( Incidence *incidence ) |
1522 | { | 1500 | { |
1523 | 1501 | ||
1524 | if ( !incidence ) { | 1502 | if ( !incidence ) { |
1525 | enableIncidenceActions( false ); | 1503 | enableIncidenceActions( false ); |
1526 | 1504 | ||
1527 | mNewSubTodoAction->setEnabled( false ); | 1505 | mNewSubTodoAction->setEnabled( false ); |
1528 | setCaptionToDates(); | 1506 | setCaptionToDates(); |
1529 | return; | 1507 | return; |
1530 | 1508 | ||
1531 | } | 1509 | } |