author | zautrix <zautrix> | 2005-03-30 13:24:56 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-30 13:24:56 (UTC) |
commit | 056f171723a9301aea5a65340dffeda34e078abf (patch) (unidiff) | |
tree | 7930525c801dd9c5d9a910b71bca7dc79e10f666 /korganizer | |
parent | b5222dd7a607f78235b1ea39fea0f95a9c08ccd3 (diff) | |
download | kdepimpi-056f171723a9301aea5a65340dffeda34e078abf.zip kdepimpi-056f171723a9301aea5a65340dffeda34e078abf.tar.gz kdepimpi-056f171723a9301aea5a65340dffeda34e078abf.tar.bz2 |
fixes
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 36 | ||||
-rw-r--r-- | korganizer/kdatenavigator.cpp | 1 |
2 files changed, 17 insertions, 20 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 27ba9e0..f6f62a4 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp | |||
@@ -207,11 +207,4 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
207 | count = horizontalCount * verticalCount; | 207 | count = horizontalCount * verticalCount; |
208 | } else { | 208 | } |
209 | if ( mNavigatorView->fontChanged() ) { | 209 | |
210 | fontchange = true; | ||
211 | fo = KOPrefs::instance()->mDateNavigatorFont; | ||
212 | mNavigatorView->changeFont( fo ); | ||
213 | mNavigatorView->unsetFontChanged(); | ||
214 | } | ||
215 | } | ||
216 | |||
217 | mLastDisplayedDN = horizontalCount*verticalCount-1; | 210 | mLastDisplayedDN = horizontalCount*verticalCount-1; |
@@ -226,12 +219,3 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
226 | 219 | ||
227 | |||
228 | setBaseDates(); | 220 | setBaseDates(); |
229 | if ( fontchange ) { | ||
230 | //mNavigatorView->changeFont( fo ); | ||
231 | uint i; | ||
232 | for( i = 0; i < mExtraViews.count(); ++i ) { | ||
233 | KDateNavigator *view = mExtraViews.at( i ); | ||
234 | view->changeFont( fo ); | ||
235 | } | ||
236 | } | ||
237 | mHorizontalCount = horizontalCount; | 221 | mHorizontalCount = horizontalCount; |
@@ -240,3 +224,17 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
240 | } | 224 | } |
241 | 225 | if ( !fontchange ) { | |
226 | if ( mNavigatorView->fontChanged() ) { | ||
227 | fontchange = true; | ||
228 | fo = KOPrefs::instance()->mDateNavigatorFont; | ||
229 | mNavigatorView->changeFont( fo ); | ||
230 | mNavigatorView->unsetFontChanged(); | ||
231 | } | ||
232 | } | ||
233 | if ( fontchange ) { | ||
234 | uint i; | ||
235 | for( i = 0; i < mLastDisplayedDN; ++i ) { | ||
236 | KDateNavigator *view = mExtraViews.at( i ); | ||
237 | view->changeFont( fo ); | ||
238 | } | ||
239 | } | ||
242 | int theight = height() / mVerticalCount; | 240 | int theight = height() / mVerticalCount; |
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 2fca49e..1d09f40 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -63,3 +63,2 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
63 | m_bShowWeekNums = true; | 63 | m_bShowWeekNums = true; |
64 | |||
65 | setFont( KOPrefs::instance()->mDateNavigatorFont ); | 64 | setFont( KOPrefs::instance()->mDateNavigatorFont ); |