author | zautrix <zautrix> | 2005-07-26 19:03:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-26 19:03:31 (UTC) |
commit | c7b8804b49e463d42f0bd5aec4b638187190417a (patch) (unidiff) | |
tree | 2941cd5b9df04c96cc18800acf5df9d320c167d8 /korganizer | |
parent | d0fe94073aa3209532952c944b41bccfb4341a8d (diff) | |
download | kdepimpi-c7b8804b49e463d42f0bd5aec4b638187190417a.zip kdepimpi-c7b8804b49e463d42f0bd5aec4b638187190417a.tar.gz kdepimpi-c7b8804b49e463d42f0bd5aec4b638187190417a.tar.bz2 |
ol fix
-rw-r--r-- | korganizer/koimportoldialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp index 2af436c..79b97e8 100644 --- a/korganizer/koimportoldialog.cpp +++ b/korganizer/koimportoldialog.cpp | |||
@@ -242,27 +242,27 @@ void KOImportOLdialog::slotOk() | |||
242 | void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRecurrence ) | 242 | void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRecurrence ) |
243 | { | 243 | { |
244 | KCal::Event* event = new KCal::Event(); | 244 | KCal::Event* event = new KCal::Event(); |
245 | if ( aItem->GetAllDayEvent() ){ | 245 | if ( aItem->GetAllDayEvent() ){ |
246 | event->setDtStart( QDateTime( mDdate2Qdtr( aItem->GetStart()).date(),QTime(0,0,0 ) )); | 246 | event->setDtStart( QDateTime( mDdate2Qdtr( aItem->GetStart()).date(),QTime(0,0,0 ) )); |
247 | event->setDtEnd( QDateTime( mDdate2Qdtr( aItem->GetEnd()) .date(),QTime(0,0,0 )).addDays(-1)); | 247 | event->setDtEnd( QDateTime( mDdate2Qdtr( aItem->GetEnd()) .date(),QTime(0,0,0 )).addDays(-1)); |
248 | event->setFloats( true ); | 248 | event->setFloats( true ); |
249 | } else { | 249 | } else { |
250 | event->setDtStart( mDdate2Qdtr( aItem->GetStart()) ); | 250 | event->setDtStart( mDdate2Qdtr( aItem->GetStart()) ); |
251 | event->setDtEnd( mDdate2Qdtr( aItem->GetEnd()) ); | 251 | event->setDtEnd( mDdate2Qdtr( aItem->GetEnd()) ); |
252 | event->setFloats( false ); | 252 | event->setFloats( false ); |
253 | } | 253 | } |
254 | event->setSummary( QString::fromUcs2( aItem->GetSubject().GetBuffer()) ); | 254 | event->setSummary( QString::fromUcs2( aItem->GetSubject().GetBuffer()).stripWhiteSpace() ); |
255 | event->setLocation( QString::fromUcs2( aItem->GetLocation().GetBuffer()) ); | 255 | event->setLocation( QString::fromUcs2( aItem->GetLocation().GetBuffer()).stripWhiteSpace() ); |
256 | event->setDescription( QString::fromUcs2( aItem->GetBody().GetBuffer()).replace( QRegExp("\\r"), "") ); | 256 | event->setDescription( QString::fromUcs2( aItem->GetBody().GetBuffer()).replace( QRegExp("\\r"), "").stripWhiteSpace() ); |
257 | QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("; "), ";"); | 257 | QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("; "), ";"); |
258 | event->setCategories( QStringList::split( ";", cat ) ); | 258 | event->setCategories( QStringList::split( ";", cat ) ); |
259 | if ( aItem->GetReminderSet() ) { | 259 | if ( aItem->GetReminderSet() ) { |
260 | event->clearAlarms(); | 260 | event->clearAlarms(); |
261 | Alarm* alarm = event->newAlarm(); | 261 | Alarm* alarm = event->newAlarm(); |
262 | alarm->setStartOffset( -aItem->GetReminderMinutesBeforeStart()*60 ); | 262 | alarm->setStartOffset( -aItem->GetReminderMinutesBeforeStart()*60 ); |
263 | alarm->setEnabled( true ); | 263 | alarm->setEnabled( true ); |
264 | if ( aItem->GetReminderPlaySound() ) { | 264 | if ( aItem->GetReminderPlaySound() ) { |
265 | alarm->setType( Alarm::Audio ); | 265 | alarm->setType( Alarm::Audio ); |
266 | alarm->setAudioFile( QString::fromUcs2( aItem->GetReminderSoundFile().GetBuffer())); | 266 | alarm->setAudioFile( QString::fromUcs2( aItem->GetReminderSoundFile().GetBuffer())); |
267 | } | 267 | } |
268 | else | 268 | else |
@@ -277,25 +277,25 @@ void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRe | |||
277 | event->setSecrecy( sec ); | 277 | event->setSecrecy( sec ); |
278 | if ( aItem->GetBusyStatus() == 0 ) | 278 | if ( aItem->GetBusyStatus() == 0 ) |
279 | event->setTransparency( Event::Transparent);// OL free | 279 | event->setTransparency( Event::Transparent);// OL free |
280 | else | 280 | else |
281 | event->setTransparency( Event::Opaque);//OL all other | 281 | event->setTransparency( Event::Opaque);//OL all other |
282 | 282 | ||
283 | if ( aItem->GetIsRecurring() && computeRecurrence ) { //recur | 283 | if ( aItem->GetIsRecurring() && computeRecurrence ) { //recur |
284 | 284 | ||
285 | RecurrencePattern recpat = aItem->GetRecurrencePattern(); | 285 | RecurrencePattern recpat = aItem->GetRecurrencePattern(); |
286 | 286 | ||
287 | QDate startDate = mDdate2Qdtr(recpat.GetPatternStartDate()).date(); | 287 | QDate startDate = mDdate2Qdtr(recpat.GetPatternStartDate()).date(); |
288 | int freq = recpat.GetInterval(); | 288 | int freq = recpat.GetInterval(); |
289 | 289 | if ( freq == 0 ) freq = 1; | |
290 | bool hasEndDate = !recpat.GetNoEndDate(); | 290 | bool hasEndDate = !recpat.GetNoEndDate(); |
291 | QDate endDate = mDdate2Qdtr(recpat.GetPatternEndDate()).date(); | 291 | QDate endDate = mDdate2Qdtr(recpat.GetPatternEndDate()).date(); |
292 | QBitArray weekDays( 7 ); | 292 | QBitArray weekDays( 7 ); |
293 | weekDays.fill(false ); | 293 | weekDays.fill(false ); |
294 | uint weekDaysNum = recpat.GetDayOfWeekMask(); | 294 | uint weekDaysNum = recpat.GetDayOfWeekMask(); |
295 | int i; | 295 | int i; |
296 | int bb = 2; | 296 | int bb = 2; |
297 | for( i = 1; i <= 6; ++i ) { | 297 | for( i = 1; i <= 6; ++i ) { |
298 | weekDays.setBit( i - 1, ( bb & weekDaysNum )); | 298 | weekDays.setBit( i - 1, ( bb & weekDaysNum )); |
299 | bb = 4 << (i-1); | 299 | bb = 4 << (i-1); |
300 | //qDebug(" %d bit %d ",i-1,weekDays.at(i-1) ); | 300 | //qDebug(" %d bit %d ",i-1,weekDays.at(i-1) ); |
301 | } | 301 | } |