author | zautrix <zautrix> | 2004-12-04 13:59:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-12-04 13:59:01 (UTC) |
commit | a3b1470f3da722d044505f78bef9de51b2107802 (patch) (unidiff) | |
tree | 52965f580d00f865231661ff3d51af5c881e77cc /korganizer | |
parent | 7828f46413766ee5db72dc9bd457eac0868f0646 (diff) | |
download | kdepimpi-a3b1470f3da722d044505f78bef9de51b2107802.zip kdepimpi-a3b1470f3da722d044505f78bef9de51b2107802.tar.gz kdepimpi-a3b1470f3da722d044505f78bef9de51b2107802.tar.bz2 |
monthview changes
-rw-r--r-- | korganizer/calendarview.cpp | 3 | ||||
-rw-r--r-- | korganizer/datenavigator.cpp | 6 | ||||
-rw-r--r-- | korganizer/datenavigator.h | 1 | ||||
-rw-r--r-- | korganizer/interfaces/korganizer/baseview.h | 1 | ||||
-rw-r--r-- | korganizer/komonthview.h | 1 |
5 files changed, 12 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 3908dbb..47cd488 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1990,8 +1990,11 @@ void CalendarView::writeFilterSettings(KConfig *config) | |||
1990 | 1990 | ||
1991 | 1991 | ||
1992 | void CalendarView::goToday() | 1992 | void CalendarView::goToday() |
1993 | { | 1993 | { |
1994 | if ( mViewManager->currentView()->isMonthView() ) | ||
1995 | mNavigator->selectTodayMonth(); | ||
1996 | else | ||
1994 | mNavigator->selectToday(); | 1997 | mNavigator->selectToday(); |
1995 | } | 1998 | } |
1996 | 1999 | ||
1997 | void CalendarView::goNext() | 2000 | void CalendarView::goNext() |
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index e26e20b..3156b2b 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp | |||
@@ -198,8 +198,14 @@ void DateNavigator::selectWorkWeek( const QDate &d ) | |||
198 | 198 | ||
199 | selectDates( firstDate, 5 ); | 199 | selectDates( firstDate, 5 ); |
200 | } | 200 | } |
201 | 201 | ||
202 | void DateNavigator::selectTodayMonth() | ||
203 | { | ||
204 | QDate date = QDate::currentDate().addDays( 1-QDate::currentDate().day() ); | ||
205 | selectDates( date , date.daysInMonth ()); | ||
206 | |||
207 | } | ||
202 | void DateNavigator::selectToday() | 208 | void DateNavigator::selectToday() |
203 | { | 209 | { |
204 | QDate d = QDate::currentDate(); | 210 | QDate d = QDate::currentDate(); |
205 | 211 | ||
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h index 747e3d3..4a19e17 100644 --- a/korganizer/datenavigator.h +++ b/korganizer/datenavigator.h | |||
@@ -60,8 +60,9 @@ class DateNavigator : public QObject | |||
60 | 60 | ||
61 | void selectWeekByDay( int weekDay, const QDate & ); | 61 | void selectWeekByDay( int weekDay, const QDate & ); |
62 | 62 | ||
63 | void selectToday(); | 63 | void selectToday(); |
64 | void selectTodayMonth(); | ||
64 | 65 | ||
65 | void selectPreviousYear(); | 66 | void selectPreviousYear(); |
66 | void selectPreviousMonth(); | 67 | void selectPreviousMonth(); |
67 | void selectNextMonth(); | 68 | void selectNextMonth(); |
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index 09f8ba3..2ac9de1 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h | |||
@@ -133,8 +133,9 @@ class BaseView : public QWidget | |||
133 | virtual int currentDateCount() = 0; | 133 | virtual int currentDateCount() = 0; |
134 | 134 | ||
135 | /** Return if this view is a view for displaying events. */ | 135 | /** Return if this view is a view for displaying events. */ |
136 | virtual bool isEventView() { return false; } | 136 | virtual bool isEventView() { return false; } |
137 | virtual bool isMonthView() { return false; } | ||
137 | 138 | ||
138 | public slots: | 139 | public slots: |
139 | /** | 140 | /** |
140 | Show incidences for the given date range. The date range actually shown may be | 141 | Show incidences for the given date range. The date range actually shown may be |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index d976246..e94952f 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -199,8 +199,9 @@ class KOMonthView: public KOEventView | |||
199 | virtual DateList selectedDates(); | 199 | virtual DateList selectedDates(); |
200 | 200 | ||
201 | virtual void printPreview(CalPrinter *calPrinter, | 201 | virtual void printPreview(CalPrinter *calPrinter, |
202 | const QDate &, const QDate &); | 202 | const QDate &, const QDate &); |
203 | bool isMonthView() { return true; } | ||
203 | 204 | ||
204 | MonthViewCell * selectedCell(); | 205 | MonthViewCell * selectedCell(); |
205 | public slots: | 206 | public slots: |
206 | virtual void updateView(); | 207 | virtual void updateView(); |