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
@@ -97,146 +97,148 @@ public:
                 else {
                     todo->setCompleted( false );
                 }
                 break;
             case TODO_ALARM_DATETIME:
                 dtp = &ToDo->Entries[j].Date ;
                 alarm = true;
                 alarmDt = fromGSM ( dtp );
                 break;
             case TODO_SILENT_ALARM_DATETIME:
                 dtp = &ToDo->Entries[j].Date ;
                 alarm = true;
                 alarmDt = fromGSM ( dtp );
                 break;
             case TODO_TEXT:
                 //qDebug(" text *%s* ",  (const char*) DecodeUnicodeConsole(ToDo->Entries[j].Text  ));
                 todo->setSummary( QString::fromUtf8 ( (const char*)DecodeUnicodeConsole(ToDo->Entries[j].Text )));
                 break;
             case TODO_PRIVATE:
                 if ( ToDo->Entries[j].Number == 1 )
                     todo->setSecrecy( Incidence::SecrecyPrivate );
                 else
                     todo->setSecrecy( Incidence::SecrecyPublic );
                 break;
             case TODO_CATEGORY:
                 Category.Location = ToDo->Entries[j].Number;
                 Category.Type = Category_ToDo;
                 error=Phone->GetCategory(s, &Category);
                 if (error == ERR_NONE) {
                     QStringList cat = todo->categories();
                     QString nCat = QString ( (const char*)Category.Name );
                     if ( !nCat.isEmpty() )
                         if ( !cat.contains( nCat )) {
                             cat << nCat;
                             todo->setCategories( cat );
                         }
                 } 
                 break;
             case TODO_CONTACTID:
 #if 0
                 // not supported
                 entry.Location = ToDo->Entries[j].Number;
                 entry.MemoryType = MEM_ME;
                 error=Phone->GetMemory(s, &entry);
                 if (error == ERR_NONE) {
                     name = GSM_PhonebookGetEntryName(&entry);
                     if (name != NULL) {
                         printmsg("Contact ID   : \"%s\" (%d)\n", DecodeUnicodeConsole(name), ToDo->Entries[j].Number);
                     } else {
                         printmsg("Contact ID   : %d\n",ToDo->Entries[j].Number);
                     }
                 } else {
                     printmsg("Contact   : %d\n",ToDo->Entries[j].Number);
                 }
 #endif
                 break;
             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 );
             }
             alarm->setType( Alarm::Audio );
             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() );
         attList << QString::number( id );
         attList << todo->summary();
         attList << completedString; 
         attList << QString::number( todo->priority() ); 
         attList << alarmString;
         attList << todo->categoriesStr();
         attList << todo->secrecyStr();
         cSum = PhoneFormat::getCsum(attList );
         todo->setCsum( mProfileName, QString::number( cSum ));
         mCalendar->addTodo( todo);
 
         return true;
     }
             bool readEvent( Calendar *existingCalendar,         GSM_CalendarEntry*Note)
     {
        
         int id = Note->Location;
         Event *event;
         event = existingCalendar->event( mProfileName ,QString::number( id ) );
         if ( event )
             event = (Event*)event->clone();
         else
             event = new Event;
         event->setID( mProfileName,QString::number( id ) );
         event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
 
 
                 int i = 0;
                 bool repeating          = false;
                 int repeat_dayofweek = -1;
                 int repeat_day          = -1;
                 int repeat_weekofmonth = -1;
                 int repeat_month        = -1;
                 int repeat_frequency = -1;
         int rec_type = -1;
                 GSM_DateTime repeat_startdate = {0,0,0,0,0,0,0};
                 GSM_DateTime repeat_stopdate = {0,0,0,0,0,0,0};
                 GSM_DateTime*   dtp;
         bool alarm = false;
         QDateTime alarmDt;
                 repeat_startdate.Day= 0;
                 repeat_stopdate.Day = 0;
         for (i=0;i<Note->EntriesNum;i++) { 
 
             //qDebug(" for ev");
             switch (Note->Entries[i].EntryType) {
             case CAL_START_DATETIME:
                 dtp = &Note->Entries[i].Date ;
                 if (  dtp->Hour > 24 ) {
                     event->setFloats( true );
                     event->setDtStart( QDateTime (datefromGSM ( dtp ), QTime(0,0,0 )));
                 } else {
                     event->setDtStart (fromGSM ( dtp ));
 
                 }
                 break;
@@ -380,147 +382,149 @@ public:
             }
             // qDebug("next ");
             int pos = 0;
             Recurrence *r = event->recurrence();
             /*
               0 daily;
               1 weekly;x
               2 monthpos;x
               3 monthlyday;
               4 rYearlyMont
                       bool repeating    = false;
                       int repeat_dayofweek = -1;
                       int repeat_day    = -1;
                       int repeat_weekofmonth = -1;
                       int repeat_month          = -1;
                       int repeat_frequency = -1;
             */
             int dayOfWeek = startDate.dayOfWeek();
             if (  repeat_weekofmonth >= 0 ) {
                 rtype = 2;
                 pos = repeat_weekofmonth;
                 if ( repeat_dayofweek >= 0 )
                     dayOfWeek = repeat_dayofweek;
             } else if ( repeat_dayofweek >= 0  ) {
                 rtype = 1;
             } if ( repeat_dayofweek >= 0  ) {
                 rtype = 1;
             }
 
             if ( rtype == 0 ) {
                 if ( hasEndDate ) r->setDaily( freq, endDate );
                 else r->setDaily( freq, -1 );
             } else if ( rtype == 1 ) {
                 if ( hasEndDate ) r->setWeekly( freq, weekDays, endDate );
                 else r->setWeekly( freq, weekDays, -1 );
             } else if ( rtype == 3 ) {
                 if ( hasEndDate )
                     r->setMonthly( Recurrence::rMonthlyDay, freq, endDate );
                 else
                     r->setMonthly( Recurrence::rMonthlyDay, freq, -1 );
                 r->addMonthlyDay( startDate.day() );
             } else if ( rtype == 2 ) {
                 if ( hasEndDate )
                     r->setMonthly( Recurrence::rMonthlyPos, freq, endDate );
                 else
                     r->setMonthly( Recurrence::rMonthlyPos, freq, -1 );
                 QBitArray days( 7 );
                 days.fill( false );
                 days.setBit( dayOfWeek - 1 );
                 r->addMonthlyPos( pos, days );
             } else if ( rtype == 4 ) {
                 if ( hasEndDate )
                     r->setYearly( Recurrence::rYearlyMonth, freq, endDate );
                 else
                     r->setYearly( Recurrence::rYearlyMonth, freq, -1 );
                 r->addYearlyNum( startDate.month() );
             }
         } 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 );
             }
             alarm->setType( Alarm::Audio );
             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() );
         attList << QString::number( id );
         attList <<  event->summary();
         attList <<  event->location();
         attList <<  alarmString;
         attList << recurString;
         attList << event->categoriesStr();
         attList << event->secrecyStr();
         cSum = PhoneFormat::getCsum(attList );
         event->setCsum( mProfileName, QString::number( cSum ));
         mCalendar->addEvent( event);
        
         return true;
     }
 
   
             QDateTime fromGSM ( GSM_DateTime*dtp, bool useTz = true ) {
         QDateTime dt;
         int y,m,t,h,min,sec;
         y = dtp->Year;
         m = dtp->Month;
         t = dtp->Day;
         h = dtp->Hour;
         min = dtp->Minute;
         sec = dtp->Second;
         dt = QDateTime(QDate(y,m,t), QTime(h,min,sec));
         // dtp->Timezone: offset in hours
         int offset =  KGlobal::locale()->localTimeOffset( dt );
         if ( useTz )
             dt =  dt.addSecs ( offset*60);
         return dt;
 
     }
 
     QString dtToString( const QDateTime& dti, bool useTZ = false )
     {
         QString datestr;
         QString timestr;
         int offset =  KGlobal::locale()->localTimeOffset( dti );
         QDateTime   dt;
         if (useTZ)
             dt =  dti.addSecs ( -(offset*60));
         else
             dt =  dti;
         if(dt.date().isValid()){
             const QDate& date = dt.date();
             datestr.sprintf("%04d%02d%02d",
                             date.year(), date.month(), date.day());
         }
         if(dt.time().isValid()){
             const QTime& time = dt.time();
             timestr.sprintf("T%02d%02d%02d",
                             time.hour(), time.minute(), time.second());
         }
         return datestr + timestr;
     }
             QDate datefromGSM ( GSM_DateTime*dtp ) {
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index f8b066d..defdb09 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -128,128 +128,130 @@ class SharpParser : public QObject
                 int i;
                 int bb = 1;
                 for( i = 1; i <= 7; ++i ) {
                     weekDays.setBit( i - 1, ( bb & weekDaysNum )); 
                     bb =  2 << (i-1);
                     //qDebug(" %d bit %d ",i-1,weekDays.at(i-1) );
                 }
                 // qDebug("next ");
                 QString posStr = attList[13];
                 int pos = posStr.toInt();
                 Recurrence *r = event->recurrence();
 
                 if ( rtype == "0" ) {
                     if ( hasEndDate ) r->setDaily( freq, endDate );
                     else r->setDaily( freq, -1 );
                 } else if ( rtype == "1" ) {
                     if ( hasEndDate ) r->setWeekly( freq, weekDays, endDate );
                     else r->setWeekly( freq, weekDays, -1 );
                 } else if ( rtype == "3" ) {
                     if ( hasEndDate )
                         r->setMonthly( Recurrence::rMonthlyDay, freq, endDate );
                     else
                         r->setMonthly( Recurrence::rMonthlyDay, freq, -1 );
                     r->addMonthlyDay( startDate.day() );
                 } else if ( rtype == "2" ) {
                     if ( hasEndDate )
                         r->setMonthly( Recurrence::rMonthlyPos, freq, endDate );
                     else
                         r->setMonthly( Recurrence::rMonthlyPos, freq, -1 );
                     QBitArray days( 7 );
                     days.fill( false );
                     days.setBit( startDate.dayOfWeek() - 1 );
                     r->addMonthlyPos( pos, days );
                 } else if ( rtype == "4" ) {
                     if ( hasEndDate )
                         r->setYearly( Recurrence::rYearlyMonth, freq, endDate );
                     else
                         r->setYearly( Recurrence::rYearlyMonth, freq, -1 );
                     r->addYearlyNum( startDate.month() );
                 }
             } else {
                 event->recurrence()->unsetRecurs();
             }
         
             QString categoryList = attList[1] ;
             event->setCategories( lookupCategories( categoryList ) );
 
             // strange 0 semms to mean: alarm enabled
             if ( attList[8] == "0" ) {
                 Alarm *alarm;
                 if (  event->alarms().count() > 0 )
                     alarm = event->alarms().first();
                 else {
                     alarm = new Alarm( event );
                     event->addAlarm( alarm );
                 }
                 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;
 
             todo = existingCalendar->todo( "Sharp_DTM", attList[0] );
             if (todo )
                 todo = (Todo*)todo->clone();
             else
                 todo = new Todo;
 
 //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1
 //  0      1       2    3    4    5    6    7    8
 //1,,,,,1,4,Loch zumachen,""
 //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb ""   "
 //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes
      
             todo->setID( "Sharp_DTM", attList[0]);
             todo->setCsum( "Sharp_DTM", QString::number( cSum ));
             todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
       
             todo->setSummary( attList[7] );
             todo->setDescription( attList[8]);
         
             int priority = attList[6].toInt();
             if ( priority == 0 ) priority = 3;
             todo->setPriority( priority );
         
             QString categoryList = attList[1];
             todo->setCategories( lookupCategories( categoryList ) );
         
        
         
             QString hasDateStr = attList[3]; // due
             if ( !hasDateStr.isEmpty() ) {
                 if ( hasDateStr.right(6) == "000000" ) {
                     todo->setDtDue( QDateTime(fromString( hasDateStr, false ).date(), QTime(0,0,0 )) );
                     todo->setFloats( true );
                 }
                 else {
                     todo->setDtDue( fromString( hasDateStr ) );
                     todo->setFloats( false );
                 }
                 
                 todo->setHasDueDate( true );
             }
             hasDateStr = attList[2];//start
             if ( !hasDateStr.isEmpty() ) {
           
                 todo->setDtStart( fromString( hasDateStr ) );
                 todo->setHasStartDate( true);
             } else
                 todo->setHasStartDate( false );
             hasDateStr = attList[4];//completed
             if ( !hasDateStr.isEmpty() ) {
                 todo->setCompleted(fromString( hasDateStr ) );
             }
             QString completedStr = attList[5];
             if ( completedStr == "0" )
                 todo->setCompleted( true );
             else