author | zautrix <zautrix> | 2005-03-22 14:59:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-22 14:59:07 (UTC) |
commit | 0fe23b2c9b74bac46f409098f950259bffbdbe3c (patch) (unidiff) | |
tree | 80b4077661301ee3216217dfcb0bc9fd0a74b7d7 /korganizer | |
parent | 03b3e902ed6362d8f72d0acfc5a9be9d9ee1ef21 (diff) | |
download | kdepimpi-0fe23b2c9b74bac46f409098f950259bffbdbe3c.zip kdepimpi-0fe23b2c9b74bac46f409098f950259bffbdbe3c.tar.gz kdepimpi-0fe23b2c9b74bac46f409098f950259bffbdbe3c.tar.bz2 |
more layout fixes
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 7 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 2 |
2 files changed, 4 insertions, 5 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 | ||
379 | QSize DateNavigatorContainer::minimumSizeHint() const | 378 | QSize DateNavigatorContainer::minimumSizeHint() const |
380 | { | 379 | { |
381 | return mNavigatorView->minimumSizeHint(); | 380 | return mNavigatorView->minimumSizeHint(); |
382 | } | 381 | } |
383 | 382 | ||
384 | QSize DateNavigatorContainer::sizeHint() const | 383 | QSize DateNavigatorContainer::sizeHint() const |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 3ee1fa7..366e8b8 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -98,17 +98,17 @@ void DynamicTip::maybeTip( const QPoint &pos ) | |||
98 | // ============================================================================ | 98 | // ============================================================================ |
99 | // K O D A Y M A T R I X | 99 | // K O D A Y M A T R I X |
100 | // ============================================================================ | 100 | // ============================================================================ |
101 | 101 | ||
102 | const int KODayMatrix::NOSELECTION = -1000; | 102 | const int KODayMatrix::NOSELECTION = -1000; |
103 | const int KODayMatrix::NUMDAYS = 42; | 103 | const int KODayMatrix::NUMDAYS = 42; |
104 | 104 | ||
105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) | 105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) |
106 | : QFrame( parent, name ), mCalendar( 0 ) | 106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) |
107 | 107 | ||
108 | #if 0 | 108 | #if 0 |
109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : | 109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : |
110 | QFrame(parent, name) | 110 | QFrame(parent, name) |
111 | #endif | 111 | #endif |
112 | { | 112 | { |
113 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); | 113 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); |
114 | mPendingUpdateBeforeRepaint = false; | 114 | mPendingUpdateBeforeRepaint = false; |