fixxx

2 files changed, 35 insertions, 35 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 48320a5..b9d8742 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1024,29 +1024,30 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
     //#else
 #ifdef _OL_IMPORT_
     importMenu_X->insertSeparator();
     action = new QAction( "import_ol", i18n("Import from OL"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
 #endif
     //#endif
 
     //importMenu->insertSeparator();
+#if 0
     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 Calendar 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( "import_qtopia", i18n("Export VCalendar"), 0,
                           this );
     action->addTo( exportMenu_X );    
     connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
 
@@ -1836,69 +1837,78 @@ void MainWindow::slotModifiedChanged( bool changed )
     if ( !mSyncManager->blockSave() )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
 }
-void MainWindow::save()
+void MainWindow::backupAllFiles()
 {
-    if ( !mCalendarModifiedFlag ) {
-        qDebug("KO: Calendar not modified. Nothing saved.");
-        return;
-    }
-    if ( mSyncManager->blockSave() )
-        return;
-    mSyncManager->setBlockSave(true);
-    if ( mView->checkAllFileVersions() ) {
-        if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
             QDate reference ( 2000,1,1);
             int daysTo = reference.daysTo ( QDate::currentDate() );
-            if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) {
                 setCaption(i18n("Creating backup ... please wait ..." ));
                 qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate);
                 // we need the file path, the backup dir and the number of bups as param
                 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
                 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
                     bupDir = KGlobalSettings::backupDataDir();
                 int retval =  KApplication::createBackup(  defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
                 if ( retval == 0 ) {
+        setCaption(i18n("Backup cancelled" ));
                     qDebug("KO: Backup cancelled. Will try again tomorrow ");
                     // retval == 0 : backup skipped for today, try again tomorrow
                     KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
                 } else if ( retval == 1 ){
                     qDebug("KO: Backup created.");
                     // backup ok
                     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
                     KopiCalendarFile * cal = calendars.first();
                     cal = calendars.next();
                     while ( cal ) {
                         if ( !cal->mErrorOnLoad ) {
                           int retval =  KApplication::createBackup(  cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );  
                         }
                         cal = calendars.next();
                     }
                     KOPrefs::instance()->mLastBackupDate =  daysTo;
+        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 ( !mCalendarModifiedFlag ) {
+        qDebug("KO: Calendar not modified. Nothing saved.");
+        return;
+    }
+    if ( mSyncManager->blockSave() )
+        return;
+    mSyncManager->setBlockSave(true);
+    if ( mView->checkAllFileVersions() ) {
+        if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
+            QDate reference ( 2000,1,1);
+            int daysTo = reference.daysTo ( QDate::currentDate() );
+            if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) {
+                backupAllFiles();
+            }
                 ; //  KPimGlobalPrefs::instance()->mLastBackupDate
         }
         QTime neededSaveTime = QDateTime::currentDateTime().time();
         setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         mView->saveCalendars();
         mCalendarModifiedFlag = false;
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
         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  );
         setCaption(savemes);
@@ -2291,52 +2301,40 @@ void MainWindow::showConfigureAgenda( )
     configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true );
 }
 void MainWindow::configureAgenda( int item )
 {
     if ( KOPrefs::instance()->mHourSize == item )
         return;
     KOPrefs::instance()->mHourSize=item;
     mView->viewManager()->agendaView()->updateConfig();
 }
 
 void  MainWindow::saveCalendar()
 {
-    QString fn =  KOPrefs::instance()->mLastSaveFile;
-    fn =  KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this );
 
-    if ( fn == "" )
-        return;
-    QFileInfo info;
-    info.setFile( fn );
-    QString mes;
-    bool createbup = true;
-    if ( info. exists() ) {
-        mes =  i18n("Backup file\nalready exists!\nOld backup 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 ) {
-        mView->saveCalendar( fn );
-        mes = i18n("KO/Pi:Saved %1").arg(fn);
-        KOPrefs::instance()->mLastSaveFile = fn;
-        setCaption(mes);
-    }
+    QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
+    if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
+        bupDir = KGlobalSettings::backupDataDir();
+    bupDir = KGlobal::formatMessage ( bupDir, 0 );
+    QString bupHint;
+    if ( !KPimGlobalPrefs::instance()->mBackupEnabled )
+        bupHint = i18n("(Hint: You can enable automatic backup in the global settings!)");
+    if ( KMessageBox::warningContinueCancel( this,  i18n("This will <b>backup all calendar files</b> to the directory %1 %2").arg(bupDir).arg(bupHint),i18n("Information") ) != KMessageBox::Continue ) return;
+    backupAllFiles();
 }
 void  MainWindow::loadCalendar()
 {
 
+   
+#if 0
     QString fn =   KOPrefs::instance()->mLastLoadFile;
     fn =  KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this );
 
     if ( fn == "" )
         return;
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;
     if ( info. exists() ) {
         mess =   i18n("Backup file from:\n%1\nLoading  backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         int result = QMessageBox::warning( this, "KO/Pi: Warning!",
@@ -2350,24 +2348,25 @@ void  MainWindow::loadCalendar()
         QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                               i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0,
                               0, 1 );
 
         return;
     }
     if ( loadbup ) {
         mView->openCalendar( fn );
         KOPrefs::instance()->mLastLoadFile = fn;
         mess = i18n("KO/Pi:Loaded %1").arg(fn) ;
         setCaption(mess);
     }
+#endif
 
 }
 void  MainWindow::quickImportIcal()
 {
     importFile( KOPrefs::instance()->mLastImportFile, false );
 }
 void MainWindow::importFile( QString  fn, bool quick )
 {
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 9a8bc7f..c9817c3 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -72,24 +72,25 @@ class MainWindow : public QMainWindow
     void processIncidenceSelection( Incidence * );
 
     void importQtopia();
     void importBday();
     void importOL();
     void importIcal();
     void importFile( QString, bool );
     void quickImportIcal();
     
     void slotModifiedChanged( bool );
     
     void save();
+    void backupAllFiles();
     void saveStopTimer();
     void configureToolBar( int );
     void printSel();
     void printCal();
     void printListView();
     void saveCalendar();
     void loadCalendar();
     void exportVCalendar();
     void fillFilterMenu();
     void fillFilterMenuTB();
     void selectFilter( int );
     void fillFilterMenuPopup();