fixed some bugs

1 files changed, 5 insertions, 2 deletions

diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 24b8349..c2ee2c9 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -161,194 +161,197 @@ class SharpParser : public QObject
                     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( 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->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(  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
-                todo->setCompleted( false );
+            else {
+                // do not change percent complete
+                if ( todo->isCompleted() )
+                    todo->setCompleted( false );
+            }
             mCalendar->addTodo( todo );
         
         } else if ( qName == "Category" ) {
             /*
               QString id = attributes.value( "id" );
               QString name = attributes.value( "name" );
               setCategory( id, name );
             */
         }
         //qDebug("end ");
         return true;
     }
 
    
    QDateTime fromString ( QString  s, bool useTz = true ) {
        QDateTime dt;
        int y,m,t,h,min,sec;
        y = s.mid(0,4).toInt();
        m = s.mid(4,2).toInt();
        t = s.mid(6,2).toInt();
        h = s.mid(9,2).toInt();
        min = s.mid(11,2).toInt();
        sec = s.mid(13,2).toInt();
        dt = QDateTime(QDate(y,m,t), QTime(h,min,sec));
       int offset =  KGlobal::locale()->localTimeOffset( dt );
       if ( useTz )
           dt =  dt.addSecs ( offset*60);
        return dt;
 
    }
   protected:
     QDateTime toDateTime( const QString &value )
     {
       QDateTime dt;
       dt.setTime_t( value.toUInt() );
       
       return dt;
     }
 
   private:
     Calendar *mCalendar;
 };
 
 
 SharpFormat::SharpFormat()
 {
     
 }
 
 SharpFormat::~SharpFormat()
 {
 }
 ulong SharpFormat::getCsum( const QStringList &  attList)
 {
     int max = attList.count() -1;
     ulong cSum = 0;
     int j,k,i;
     int add;
     for ( i = 1; i < max ; ++i ) {
         QString s = attList[i];
         if ( ! s.isEmpty() ){
             j = s.length();
             for ( k = 0; k < j; ++k ) {
                 int mul = k +1;
                 add = s[k].unicode ();
                 if ( k < 16 )
                     mul = mul * mul;
                 add = add * mul *i*i*i;
                 cSum += add;
             }
         }
     }
     return cSum;
 
 }
 #include <stdlib.h>
 #define DEBUGMODE false
 //#define DEBUGMODE true
 bool SharpFormat::load( Calendar *calendar, Calendar *existngCal )
 {
 
    
     bool debug = DEBUGMODE;
     QString text;
     QString codec = "utf8";
     QLabel status ( i18n("Reading events ..."), 0 );
     
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 200;
     int h = status.sizeHint().height()+20 ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     status.setCaption(i18n("Reading DTM Data") );
     status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     status.show();
     status.raise();