author | zautrix <zautrix> | 2004-08-07 17:37:12 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-07 17:37:12 (UTC) |
commit | 2219ddf2cb8022a24101e45ca439e65e95743388 (patch) (unidiff) | |
tree | 3e15d6b069a82901a5e032f641889b1870fc6ede /korganizer | |
parent | 88b0d33b8b0b1f6ae320cfc863ca6a47fa8fec22 (diff) | |
download | kdepimpi-2219ddf2cb8022a24101e45ca439e65e95743388.zip kdepimpi-2219ddf2cb8022a24101e45ca439e65e95743388.tar.gz kdepimpi-2219ddf2cb8022a24101e45ca439e65e95743388.tar.bz2 |
added gammu
-rw-r--r-- | korganizer/calendarview.cpp | 42 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 8 |
3 files changed, 41 insertions, 10 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 689618d..a7f7010 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -80,12 +80,13 @@ | |||
80 | #include <libkcal/qtopiaformat.h> | 80 | #include <libkcal/qtopiaformat.h> |
81 | #include "../kalarmd/alarmdialog.h" | 81 | #include "../kalarmd/alarmdialog.h" |
82 | 82 | ||
83 | #ifndef DESKTOP_VERSION | 83 | #ifndef DESKTOP_VERSION |
84 | #include <libkcal/sharpformat.h> | 84 | #include <libkcal/sharpformat.h> |
85 | #endif | 85 | #endif |
86 | #include <libkcal/phoneformat.h> | ||
86 | #ifndef KORG_NOMAIL | 87 | #ifndef KORG_NOMAIL |
87 | #include "komailclient.h" | 88 | #include "komailclient.h" |
88 | #endif | 89 | #endif |
89 | #ifndef KORG_NOPRINTER | 90 | #ifndef KORG_NOPRINTER |
90 | #include "calprinter.h" | 91 | #include "calprinter.h" |
91 | #endif | 92 | #endif |
@@ -1172,27 +1173,41 @@ bool CalendarView::syncCalendar(QString filename, int mode) | |||
1172 | if ( syncOK ) | 1173 | if ( syncOK ) |
1173 | updateView(); | 1174 | updateView(); |
1174 | return syncOK; | 1175 | return syncOK; |
1175 | } | 1176 | } |
1176 | void CalendarView::syncPhone() | 1177 | void CalendarView::syncPhone() |
1177 | { | 1178 | { |
1178 | qDebug("CalendarView::syncPhone() "); | 1179 | syncExternal( 1 ); |
1179 | } | 1180 | } |
1180 | void CalendarView::syncSharp() | 1181 | void CalendarView::syncExternal( int mode ) |
1181 | { | 1182 | { |
1182 | #ifndef DESKTOP_VERSION | 1183 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
1183 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | ||
1184 | //mCurrentSyncDevice = "sharp-DTM"; | 1184 | //mCurrentSyncDevice = "sharp-DTM"; |
1185 | if ( KOPrefs::instance()->mAskForPreferences ) | 1185 | if ( KOPrefs::instance()->mAskForPreferences ) |
1186 | edit_sync_options(); | 1186 | edit_sync_options(); |
1187 | qApp->processEvents(); | 1187 | qApp->processEvents(); |
1188 | CalendarLocal* calendar = new CalendarLocal(); | 1188 | CalendarLocal* calendar = new CalendarLocal(); |
1189 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1189 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1190 | bool syncOK = false; | 1190 | bool syncOK = false; |
1191 | SharpFormat sharpFormat; | 1191 | boo loadSuccess = false; |
1192 | if ( sharpFormat.load( calendar, mCalendar ) ) { | 1192 | PhoneFormat* phoneFormat = 0; |
1193 | #ifndef DESKTOP_VERSION | ||
1194 | SharpFormat* sharpFormat = 0; | ||
1195 | if ( mode == 0 ) { // sharp | ||
1196 | sharpFormat = new SharpFormat () ; | ||
1197 | loadSuccess = sharpFormat->load( calendar, mCalendar ); | ||
1198 | |||
1199 | } else | ||
1200 | #endif | ||
1201 | if ( mode == 1 ) { // phone | ||
1202 | phoneFormat = new PhoneFormat (); | ||
1203 | loadSuccess = phoneFormat->load( calendar, mCalendar ); | ||
1204 | |||
1205 | } else | ||
1206 | return; | ||
1207 | if ( loadSuccess ) { | ||
1193 | getEventViewerDialog()->setSyncMode( true ); | 1208 | getEventViewerDialog()->setSyncMode( true ); |
1194 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); | 1209 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); |
1195 | getEventViewerDialog()->setSyncMode( false ); | 1210 | getEventViewerDialog()->setSyncMode( false ); |
1196 | qApp->processEvents(); | 1211 | qApp->processEvents(); |
1197 | if ( syncOK ) { | 1212 | if ( syncOK ) { |
1198 | if ( KOPrefs::instance()->mWriteBackFile ) | 1213 | if ( KOPrefs::instance()->mWriteBackFile ) |
@@ -1202,14 +1217,18 @@ void CalendarView::syncSharp() | |||
1202 | /* obsolete | 1217 | /* obsolete |
1203 | while ( inc ) { | 1218 | while ( inc ) { |
1204 | inc->setZaurusStat( inc->revision () ); | 1219 | inc->setZaurusStat( inc->revision () ); |
1205 | inc = iL.next(); | 1220 | inc = iL.next(); |
1206 | } | 1221 | } |
1207 | */ | 1222 | */ |
1208 | // pending: clean last sync event description | 1223 | #ifndef DESKTOP_VERSION |
1209 | sharpFormat.save(calendar); | 1224 | if ( sharpFormat ) |
1225 | sharpFormat->save(calendar); | ||
1226 | #endif | ||
1227 | if ( phoneFormat ) | ||
1228 | phoneFormat->save(calendar); | ||
1210 | iL = calendar->rawIncidences(); | 1229 | iL = calendar->rawIncidences(); |
1211 | inc = iL.first(); | 1230 | inc = iL.first(); |
1212 | Incidence* loc; | 1231 | Incidence* loc; |
1213 | while ( inc ) { | 1232 | while ( inc ) { |
1214 | if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) { | 1233 | if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) { |
1215 | loc = mCalendar->incidence(inc->uid() ); | 1234 | loc = mCalendar->incidence(inc->uid() ); |
@@ -1235,13 +1254,18 @@ void CalendarView::syncSharp() | |||
1235 | question, i18n("Ok")) ; | 1254 | question, i18n("Ok")) ; |
1236 | 1255 | ||
1237 | } | 1256 | } |
1238 | delete calendar; | 1257 | delete calendar; |
1239 | updateView(); | 1258 | updateView(); |
1240 | return ;//syncOK; | 1259 | return ;//syncOK; |
1241 | #endif | 1260 | |
1261 | } | ||
1262 | void CalendarView::syncSharp() | ||
1263 | { | ||
1264 | syncExternal( 0 ); | ||
1265 | |||
1242 | } | 1266 | } |
1243 | 1267 | ||
1244 | 1268 | ||
1245 | #include <kabc/stdaddressbook.h> | 1269 | #include <kabc/stdaddressbook.h> |
1246 | bool CalendarView::importBday() | 1270 | bool CalendarView::importBday() |
1247 | { | 1271 | { |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index b2838db..a3315ad 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -423,12 +423,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
423 | bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday ); | 423 | bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday ); |
424 | bool importQtopia( const QString &categoriesFile, | 424 | bool importQtopia( const QString &categoriesFile, |
425 | const QString &datebookFile, | 425 | const QString &datebookFile, |
426 | const QString &tasklistFile ); | 426 | const QString &tasklistFile ); |
427 | void syncSharp( ); | 427 | void syncSharp( ); |
428 | void syncPhone( ); | 428 | void syncPhone( ); |
429 | void syncExternal( int mode ); | ||
429 | void slotSelectPickerDate( QDate ) ; | 430 | void slotSelectPickerDate( QDate ) ; |
430 | void showDatePicker( ) ; | 431 | void showDatePicker( ) ; |
431 | void moveIncidence(Incidence *) ; | 432 | void moveIncidence(Incidence *) ; |
432 | void beamIncidence(Incidence *) ; | 433 | void beamIncidence(Incidence *) ; |
433 | void beamCalendar() ; | 434 | void beamCalendar() ; |
434 | void beamFilteredCalendar() ; | 435 | void beamFilteredCalendar() ; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 062c95f..cce182a 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -997,13 +997,19 @@ void MainWindow::slotSyncMenu( int action ) | |||
997 | 997 | ||
998 | } else if ( action >= 1003 ) { | 998 | } else if ( action >= 1003 ) { |
999 | if ( temp->getIsLocalFileSync() ) { | 999 | if ( temp->getIsLocalFileSync() ) { |
1000 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) | 1000 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) |
1001 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); | 1001 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); |
1002 | } else { | 1002 | } else { |
1003 | syncRemote( temp ); | 1003 | if ( temp->getIsPhoneSync() ) { |
1004 | KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; | ||
1005 | KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); | ||
1006 | KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); | ||
1007 | syncPhone(); | ||
1008 | } else | ||
1009 | syncRemote( temp ); | ||
1004 | 1010 | ||
1005 | } | 1011 | } |
1006 | } | 1012 | } |
1007 | delete temp; | 1013 | delete temp; |
1008 | mBlockSaveFlag = false; | 1014 | mBlockSaveFlag = false; |
1009 | } | 1015 | } |