summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kojournalview.cpp1
-rw-r--r--korganizer/mainwindow.cpp6
2 files changed, 2 insertions, 5 deletions
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 51ae0a0..7a96aa5 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -115,17 +115,16 @@ void KOJournalView::updateView()
115 while ( mEntry ) { 115 while ( mEntry ) {
116 mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); 116 mEntry->setFont ( KOPrefs::instance()->mJornalViewFont );
117 mEntry = jEntries.next(); 117 mEntry = jEntries.next();
118 } 118 }
119 showDates( mDate, QDate() ); 119 showDates( mDate, QDate() );
120} 120}
121void KOJournalView::checkModified() 121void KOJournalView::checkModified()
122{ 122{
123 qDebug("checkmod ");
124 flushView(); 123 flushView();
125} 124}
126void KOJournalView::flushView() 125void KOJournalView::flushView()
127{ 126{
128 static bool ff = false; 127 static bool ff = false;
129 if ( ff ) return; 128 if ( ff ) return;
130 ff = true; 129 ff = true;
131 JournalEntry* mEntry = jEntries.first(); 130 JournalEntry* mEntry = jEntries.first();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index fb6d6ec..23537a6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1830,20 +1830,18 @@ void MainWindow::saveOnClose()
1830 p->mToolBarUpN = navigatorToolBar->x() > width()/2 ; 1830 p->mToolBarUpN = navigatorToolBar->x() > width()/2 ;
1831 if ( filterToolBar ) { 1831 if ( filterToolBar ) {
1832 if ( p->mToolBarHorF ) 1832 if ( p->mToolBarHorF )
1833 p->mToolBarUpF = filterToolBar->y() > height()/2; 1833 p->mToolBarUpF = filterToolBar->y() > height()/2;
1834 else 1834 else
1835 p->mToolBarUpF = filterToolBar->x() > width()/2 ; 1835 p->mToolBarUpF = filterToolBar->x() > width()/2 ;
1836 } 1836 }
1837#endif 1837#endif
1838 if ( mView->viewManager()->journalView() ) 1838
1839 mView->viewManager()->journalView()->checkModified(); 1839 save();
1840 if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
1841 save();
1842 mView->writeSettings(); 1840 mView->writeSettings();
1843} 1841}
1844void MainWindow::slotModifiedChanged( bool changed ) 1842void MainWindow::slotModifiedChanged( bool changed )
1845{ 1843{
1846 if ( mBlockAtStartup ) 1844 if ( mBlockAtStartup )
1847 return; 1845 return;
1848 1846
1849 int msec; 1847 int msec;