-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 @@ -697,13 +697,8 @@ void CalendarView::createPrinter() } #endif } -void CalendarView::confSync() -{ - //DELETE -} - //KOPrefs::instance()->mWriteBackFile //KOPrefs::instance()->mWriteBackExistingOnly @@ -1200,8 +1195,9 @@ void CalendarView::setSyncName( QString s ) mCurrentSyncName= s; } bool CalendarView::syncCalendar(QString filename, int mode) { + //qDebug("syncCalendar %s ", filename.latin1()); mGlobalSyncMode = SYNC_MODE_NORMAL; CalendarLocal* calendar = new CalendarLocal(); calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); FileStorage* storage = new FileStorage( calendar ); @@ -1226,12 +1222,9 @@ bool CalendarView::syncCalendar(QString filename, int mode) if ( syncOK ) updateView(); return syncOK; } -void CalendarView::syncPhone() -{ - //DELETE -} + void CalendarView::syncExternal( int mode ) { mGlobalSyncMode = SYNC_MODE_EXTERNAL; @@ -1312,14 +1305,8 @@ void CalendarView::syncExternal( int mode ) updateView(); return ;//syncOK; } -void CalendarView::syncSharp() -{ - //DELETE - -} - bool CalendarView::importBday() { #ifndef KORG_NOKABC @@ -1588,12 +1575,15 @@ bool CalendarView::openCalendar(QString filename, bool merge) mCalendar->reInitAlarmSettings(); setSyncEventsReadOnly(); 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; } else { // while failing to load, the calendar object could @@ -1688,18 +1678,21 @@ bool CalendarView::saveCalendar( QString filename ) // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); if ( mViewManager->currentView() ) mViewManager->currentView()->flushView(); - //mStorage->setFileName( filename ); + QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); mStorage->setSaveFormat( new ICalFormat() ); mStorage->setFileName( filename ); bool success; success = mStorage->save(); if ( !success ) { return false; } - + if ( filename == MainWindow::defaultFileName() ) { + setLoadedFileVersion( lfv ); + watchSavedFile(); + } return true; } void CalendarView::closeCalendar() @@ -2181,13 +2174,8 @@ void CalendarView::edit_options() { mDialogManager->showOptionsDialog(); //writeSettings(); } -void CalendarView::edit_sync_options() -{ - // DELETE - -} void CalendarView::slotSelectPickerDate( QDate d) { mDateFrame->hide(); |