author | zautrix <zautrix> | 2005-03-25 21:08:48 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-25 21:08:48 (UTC) |
commit | 6427570041c902840fe0f557415a07bb7aa8c031 (patch) (unidiff) | |
tree | e397342aca97119927ec6c312be5ac5f953d5eec /korganizer | |
parent | 4d93404e3453229e58c2ff9305beae131c9f1af9 (diff) | |
download | kdepimpi-6427570041c902840fe0f557415a07bb7aa8c031.zip kdepimpi-6427570041c902840fe0f557415a07bb7aa8c031.tar.gz kdepimpi-6427570041c902840fe0f557415a07bb7aa8c031.tar.bz2 |
fix
-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 | |||
@@ -371,4 +371,8 @@ void CalendarView::init() | |||
371 | 371 | ||
372 | 372 | ||
373 | |||
374 | connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ), | ||
375 | mViewManager, SLOT( showMonth( const QDate & ) ) ); | ||
376 | |||
373 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), | 377 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), |
374 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); | 378 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); |
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 11dc592..edeebdf 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp | |||
@@ -72,4 +72,6 @@ void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) | |||
72 | connect( v, SIGNAL( weekClicked( const QDate & ) ), | 72 | connect( v, SIGNAL( weekClicked( const QDate & ) ), |
73 | SIGNAL( weekClicked( const QDate & ) ) ); | 73 | SIGNAL( weekClicked( const QDate & ) ) ); |
74 | connect( v, SIGNAL( showMonth( const QDate & ) ), | ||
75 | SIGNAL( showMonth( const QDate & ) ) ); | ||
74 | 76 | ||
75 | connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) ); | 77 | connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) ); |
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h index ac9745d..87cc59f 100644 --- a/korganizer/datenavigatorcontainer.h +++ b/korganizer/datenavigatorcontainer.h | |||
@@ -79,4 +79,5 @@ class DateNavigatorContainer: public QWidget | |||
79 | void goNextYear(); | 79 | void goNextYear(); |
80 | void goPrevYear(); | 80 | void goPrevYear(); |
81 | void showMonth( const QDate & ); | ||
81 | 82 | ||
82 | void monthSelected( int month ); | 83 | void monthSelected( int month ); |
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 5eccfd6..38bddc2 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -448,4 +448,6 @@ bool KDateNavigator::eventFilter (QObject *o,QEvent *e) | |||
448 | KCal::DateList selDays; | 448 | KCal::DateList selDays; |
449 | QDate date = daymatrix->getDate(14); | 449 | QDate date = daymatrix->getDate(14); |
450 | emit showMonth(date ); | ||
451 | #if 0 | ||
450 | int dio = date.daysInMonth(); | 452 | int dio = date.daysInMonth(); |
451 | int j; | 453 | int j; |
@@ -456,4 +458,5 @@ bool KDateNavigator::eventFilter (QObject *o,QEvent *e) | |||
456 | } | 458 | } |
457 | emit datesSelected( selDays ); | 459 | emit datesSelected( selDays ); |
460 | #endif | ||
458 | break; | 461 | break; |
459 | } | 462 | } |
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index 93bbceb..780ebb8 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h | |||
@@ -87,4 +87,5 @@ class KDateNavigator: public QFrame | |||
87 | void eventDropped( Event * ); | 87 | void eventDropped( Event * ); |
88 | void weekClicked( const QDate &); | 88 | void weekClicked( const QDate &); |
89 | void showMonth( const QDate & ); | ||
89 | 90 | ||
90 | void goPrevious(); | 91 | void goPrevious(); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index c6e76c4..5a2dce3 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -129,6 +129,7 @@ void KOViewManager::showDateView( int view, QDate date) | |||
129 | lastCount = mMainView->dateNavigator()->selectedDates().count(); | 129 | lastCount = mMainView->dateNavigator()->selectedDates().count(); |
130 | lastNDMode = savemFlagShowNextxDays; | 130 | lastNDMode = savemFlagShowNextxDays; |
131 | mMainView->showDay( date ); | 131 | mMainView->dateNavigator()->selectDate( date ); |
132 | lastMode = 1; | 132 | lastMode = 1; |
133 | mCurrentAgendaView = 1 ; | ||
133 | } else if (view == 4 ) { | 134 | } else if (view == 4 ) { |
134 | mCurrentAgendaView = 7 ; | 135 | mCurrentAgendaView = 7 ; |
@@ -578,4 +579,11 @@ void KOViewManager::showMonthViewWeek() | |||
578 | } | 579 | } |
579 | 580 | ||
581 | void KOViewManager::showMonth( const QDate & date ) | ||
582 | { | ||
583 | mMainView->dateNavigator()->blockSignals( true ); | ||
584 | mMainView->dateNavigator()->selectDate( date ); | ||
585 | mMainView->dateNavigator()->blockSignals( false ); | ||
586 | showMonthView(); | ||
587 | } | ||
580 | void KOViewManager::showMonthView() | 588 | void KOViewManager::showMonthView() |
581 | { | 589 | { |
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index 8f0bf82..6290227 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h | |||
@@ -82,5 +82,6 @@ class KOViewManager : public QObject | |||
82 | void signalFullScreen( bool ); | 82 | void signalFullScreen( bool ); |
83 | void signalAgendaView( bool ); | 83 | void signalAgendaView( bool ); |
84 | public slots: | 84 | public slots: |
85 | void showMonth( const QDate & ); | ||
85 | void showDateView( int, QDate ); | 86 | void showDateView( int, QDate ); |
86 | void updateView(); | 87 | void updateView(); |