summaryrefslogtreecommitdiffabout
path: root/libkcal
Side-by-side diff
Diffstat (limited to 'libkcal') (more/less context) (ignore whitespace changes)
-rw-r--r--libkcal/phoneformat.cpp53
1 files changed, 45 insertions, 8 deletions
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 2ad1b5a..6df639f 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -36,4 +36,5 @@
#include <klocale.h>
#include <kglobal.h>
+#include <kmessagebox.h>
#include "calendar.h"
@@ -247,4 +248,6 @@ ulong PhoneFormat::getCsumEvent( Event* event )
attList << list.join("");
attList << event->categoriesStr();
+ //qDebug("csum cat %s", event->categoriesStr().latin1());
+
attList << event->secrecyStr();
return PhoneFormat::getCsum(attList );
@@ -270,4 +273,7 @@ ulong PhoneFormat::getCsum( const QStringList & attList)
}
}
+ //QString dump = attList.join(",");
+ //qDebug("csum: %s", dump.latin1());
+
return cSum;
@@ -288,13 +294,23 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
mConnection +" -D" + mDevice +" -M" + mModel;
int ret = system ( command.latin1() );
- if ( ret != 0 )
+ if ( ret != 0 ) {
+ qDebug("Error::command returned %d", ret);
return false;
+ }
+ qDebug("Command returned %d", ret);
VCalFormat vfload;
vfload.setLocalTime ( true );
+ qDebug("loading file ...");
+
if ( ! vfload.load( calendar, fileName ) )
return false;
QPtrList<Event> er = calendar->rawEvents();
Event* ev = er.first();
+ qDebug("reading events... ");
while ( ev ) {
+ QStringList cat = ev->categories();
+ if ( cat.contains( "MeetingDEF" )) {
+ ev->setCategories( QStringList() );
+ }
int id = ev->pilotId();
Event *event;
@@ -316,4 +332,5 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
}
{
+ qDebug("reading todos... ");
QPtrList<Todo> tr = calendar->rawTodos();
Todo* ev = tr.first();
@@ -483,5 +500,5 @@ bool PhoneFormat::save( Calendar *calendar)
}
to = tl.next();
- }
+ }
// 3 save file
VCalFormat vfsave;
@@ -491,8 +508,17 @@ bool PhoneFormat::save( Calendar *calendar)
// 4 call kammu
QString command ="./kammu --restore " + fileName + " -C" +
- mConnection +" -D" + mDevice +" -M" + mModel;;
- int ret = system ( command.latin1() );
- if ( ret != 0 )
+ mConnection +" -D" + mDevice +" -M" + mModel;
+ int ret;
+ while ( (ret = system ( command.latin1())) != 0 ) {
+ qDebug("Error S::command returned %d. asking users", ret);
+ int retval = KMessageBox::warningContinueCancel(0,
+ i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone sync"),i18n("Retry"),i18n("Cancel"));
+ if ( retval != KMessageBox::Continue )
+ return false;
+ }
+ if ( ret != 0 ) {
+ qDebug("Error S::command returned %d", ret);
return false;
+ }
// 5 reread data
message = i18n(" Rereading all data ... ");
@@ -516,8 +542,12 @@ bool PhoneFormat::save( Calendar *calendar)
int procCount = 0;
while ( ev ) {
- qDebug("event new ID ");
+ //qDebug("event new ID %s",ev->summary().latin1());
status.setText ( message + QString::number ( ++procCount ) );
qApp->processEvents();
- QString cSum = ev->getCsum(mProfileName);
+ 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 ) {
@@ -526,4 +556,6 @@ bool PhoneFormat::save( Calendar *calendar)
afterSave( ev );
ev->setID(mProfileName, ev1->getID(mProfileName) );
+ //qDebug("Event found on phone for %s ", ev->summary().latin1());
+
break;
}
@@ -539,4 +571,5 @@ bool PhoneFormat::save( Calendar *calendar)
}
//algo 6 compare todo
+ tl = calendar->rawTodos();
to = tl.first();
procCount = 0;
@@ -548,5 +581,9 @@ bool PhoneFormat::save( Calendar *calendar)
status.setText ( message + QString::number ( ++procCount ) );
qApp->processEvents();
- QString cSum = to->getCsum(mProfileName);
+ 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 ) {