-rw-r--r-- | libkcal/recurrence.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp index 5181eaf..8a175c9 100644 --- a/libkcal/recurrence.cpp +++ b/libkcal/recurrence.cpp | |||
@@ -170,67 +170,73 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
170 | case rMinutely: | 170 | case rMinutely: |
171 | case rHourly: | 171 | case rHourly: |
172 | case rDaily: | 172 | case rDaily: |
173 | default: | 173 | default: |
174 | return true; | 174 | return true; |
175 | } | 175 | } |
176 | } | 176 | } |
177 | /* | 177 | /* |
178 | bool Recurrence::compareLists( const QPtrList<int> &l1 ,const QPtrList<int> &l2) | 178 | bool Recurrence::compareLists( const QPtrList<int> &l1 ,const QPtrList<int> &l2) |
179 | { | 179 | { |
180 | if ( l1.count() != l2.count() ) | 180 | if ( l1.count() != l2.count() ) |
181 | return false; | 181 | return false; |
182 | int count = l1.count(); | 182 | int count = l1.count(); |
183 | int i; | 183 | int i; |
184 | for ( i = 0; i < count ; ++i ) { | 184 | for ( i = 0; i < count ; ++i ) { |
185 | // if ( l1.at(i) != l2.at(i) ) | 185 | // if ( l1.at(i) != l2.at(i) ) |
186 | return false; | 186 | return false; |
187 | qDebug("compüare "); | 187 | qDebug("compüare "); |
188 | } | 188 | } |
189 | return true; | 189 | return true; |
190 | } | 190 | } |
191 | */ | 191 | */ |
192 | QString Recurrence::recurrenceText() const | 192 | QString Recurrence::recurrenceText() const |
193 | { | 193 | { |
194 | QString recurText = i18n("No"); | 194 | QString recurText; |
195 | if ( recurs == Recurrence::rMinutely ) | 195 | if ( recurs == Recurrence::rMinutely ) |
196 | recurText = i18n("minutely"); | 196 | recurText = i18n("minutely"); |
197 | else if ( recurs == Recurrence::rHourly ) | 197 | else if ( recurs == Recurrence::rHourly ) |
198 | recurText = i18n("hourly"); | 198 | recurText = i18n("hourly"); |
199 | else if ( recurs == Recurrence::rDaily ) | 199 | else if ( recurs == Recurrence::rDaily ) |
200 | recurText = i18n("daily"); | 200 | recurText = i18n("daily"); |
201 | else if ( recurs == Recurrence::rWeekly ) | 201 | else if ( recurs == Recurrence::rWeekly ) |
202 | recurText = i18n("weekly"); | 202 | recurText = i18n("weekly"); |
203 | else if ( recurs == Recurrence::rMonthlyPos ) | 203 | else if ( recurs == Recurrence::rMonthlyPos ) |
204 | recurText = i18n("monthly"); | 204 | recurText = i18n("monthly"); |
205 | else if ( recurs == Recurrence::rMonthlyDay ) | 205 | else if ( recurs == Recurrence::rMonthlyDay ) |
206 | recurText = i18n("day-monthly"); | 206 | recurText = i18n("monthly"); |
207 | else if ( recurs == Recurrence::rYearlyMonth ) | 207 | else if ( recurs == Recurrence::rYearlyMonth ) |
208 | recurText = i18n("month-yearly"); | 208 | recurText = i18n("yearly"); |
209 | else if ( recurs == Recurrence::rYearlyDay ) | 209 | else if ( recurs == Recurrence::rYearlyDay ) |
210 | recurText = i18n("day-yearly"); | 210 | recurText = i18n("day-yearly"); |
211 | else if ( recurs == Recurrence::rYearlyPos ) | 211 | else if ( recurs == Recurrence::rYearlyPos ) |
212 | recurText = i18n("position-yearly"); | 212 | recurText = i18n("position-yearly"); |
213 | if ( !recurText.isEmpty() ) { | ||
214 | if ( rFreq > 1 ){ | ||
215 | recurText = i18n("(%1) ").arg(rFreq ) + recurText; | ||
216 | } | ||
217 | } else | ||
218 | recurText = i18n("No"); | ||
213 | return recurText; | 219 | return recurText; |
214 | } | 220 | } |
215 | 221 | ||
216 | void Recurrence::setCompatVersion(int version) | 222 | void Recurrence::setCompatVersion(int version) |
217 | { | 223 | { |
218 | mCompatVersion = version ? version : INT_MAX; | 224 | mCompatVersion = version ? version : INT_MAX; |
219 | } | 225 | } |
220 | 226 | ||
221 | ushort Recurrence::doesRecur() const | 227 | ushort Recurrence::doesRecur() const |
222 | { | 228 | { |
223 | return recurs; | 229 | return recurs; |
224 | } | 230 | } |
225 | 231 | ||
226 | bool Recurrence::recursOnPure(const QDate &qd) const | 232 | bool Recurrence::recursOnPure(const QDate &qd) const |
227 | { | 233 | { |
228 | switch(recurs) { | 234 | switch(recurs) { |
229 | case rMinutely: | 235 | case rMinutely: |
230 | return recursSecondly(qd, rFreq*60); | 236 | return recursSecondly(qd, rFreq*60); |
231 | case rHourly: | 237 | case rHourly: |
232 | return recursSecondly(qd, rFreq*3600); | 238 | return recursSecondly(qd, rFreq*3600); |
233 | case rDaily: | 239 | case rDaily: |
234 | return recursDaily(qd); | 240 | return recursDaily(qd); |
235 | case rWeekly: | 241 | case rWeekly: |
236 | return recursWeekly(qd); | 242 | return recursWeekly(qd); |