-rw-r--r-- | korganizer/kojournalview.cpp | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 51ae0a0..7a96aa5 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -111,25 +111,24 @@ void KOJournalView::updateConfig() | |||
111 | } | 111 | } |
112 | void KOJournalView::updateView() | 112 | void KOJournalView::updateView() |
113 | { | 113 | { |
114 | JournalEntry* mEntry = jEntries.first(); | 114 | JournalEntry* mEntry = jEntries.first(); |
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 | } |
121 | void KOJournalView::checkModified() | 121 | void KOJournalView::checkModified() |
122 | { | 122 | { |
123 | qDebug("checkmod "); | ||
124 | flushView(); | 123 | flushView(); |
125 | } | 124 | } |
126 | void KOJournalView::flushView() | 125 | void 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(); |
132 | while ( mEntry ) { | 131 | while ( mEntry ) { |
133 | mEntry->flushEntry(); | 132 | mEntry->flushEntry(); |
134 | mEntry = jEntries.next(); | 133 | mEntry = jEntries.next(); |
135 | } | 134 | } |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index fb6d6ec..23537a6 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1826,27 +1826,25 @@ void MainWindow::saveOnClose() | |||
1826 | 1826 | ||
1827 | if ( p->mToolBarHorN ) | 1827 | if ( p->mToolBarHorN ) |
1828 | p->mToolBarUpN = navigatorToolBar->y() > height()/2; | 1828 | p->mToolBarUpN = navigatorToolBar->y() > height()/2; |
1829 | else | 1829 | else |
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(); | ||
1840 | if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) | ||
1841 | save(); | 1839 | save(); |
1842 | mView->writeSettings(); | 1840 | mView->writeSettings(); |
1843 | } | 1841 | } |
1844 | void MainWindow::slotModifiedChanged( bool changed ) | 1842 | void MainWindow::slotModifiedChanged( bool changed ) |
1845 | { | 1843 | { |
1846 | if ( mBlockAtStartup ) | 1844 | if ( mBlockAtStartup ) |
1847 | return; | 1845 | return; |
1848 | 1846 | ||
1849 | int msec; | 1847 | int msec; |
1850 | // we store the changes after 1 minute, | 1848 | // we store the changes after 1 minute, |
1851 | // and for safety reasons after 10 minutes again | 1849 | // and for safety reasons after 10 minutes again |
1852 | if ( !mSyncManager->blockSave() ) | 1850 | if ( !mSyncManager->blockSave() ) |