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
@@ -107,33 +107,32 @@ void KOJournalView::updateConfig()
107 while ( mEntry ) { 107 while ( mEntry ) {
108 mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); 108 mEntry->setFont ( KOPrefs::instance()->mJornalViewFont );
109 mEntry = jEntries.next(); 109 mEntry = jEntries.next();
110 } 110 }
111} 111}
112void KOJournalView::updateView() 112void 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}
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();
132 while ( mEntry ) { 131 while ( mEntry ) {
133 mEntry->flushEntry(); 132 mEntry->flushEntry();
134 mEntry = jEntries.next(); 133 mEntry = jEntries.next();
135 } 134 }
136 ff = false; 135 ff = false;
137} 136}
138 137
139void KOJournalView::clearList() 138void KOJournalView::clearList()
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index fb6d6ec..23537a6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1822,36 +1822,34 @@ void MainWindow::saveOnClose()
1822 if ( p->mToolBarHorV ) 1822 if ( p->mToolBarHorV )
1823 p->mToolBarUpV = viewToolBar->y() > height()/2; 1823 p->mToolBarUpV = viewToolBar->y() > height()/2;
1824 else 1824 else
1825 p->mToolBarUpV = viewToolBar->x() > width()/2 ; 1825 p->mToolBarUpV = viewToolBar->x() > width()/2 ;
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(); 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;
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() )
1853 msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000; 1851 msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
1854 else 1852 else
1855 msec = 1000 * 600; 1853 msec = 1000 * 600;
1856 mSaveTimer.start( msec, true ); // 1 minute 1854 mSaveTimer.start( msec, true ); // 1 minute
1857 qDebug("KO: Saving File in %d secs!", msec/1000); 1855 qDebug("KO: Saving File in %d secs!", msec/1000);