fixxx

3 files changed, 42 insertions, 36 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 90521ec..2ade5bd 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1358,5 +1358,5 @@
 { "Make backup every ","Mache ein Backup alle " },
 { " days"," Tage" }, 
-{ "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." },
+{ "Creating backup ... please wait ...","Erstelle Backup ... bitte warten ..." },
 { "Backup Failed!","Backup Problem!" },
 { "Try again now","Versuche jetzt nochmal" },
@@ -1451,4 +1451,10 @@
 { "Children","Kinder" },
 { "Department","Abteilung" },
+{ "Backup cancelled","Backup abgebrochen" },
+{ "Backup globally disabled","Backup global abgeschaltet" },
+{ "Backup succesfully finished","Backup erfolgreich beendet" },
+{ "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" },
+{ "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" },
+{ "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 48320a5..b9d8742 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1034,9 +1034,10 @@ void MainWindow::initActions()
 
     //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 );
@@ -1846,18 +1847,8 @@ 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);
@@ -1868,4 +1859,5 @@ void MainWindow::save()
                 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
@@ -1884,5 +1876,7 @@ void MainWindow::save()
                     }
                     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
@@ -1891,4 +1885,20 @@ void MainWindow::save()
                 // 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
         }
@@ -2301,32 +2311,20 @@ void MainWindow::configureAgenda( int item )
 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 );
@@ -2360,4 +2358,5 @@ void  MainWindow::loadCalendar()
         setCaption(mess);
     }
+#endif
 
 }
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 9a8bc7f..c9817c3 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -82,4 +82,5 @@ class MainWindow : public QMainWindow
     
     void save();
+    void backupAllFiles();
     void saveStopTimer();
     void configureToolBar( int );