-rw-r--r-- | korganizer/kdatenavigator.cpp | 7 | ||||
-rw-r--r-- | korganizer/koeditorrecurrence.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 7d0c516..b420351 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -188,132 +188,135 @@ void KDateNavigator::passedMidnight() | |||
188 | QTime now = QTime::currentTime(); | 188 | QTime now = QTime::currentTime(); |
189 | QTime midnight = QTime(23,59,59); | 189 | QTime midnight = QTime(23,59,59); |
190 | int msecsWait = QMIN(480000,now.msecsTo(midnight)+2000); | 190 | int msecsWait = QMIN(480000,now.msecsTo(midnight)+2000); |
191 | 191 | ||
192 | // qDebug(QString("Waiting %1 msec from %2 to %3.").arg(msecsWait)) | 192 | // qDebug(QString("Waiting %1 msec from %2 to %3.").arg(msecsWait)) |
193 | //.arg(now.toString()).arg(midnight.toString())); | 193 | //.arg(now.toString()).arg(midnight.toString())); |
194 | 194 | ||
195 | updateTimer->stop(); | 195 | updateTimer->stop(); |
196 | updateTimer->start(msecsWait,true); | 196 | updateTimer->start(msecsWait,true); |
197 | } | 197 | } |
198 | } | 198 | } |
199 | 199 | ||
200 | void KDateNavigator::updateDates() | 200 | void KDateNavigator::updateDates() |
201 | { | 201 | { |
202 | // Find the first day of the week of the current month. | 202 | // Find the first day of the week of the current month. |
203 | //int d1 = KOGlobals::self()->calendarSystem()->day( m_MthYr ); | 203 | //int d1 = KOGlobals::self()->calendarSystem()->day( m_MthYr ); |
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 | ||
304 | // set our record of the month and year that this datetbl is | 307 | // set our record of the month and year that this datetbl is |
305 | // displaying. | 308 | // displaying. |
306 | m_MthYr = mSelectedDates.first(); | 309 | m_MthYr = mSelectedDates.first(); |
307 | 310 | ||
308 | 311 | ||
309 | // set our record of the first day of the week of the current | 312 | // set our record of the first day of the week of the current |
310 | // month. This needs to be done before calling dayToIndex, since it | 313 | // month. This needs to be done before calling dayToIndex, since it |
311 | // relies on this information being up to date. | 314 | // relies on this information being up to date. |
312 | QDate dayone(m_MthYr.year(), m_MthYr.month(), 1); | 315 | QDate dayone(m_MthYr.year(), m_MthYr.month(), 1); |
313 | m_fstDayOfWk = dayone.dayOfWeek(); | 316 | m_fstDayOfWk = dayone.dayOfWeek(); |
314 | 317 | ||
315 | updateDates(); | 318 | updateDates(); |
316 | 319 | ||
317 | daymatrix->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end())); | 320 | daymatrix->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end())); |
318 | 321 | ||
319 | updateView(); | 322 | updateView(); |
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 584d1ed..4209e10 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp | |||
@@ -991,129 +991,129 @@ void KOEditorRecurrence::readEvent(Event *event) | |||
991 | #endif | 991 | #endif |
992 | mYearly->setFrequency( f ); | 992 | mYearly->setFrequency( f ); |
993 | } | 993 | } |
994 | 994 | ||
995 | break; | 995 | break; |
996 | case Recurrence::rYearlyDay: | 996 | case Recurrence::rYearlyDay: |
997 | qDebug("Recurrence::rYearlyDay: "); | 997 | qDebug("Recurrence::rYearlyDay: "); |
998 | recurrenceType = RecurrenceChooser::Yearly; | 998 | recurrenceType = RecurrenceChooser::Yearly; |
999 | mYearly->setByDay( event->dtStart().date().dayOfYear() ); | 999 | mYearly->setByDay( event->dtStart().date().dayOfYear() ); |
1000 | mYearly->setFrequency( f ); | 1000 | mYearly->setFrequency( f ); |
1001 | break; | 1001 | break; |
1002 | default: | 1002 | default: |
1003 | setDefaults( event->dtStart(), event->dtEnd(), true ); | 1003 | setDefaults( event->dtStart(), event->dtEnd(), true ); |
1004 | break; | 1004 | break; |
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | mRecurrenceChooser->setType( recurrenceType ); | 1007 | mRecurrenceChooser->setType( recurrenceType ); |
1008 | showCurrentRule( recurrenceType ); | 1008 | showCurrentRule( recurrenceType ); |
1009 | 1009 | ||
1010 | mRecurrenceRange->setDateTimes( event->dtStart() ); | 1010 | mRecurrenceRange->setDateTimes( event->dtStart() ); |
1011 | 1011 | ||
1012 | if ( r->doesRecur() ) { | 1012 | if ( r->doesRecur() ) { |
1013 | mRecurrenceRange->setDuration( r->duration() ); | 1013 | mRecurrenceRange->setDuration( r->duration() ); |
1014 | if ( r->duration() == 0 ) | 1014 | if ( r->duration() == 0 ) |
1015 | { | 1015 | { |
1016 | if ( r->endDate() < event->dtStart().date() ) | 1016 | if ( r->endDate() < event->dtStart().date() ) |
1017 | mRecurrenceRange->setEndDate( event->dtStart().date() ); | 1017 | mRecurrenceRange->setEndDate( event->dtStart().date() ); |
1018 | else | 1018 | else |
1019 | mRecurrenceRange->setEndDate( r->endDate() ); | 1019 | mRecurrenceRange->setEndDate( r->endDate() ); |
1020 | } else | 1020 | } else |
1021 | mRecurrenceRange->setEndDate( event->dtStart().date() ); | 1021 | mRecurrenceRange->setEndDate( event->dtStart().date() ); |
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | mExceptions->setDates( event->exDates() ); | 1024 | mExceptions->setDates( event->exDates() ); |
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | void KOEditorRecurrence::writeEvent( Event *event ) | 1027 | void KOEditorRecurrence::writeEvent( Event *event ) |
1028 | { | 1028 | { |
1029 | Recurrence *r = event->recurrence(); | 1029 | Recurrence *r = event->recurrence(); |
1030 | 1030 | ||
1031 | // clear out any old settings; | 1031 | // clear out any old settings; |
1032 | r->unsetRecurs(); | 1032 | r->unsetRecurs(); |
1033 | 1033 | ||
1034 | if ( mEnabledCheck->isChecked() ) { | 1034 | if ( mEnabledCheck->isChecked() ) { |
1035 | int duration = mRecurrenceRange->duration(); | 1035 | int duration = mRecurrenceRange->duration(); |
1036 | QDate endDate; | 1036 | QDate endDate; |
1037 | if ( duration == 0 ) endDate = mRecurrenceRange->endDate(); | 1037 | if ( duration == 0 ) endDate = mRecurrenceRange->endDate(); |
1038 | 1038 | ||
1039 | int recurrenceType = mRecurrenceChooser->type(); | 1039 | int recurrenceType = mRecurrenceChooser->type(); |
1040 | 1040 | ||
1041 | if ( recurrenceType == RecurrenceChooser::Daily ) { | 1041 | if ( recurrenceType == RecurrenceChooser::Daily ) { |
1042 | int freq = mDaily->frequency(); | 1042 | int freq = mDaily->frequency(); |
1043 | if ( duration != 0 ) r->setDaily( freq, duration ); | 1043 | if ( duration != 0 ) r->setDaily( freq, duration ); |
1044 | else r->setDaily( freq, endDate ); | 1044 | else r->setDaily( freq, endDate ); |
1045 | } else if ( recurrenceType == RecurrenceChooser::Weekly ) { | 1045 | } else if ( recurrenceType == RecurrenceChooser::Weekly ) { |
1046 | int freq = mWeekly->frequency(); | 1046 | int freq = mWeekly->frequency(); |
1047 | QBitArray days = mWeekly->days(); | 1047 | QBitArray days = mWeekly->days(); |
1048 | int j; | 1048 | int j; |
1049 | bool found = false; | 1049 | bool found = false; |
1050 | for (j = 0; j < 7 ; ++j ) { | 1050 | for (j = 0; j < 7 ; ++j ) { |
1051 | found |=days.at(j); | 1051 | found |=days.at(j); |
1052 | } | 1052 | } |
1053 | if ( !found ) { | 1053 | if ( !found ) { |
1054 | days.setBit( event->dtStart().date().dayOfWeek()-1); | 1054 | days.setBit( event->dtStart().date().dayOfWeek()-1); |
1055 | qDebug("bit set %d "); | 1055 | qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1); |
1056 | } | 1056 | } |
1057 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); | 1057 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); |
1058 | else r->setWeekly( freq, days, endDate ); | 1058 | else r->setWeekly( freq, days, endDate ); |
1059 | } else if ( recurrenceType == RecurrenceChooser::Monthly ) { | 1059 | } else if ( recurrenceType == RecurrenceChooser::Monthly ) { |
1060 | int freq = mMonthly->frequency(); | 1060 | int freq = mMonthly->frequency(); |
1061 | if ( mMonthly->byPos() ) { | 1061 | if ( mMonthly->byPos() ) { |
1062 | int pos = mMonthly->count(); | 1062 | int pos = mMonthly->count(); |
1063 | 1063 | ||
1064 | QBitArray days( 7 ); | 1064 | QBitArray days( 7 ); |
1065 | days.fill( false ); | 1065 | days.fill( false ); |
1066 | 1066 | ||
1067 | days.setBit( mMonthly->weekday() ); | 1067 | days.setBit( mMonthly->weekday() ); |
1068 | if ( duration != 0 ) | 1068 | if ( duration != 0 ) |
1069 | r->setMonthly( Recurrence::rMonthlyPos, freq, duration ); | 1069 | r->setMonthly( Recurrence::rMonthlyPos, freq, duration ); |
1070 | else | 1070 | else |
1071 | r->setMonthly( Recurrence::rMonthlyPos, freq, endDate ); | 1071 | r->setMonthly( Recurrence::rMonthlyPos, freq, endDate ); |
1072 | r->addMonthlyPos( pos, days ); | 1072 | r->addMonthlyPos( pos, days ); |
1073 | } else { | 1073 | } else { |
1074 | // it's by day | 1074 | // it's by day |
1075 | int day = mMonthly->day(); | 1075 | int day = mMonthly->day(); |
1076 | 1076 | ||
1077 | if ( duration != 0 ) { | 1077 | if ( duration != 0 ) { |
1078 | r->setMonthly( Recurrence::rMonthlyDay, freq, duration ); | 1078 | r->setMonthly( Recurrence::rMonthlyDay, freq, duration ); |
1079 | } else { | 1079 | } else { |
1080 | r->setMonthly( Recurrence::rMonthlyDay, freq, endDate ); | 1080 | r->setMonthly( Recurrence::rMonthlyDay, freq, endDate ); |
1081 | } | 1081 | } |
1082 | r->addMonthlyDay( day ); | 1082 | r->addMonthlyDay( day ); |
1083 | } | 1083 | } |
1084 | } else if ( recurrenceType == RecurrenceChooser::Yearly ) { | 1084 | } else if ( recurrenceType == RecurrenceChooser::Yearly ) { |
1085 | qDebug("RecurrenceChooser::Yearly "); | 1085 | qDebug("RecurrenceChooser::Yearly "); |
1086 | int freq = mYearly->frequency(); | 1086 | int freq = mYearly->frequency(); |
1087 | if ( mYearly->byDay() ) { | 1087 | if ( mYearly->byDay() ) { |
1088 | if ( duration != 0 ) { | 1088 | if ( duration != 0 ) { |
1089 | r->setYearly( Recurrence::rYearlyDay, freq, duration ); | 1089 | r->setYearly( Recurrence::rYearlyDay, freq, duration ); |
1090 | } else { | 1090 | } else { |
1091 | r->setYearly( Recurrence::rYearlyDay, freq, endDate ); | 1091 | r->setYearly( Recurrence::rYearlyDay, freq, endDate ); |
1092 | } | 1092 | } |
1093 | r->addYearlyNum( event->dtStart().date().dayOfYear() ); | 1093 | r->addYearlyNum( event->dtStart().date().dayOfYear() ); |
1094 | } else { | 1094 | } else { |
1095 | if ( duration != 0 ) { | 1095 | if ( duration != 0 ) { |
1096 | r->setYearly( Recurrence::rYearlyMonth, freq, duration ); | 1096 | r->setYearly( Recurrence::rYearlyMonth, freq, duration ); |
1097 | } else { | 1097 | } else { |
1098 | r->setYearly( Recurrence::rYearlyMonth, freq, endDate ); | 1098 | r->setYearly( Recurrence::rYearlyMonth, freq, endDate ); |
1099 | } | 1099 | } |
1100 | r->addYearlyNum( mYearly->month() ); | 1100 | r->addYearlyNum( mYearly->month() ); |
1101 | } | 1101 | } |
1102 | 1102 | ||
1103 | } | 1103 | } |
1104 | 1104 | ||
1105 | event->setExDates( mExceptions->dates() ); | 1105 | event->setExDates( mExceptions->dates() ); |
1106 | } | 1106 | } |
1107 | } | 1107 | } |
1108 | 1108 | ||
1109 | void KOEditorRecurrence::setDateTimeStr( const QString &str ) | 1109 | void KOEditorRecurrence::setDateTimeStr( const QString &str ) |
1110 | { | 1110 | { |
1111 | mDateTimeLabel->setText( str ); | 1111 | mDateTimeLabel->setText( str ); |
1112 | } | 1112 | } |
1113 | 1113 | ||
1114 | bool KOEditorRecurrence::validateInput() | 1114 | bool KOEditorRecurrence::validateInput() |
1115 | { | 1115 | { |
1116 | // Check input here | 1116 | // Check input here |
1117 | 1117 | ||
1118 | return true; | 1118 | return true; |
1119 | } | 1119 | } |