-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/korganizerE.pro | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a7f7010..b307649 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1167,49 +1167,49 @@ bool CalendarView::syncCalendar(QString filename, int mode) | |||
1167 | } | 1167 | } |
1168 | } | 1168 | } |
1169 | setModified( true ); | 1169 | setModified( true ); |
1170 | } | 1170 | } |
1171 | delete storage; | 1171 | delete storage; |
1172 | delete calendar; | 1172 | delete calendar; |
1173 | if ( syncOK ) | 1173 | if ( syncOK ) |
1174 | updateView(); | 1174 | updateView(); |
1175 | return syncOK; | 1175 | return syncOK; |
1176 | } | 1176 | } |
1177 | void CalendarView::syncPhone() | 1177 | void CalendarView::syncPhone() |
1178 | { | 1178 | { |
1179 | syncExternal( 1 ); | 1179 | syncExternal( 1 ); |
1180 | } | 1180 | } |
1181 | void CalendarView::syncExternal( int mode ) | 1181 | void CalendarView::syncExternal( int mode ) |
1182 | { | 1182 | { |
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 | boo loadSuccess = false; | 1191 | bool loadSuccess = false; |
1192 | PhoneFormat* phoneFormat = 0; | 1192 | PhoneFormat* phoneFormat = 0; |
1193 | #ifndef DESKTOP_VERSION | 1193 | #ifndef DESKTOP_VERSION |
1194 | SharpFormat* sharpFormat = 0; | 1194 | SharpFormat* sharpFormat = 0; |
1195 | if ( mode == 0 ) { // sharp | 1195 | if ( mode == 0 ) { // sharp |
1196 | sharpFormat = new SharpFormat () ; | 1196 | sharpFormat = new SharpFormat () ; |
1197 | loadSuccess = sharpFormat->load( calendar, mCalendar ); | 1197 | loadSuccess = sharpFormat->load( calendar, mCalendar ); |
1198 | 1198 | ||
1199 | } else | 1199 | } else |
1200 | #endif | 1200 | #endif |
1201 | if ( mode == 1 ) { // phone | 1201 | if ( mode == 1 ) { // phone |
1202 | phoneFormat = new PhoneFormat (); | 1202 | phoneFormat = new PhoneFormat (); |
1203 | loadSuccess = phoneFormat->load( calendar, mCalendar ); | 1203 | loadSuccess = phoneFormat->load( calendar, mCalendar ); |
1204 | 1204 | ||
1205 | } else | 1205 | } else |
1206 | return; | 1206 | return; |
1207 | if ( loadSuccess ) { | 1207 | if ( loadSuccess ) { |
1208 | getEventViewerDialog()->setSyncMode( true ); | 1208 | getEventViewerDialog()->setSyncMode( true ); |
1209 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); | 1209 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); |
1210 | getEventViewerDialog()->setSyncMode( false ); | 1210 | getEventViewerDialog()->setSyncMode( false ); |
1211 | qApp->processEvents(); | 1211 | qApp->processEvents(); |
1212 | if ( syncOK ) { | 1212 | if ( syncOK ) { |
1213 | if ( KOPrefs::instance()->mWriteBackFile ) | 1213 | if ( KOPrefs::instance()->mWriteBackFile ) |
1214 | { | 1214 | { |
1215 | QPtrList<Incidence> iL = mCalendar->rawIncidences(); | 1215 | QPtrList<Incidence> iL = mCalendar->rawIncidences(); |
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro index 727764a..b39de35 100644 --- a/korganizer/korganizerE.pro +++ b/korganizer/korganizerE.pro | |||
@@ -1,43 +1,50 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | TARGET = kopi | 3 | TARGET = kopi |
4 | OBJECTS_DIR = obj/$(PLATFORM) | 4 | OBJECTS_DIR = obj/$(PLATFORM) |
5 | MOC_DIR = moc/$(PLATFORM) | 5 | MOC_DIR = moc/$(PLATFORM) |
6 | DESTDIR=$(QPEDIR)/bin | 6 | DESTDIR=$(QPEDIR)/bin |
7 | 7 | ||
8 | INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces ../kabc $(QPEDIR)/include | 8 | INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces ../kabc $(QPEDIR)/include |
9 | #../libkabcwrap | 9 | #../libkabcwrap |
10 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 10 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
11 | DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 11 | DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
12 | DEFINES += KORG_NOLVALTERNATION | 12 | DEFINES += KORG_NOLVALTERNATION |
13 | #KORG_NOKABC | 13 | #KORG_NOKABC |
14 | LIBS += -lmicrokdepim | 14 | LIBS += -lmicrokdepim |
15 | LIBS += -lmicrokcal | 15 | LIBS += -lmicrokcal |
16 | LIBS += -lmicrokde | 16 | LIBS += -lmicrokde |
17 | LIBS += -lmicroqtcompat | 17 | LIBS += -lmicroqtcompat |
18 | LIBS += -lmicrokabc | 18 | LIBS += -lmicrokabc |
19 | #LIBS += -lmicrokabcwrap | 19 | #LIBS += -lmicrokabcwrap |
20 | |||
21 | #LIBS += $(QPEDIR)/lib/gammu | ||
22 | LIBS += -lmicrogammu | ||
23 | LIBS += -lbluetooth | ||
24 | LIBS += -lsdp | ||
25 | |||
26 | |||
20 | LIBS += -lqpe | 27 | LIBS += -lqpe |
21 | LIBS += -ljpeg | 28 | LIBS += -ljpeg |
22 | LIBS += $(QTOPIALIB) | 29 | LIBS += $(QTOPIALIB) |
23 | LIBS += -L$(QPEDIR)/lib | 30 | LIBS += -L$(QPEDIR)/lib |
24 | 31 | ||
25 | INTERFACES = kofilterview_base.ui | 32 | INTERFACES = kofilterview_base.ui |
26 | #filteredit_base.ui | 33 | #filteredit_base.ui |
27 | 34 | ||
28 | HEADERS = \ | 35 | HEADERS = \ |
29 | wordsgerman.h \ | 36 | wordsgerman.h \ |
30 | filteredit_base.h \ | 37 | filteredit_base.h \ |
31 | alarmclient.h \ | 38 | alarmclient.h \ |
32 | calendarview.h \ | 39 | calendarview.h \ |
33 | customlistviewitem.h \ | 40 | customlistviewitem.h \ |
34 | datenavigator.h \ | 41 | datenavigator.h \ |
35 | docprefs.h \ | 42 | docprefs.h \ |
36 | filtereditdialog.h \ | 43 | filtereditdialog.h \ |
37 | incomingdialog.h \ | 44 | incomingdialog.h \ |
38 | incomingdialog_base.h \ | 45 | incomingdialog_base.h \ |
39 | interfaces/korganizer/baseview.h \ | 46 | interfaces/korganizer/baseview.h \ |
40 | interfaces/korganizer/calendarviewbase.h \ | 47 | interfaces/korganizer/calendarviewbase.h \ |
41 | journalentry.h \ | 48 | journalentry.h \ |
42 | kdateedit.h \ | 49 | kdateedit.h \ |
43 | kdatenavigator.h \ | 50 | kdatenavigator.h \ |