author | zautrix <zautrix> | 2005-07-26 15:43:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-26 15:43:00 (UTC) |
commit | d0fe94073aa3209532952c944b41bccfb4341a8d (patch) (unidiff) | |
tree | abab8e118a2661847c65715b9c68e5d3b9ac97e6 /korganizer/mainwindow.cpp | |
parent | e1d72bb77c51ff7313b390f263bc1f10d20123b0 (diff) | |
download | kdepimpi-d0fe94073aa3209532952c944b41bccfb4341a8d.zip kdepimpi-d0fe94073aa3209532952c944b41bccfb4341a8d.tar.gz kdepimpi-d0fe94073aa3209532952c944b41bccfb4341a8d.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 279955f..77d0ac8 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1911,12 +1911,16 @@ void MainWindow::saveOnClose() | |||
1911 | void MainWindow::slotModifiedChanged( bool ) | 1911 | void MainWindow::slotModifiedChanged( bool ) |
1912 | { | 1912 | { |
1913 | if ( mBlockAtStartup ) | 1913 | if ( mBlockAtStartup ) |
1914 | return; | 1914 | return; |
1915 | 1915 | ||
1916 | int msec; | 1916 | int msec; |
1917 | if ( mCalendarModifiedFlag ) { | ||
1918 | //qDebug(" MainWindow timer is running "); | ||
1919 | return; | ||
1920 | } | ||
1917 | // we store the changes after 1 minute, | 1921 | // we store the changes after 1 minute, |
1918 | // and for safety reasons after 10 minutes again | 1922 | // and for safety reasons after 10 minutes again |
1919 | if ( !mSyncManager->blockSave() ) | 1923 | if ( !mSyncManager->blockSave() ) |
1920 | msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000; | 1924 | msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000; |
1921 | else | 1925 | else |
1922 | msec = 1000 * 600; | 1926 | msec = 1000 * 600; |
@@ -1972,14 +1976,15 @@ void MainWindow::save() | |||
1972 | if ( mView->viewManager()->journalView() ) | 1976 | if ( mView->viewManager()->journalView() ) |
1973 | mView->viewManager()->journalView()->checkModified(); | 1977 | mView->viewManager()->journalView()->checkModified(); |
1974 | if ( !mCalendarModifiedFlag ) { | 1978 | if ( !mCalendarModifiedFlag ) { |
1975 | qDebug("KO: Calendar not modified. Nothing saved."); | 1979 | qDebug("KO: Calendar not modified. Nothing saved."); |
1976 | return; | 1980 | return; |
1977 | } | 1981 | } |
1978 | if ( mSyncManager->blockSave() ) | 1982 | if ( mSyncManager->blockSave() ) { |
1979 | return; | 1983 | return; |
1984 | } | ||
1980 | mSyncManager->setBlockSave(true); | 1985 | mSyncManager->setBlockSave(true); |
1981 | if ( mView->checkAllFileVersions() ) { | 1986 | if ( mView->checkAllFileVersions() ) { |
1982 | if ( KPimGlobalPrefs::instance()->mBackupEnabled ){ | 1987 | if ( KPimGlobalPrefs::instance()->mBackupEnabled ){ |
1983 | QDate reference ( 2000,1,1); | 1988 | QDate reference ( 2000,1,1); |
1984 | int daysTo = reference.daysTo ( QDate::currentDate() ); | 1989 | int daysTo = reference.daysTo ( QDate::currentDate() ); |
1985 | if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) { | 1990 | if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) { |
@@ -1998,14 +2003,17 @@ void MainWindow::save() | |||
1998 | QString savemes; | 2003 | QString savemes; |
1999 | savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); | 2004 | savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); |
2000 | if ( !isMinimized () ) | 2005 | if ( !isMinimized () ) |
2001 | setCaption(savemes); | 2006 | setCaption(savemes); |
2002 | else | 2007 | else |
2003 | qDebug(savemes); | 2008 | qDebug(savemes); |
2004 | } else | 2009 | } else { |
2005 | setCaption(i18n("Saving cancelled!")); | 2010 | setCaption(i18n("Saving cancelled!")); |
2011 | mCalendarModifiedFlag = false; | ||
2012 | slotModifiedChanged( true ); | ||
2013 | } | ||
2006 | mSyncManager->setBlockSave( false ); | 2014 | mSyncManager->setBlockSave( false ); |
2007 | } | 2015 | } |
2008 | 2016 | ||
2009 | void MainWindow::keyReleaseEvent ( QKeyEvent * e) | 2017 | void MainWindow::keyReleaseEvent ( QKeyEvent * e) |
2010 | { | 2018 | { |
2011 | if ( !e->isAutoRepeat() ) { | 2019 | if ( !e->isAutoRepeat() ) { |