| -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 @@ -699,9 +699,4 @@ void CalendarView::createPrinter() } -void CalendarView::confSync() -{ - //DELETE -} - //KOPrefs::instance()->mWriteBackFile @@ -1202,4 +1197,5 @@ void CalendarView::setSyncName( QString s ) bool CalendarView::syncCalendar(QString filename, int mode) { + //qDebug("syncCalendar %s ", filename.latin1()); mGlobalSyncMode = SYNC_MODE_NORMAL; CalendarLocal* calendar = new CalendarLocal(); @@ -1228,8 +1224,5 @@ bool CalendarView::syncCalendar(QString filename, int mode) return syncOK; } -void CalendarView::syncPhone() -{ - //DELETE -} + void CalendarView::syncExternal( int mode ) { @@ -1314,10 +1307,4 @@ void CalendarView::syncExternal( int mode ) } -void CalendarView::syncSharp() -{ - //DELETE - -} - bool CalendarView::importBday() @@ -1590,8 +1577,11 @@ bool CalendarView::openCalendar(QString filename, bool merge) updateUnmanagedViews(); 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 () ); + } } return true; @@ -1690,6 +1680,6 @@ bool CalendarView::saveCalendar( QString filename ) mViewManager->currentView()->flushView(); - //mStorage->setFileName( filename ); + QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); mStorage->setSaveFormat( new ICalFormat() ); mStorage->setFileName( filename ); @@ -1699,5 +1689,8 @@ bool CalendarView::saveCalendar( QString filename ) return false; } - + if ( filename == MainWindow::defaultFileName() ) { + setLoadedFileVersion( lfv ); + watchSavedFile(); + } return true; } @@ -2183,9 +2176,4 @@ void CalendarView::edit_options() //writeSettings(); } -void CalendarView::edit_sync_options() -{ - // DELETE - -} void CalendarView::slotSelectPickerDate( QDate d) |