| -rw-r--r-- | korganizer/calendarview.cpp | 4 | ||||
| -rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 2 | ||||
| -rw-r--r-- | korganizer/datenavigatorcontainer.h | 1 | ||||
| -rw-r--r-- | korganizer/kdatenavigator.cpp | 3 | ||||
| -rw-r--r-- | korganizer/kdatenavigator.h | 1 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 10 | ||||
| -rw-r--r-- | korganizer/koviewmanager.h | 3 |
7 files changed, 22 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 6ed6a1c..92fd59c 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -372,2 +372,6 @@ void CalendarView::init() + + connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ), + mViewManager, SLOT( showMonth( const QDate & ) ) ); + connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 11dc592..edeebdf 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -73,2 +73,4 @@ void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) SIGNAL( weekClicked( const QDate & ) ) ); + connect( v, SIGNAL( showMonth( const QDate & ) ), + SIGNAL( showMonth( const QDate & ) ) ); diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h index ac9745d..87cc59f 100644 --- a/korganizer/datenavigatorcontainer.h +++ b/korganizer/datenavigatorcontainer.h @@ -80,2 +80,3 @@ class DateNavigatorContainer: public QWidget void goPrevYear(); + void showMonth( const QDate & ); diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 5eccfd6..38bddc2 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -449,2 +449,4 @@ bool KDateNavigator::eventFilter (QObject *o,QEvent *e) QDate date = daymatrix->getDate(14); + emit showMonth(date ); +#if 0 int dio = date.daysInMonth(); @@ -457,2 +459,3 @@ bool KDateNavigator::eventFilter (QObject *o,QEvent *e) emit datesSelected( selDays ); +#endif break; diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index 93bbceb..780ebb8 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h @@ -88,2 +88,3 @@ class KDateNavigator: public QFrame void weekClicked( const QDate &); + void showMonth( const QDate & ); diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index c6e76c4..5a2dce3 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -130,4 +130,5 @@ void KOViewManager::showDateView( int view, QDate date) lastNDMode = savemFlagShowNextxDays; - mMainView->showDay( date ); + mMainView->dateNavigator()->selectDate( date ); lastMode = 1; + mCurrentAgendaView = 1 ; } else if (view == 4 ) { @@ -579,2 +580,9 @@ void KOViewManager::showMonthViewWeek() +void KOViewManager::showMonth( const QDate & date ) +{ + mMainView->dateNavigator()->blockSignals( true ); + mMainView->dateNavigator()->selectDate( date ); + mMainView->dateNavigator()->blockSignals( false ); + showMonthView(); +} void KOViewManager::showMonthView() diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index 8f0bf82..6290227 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h @@ -83,3 +83,4 @@ class KOViewManager : public QObject void signalAgendaView( bool ); - public slots: + public slots: + void showMonth( const QDate & ); void showDateView( int, QDate ); |