| -rw-r--r-- | korganizer/calendarview.cpp | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 04051a2..0c35bb3 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -700,7 +700,2 @@ void CalendarView::createPrinter() -void CalendarView::confSync() -{ - //DELETE -} - @@ -1203,2 +1198,3 @@ bool CalendarView::syncCalendar(QString filename, int mode) { + //qDebug("syncCalendar %s ", filename.latin1()); mGlobalSyncMode = SYNC_MODE_NORMAL; @@ -1229,6 +1225,3 @@ bool CalendarView::syncCalendar(QString filename, int mode) } -void CalendarView::syncPhone() -{ - //DELETE -} + void CalendarView::syncExternal( int mode ) @@ -1315,8 +1308,2 @@ void CalendarView::syncExternal( int mode ) } -void CalendarView::syncSharp() -{ - //DELETE - -} - @@ -1591,6 +1578,9 @@ bool CalendarView::openCalendar(QString filename, bool merge) updateView(); - setLoadedFileVersion( QDateTime::currentDateTime().addSecs( -1 )); if ( filename != MainWindow::defaultFileName() ) { saveCalendar( MainWindow::defaultFileName() ); - watchSavedFile(); + } else { + QFileInfo finf ( MainWindow::defaultFileName()); + if ( finf.exists() ) { + setLoadedFileVersion( finf.lastModified () ); + } } @@ -1691,4 +1681,4 @@ bool CalendarView::saveCalendar( QString filename ) - //mStorage->setFileName( filename ); + QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); mStorage->setSaveFormat( new ICalFormat() ); @@ -1700,3 +1690,6 @@ bool CalendarView::saveCalendar( QString filename ) } - + if ( filename == MainWindow::defaultFileName() ) { + setLoadedFileVersion( lfv ); + watchSavedFile(); + } return true; @@ -2184,7 +2177,2 @@ void CalendarView::edit_options() } -void CalendarView::edit_sync_options() -{ - // DELETE - -} |