summaryrefslogtreecommitdiffabout
path: root/korganizer/datenavigatorcontainer.cpp
Unidiff
Diffstat (limited to 'korganizer/datenavigatorcontainer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 6de7c45..9720146 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -313,36 +313,34 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
313 fontchange = true; 313 fontchange = true;
314 fo = KOPrefs::instance()->mDateNavigatorFont; 314 fo = KOPrefs::instance()->mDateNavigatorFont;
315 mNavigatorView->changeFont( fo ); 315 mNavigatorView->changeFont( fo );
316 mNavigatorView->unsetFontChanged(); 316 mNavigatorView->unsetFontChanged();
317 } 317 }
318 } 318 }
319 319
320 mLastDisplayedDN = horizontalCount*verticalCount-1; 320 mLastDisplayedDN = horizontalCount*verticalCount-1;
321 bool setBaseD = false;
322 while ( count > ( mExtraViews.count() + 1 ) ) { 321 while ( count > ( mExtraViews.count() + 1 ) ) {
323 KDateNavigator *n = new KDateNavigator( this ); 322 KDateNavigator *n = new KDateNavigator( this );
324 n->setMonthSignalOffset ( mExtraViews.count()+1 ); 323 n->setMonthSignalOffset ( mExtraViews.count()+1 );
325 mExtraViews.append( n ); 324 mExtraViews.append( n );
326 n->setCalendar( mCalendar ); 325 n->setCalendar( mCalendar );
327 setBaseD = true;
328 connectNavigatorView( n ); 326 connectNavigatorView( n );
329 n->show(); 327 n->show();
330 } 328 }
331 int iii = 0; 329 int iii = 0;
332 while ( iii < ( mExtraViews.count() ) ) { 330 while ( iii < ( mExtraViews.count() ) ) {
333 if ( iii < count-1 ) 331 if ( iii < count-1 )
334 mExtraViews.at( iii )->show(); 332 mExtraViews.at( iii )->show();
335 else 333 else
336 mExtraViews.at( iii )->hide(); 334 mExtraViews.at( iii )->hide();
337 ++iii; 335 ++iii;
338 } 336 }
339 if ( setBaseD ) 337
340 setBaseDates(); 338 setBaseDates();
341 if ( fontchange ) { 339 if ( fontchange ) {
342 //mNavigatorView->changeFont( fo ); 340 //mNavigatorView->changeFont( fo );
343 uint i; 341 uint i;
344 for( i = 0; i < mExtraViews.count(); ++i ) { 342 for( i = 0; i < mExtraViews.count(); ++i ) {
345 KDateNavigator *view = mExtraViews.at( i ); 343 KDateNavigator *view = mExtraViews.at( i );
346 view->changeFont( fo ); 344 view->changeFont( fo );
347 } 345 }
348 } 346 }
@@ -369,16 +367,17 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
369 if ( y > 0 ) bar->showButtons( false, false ); 367 if ( y > 0 ) bar->showButtons( false, false );
370 else { 368 else {
371 if ( x + 1 == horizontalCount ) bar->showButtons( false, true ); 369 if ( x + 1 == horizontalCount ) bar->showButtons( false, true );
372 else bar->showButtons( false, false ); 370 else bar->showButtons( false, false );
373 } 371 }
374 view->setGeometry( x * width, 372 view->setGeometry( x * width,
375 y * height, width, height ); 373 y * height, width, height );
376 } 374 }
375 //updateDayMatrixDates();
377} 376}
378 377
379QSize DateNavigatorContainer::minimumSizeHint() const 378QSize DateNavigatorContainer::minimumSizeHint() const
380{ 379{
381 return mNavigatorView->minimumSizeHint(); 380 return mNavigatorView->minimumSizeHint();
382} 381}
383 382
384QSize DateNavigatorContainer::sizeHint() const 383QSize DateNavigatorContainer::sizeHint() const