summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-04-22 09:02:00 (UTC)
committer zautrix <zautrix>2005-04-22 09:02:00 (UTC)
commit86518702ea6efc14992580a7fc6c089905cfb716 (patch) (unidiff)
tree29ba7c61bd1948a0eb1155d1f4f06f48aeaadd9f /korganizer
parentabf935a18e55fcbe221d5a7c652840af279e2e3f (diff)
downloadkdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.zip
kdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.tar.gz
kdepimpi-86518702ea6efc14992580a7fc6c089905cfb716.tar.bz2
fixes
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp5
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
@@ -1764,16 +1764,15 @@ void MainWindow::saveOnClose()
1764 p->mToolBarUpF = filterToolBar->y() > height()/2; 1764 p->mToolBarUpF = filterToolBar->y() > height()/2;
1765 else 1765 else
1766 p->mToolBarUpF = filterToolBar->x() > width()/2 ; 1766 p->mToolBarUpF = filterToolBar->x() > width()/2 ;
1767 } 1767 }
1768#endif 1768#endif
1769 1769
1770
1771 mView->writeSettings();
1772 if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) 1770 if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
1773 save(); 1771 save();
1772 mView->writeSettings();
1774} 1773}
1775void MainWindow::slotModifiedChanged( bool changed ) 1774void MainWindow::slotModifiedChanged( bool changed )
1776{ 1775{
1777 if ( mBlockAtStartup ) 1776 if ( mBlockAtStartup )
1778 return; 1777 return;
1779 1778
@@ -1809,13 +1808,13 @@ void MainWindow::save()
1809 setCaption(i18n("KO/Pi:Creating backup ... please wait ..." )); 1808 setCaption(i18n("KO/Pi:Creating backup ... please wait ..." ));
1810 qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate); 1809 qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate);
1811 // we need the file path, the backup dir and the number of bups as param 1810 // we need the file path, the backup dir and the number of bups as param
1812 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir; 1811 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
1813 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir) 1812 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
1814 bupDir = KGlobalSettings::backupDataDir(); 1813 bupDir = KGlobalSettings::backupDataDir();
1815 int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );//55;//call backup 1814 int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
1816 if ( retval == 0 ) { 1815 if ( retval == 0 ) {
1817 qDebug("KO: Backup cancelled. Will try again tomorrow "); 1816 qDebug("KO: Backup cancelled. Will try again tomorrow ");
1818 // retval == 0 : backup skipped for today, try again tomorrow 1817 // retval == 0 : backup skipped for today, try again tomorrow
1819 KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1; 1818 KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
1820 } else if ( retval == 1 ){ 1819 } else if ( retval == 1 ){
1821 qDebug("KO: Backup created."); 1820 qDebug("KO: Backup created.");