author | zautrix <zautrix> | 2005-03-19 21:14:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-19 21:14:06 (UTC) |
commit | 6c913e8e5fb19ef3c5a74b94757aeabb9b808cc4 (patch) (side-by-side diff) | |
tree | 0facf1e6f5040d1345f1e067efe44d2382a3981a /korganizer | |
parent | 88e1a262374ba8cb018469f7873df45b12050c67 (diff) | |
download | kdepimpi-6c913e8e5fb19ef3c5a74b94757aeabb9b808cc4.zip kdepimpi-6c913e8e5fb19ef3c5a74b94757aeabb9b808cc4.tar.gz kdepimpi-6c913e8e5fb19ef3c5a74b94757aeabb9b808cc4.tar.bz2 |
month select fix
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 1 | ||||
-rw-r--r-- | korganizer/kdatenavigator.cpp | 12 | ||||
-rw-r--r-- | korganizer/kdatenavigator.h | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index cbfc5b2..3f6e29b 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -166,8 +166,9 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * ) if ( count == 0 ) return; while ( count > ( mExtraViews.count() + 1 ) ) { KDateNavigator *n = new KDateNavigator( this ); + n->setMonthSignalOffset ( mExtraViews.count()+1 ); mExtraViews.append( n ); n->setCalendar( mCalendar ); setBaseDates(); connectNavigatorView( n ); diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index e76a85a..ab9a40f 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -56,9 +56,9 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) if (! startDate.isValid()) { qDebug("KDateNavigator::invalid startdate "); startDate = QDate::currentDate(); } - + mMonthSignalOffset = 0; mSelectedDates.append(startDate); m_MthYr = startDate; m_bShowWeekNums = true; @@ -69,9 +69,9 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) connect( mNavigatorBar, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) ); connect( mNavigatorBar, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) ); connect( mNavigatorBar, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) ); connect( mNavigatorBar, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) ); - connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SIGNAL( monthSelected( int ) ) ); + connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) ); // get the day of the week on the first day QDate dayone(m_MthYr.year(), m_MthYr.month(), 1); m_fstDayOfWk = dayone.dayOfWeek(); @@ -116,8 +116,16 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) updateConfig(); enableRollover(FollowMonth); //setFixedSize ( sizeHint() ); } +void KDateNavigator::slotMonthSelected( int m ) +{ + if ( m_MthYr.month() <= mMonthSignalOffset) + m += 12; + int mo = m - mMonthSignalOffset; + emit monthSelected( m - mMonthSignalOffset ); + +} void KDateNavigator::setCalendar( Calendar *cal ) { daymatrix->setCalendar( cal ); } diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index 0aeb77a..56822fa 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h @@ -62,9 +62,9 @@ class KDateNavigator: public QFrame void setCalendar( Calendar * ); void setBaseDate( const QDate & ); KCal::DateList selectedDates() const { return mSelectedDates; } NavigatorBar *navigatorBar() const { return mNavigatorBar; } - + void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off;} public slots: void selectDates( const KCal::DateList & ); void updateView(); void updateConfig(); @@ -104,17 +104,18 @@ class KDateNavigator: public QFrame /** handles updating the view when midnight has come by due to idle time. * */ void passedMidnight(); - + void slotMonthSelected( int m ); protected: void updateDates(); void wheelEvent (QWheelEvent *); bool eventFilter (QObject *,QEvent *); private: + int mMonthSignalOffset; NavigatorBar *mNavigatorBar; QFrame *headingSep; QFrame *weeknumSep; |