author | zautrix <zautrix> | 2005-06-30 06:47:32 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-30 06:47:32 (UTC) |
commit | 0e4ec4bb2a13a89d3d6145ea076a5734481cb252 (patch) (side-by-side diff) | |
tree | fecf6ecb38a726323fb9522eaae1764930ec49cf /korganizer/mainwindow.cpp | |
parent | 0fc571a7eadda739fd1a93d627e7129b9956c9f6 (diff) | |
download | kdepimpi-0e4ec4bb2a13a89d3d6145ea076a5734481cb252.zip kdepimpi-0e4ec4bb2a13a89d3d6145ea076a5734481cb252.tar.gz kdepimpi-0e4ec4bb2a13a89d3d6145ea076a5734481cb252.tar.bz2 |
fixixix
-rw-r--r-- | korganizer/mainwindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index d8373a6..fb6d6ec 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -42,16 +42,17 @@ #include <libkdepim/phoneaccess.h> #include <libkcal/kincidenceformatter.h> #include <libkdepim/kpimglobalprefs.h> #include "calendarview.h" #include "koviewmanager.h" #include "datenavigator.h" #include "koagendaview.h" +#include "kojournalview.h" #include "koagenda.h" #include "kodialogmanager.h" #include "kdialogbase.h" #include "kapplication.h" #include "kofilterview.h" #include "kstandarddirs.h" #include "koprefs.h" #include "kfiledialog.h" @@ -1829,17 +1830,18 @@ void MainWindow::saveOnClose() p->mToolBarUpN = navigatorToolBar->x() > width()/2 ; if ( filterToolBar ) { if ( p->mToolBarHorF ) p->mToolBarUpF = filterToolBar->y() > height()/2; else p->mToolBarUpF = filterToolBar->x() > width()/2 ; } #endif - + if ( mView->viewManager()->journalView() ) + mView->viewManager()->journalView()->checkModified(); if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) save(); mView->writeSettings(); } void MainWindow::slotModifiedChanged( bool changed ) { if ( mBlockAtStartup ) return; @@ -1894,16 +1896,18 @@ void MainWindow::backupAllFiles() qDebug("KO: Backup globally cancelled."); // backup globally cancelled KPimGlobalPrefs::instance()->mBackupEnabled = false; } // retval == 3: do nothing, try again later } void MainWindow::save() { + if ( mView->viewManager()->journalView() ) + mView->viewManager()->journalView()->checkModified(); if ( !mCalendarModifiedFlag ) { qDebug("KO: Calendar not modified. Nothing saved."); return; } if ( mSyncManager->blockSave() ) return; mSyncManager->setBlockSave(true); if ( mView->checkAllFileVersions() ) { |