author | zautrix <zautrix> | 2005-04-22 09:02:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-22 09:02:00 (UTC) |
commit | 86518702ea6efc14992580a7fc6c089905cfb716 (patch) (side-by-side diff) | |
tree | 29ba7c61bd1948a0eb1155d1f4f06f48aeaadd9f /korganizer/mainwindow.cpp | |
parent | abf935a18e55fcbe221d5a7c652840af279e2e3f (diff) | |
download | kdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.zip kdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.tar.gz kdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.tar.bz2 |
fixes
-rw-r--r-- | korganizer/mainwindow.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 9ad0694..eed023c 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1762,20 +1762,19 @@ void MainWindow::saveOnClose() if ( filterToolBar ) { if ( p->mToolBarHorF ) p->mToolBarUpF = filterToolBar->y() > height()/2; else p->mToolBarUpF = filterToolBar->x() > width()/2 ; } #endif - - mView->writeSettings(); if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) save(); + mView->writeSettings(); } void MainWindow::slotModifiedChanged( bool changed ) { if ( mBlockAtStartup ) return; int msec; // we store the changes after 1 minute, @@ -1807,17 +1806,17 @@ void MainWindow::save() int daysTo = reference.daysTo ( QDate::currentDate() ); if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) { setCaption(i18n("KO/Pi: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 );//55;//call backup + int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); if ( retval == 0 ) { 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 KOPrefs::instance()->mLastBackupDate = daysTo; |