delay

1 files changed, 55 insertions, 14 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2af605f..98d3e35 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -514,48 +514,67 @@ void MainWindow::toggleBeamReceive()
 #endif
 }
 void MainWindow::showMaximized () 
 {
 #ifndef DESKTOP_VERSION
     if ( ! globalFlagBlockStartup )
         if ( mClosed )
             mView->goToday();
 #endif
     QWidget::showMaximized () ;
     mClosed = false;
 }
+
+bool MainWindow::askForQuitOnSaveError()
+{
+    bool retval = false;
+    switch( QMessageBox::information( this, "KO/Pi",
+                                      i18n("Error saving data") + "!\n" +
+                                      i18n("You can save all data\nto another file via\nFile->Export->Export All Data") + "!\n" +
+                                      i18n("Do you really want\nto close KO/Pi?"),
+                                      i18n(" Yes, close "), i18n("No"),
+                                      0, 1 ) ) {
+    case 0:
+        retval = true;
+        break;
+    default:
+        break;
+    }
+    return retval;
+}
+
 void MainWindow::closeEvent( QCloseEvent* ce )
 {
 
 
 
     if ( ! KOPrefs::instance()->mAskForQuit ) {
         saveOnClose();
-        if ( mCalendarModifiedFlag ) {
+        if ( mCalendarModifiedFlag && !askForQuitOnSaveError() ) {
             ce->ignore();
             return;
         }
         mClosed = true;
         ce->accept();
         return;
 
     }
 
     switch( QMessageBox::information( this, "KO/Pi",
                                       i18n("Do you really want\nto close KO/Pi?"),
                                       i18n("Close"), i18n("No"),
                                       0, 0 ) ) {
     case 0:
         saveOnClose();
-        if ( mCalendarModifiedFlag ) {
+        if ( mCalendarModifiedFlag  && !askForQuitOnSaveError() ) {
             ce->ignore();
             return;
         }
         mClosed = true;
         ce->accept();
         break;
     case 1:
         ce->ignore();
         break;
     case 2:
 
     default:
@@ -1156,24 +1175,28 @@ void MainWindow::initActions()
     action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
 #endif
     action = new QAction( "save_cal", i18n("Save Backup..."), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
     importMenu->insertSeparator();
     importMenu->insertItem( i18n("Import"), importMenu_X );
     //importMenu->insertSeparator();
+    action = new QAction( "export ical", i18n("Export All Data"), 0,
+                          this );
+    action->addTo( exportMenu_X );    
+    connect( action, SIGNAL( activated() ), SLOT( exportICalendar() ) );
     action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
                           this );
     action->addTo( exportMenu_X );    
     connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
 
 
     //LR
     QPopupMenu *ex2phone = new QPopupMenu( this );
     ex2phone->insertItem(i18n("Complete calendar..."), 1 );
     ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
     connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
     exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
@@ -1958,25 +1981,25 @@ void MainWindow::slotModifiedChanged( bool )
     int msec;
     if ( mCalendarModifiedFlag ) {
         //qDebug(" MainWindow timer is running ");
         return;
     }
     // we store the changes after 1 minute,
     // and for safety reasons after 10 minutes again
     if ( !mSyncManager->blockSave() )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
-    mSaveTime.restart();
+    mSaveTimerStart = QDateTime::currentDateTime();
     mSaveDelay = msec/1000;
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
 }
 void MainWindow::backupAllFiles()
 {
     QDate reference ( 2000,1,1);
     int daysTo = reference.daysTo ( QDate::currentDate() );
@@ -2008,30 +2031,32 @@ void MainWindow::backupAllFiles()
         setCaption(i18n("Backup succesfully finished" ));
     } else if ( retval == 2 ){
         setCaption(i18n("Backup globally disabled" ));
         qDebug("KO: Backup globally cancelled.");
         // backup globally cancelled
         KPimGlobalPrefs::instance()->mBackupEnabled = false;
     }
     // retval == 3: do nothing, try again later
 }
 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();
+        int elapsed = mSaveTimerStart.secsTo( QDateTime::currentDateTime() );
+        if ( mSaveDelay < elapsed ) {
+            qDebug("KO: Pending save after wakeup from suspend detected.");
+            qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed );
+            qDebug("KO: Restarting save timer to save in 15 sec.");
+            int msec = 15000;
+            mSaveTimer.start( msec, true );
+            mSaveTimerStart = QDateTime::currentDateTime();
             mSaveDelay = msec/1000;
             return;
         }
     }
 
     if ( mView->viewManager()->journalView() )
         mView->viewManager()->journalView()->checkModified();
     if ( !mCalendarModifiedFlag ) {
         qDebug("KO: Calendar not modified. Nothing saved.");
         return;
     }
     if ( mSyncManager->blockSave() ) {
@@ -2566,56 +2591,72 @@ void MainWindow::importFile( QString  fn, bool quick )
 
 void   MainWindow::importIcal()
 {
 
     QString fn =KOPrefs::instance()->mLastImportFile;
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
     importFile(  fn, true );
 
 }
-
-void MainWindow::exportVCalendar()
+void MainWindow::exportCalendar( bool iCalFormat )
 {
     QString fn =  KOPrefs::instance()->mLastVcalFile;
-    fn =  KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this );
+    if ( iCalFormat ) {
+        fn =  QDir::homeDirPath()+"/kopiexport.ics";
+        fn =  KFileDialog::getSaveFileName( fn, i18n("Export iCal filename(*.ics)"), this );
+    }
+    else
+        fn =  KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this );
     if ( fn == "" )
         return;
     QFileInfo info;
     info.setFile( fn );
     QString mes;
     bool createbup = true;
     if ( info. exists() ) {
         mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                            i18n("Overwrite!"), i18n("Cancel"), 0,
                                            0, 1 );
         if ( result != 0 ) {
             createbup = false;
         }
     }
     if ( createbup ) {
-        if ( mView->exportVCalendar( fn ) ) {
-            KOPrefs::instance()->mLastVcalFile = fn;
+        bool success = false;
+        if  ( iCalFormat )
+            success = mView->exportICalendar( fn );
+        else
+            success = mView->exportVCalendar( fn );
+        if ( success ) {
             if ( fn.length() > 20 )
                 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
             else
                 mes = i18n("KO/Pi:Exported to %1").arg(fn );
             setCaption(mes);
         }
     }
 
 }
+void MainWindow::exportICalendar()
+{
+    exportCalendar( true );
+}
+void MainWindow::exportVCalendar()
+{
+    exportCalendar( false );
+}
 QString MainWindow::sentSyncFile()
 {
 #ifdef DESKTOP_VERSION
     return  QDir::convertSeparators( locateLocal( "tmp", "copysynccal.ics" ) );
 #else
     return QString( "/tmp/copysynccal.ics" );
 #endif 
 }
 
 void MainWindow::syncFileRequest()
 {
     while ( mSyncManager->blockSave() ) {