summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-19 21:14:06 (UTC)
committer zautrix <zautrix>2005-03-19 21:14:06 (UTC)
commit6c913e8e5fb19ef3c5a74b94757aeabb9b808cc4 (patch) (side-by-side diff)
tree0facf1e6f5040d1345f1e067efe44d2382a3981a
parent88e1a262374ba8cb018469f7873df45b12050c67 (diff)
downloadkdepimpi-6c913e8e5fb19ef3c5a74b94757aeabb9b808cc4.zip
kdepimpi-6c913e8e5fb19ef3c5a74b94757aeabb9b808cc4.tar.gz
kdepimpi-6c913e8e5fb19ef3c5a74b94757aeabb9b808cc4.tar.bz2
month select fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp1
-rw-r--r--korganizer/kdatenavigator.cpp12
-rw-r--r--korganizer/kdatenavigator.h5
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
@@ -167,6 +167,7 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * )
while ( count > ( mExtraViews.count() + 1 ) ) {
KDateNavigator *n = new KDateNavigator( this );
+ n->setMonthSignalOffset ( mExtraViews.count()+1 );
mExtraViews.append( n );
n->setCalendar( mCalendar );
setBaseDates();
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index e76a85a..ab9a40f 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -57,7 +57,7 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
qDebug("KDateNavigator::invalid startdate ");
startDate = QDate::currentDate();
}
-
+ mMonthSignalOffset = 0;
mSelectedDates.append(startDate);
m_MthYr = startDate;
m_bShowWeekNums = true;
@@ -70,7 +70,7 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
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);
@@ -117,6 +117,14 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
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
@@ -63,7 +63,7 @@ class KDateNavigator: public QFrame
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();
@@ -105,7 +105,7 @@ class KDateNavigator: public QFrame
*
*/
void passedMidnight();
-
+ void slotMonthSelected( int m );
protected:
void updateDates();
@@ -114,6 +114,7 @@ class KDateNavigator: public QFrame
bool eventFilter (QObject *,QEvent *);
private:
+ int mMonthSignalOffset;
NavigatorBar *mNavigatorBar;
QFrame *headingSep;