| -rw-r--r-- | korganizer/mainwindow.cpp | 69 | ||||
| -rw-r--r-- | korganizer/mainwindow.h | 1 |
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 @@ -1033,11 +1033,12 @@ void MainWindow::initActions() //#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 ); @@ -1845,20 +1846,10 @@ 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 @@ -1867,6 +1858,7 @@ void MainWindow::save() 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; @@ -1883,13 +1875,31 @@ void MainWindow::save() 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(); @@ -2300,34 +2310,22 @@ 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 ); @@ -2359,6 +2357,7 @@ void MainWindow::loadCalendar() mess = i18n("KO/Pi:Loaded %1").arg(fn) ; setCaption(mess); } +#endif } void MainWindow::quickImportIcal() diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 9a8bc7f..c9817c3 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -81,6 +81,7 @@ class MainWindow : public QMainWindow void slotModifiedChanged( bool ); void save(); + void backupAllFiles(); void saveStopTimer(); void configureToolBar( int ); void printSel(); |