From c640aaff31f298b4aff7a61cbdfa9c8a95269479 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 22 Sep 2004 06:39:51 +0000
Subject: modified file warning fix

---
(limited to 'korganizer/calendarview.cpp')

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 3635cfa..eaea040 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1514,7 +1514,7 @@ bool CalendarView::openCalendar(QString filename, bool merge)
         setSyncEventsReadOnly();
         updateUnmanagedViews();
         updateView();
-        if (  filename != MainWindow::defaultFileName() )
+        if (  filename != MainWindow::defaultFileName() ) 
             saveCalendar( MainWindow::defaultFileName() );
         loadedFileVersion = QDateTime::currentDateTime();
         return true;
@@ -1545,6 +1545,19 @@ bool CalendarView::checkFileChanged(QString fn)
     return true;
 
 }
+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)
 {
     QFileInfo finf ( fn );  
@@ -1555,7 +1568,7 @@ bool CalendarView::checkFileVersion(QString fn)
     //qDebug("file on disk version  %s",dt.toString().latin1());
     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"));
    
--
cgit v0.9.0.2