-rw-r--r-- | korganizer/calendarview.cpp | 4 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 | ||||
-rw-r--r-- | korganizer/koprefs.h | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 16 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 |
5 files changed, 24 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index f859b90..689618d 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1174,4 +1174,8 @@ bool CalendarView::syncCalendar(QString filename, int mode) | |||
1174 | return syncOK; | 1174 | return syncOK; |
1175 | } | 1175 | } |
1176 | void CalendarView::syncPhone() | ||
1177 | { | ||
1178 | qDebug("CalendarView::syncPhone() "); | ||
1179 | } | ||
1176 | void CalendarView::syncSharp() | 1180 | void CalendarView::syncSharp() |
1177 | { | 1181 | { |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index d564473..b2838db 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -426,4 +426,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
426 | const QString &tasklistFile ); | 426 | const QString &tasklistFile ); |
427 | void syncSharp( ); | 427 | void syncSharp( ); |
428 | void syncPhone( ); | ||
428 | void slotSelectPickerDate( QDate ) ; | 429 | void slotSelectPickerDate( QDate ) ; |
429 | void showDatePicker( ) ; | 430 | void showDatePicker( ) ; |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 424fa98..446fe2e 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -211,4 +211,7 @@ class KOPrefs : public KPimPrefs | |||
211 | QString mRemoteFile; | 211 | QString mRemoteFile; |
212 | QString mLocalTempFile; | 212 | QString mLocalTempFile; |
213 | QString mPhoneDevice; | ||
214 | QString mPhoneConnection; | ||
215 | QString mPhoneModel; | ||
213 | 216 | ||
214 | int mLastSyncTime; | 217 | int mLastSyncTime; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index c3c4c26..062c95f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -898,5 +898,11 @@ int MainWindow::ringSync() | |||
898 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); | 898 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); |
899 | } else { | 899 | } else { |
900 | syncRemote( temp, false ); | 900 | if ( temp->getIsPhoneSync() ) { |
901 | KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; | ||
902 | KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); | ||
903 | KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); | ||
904 | syncPhone(); | ||
905 | } else | ||
906 | syncRemote( temp, false ); | ||
901 | 907 | ||
902 | } | 908 | } |
@@ -2038,4 +2044,12 @@ void MainWindow::syncSharp() | |||
2038 | 2044 | ||
2039 | } | 2045 | } |
2046 | void MainWindow::syncPhone() | ||
2047 | { | ||
2048 | if ( mCalendarModifiedFlag ) | ||
2049 | save(); | ||
2050 | mView->syncPhone(); | ||
2051 | slotModifiedChanged( true ); | ||
2052 | |||
2053 | } | ||
2040 | 2054 | ||
2041 | void MainWindow::printSel( ) | 2055 | void MainWindow::printSel( ) |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index fba8c52..1d87db0 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -76,4 +76,5 @@ class MainWindow : public QMainWindow | |||
76 | void confSync(); | 76 | void confSync(); |
77 | void syncSharp(); | 77 | void syncSharp(); |
78 | void syncPhone(); | ||
78 | void syncLocalFile(); | 79 | void syncLocalFile(); |
79 | bool syncWithFile( QString, bool ); | 80 | bool syncWithFile( QString, bool ); |