summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp7
-rw-r--r--libkcal/phoneformat.cpp265
-rw-r--r--libkcal/phoneformat.h3
3 files changed, 217 insertions, 58 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index b307649..d6ead37 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1179,49 +1179,54 @@ void CalendarView::syncPhone()
syncExternal( 1 );
}
void CalendarView::syncExternal( int mode )
{
mGlobalSyncMode = SYNC_MODE_EXTERNAL;
//mCurrentSyncDevice = "sharp-DTM";
if ( KOPrefs::instance()->mAskForPreferences )
edit_sync_options();
qApp->processEvents();
CalendarLocal* calendar = new CalendarLocal();
calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
bool syncOK = false;
bool loadSuccess = false;
PhoneFormat* phoneFormat = 0;
#ifndef DESKTOP_VERSION
SharpFormat* sharpFormat = 0;
if ( mode == 0 ) { // sharp
sharpFormat = new SharpFormat () ;
loadSuccess = sharpFormat->load( calendar, mCalendar );
} else
#endif
if ( mode == 1 ) { // phone
phoneFormat = new PhoneFormat ();
- loadSuccess = phoneFormat->load( calendar, mCalendar );
+ loadSuccess = phoneFormat->load( calendar,
+ mCalendar,
+ mCurrentSyncDevice,
+ KOPrefs::instance()->mPhoneDevice,
+ KOPrefs::instance()->mPhoneConnection,
+ KOPrefs::instance()->mPhoneModel);
} else
return;
if ( loadSuccess ) {
getEventViewerDialog()->setSyncMode( true );
syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs );
getEventViewerDialog()->setSyncMode( false );
qApp->processEvents();
if ( syncOK ) {
if ( KOPrefs::instance()->mWriteBackFile )
{
QPtrList<Incidence> iL = mCalendar->rawIncidences();
Incidence* inc = iL.first();
/* obsolete
while ( inc ) {
inc->setZaurusStat( inc->revision () );
inc = iL.next();
}
*/
#ifndef DESKTOP_VERSION
if ( sharpFormat )
sharpFormat->save(calendar);
#endif
if ( phoneFormat )
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index fa18683..fd6b6af 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -21,192 +21,327 @@
#include <qdatetime.h>
#include <qstring.h>
#include <qapplication.h>
#include <qptrlist.h>
#include <qregexp.h>
#include <qmessagebox.h>
#include <qclipboard.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qtextcodec.h>
#include <qxml.h>
#include <qlabel.h>
#include <kdebug.h>
#include <klocale.h>
#include <kglobal.h>
#include "calendar.h"
#include "alarm.h"
#include "recurrence.h"
#include "calendarlocal.h"
#include "phoneformat.h"
+#include "syncdefines.h"
using namespace KCal;
//CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
//ARSD silentalarm = 0
// 11 RTYP 225 no /0 dialy/ 1 weekly/ 3 month by date/ 2 month by day(pos)/ yearly
// 12 RFRQ
// 13 RPOS pos = 4. monday in month
// 14 RDYS days: 1 mon/ 2 tue .. 64 sun
// 15 REND 0 = no end/ 1 = end
// 16 REDT rec end dt
//ALSD
//ALED
//MDAY
class PhoneParser : public QObject
{
public:
- PhoneParser( Calendar *calendar ) : mCalendar( calendar ) {
+ PhoneParser( Calendar *calendar, QString profileName ) : mCalendar( calendar ), mProfileName ( profileName ) {
oldCategories = 0;
}
- bool startElement( Calendar *existingCalendar, const QStringList & attList, QString qName )
+ bool startElement( Calendar *existingCalendar, GSM_CalendarEntry* Note, QString qName )
{
+ QStringList attList;
+ /*
+// pending csum
int i = 1;
bool skip = true;
int max = attList.count() -2;
while ( i < max ) {
if ( !attList[i].isEmpty() ) {
skip = false;
break;
}
++i ;
}
if ( skip )
return false;
ulong cSum = PhoneFormat::getCsum(attList );
-
+ */
if ( qName == "Event" ) {
+ int id = Note->Location;
Event *event;
- event = existingCalendar->event( attList[0] );
+ event = existingCalendar->event( mProfileName ,QString::number( id ) );
if ( event )
event = (Event*)event->clone();
else
event = new Event;
- // event->setZaurusId( attList[0].toInt() );
- //event->setZaurusUid( cSum );
- //event->setZaurusStat( -2 );
+ event->setID( mProfileName, attList[0] );
+ // pending event->setCsum( "Sharp_DTM", QString::number( cSum ));
+ event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
- event->setSummary( attList[2] );
- event->setLocation( attList[3] );
- event->setDescription( attList[4] );
- if ( attList[7] == "1" ) {
- event->setDtStart( QDateTime(fromString( attList[17]+"T000000", false ).date(),QTime(0,0,0 ) ));
- event->setDtEnd( QDateTime(fromString( attList[18]+"T000000", false ).date(),QTime(0,0,0 )));
+
+ 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;
+ 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 ");
+ 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->setFloats( false );
- event->setDtStart( fromString( attList[5] ) );
- event->setDtEnd( fromString( attList[6] ));
+ event->setDtStart (fromGSM ( dtp ));
+
+ }
+ break;
+ case CAL_END_DATETIME:
+ dtp = &Note->Entries[i].Date ;
+ if ( dtp->Hour > 24 ) {
+ event->setFloats( true );
+ event->setDtEnd( QDateTime (datefromGSM ( dtp ), QTime(0,0,0 )));
+ } else {
+ event->setDtEnd (fromGSM ( dtp ));
+ }
+ break;
+ case CAL_ALARM_DATETIME:
+ dtp = &Note->Entries[i].Date ;
+ alarm = true;
+ alarmDt = fromGSM ( dtp );
+ break;
+ case CAL_SILENT_ALARM_DATETIME:
+ dtp = &Note->Entries[i].Date ;
+ alarm = true;
+ alarmDt = fromGSM ( dtp );
+ break;
+ case CAL_RECURRANCE:
+ //printmsg("Repeat : %d day%s\n",Note->Entries[i].Number/24,((Note->Entries[i].Number/24)>1) ? "s":"" );
+ break;
+ case CAL_TEXT:
+ event->setSummary( QString ( (const char*) Note->Entries[i].Text ));
+ break;
+ case CAL_LOCATION:
+ event->setLocation(QString ((const char*) Note->Entries[i].Text ));
+ break;
+ case CAL_PHONE:
+ //printmsg("Phone : \"%s\"\n",DecodeUnicodeConsole(Note->Entries[i].Text));
+ break;
+ case CAL_PRIVATE:
+ //printmsg("Private : %s\n",Note->Entries[i].Number == 1 ? "Yes" : "No");
+ break;
+ case CAL_CONTACTID:
+#if 0
+ entry.Location = Note->Entries[i].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), Note->Entries[i].Number);
+ } else {
+ //printmsg("Contact ID : %d\n",Note->Entries[i].Number);
}
+ } else {
+ //printmsg("Contact ID : %d\n",Note->Entries[i].Number);
+ }
+#endif
+ break;
+ case CAL_REPEAT_DAYOFWEEK:
+ repeat_dayofweek = Note->Entries[i].Number;
+ repeating = true;
+ break;
+ case CAL_REPEAT_DAY:
+ repeat_day = Note->Entries[i].Number;
+ repeating = true;
+ break;
+ case CAL_REPEAT_WEEKOFMONTH:
+ repeat_weekofmonth = Note->Entries[i].Number;
+ repeating = true;
+ break;
+ case CAL_REPEAT_MONTH:
+ repeat_month = Note->Entries[i].Number;
+ repeating = true;
+ break;
+ case CAL_REPEAT_FREQUENCY:
+ repeat_frequency = Note->Entries[i].Number;
+ repeating = true;
+ break;
+ case CAL_REPEAT_STARTDATE:
+ repeat_startdate = Note->Entries[i].Date;
+ repeating = true;
+ break;
+ case CAL_REPEAT_STOPDATE:
+ repeat_stopdate = Note->Entries[i].Date;
+ repeating = true;
+ break;
+ }
+ }
+#if 0
+ event->setDescription( attList[4] );
+ bool repeating = false;
+ int repeat_dayofweek = -1;
+ int repeat_day = -1;
+ int repeat_weekofmonth = -1;
+ int repeat_month = -1;
+ int repeat_frequency = -1;
+ GSM_DateTime repeat_startdate = {0,0,0,0,0,0,0};
+ GSM_DateTime repeat_stopdate = {0,0,0,0,0,0,0};
+
+#endif
QString rtype = attList[11];
- if ( rtype != "255" ) {
+ if ( repeating ) {
+ int rtype = 0;
// qDebug("recurs ");
- QDate startDate = event->dtStart().date();
-
- QString freqStr = attList[12];
- int freq = freqStr.toInt();
-
- QString hasEndDateStr = attList[15] ;
- bool hasEndDate = hasEndDateStr == "1";
-
- QString endDateStr = attList[16];
- QDate endDate = fromString( endDateStr ).date();
+ QDate startDate, endDate;
+ if ( repeat_startdate.Day > 0 )
+ startDate = datefromGSM ( &repeat_startdate );
+ else
+ startDate = event->dtStart().date();
+ int freq = repeat_frequency;
+ bool hasEndDate = false;
+ if ( repeat_stopdate.Day > 0 ) {
+ endDate = datefromGSM ( &repeat_stopdate );
+ hasEndDate = true;
+ }
- QString weekDaysStr = attList[14];
- uint weekDaysNum = weekDaysStr.toInt();
+ uint weekDaysNum = repeat_dayofweek ;
QBitArray weekDays( 7 );
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();
+ int pos = 0;
Recurrence *r = event->recurrence();
-
- if ( rtype == "0" ) {
+ /*
+ 0 daily;
+ 1 weekly;x
+ 2 monthpos;x
+ 3 monthlyday;
+ 4 rYearlyMont
+ */
+ 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" ) {
+ } else if ( rtype == 1 ) {
if ( hasEndDate ) r->setWeekly( freq, weekDays, endDate );
else r->setWeekly( freq, weekDays, -1 );
- } else if ( rtype == "3" ) {
+ } 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" ) {
+ } 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 );
+ days.setBit( dayOfWeek - 1 );
r->addMonthlyPos( pos, days );
- } else if ( rtype == "4" ) {
+ } 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" ) {
+ 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 = attList[9].toInt();
- alarm->setStartOffset( alarmOffset * -60 );
+ int alarmOffset = alarmDt.secsTo( event->dtStart() );
+ alarm->setStartOffset( alarmOffset );
}
-
mCalendar->addEvent( event);
} else if ( qName == "Todo" ) {
+#if 0
Todo *todo;
todo = existingCalendar->todo( 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->setZaurusId( attList[0] );
//todo->setZaurusUid( cSum );
//todo->setZaurusStat( -2 );
todo->setSummary( attList[7] );
todo->setDescription( attList[8]);
int priority = attList[6].toInt();
if ( priority == 0 ) priority = 3;
todo->setPriority( priority );
@@ -225,108 +360,114 @@ class PhoneParser : public QObject
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 );
mCalendar->addTodo( todo );
+#endif
} else if ( qName == "Category" ) {
/*
QString id = attributes.value( "id" );
QString name = attributes.value( "name" );
setCategory( id, name );
*/
}
//qDebug("end ");
return true;
}
void setCategoriesList ( QStringList * c )
{
oldCategories = c;
}
- QDateTime fromString ( QString s, bool useTz = true ) {
+ QDateTime fromGSM ( GSM_DateTime* dtp, 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();
+ 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;
}
+ QDate datefromGSM ( GSM_DateTime* dtp ) {
+ return QDate ( dtp->Year, dtp->Month, dtp->Day );
+ }
protected:
QDateTime toDateTime( const QString &value )
{
QDateTime dt;
dt.setTime_t( value.toUInt() );
return dt;
}
QStringList lookupCategories( const QString &categoryList )
{
QStringList categoryIds = QStringList::split( ";", categoryList );
QStringList categories;
QStringList::ConstIterator it;
for( it = categoryIds.begin(); it != categoryIds.end(); ++it ) {
QString cate = category( *it );
if ( oldCategories ) {
if ( ! oldCategories->contains( cate ) )
oldCategories->append( cate );
}
categories.append(cate );
}
return categories;
}
private:
+ QString mProfileName ;
Calendar *mCalendar;
QStringList * oldCategories;
static QString category( const QString &id )
{
QMap<QString,QString>::ConstIterator it = mCategoriesMap.find( id );
if ( it == mCategoriesMap.end() ) return id;
else return *it;
}
static void setCategory( const QString &id, const QString &name )
{
mCategoriesMap.insert( id, name );
}
static QMap<QString,QString> mCategoriesMap;
};
QMap<QString,QString> PhoneParser::mCategoriesMap;
PhoneFormat::PhoneFormat()
{
mCategories = 0;
}
@@ -338,51 +479,51 @@ ulong PhoneFormat::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;
}
//extern "C" GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum);
#include <stdlib.h>
#define DEBUGMODE false
-bool PhoneFormat::load( Calendar *calendar, Calendar *existngCal )
+bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal ,QString profileName, QString device,QString connection, QString model )
{
-
+ mProfileName = profileName;
GSM_StateMachine s;
qDebug(" load ");
s.opened = false;
s.msg = NULL;
s.ConfigNum = 0;
static char *cp;
static INI_Section *cfg = NULL;
cfg=GSM_FindGammuRC();
int i;
for (i = 0; i <= MAX_CONFIG_NUM; i++) {
if (cfg!=NULL) {
cp = (char *)INI_GetValue(cfg, (unsigned char*) "gammu", (unsigned char*)"gammucoding", false);
if (cp) di.coding = cp;
s.Config[i].Localize = (char *)INI_GetValue(cfg, (unsigned char*) "gammu", (unsigned char*) "gammuloc", false);
if (s.Config[i].Localize) {
s.msg=INI_ReadFile(s.Config[i].Localize, true);
} else {
#if !defined(WIN32) && defined(LOCALE_PATH)
locale = setlocale(LC_MESSAGES, NULL);
if (locale != NULL) {
snprintf(locale_file, 200, "%s/gammu_%c%c.txt",
LOCALE_PATH,
tolower(locale[0]),
@@ -396,54 +537,65 @@ static char *cp;
/* Wanted user specific configuration? */
if (!GSM_ReadConfig(cfg, &s.Config[i], i) && i != 0) break;
s.ConfigNum++;
/* We want to use only one file descriptor for global and state machine debug output */
s.Config[i].UseGlobalDebugFile = true;
/* We wanted to read just user specified configuration. */
{break;}
}
int error=GSM_InitConnection(&s,3);
qDebug(" init %d %d", error, ERR_NONE);
if ( error != ERR_NONE )
return false;
- fromString2Cal( calendar, existngCal, &s, "Event" );
-
+ // fromString2Cal( calendar, existngCal, &s, "Event" );
+ GSM_Phone_Functions *Phone;
+ GSM_CalendarEntry note;
+ bool refresh = true;
+ Phone=s.Phone.Functions;
+ bool gshutdown = false;
+ PhoneParser handler( calendar, profileName );
+ //handler.setCategoriesList( mCategories );
+ int ccc = 0;
+ while (!gshutdown && ccc++ < 10 ) {
+ qDebug("count %d ", ccc);
+ error=Phone->GetNextCalendar(&s,&note,refresh);
+ if (error == ERR_EMPTY) break;
+ handler.startElement( existingCal, &note, "Event" );
+ }
error=GSM_TerminateConnection(&s);
-
-
#if 0
bool debug = DEBUGMODE;
//debug = true;
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();
qApp->processEvents();
QString fileName;
if ( ! debug ) {
fileName = "/tmp/kopitempout";
QString command ="db2file datebook -r -c "+ codec + " > " + fileName;
system ( command.latin1() );
} else {
@@ -1018,48 +1170,49 @@ QString PhoneFormat::getPart( const QString & text, bool &ok, int &start )
retval = text.mid(start, kom-start);
start = kom+1;
return retval;
} else {
if ( nl == kom ) {
// qDebug(" nl == kom ");
start = 0;
ok = false;
return "0";
}
// qDebug(" nl < kom ", nl);
retval = text.mid( start, nl-start);
ok = false;
start = nl+1;
return retval;
}
}
}
bool PhoneFormat::fromString( Calendar *calendar, const QString & text)
{
return false;
}
bool PhoneFormat::fromString2Cal( Calendar *calendar,Calendar *existingCalendar, GSM_StateMachine* s, const QString & type)
{
+#if 0
GSM_Phone_Functions *Phone;
GSM_CalendarEntry note;
GSM_CalendarEntry* Note;
bool refresh = true;
Phone=s->Phone.Functions;
bool gshutdown = false;
PhoneParser handler( calendar );
//handler.setCategoriesList( mCategories );
QStringList templist;
QString tempString;
int start = 0;
int error;
int ccc = 0;
while (!gshutdown && ccc++ < 10 ) {
QString CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY;
templist.clear();
qDebug("count %d ", ccc);
error=Phone->GetNextCalendar(s,&note,refresh);
if (error == ERR_EMPTY) break;
Note = &note;
//CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY
@@ -1304,49 +1457,49 @@ typedef struct {
break;
case CAL_REPEAT_STOPDATE:
repeat_stopdate = Note->Entries[i].Date;
repeating = true;
break;
}
}
if ( ARON == "0" ) {
QDateTime start,alarm;
start = handler.fromString( TIM1 );
alarm = handler.fromString( ARMN );
int min = alarm.secsTo ( start )/60;
ARMN = QString::number ( min );
}
templist.clear();
templist << CARDID << CATEGORY << DSRP << PLCE << MEM1 << TIM1 << TIM2 << ADAY << ARON << ARMN << ARSD << RTYP << RFRQ << RPOS << RDYS << REND << REDT << ALSD << ALED << MDAY;
handler.startElement( existingCalendar, templist, type );
}
-
+#endif
#if 0
// qDebug("test %s ", text.latin1());
QStringList templist;
QString tempString;
int start = 0;
int len = text.length();
int end = text.find ("\n",start)+1;
bool ok = true;
start = end;
PhoneParser handler( calendar );
handler.setCategoriesList( mCategories );
while ( start > 0 ) {
templist.clear();
ok = true;
while ( ok ) {
tempString = getPart( text, ok, start );
if ( start >= len || start == 0 ) {
start = 0;
ok = false;
}
if ( tempString.right(1) =="\n" )
tempString = tempString.left( tempString.length()-1);
//if ( ok )
templist.append( tempString );
diff --git a/libkcal/phoneformat.h b/libkcal/phoneformat.h
index 4ddf6f0..4da38c8 100644
--- a/libkcal/phoneformat.h
+++ b/libkcal/phoneformat.h
@@ -21,45 +21,46 @@
#ifndef PHONEFORMAT_H
#define PHONEFORMAT_H
#include <qstring.h>
#include "scheduler.h"
#include "calformat.h"
extern "C" {
#include "../gammu/emb/common/gammu.h"
}
namespace KCal {
/**
This class implements the calendar format used by Phone.
*/
class PhoneFormat : public QObject {
public:
/** Create new iCalendar format. */
PhoneFormat();
virtual ~PhoneFormat();
- bool load( Calendar * ,Calendar *);
+ bool load( Calendar * ,Calendar *, QString profileName, QString device,QString connection, QString model );
bool save( Calendar * );
void setCategoriesList ( QStringList * cat ){ mCategories = cat; }
bool fromString2Cal( Calendar *, Calendar *, GSM_StateMachine* s , const QString & );
bool fromString( Calendar *, const QString & );
QString toString( Calendar * );
static ulong getCsum( const QStringList & );
private:
QString getEventString( Event* );
QString getTodoString( Todo* );
QString dtToString( const QDateTime& dt, bool useTZ = true );
QStringList *mCategories;
int getNumFromRecord( QString answer,Incidence* inc ) ;
QString getPart( const QString & text, bool &ok, int &start );
+ QString mProfileName;
};
}
#endif