From 64199073c047a30f3cff85fe6ee30691ff0db2f7 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 17 Sep 2005 22:07:21 +0000
Subject: savetimer

---
(limited to 'korganizer')

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 14094bb..79fb727 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2500,8 +2500,8 @@ bool CalendarView::checkFileVersion(QString fn)
     if ( !finf.exists() )
         return true;
     QDateTime dt = finf.lastModified ();
-    qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1());
-    qDebug("file on disk version  %s %s", fn.latin1(),dt.toString().latin1());
+    //qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1());
+    //qDebug("file on disk version  %s %s", fn.latin1(),dt.toString().latin1());
     if ( dt <= loadedFileVersion )
         return true;
     int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg(KGlobal::formatMessage(fn,0)).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 70baf5c..2af605f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -402,7 +402,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     //toggleBeamReceive();
 
     setCaption(i18n("Loading calendar files ... please wait" ));
-    QTimer::singleShot( 10, this, SLOT ( loadDataAfterStart() ));
+    mSaveDelay = 0;
+    QTimer::singleShot( 1, this, SLOT ( loadDataAfterStart() ));
 }
 MainWindow::~MainWindow()
 {
@@ -1966,6 +1967,8 @@ void MainWindow::slotModifiedChanged( bool )
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
+    mSaveTime.restart();
+    mSaveDelay = msec/1000;
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
@@ -2013,6 +2016,17 @@ void MainWindow::backupAllFiles()
 }
 void MainWindow::save()
 {
+    if ( mSaveDelay ) {
+        if ( mSaveDelay + 60 < mSaveTime.elapsed()/1000 ) {
+            qDebug("KO: Save delay %d. Elapsed save time %d ", mSaveDelay, mSaveTime.elapsed()/1000  );
+            qDebug("KO: Restarting save timer");
+            int msec = 10000;
+            mSaveTimer.start( msec, true ); // 1 minute
+            mSaveTime.restart();
+            mSaveDelay = msec/1000;
+            return;
+        }
+    }
 
     if ( mView->viewManager()->journalView() )
         mView->viewManager()->journalView()->checkModified();
@@ -2024,6 +2038,7 @@ void MainWindow::save()
         slotModifiedChanged( true );
         return;
     }
+    mSaveDelay = 0;
     mSyncManager->setBlockSave(true);
     if ( mView->checkAllFileVersions() ) {
         if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
@@ -2034,13 +2049,14 @@ void MainWindow::save()
             }
             ; //  KPimGlobalPrefs::instance()->mLastBackupDate
         }
-        QTime neededSaveTime = QDateTime::currentDateTime().time();
+        QTime neededSaveTime;
+        neededSaveTime.start();
         if ( !isMinimized () )
             setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         if ( mView->saveCalendars() )
             mCalendarModifiedFlag = false;
-        int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
+        int msNeeded = neededSaveTime.elapsed();
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index fdcf7c4..657c0a8 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -174,6 +174,8 @@ class MainWindow : public QMainWindow
 
     void closeEvent( QCloseEvent* ce );
     QTimer mSaveTimer;
+    QTime mSaveTime;
+    int mSaveDelay;
     //bool mBlockSaveFlag;
     bool mCalendarModifiedFlag;
     QPixmap loadPixmap( QString );
--
cgit v0.9.0.2