| author | zautrix <zautrix> | 2004-08-09 11:15:24 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-08-09 11:15:24 (UTC) |
| commit | e0ba2d4770094974ec4a2a48af436a7df9a055bc (patch) (side-by-side diff) | |
| tree | 52752d9fcff91934e43b27dd6926ead31c44f4f7 /libkcal | |
| parent | 2d3e20244a156485f6001aa82c4494dfce177b8f (diff) | |
| download | kdepimpi-e0ba2d4770094974ec4a2a48af436a7df9a055bc.zip kdepimpi-e0ba2d4770094974ec4a2a48af436a7df9a055bc.tar.gz kdepimpi-e0ba2d4770094974ec4a2a48af436a7df9a055bc.tar.bz2 | |
more fixes
| -rw-r--r-- | libkcal/phoneformat.cpp | 8 | ||||
| -rw-r--r-- | libkcal/sharpformat.cpp | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp index 94744fb..bc1b863 100644 --- a/libkcal/phoneformat.cpp +++ b/libkcal/phoneformat.cpp @@ -153,17 +153,17 @@ public: case TODO_PHONE: #if 0 // not supported printmsg("Phone : \"%s\"\n",DecodeUnicodeConsole(ToDo->Entries[j].Text)); #endif break; } } - QString alarmString = ""; + QString alarmString = "na"; if ( alarm ) { Alarm *alarm; if ( todo->alarms().count() > 0 ) alarm = todo->alarms().first(); else { alarm = new Alarm( todo ); todo->addAlarm( alarm ); } @@ -171,16 +171,18 @@ public: alarm->setEnabled( true ); int alarmOffset = alarmDt.secsTo( todo->dtStart() ); alarm->setStartOffset( -alarmOffset ); alarmString = QString::number( alarmOffset ); } else { Alarm *alarm; if ( todo->alarms().count() > 0 ) { alarm = todo->alarms().first(); + alarm->setType( Alarm::Audio ); + alarm->setStartOffset( -60*15 ); alarm->setEnabled( false ); } } // csum ***************************************** QStringList attList; uint cSum; if ( todo->hasDueDate() ) attList << dtToString ( todo->dtDue() ); @@ -436,17 +438,17 @@ public: } } else { event->recurrence()->unsetRecurs(); } QStringList categoryList; categoryList << getCategory( Note ); event->setCategories( categoryList ); - QString alarmString = ""; + QString alarmString = "na"; // strange 0 semms to mean: alarm enabled if ( alarm ) { Alarm *alarm; if ( event->alarms().count() > 0 ) alarm = event->alarms().first(); else { alarm = new Alarm( event ); event->addAlarm( alarm ); @@ -455,16 +457,18 @@ public: alarm->setEnabled( true ); int alarmOffset = alarmDt.secsTo( event->dtStart() ); alarm->setStartOffset( -alarmOffset ); alarmString = QString::number( alarmOffset ); } else { Alarm *alarm; if ( event->alarms().count() > 0 ) { alarm = event->alarms().first(); + alarm->setType( Alarm::Audio ); + alarm->setStartOffset( -60*15 ); alarm->setEnabled( false ); } } // csum ***************************************** QStringList attList; uint cSum; attList << dtToString ( event->dtStart() ); attList << dtToString ( event->dtEnd() ); diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index f8b066d..defdb09 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp @@ -184,16 +184,18 @@ class SharpParser : public QObject alarm->setType( Alarm::Audio ); alarm->setEnabled( true ); int alarmOffset = attList[9].toInt(); alarm->setStartOffset( alarmOffset * -60 ); } else { Alarm *alarm; if ( event->alarms().count() > 0 ) { alarm = event->alarms().first(); + alarm->setType( Alarm::Audio ); + alarm->setStartOffset( -60*15 ); alarm->setEnabled( false ); } } mCalendar->addEvent( event); } else if ( qName == "Todo" ) { Todo *todo; |