| -rw-r--r-- | korganizer/calendarview.cpp | 17 | ||||
| -rw-r--r-- | korganizer/calendarview.h | 1 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 3 |
3 files changed, 18 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 3635cfa..eaea040 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1515,5 +1515,5 @@ bool CalendarView::openCalendar(QString filename, bool merge) updateUnmanagedViews(); updateView(); - if ( filename != MainWindow::defaultFileName() ) + if ( filename != MainWindow::defaultFileName() ) saveCalendar( MainWindow::defaultFileName() ); loadedFileVersion = QDateTime::currentDateTime(); @@ -1546,4 +1546,17 @@ bool CalendarView::checkFileChanged(QString fn) } +void CalendarView::watchSavedFile() +{ + QFileInfo finf ( MainWindow::defaultFileName()); + if ( !finf.exists() ) + return; + QDateTime dt = finf.lastModified (); + if ( dt < loadedFileVersion ) { + QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile() ) ); + return; + } + loadedFileVersion = dt; +} + bool CalendarView::checkFileVersion(QString fn) { @@ -1556,5 +1569,5 @@ bool CalendarView::checkFileVersion(QString fn) if ( dt <= loadedFileVersion ) return true; - int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, false)) , + int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) , i18n("KO/Pi Warning"),i18n("Overwrite"), i18n("Sync+save")); diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index a3315ad..355bb84 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -173,4 +173,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser public slots: + void watchSavedFile(); void recheckTimerAlarm(); void checkNextTimerAlarm(); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 1c4a186..6315c64 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1409,8 +1409,9 @@ void MainWindow::save() setCaption(i18n("KO/Pi:Saving Data to File ..." )); qDebug("KO: Start saving data to file!"); + mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); mView->saveCalendar( defaultFileName() ); int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); - mView->setLoadedFileVersion(QDateTime::currentDateTime()); + mView->watchSavedFile(); qDebug("KO: Needed %d ms for saving.",msNeeded ); QString savemes; |