many phone and sync fixes

14 files changed, 227 insertions, 76 deletions

diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c
index 0375fee..7310755 100644
--- a/gammu/emb/common/service/gsmcal.c
+++ b/gammu/emb/common/service/gsmcal.c
@@ -113,3 +113,3 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
 		case GSM_CAL_BIRTHDAY:
-			*Length+=sprintf(Buffer+(*Length), "Special Occasion%c%c",13,10);
+			*Length+=sprintf(Buffer+(*Length), "Birthday%c%c",13,10);
 			break;
@@ -152,3 +152,3 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
 		/* Birthday is known to be recurranced */
-		if (Recurrance != -1 && note->Type != GSM_CAL_BIRTHDAY) {
+		if (Recurrance != -1 ) {
 			switch(note->Entries[Recurrance].Number/24) {
@@ -157,3 +157,3 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
 				case 14	 : *Length+=sprintf(Buffer+(*Length), "RRULE:W2 #0%c%c",13,10);	 break;
-				case 365 : *Length+=sprintf(Buffer+(*Length), "RRULE:YD1 #0%c%c",13,10); break;
+				case 365 : *Length+=sprintf(Buffer+(*Length), "RRULE:YM1 #0%c%c",13,10); break;
 			}
@@ -170,3 +170,3 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
 		case GSM_CAL_BIRTHDAY:
-			*Length+=sprintf(Buffer+(*Length), "Anniversary%c%c",13,10);
+			*Length+=sprintf(Buffer+(*Length), "Birthday%c%c",13,10);
 			break;
@@ -190,3 +190,3 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
 				case 30	 : *Length+=sprintf(Buffer+(*Length), "RRULE:MD1%c%c",13,10);	break;
-				case 365 : *Length+=sprintf(Buffer+(*Length), "RRULE:YD1%c%c",13,10);	break;
+				case 365 : *Length+=sprintf(Buffer+(*Length), "RRULE:YM1%c%c",13,10);	break;
 			}
@@ -222,3 +222,3 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
 		case GSM_CAL_BIRTHDAY:
-			*Length+=sprintf(Buffer+(*Length), "Anninversary%c%c",13,10);
+			*Length+=sprintf(Buffer+(*Length), "Birthday%c%c",13,10);
 			break;
@@ -392,4 +392,4 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
 			if (strstr(Line,"CATEGORIES:Phone Call")) 	Calendar->Type = GSM_CAL_CALL;
-			if (strstr(Line,"CATEGORIES:Special Occasion")) Calendar->Type = GSM_CAL_BIRTHDAY;
 			if (strstr(Line,"CATEGORIES:Anniversary")) 	Calendar->Type = GSM_CAL_BIRTHDAY;
+			if (strstr(Line,"CATEGORIES:Birthday")) 	Calendar->Type = GSM_CAL_BIRTHDAY;
 			if (strstr(Line,"CATEGORIES:Meeting")) 		Calendar->Type = GSM_CAL_MEETING;
@@ -422,2 +422,8 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
             // LR 
+			if (strstr(Line,"RRULE:YM1")) {
+				Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE;
+				Calendar->Entries[Calendar->EntriesNum].Number    = 365*24;
+				Calendar->EntriesNum++;
+			}
+            // LR 
 			if ((ReadVCALText(Line, "SUMMARY", Buff)) ) {
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 2564894..40877ef 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -312,2 +312,3 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
                 (*it).setType( ( *phoneItAD ).type() );
+                (*it).setNumber( ( *phoneItAD ).number() );
                 break;
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index d690acc..17ebff8 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -50,3 +50,2 @@ formats/vcardformatplugin2.h \
  addressbook.h \
- syncprefwidget.h \
  timezone.h \
@@ -162,3 +161,2 @@ formatfactory.cpp \
  addressbook.cpp \
- syncprefwidget.cpp \
  timezone.cpp \
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 3e0a27d..e4a11f5 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1132,4 +1132,6 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     int delFut = 0;
+    int remRem = 0;
     if ( mSyncManager->mWriteBackInFuture ) {
         er = remote->rawIncidences(); 
+        remRem = er.count();
         inR = er.first();
@@ -1177,3 +1179,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     if ( delFut  ) {
-        delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\n"),delFut, mSyncManager->mWriteBackInFuture ); 
+        delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInFuture, remRem-delFut); 
         mes += delmess;
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index dfa265b..7256f05 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -58,2 +58,48 @@ bool KCal::operator==( const Event& e1, const Event& e2 )
 
+bool Event::contains ( Event* from )
+{
+
+    if ( !from->summary().isEmpty() )
+        if (  !summary().startsWith(  from->summary() ))
+            return false; 
+    if ( from->dtStart().isValid() )
+        if (dtStart() != from->dtStart() )
+            return false;
+    if ( from->dtEnd().isValid() )
+        if ( dtEnd() !=  from->dtEnd() )
+            return false;
+    if ( !from->location().isEmpty() )
+        if (  !location().startsWith( from->location() ) )
+            return false;
+    if ( !from->description().isEmpty() )
+        if (  !description().startsWith(  from->description() ))
+            return false;
+    if ( from->alarms().count() ) {
+        Alarm *a = from->alarms().first();
+        if (  a->enabled()  ){
+            if ( !alarms().count() )
+                return false;
+            Alarm *b = alarms().first();
+            if( ! b->enabled() )
+                return false;
+            if ( ! (a->offset() == b->offset() ))
+                return false;
+        }
+    }
+    QStringList cat = categories();
+    QStringList catFrom = from->categories();
+    QString nCat;
+    int iii;
+    for ( iii = 0; iii < catFrom.count();++iii ) {
+        nCat = catFrom[iii];
+        if ( !nCat.isEmpty() )
+            if ( !cat.contains( nCat )) {
+                return false;
+            }
+    }
+    if ( from->doesRecur() ) 
+        if ( from->doesRecur() != doesRecur() && ! (from->doesRecur()== Recurrence::rYearlyMonth && doesRecur()== Recurrence::rYearlyDay) )
+            return false;
+    return true;
+}
 
diff --git a/libkcal/event.h b/libkcal/event.h
index 2a8bd95..3bc8adc 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -73,2 +73,4 @@ class Event : public Incidence
 
+    bool contains ( Event*);
+
   private:
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 281434e..101db57 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -314,3 +314,12 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
             ev->setCategories( QStringList() );
+        } else 
+        if ( cat.contains( "Birthday" )) {
+            ev->setFloats( true );
+            QDate da = ev->dtStart().date();
+            ev->setDtStart( QDateTime( da)  );
+            ev->setDtEnd( QDateTime( da.addDays(1))  );
+            
         }
+        uint cSum;
+        cSum = PhoneFormat::getCsumEvent( ev );
         int id = ev->pilotId();
@@ -326,4 +335,2 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
             event = ev;
-        uint cSum;
-        cSum = PhoneFormat::getCsumEvent( event );
         event->setCsum( mProfileName, QString::number( cSum ));
@@ -344,2 +351,4 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
             int id = ev->pilotId();
+            uint cSum;
+            cSum = PhoneFormat::getCsumTodo( ev );
             Todo *event;
@@ -356,4 +365,2 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
                 event = ev;
-            uint cSum;
-            cSum = PhoneFormat::getCsumTodo( event );
             event->setCsum( mProfileName, QString::number( cSum ));
@@ -384,7 +391,3 @@ void PhoneFormat::copyEvent( Event* to,  Event* from )
         b->setEnabled( a->enabled()  );
-        if ( a->hasStartOffset() ) {
-            b->setStartOffset( a->startOffset() );
-        }
-        if ( a->hasTime() )
-            b->setTime( a->time() );
+        b->setStartOffset(Duration( a->offset() ) );
     
@@ -403,4 +406,6 @@ void PhoneFormat::copyEvent( Event* to,  Event* from )
     to->setCategories( cat );
+    if ( from->doesRecur() ) {
     Recurrence * r = new Recurrence( *from->recurrence(),to);
     to->setRecurrence( r ) ;
+    }
 
@@ -410,6 +415,10 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
 {
-    if ( from->dtStart().isValid() )
+    if ( from->hasStartDate() ) {
+        to->setHasStartDate( true );
         to->setDtStart(  from->dtStart() );
-    if ( from->dtDue().isValid() )
+    }
+    if ( from->hasDueDate() ){
+        to->setHasDueDate( true );
         to->setDtDue(  from->dtDue() );
+    }
     if ( !from->location().isEmpty() )
@@ -426,6 +435,3 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
         b->setEnabled( a->enabled()  );
-        if ( a->hasStartOffset() )
-            b->setStartOffset( a->startOffset() );
-        if ( a->hasTime() )
-            b->setTime( a->time() );
+        b->setStartOffset(Duration( a->offset() ) );
     }
@@ -463,12 +469,6 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
 
-void PhoneFormat::afterSave( Incidence* inc)
+void PhoneFormat::afterSave( Incidence* inc,const QString& id ,const QString& csum)
 {
-    uint csum;
-    inc->removeID( mProfileName );
-    if ( inc->type() == "Event")
-        csum = PhoneFormat::getCsumEvent( (Event*) inc );
-    else
-        csum = PhoneFormat::getCsumTodo( (Todo*) inc );
-    inc->setCsum( mProfileName, QString::number( csum ));
-
+    inc->setID( mProfileName, id );
+    inc->setCsum( mProfileName, csum);
     inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
@@ -480,5 +480,5 @@ bool PhoneFormat::writeToPhone( Calendar *  calendar)
 #ifdef _WIN32_
-    QString  fileName = locateLocal("tmp", "tempfile.vcs");
+    QString  fileName = locateLocal("tmp", "phonefile.vcs");
 #else
-    QString  fileName = "/tmp/kdepimtemp.vcs";
+    QString  fileName = "/tmp/phonefile.vcs";
 #endif
@@ -496,14 +496,3 @@ bool PhoneFormat::save( Calendar *calendar)
 {
-    QLabel status ( i18n(" Opening device ..."), 0 );
-    int w = status.sizeHint().width()+20 ;
-    if ( w < 200 ) w = 230;
-    int h = status.sizeHint().height()+20 ;
-    int dw = QApplication::desktop()->width();
-    int dh = QApplication::desktop()->height();
-    status.setCaption(i18n("Writing to phone...") );
-    status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
-    status.show();
-    status.raise();
-    qApp->processEvents();
-    QString message;
+   
 
@@ -536,3 +525,14 @@ bool PhoneFormat::save( Calendar *calendar)
         return false;
-    
+    QLabel status ( i18n(" Opening device ..."), 0 );
+    int w = status.sizeHint().width()+20 ;
+    if ( w < 200 ) w = 230;
+    int h = status.sizeHint().height()+20 ;
+    int dw = QApplication::desktop()->width();
+    int dh = QApplication::desktop()->height();
+    status.setCaption(i18n("Writing to phone...") );
+    status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    QString message;
+    status.show();
+    status.raise();
+    qApp->processEvents();
     // 5 reread data
@@ -561,15 +561,7 @@ bool PhoneFormat::save( Calendar *calendar)
             qApp->processEvents();
-            uint csum;
-            csum = PhoneFormat::getCsumEvent( ev );
-            QString cSum = QString::number( csum );
-            //ev->setCsum( mProfileName,  cSum );
-            //qDebug("Event cSum %s ", cSum.latin1());
             ev1 = er1.first(); 
             while ( ev1 ) {
-                if (  ev1->getCsum( mProfileName ) == cSum ) {
+                if (  ev->contains( ev1 ) ) {
+                    afterSave( ev ,ev1->getID(mProfileName),ev1->getCsum(mProfileName));
                     er1.remove( ev1 );
-                    afterSave( ev );
-                    ev->setID(mProfileName, ev1->getID(mProfileName) );
-                    //qDebug("Event found  on phone for %s ", ev->summary().latin1());
-
                     break;
@@ -596,13 +588,7 @@ bool PhoneFormat::save( Calendar *calendar)
             qApp->processEvents();
-            uint csum;
-            csum = PhoneFormat::getCsumTodo( to );
-            QString cSum = QString::number( csum );
-            //to->setCsum( mProfileName,  cSum );
-            //qDebug("Todo cSum %s ", cSum.latin1());
             Todo* to1 = tl1.first(); 
             while ( to1 ) {
-                if (  to1->getCsum( mProfileName ) == cSum ) {
+                if (  to->contains( to1 ) ) {
+                    afterSave( to ,to1->getID(mProfileName),to1->getCsum(mProfileName));
                     tl1.remove( to1 );
-                    afterSave( to );
-                    to->setID(mProfileName, to1->getID(mProfileName) );
                     break;
diff --git a/libkcal/phoneformat.h b/libkcal/phoneformat.h
index 001fd81..d11f68b 100644
--- a/libkcal/phoneformat.h
+++ b/libkcal/phoneformat.h
@@ -56,3 +56,3 @@ class PhoneFormat : public QObject {
     QString mProfileName;
-    void afterSave( Incidence* );
+    void afterSave( Incidence* ,const QString&,const QString&);
 };
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 0c1e3e4..3d2de61 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -58,3 +58,61 @@ Incidence *Todo::clone()
 
+bool Todo::contains ( Todo* from )
+{ 
 
+    if ( !from->summary().isEmpty() )
+        if (  !summary().startsWith(  from->summary() ))
+            return false;
+    if ( from->hasStartDate() ) {
+        if ( !hasStartDate() )
+            return false;
+        if ( from->dtStart() != dtStart())
+            return false;      
+    }
+    if ( from->hasDueDate() ){
+        if ( !hasDueDate() )
+            return false;
+        if ( from->dtDue() != dtDue())
+            return false;  
+    }
+    if ( !from->location().isEmpty() )
+        if (  !location().startsWith( from->location() ) )
+            return false;
+    if ( !from->description().isEmpty() )
+        if (  !description().startsWith(  from->description() ))
+            return false;
+     if ( from->alarms().count() ) {
+        Alarm *a = from->alarms().first();
+        if (  a->enabled()  ){
+            if ( !alarms().count() )
+                return false;
+            Alarm *b = alarms().first();
+            if( ! b->enabled() )
+                return false;
+            if ( ! (a->offset() == b->offset() ))
+                return false;
+        }
+    }
+   
+    QStringList cat = categories();
+    QStringList catFrom = from->categories();
+    QString nCat;
+    int iii;
+    for ( iii = 0; iii < catFrom.count();++iii ) {
+        nCat = catFrom[iii];
+        if ( !nCat.isEmpty() )
+            if ( !cat.contains( nCat )) {
+                return false;
+            }
+    }
+    if ( from->isCompleted() ) {
+        if ( !isCompleted() )
+            return false;
+    }
+    if( priority() !=  from->priority() )
+        return false;
+
+
+    return true;
+
+}
 bool KCal::operator==( const Todo& t1, const Todo& t2 )
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 9aa92f8..0f22c59 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -101,2 +101,3 @@ class Todo : public Incidence
     bool hasCompletedDate() const;
+    bool contains ( Todo*);
     
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index a6ae1bc..df93209 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -64,2 +64,3 @@ bool VCalFormat::load(Calendar *calendar, const QString &fileName)
   clearException();
+  if ( ! useLocalTime )
   useLocalTime = mCalendar->isLocalTime();
@@ -92,2 +93,3 @@ bool VCalFormat::save(Calendar *calendar, const QString &fileName)
   mCalendar = calendar;
+  if ( ! useLocalTime )
   useLocalTime = mCalendar->isLocalTime();
@@ -1174,2 +1176,4 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     else if (tmpStr.left(2) == "YM") {
+        // we have to set this such that recurrence accepts addYearlyNum(tmpDay);
+        anEvent->recurrence()->setYearly(Recurrence::rYearlyMonth, 1, -1);
       int index = tmpStr.find(' ');
@@ -1208,2 +1212,4 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     else if (tmpStr.left(2) == "YD") {
+        // we have to set this such that recurrence accepts addYearlyNum(tmpDay);
+        anEvent->recurrence()->setYearly(Recurrence::rYearlyDay, 1, -1);
       int index = tmpStr.find(' ');
@@ -1538,2 +1544,3 @@ void VCalFormat::populate(VObject *vcal)
   if ((curVO = isAPropertyOf(vcal, VCTimeZoneProp)) != 0) {
+      if ( vObjectUStringZValue(curVO) != 0 ) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
@@ -1542,3 +1549,3 @@ void VCalFormat::populate(VObject *vcal)
   }
-
+  }
 
diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp
index 8298aa6..e24ad9e 100644
--- a/libkdepim/phoneaccess.cpp
+++ b/libkdepim/phoneaccess.cpp
@@ -27,2 +27,3 @@
 #include <qfile.h>
+#include <qlabel.h>
 #include <qtextstream.h>
@@ -141,4 +142,23 @@ bool PhoneAccess::writeToPhone( QString fileName)
 #endif
-    int ret;
-    while ( (ret = system (  command.latin1())) != 0 ) {
+    int ret = 1;
+    while ( ret != 0 ) {
+        QLabel* status = new QLabel( i18n(" This may take 1-3 minutes!"), 0 );
+        int w = 235;
+        int h = status->sizeHint().height()+20 ;
+        int dw = QApplication::desktop()->width();
+        int dh = QApplication::desktop()->height();
+        if ( dw > 310 )
+            w = 310;
+        status->setCaption(i18n("Writing to phone...") );
+        status->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+        status->show();
+        status->raise();
+        status->update();
+        qApp->processEvents();
+        status->update();
+        qApp->processEvents();
+        ret = system (  command.latin1());
+        delete status;
+        qApp->processEvents();
+        if ( ret ) {
         qDebug("Error S::command returned %d.", ret); 
@@ -149,2 +169,3 @@ bool PhoneAccess::writeToPhone( QString fileName)
     }
+    }
     return true;
@@ -164,3 +185,22 @@ bool PhoneAccess::readFromPhone( QString fileName)
     int ret;
-    while ( (ret = system (  command.latin1())) != 0 ) {
+    while ( ret != 0 ) {
+        QLabel* status = new QLabel( i18n(" This may take 1-3 minutes!"), 0 );
+        int w = 235;
+        int h = status->sizeHint().height()+20 ;
+        int dw = QApplication::desktop()->width();
+        int dh = QApplication::desktop()->height();
+        if ( dw > 310 )
+            w = 310;
+        status->setCaption(i18n("Reading from phone...") );
+        status->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+        status->show();
+        status->raise();
+        status->update();
+        qApp->processEvents();
+        status->update();
+        qApp->processEvents();
+        ret = system (  command.latin1() );
+        delete status;
+        qApp->processEvents();
+        if ( ret ) {
         qDebug("Error reading from phone:Command returned %d", ret); 
@@ -170,3 +210,6 @@ bool PhoneAccess::readFromPhone( QString fileName)
             return false;
+
+        }
     }
+    qApp->processEvents();
     return true;
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 71d662b..21da158 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -83,3 +83,2 @@ KDGanttMinimizeSplitter.h \
  kresources/kcmkresources.h \
- kresources/syncwidget.h \
  kdecore/kmdcodec.h \
@@ -162,3 +161,2 @@ KDGanttMinimizeSplitter.cpp \
  kresources/selectdialog.cpp \
- kresources/syncwidget.cpp \
  kutils/kcmultidialog.cpp \
diff --git a/microkde/ofileselector_p.cpp b/microkde/ofileselector_p.cpp
index cf6074d..fd5f965 100644
--- a/microkde/ofileselector_p.cpp
+++ b/microkde/ofileselector_p.cpp
@@ -22,2 +22,4 @@
 #include <qpe/storage.h>
+#include <kglobal.h>
+#include <klocale.h>
 
@@ -469,3 +471,4 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink ) {
     (void)new OFileSelectorItem( m_view, pix, name,
-                                 info->lastModified().toString(), QString::number( info->size() ),
+                                 KGlobal::locale()->formatDateTime(info->lastModified(),true, true, KLocale::ISODate),
+                                 QString::number( info->size() ),
                                  dir, locked );
@@ -489,3 +492,3 @@ void OFileViewFileListView::addDir( QFileInfo* info, bool symlink ) {
     (void)new OFileSelectorItem( m_view, pix, name,
-                                 info->lastModified().toString(),
+                                 KGlobal::locale()->formatDateTime(info->lastModified(),true, true, KLocale::ISODate),
                                  QString::number( info->size() ),