author | zautrix <zautrix> | 2005-03-24 12:34:27 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-24 12:34:27 (UTC) |
commit | 685d04bc8f696697202f2fc0de18e61905cbb2fa (patch) (side-by-side diff) | |
tree | 927d070c135d0025b236f6bd76143e0341ef2566 /korganizer/datenavigatorcontainer.cpp | |
parent | a9e8535fd6960f454ab7009cfa996973291502a2 (diff) | |
download | kdepimpi-685d04bc8f696697202f2fc0de18e61905cbb2fa.zip kdepimpi-685d04bc8f696697202f2fc0de18e61905cbb2fa.tar.gz kdepimpi-685d04bc8f696697202f2fc0de18e61905cbb2fa.tar.bz2 |
layout fix
Diffstat (limited to 'korganizer/datenavigatorcontainer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 74 |
1 files changed, 44 insertions, 30 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index d1caff3..2290c53 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -75,15 +75,47 @@ void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) ); - connect( v, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) ); - connect( v, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) ); - connect( v, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) ); - connect( v, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) ); + connect( v, SIGNAL( goNextMonth() ), SLOT( slotgoNextMonth() ) ); + connect( v, SIGNAL( goPrevMonth() ), SLOT( slotgoPrevMonth() ) ); + connect( v, SIGNAL( goNextYear() ), SLOT( slotgoNextYear() ) ); + connect( v, SIGNAL( goPrevYear() ), SLOT( slotgoPrevYear() ) ); connect( v, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) ); } +void DateNavigatorContainer::slotgoNextYear() +{ + jumpMonth( 12 ); + emit goNextYear(); + +} +void DateNavigatorContainer::slotgoPrevYear() +{ + jumpMonth( -12 ); + emit goPrevYear(); + +} +void DateNavigatorContainer::slotgoPrevMonth() +{ + jumpMonth( -1 ); + emit goPrevMonth(); + +} +void DateNavigatorContainer::slotgoNextMonth() +{ + jumpMonth( 1 ); + emit goNextMonth(); +} +void DateNavigatorContainer::jumpMonth( int month ) +{ + QDate baseDate = mNavigatorView->baseDate(); + computeMonthSelected( baseDate.month() + month, false ); +} void DateNavigatorContainer::slotMonthSelected( int month ) { - //qDebug("slotMonthSelected %d ", month); + computeMonthSelected( month, true ); +} +void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit ) +{ + //qDebug("slotMonthSelected %d ", month); QDate baseDate = mNavigatorView->baseDate(); if ( baseDate.month() == month ) @@ -94,25 +126,4 @@ void DateNavigatorContainer::slotMonthSelected( int month ) QDate newBase = QDate ( date.year(), date.month() , baseDate.day() ); -#if 0 - mFirstSelectedDate = dateList.first() ; - mSelectedDateCount = dateList.count() ; - - KDateNavigator *view = mExtraViews.at( 0 ); - QDate date = view->baseDate(); - - QDate curEnd = date.addDays( (mLastDisplayedDN)*30 +7); - //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1() ); - if ( lDate < curEnd && date.addDays( -30 ) < fDate) { - mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate ); - mNavigatorView->dayMatrix()->repaint( false ); - for( uint i = 0; i < mLastDisplayedDN; ++i ) { - KDateNavigator *n = mExtraViews.at( i ); - if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) { - n->dayMatrix()->repaint( false ); - } - } - return; - } -#endif //qDebug("NEW BASE %s", newBase.toString().latin1()); mNavigatorView->setBaseDate( newBase ); @@ -122,12 +133,15 @@ void DateNavigatorContainer::slotMonthSelected( int month ) QDate selFirst = mFirstSelectedDate; QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); - if ( selFirst >= first && selLast <= last ) { + if ( selFirst >= first && selLast <= last ) { setBaseDates(); - updateDayMatrixDates(); + if ( forceEmit ) + updateDayMatrixDates(); } else { setBaseDates(); - updateDayMatrixDates(); - emit monthSelected( month ); + if ( forceEmit ) + updateDayMatrixDates(); + if ( forceEmit ) + emit monthSelected( month ); } } |