author | zautrix <zautrix> | 2005-03-19 21:14:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-19 21:14:06 (UTC) |
commit | 6c913e8e5fb19ef3c5a74b94757aeabb9b808cc4 (patch) (unidiff) | |
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 | |||
@@ -168,4 +168,5 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * ) | |||
168 | while ( count > ( mExtraViews.count() + 1 ) ) { | 168 | while ( count > ( mExtraViews.count() + 1 ) ) { |
169 | KDateNavigator *n = new KDateNavigator( this ); | 169 | KDateNavigator *n = new KDateNavigator( this ); |
170 | n->setMonthSignalOffset ( mExtraViews.count()+1 ); | ||
170 | mExtraViews.append( n ); | 171 | mExtraViews.append( n ); |
171 | n->setCalendar( mCalendar ); | 172 | n->setCalendar( mCalendar ); |
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index e76a85a..ab9a40f 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -58,5 +58,5 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
58 | startDate = QDate::currentDate(); | 58 | startDate = QDate::currentDate(); |
59 | } | 59 | } |
60 | 60 | mMonthSignalOffset = 0; | |
61 | mSelectedDates.append(startDate); | 61 | mSelectedDates.append(startDate); |
62 | m_MthYr = startDate; | 62 | m_MthYr = startDate; |
@@ -71,5 +71,5 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
71 | connect( mNavigatorBar, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) ); | 71 | connect( mNavigatorBar, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) ); |
72 | connect( mNavigatorBar, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) ); | 72 | connect( mNavigatorBar, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) ); |
73 | connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SIGNAL( monthSelected( int ) ) ); | 73 | connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) ); |
74 | 74 | ||
75 | // get the day of the week on the first day | 75 | // get the day of the week on the first day |
@@ -118,4 +118,12 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
118 | //setFixedSize ( sizeHint() ); | 118 | //setFixedSize ( sizeHint() ); |
119 | } | 119 | } |
120 | void KDateNavigator::slotMonthSelected( int m ) | ||
121 | { | ||
122 | if ( m_MthYr.month() <= mMonthSignalOffset) | ||
123 | m += 12; | ||
124 | int mo = m - mMonthSignalOffset; | ||
125 | emit monthSelected( m - mMonthSignalOffset ); | ||
126 | |||
127 | } | ||
120 | void KDateNavigator::setCalendar( Calendar *cal ) | 128 | void KDateNavigator::setCalendar( Calendar *cal ) |
121 | { | 129 | { |
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index 0aeb77a..56822fa 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h | |||
@@ -64,5 +64,5 @@ class KDateNavigator: public QFrame | |||
64 | KCal::DateList selectedDates() const { return mSelectedDates; } | 64 | KCal::DateList selectedDates() const { return mSelectedDates; } |
65 | NavigatorBar *navigatorBar() const { return mNavigatorBar; } | 65 | NavigatorBar *navigatorBar() const { return mNavigatorBar; } |
66 | 66 | void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off;} | |
67 | public slots: | 67 | public slots: |
68 | void selectDates( const KCal::DateList & ); | 68 | void selectDates( const KCal::DateList & ); |
@@ -106,5 +106,5 @@ class KDateNavigator: public QFrame | |||
106 | */ | 106 | */ |
107 | void passedMidnight(); | 107 | void passedMidnight(); |
108 | 108 | void slotMonthSelected( int m ); | |
109 | protected: | 109 | protected: |
110 | void updateDates(); | 110 | void updateDates(); |
@@ -115,4 +115,5 @@ class KDateNavigator: public QFrame | |||
115 | 115 | ||
116 | private: | 116 | private: |
117 | int mMonthSignalOffset; | ||
117 | NavigatorBar *mNavigatorBar; | 118 | NavigatorBar *mNavigatorBar; |
118 | 119 | ||