author | zautrix <zautrix> | 2004-12-04 13:59:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-12-04 13:59:01 (UTC) |
commit | a3b1470f3da722d044505f78bef9de51b2107802 (patch) (side-by-side diff) | |
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 @@ -1986,16 +1986,19 @@ void CalendarView::writeFilterSettings(KConfig *config) config->setGroup("FilterView"); config->writeEntry("FilterEnabled",mFilterView->filtersEnabled()); config->writeEntry("Current Filter",mFilterView->selectedFilter()->name()); } void CalendarView::goToday() { + if ( mViewManager->currentView()->isMonthView() ) + mNavigator->selectTodayMonth(); + else mNavigator->selectToday(); } void CalendarView::goNext() { mNavigator->selectNext(); } diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index e26e20b..3156b2b 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp @@ -194,16 +194,22 @@ void DateNavigator::selectWorkWeek( const QDate &d ) int weekStart = KGlobal::locale()->weekStartDay(); if ( weekStart != 1 && dayOfWeek >= weekStart ) { firstDate = firstDate.addDays( 7 ); } selectDates( firstDate, 5 ); } +void DateNavigator::selectTodayMonth() +{ + QDate date = QDate::currentDate().addDays( 1-QDate::currentDate().day() ); + selectDates( date , date.daysInMonth ()); + +} void DateNavigator::selectToday() { QDate d = QDate::currentDate(); int dateCount = mSelectedDates.count(); if ( dateCount == 5 ) selectWorkWeek( d ); else if ( dateCount == 7 ) selectWeek( d ); diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h index 747e3d3..4a19e17 100644 --- a/korganizer/datenavigator.h +++ b/korganizer/datenavigator.h @@ -56,16 +56,17 @@ class DateNavigator : public QObject void selectWeek( const QDate & ); void selectWorkWeek(); void selectWorkWeek( const QDate & ); void selectWeekByDay( int weekDay, const QDate & ); void selectToday(); + void selectTodayMonth(); void selectPreviousYear(); void selectPreviousMonth(); void selectNextMonth(); void selectNextYear(); void selectMonth(); void selectMonthByDate( const QDate & ); 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 @@ -129,16 +129,17 @@ class BaseView : public QWidget /** Return number of currently shown dates. A return value of 0 means no idea. */ virtual int currentDateCount() = 0; /** Return if this view is a view for displaying events. */ virtual bool isEventView() { return false; } + virtual bool isMonthView() { return false; } public slots: /** Show incidences for the given date range. The date range actually shown may be different from the requested range, depending on the particular requirements of the view. @param start Start of date range. diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index d976246..e94952f 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -195,16 +195,17 @@ class KOMonthView: public KOEventView /** returns the currently selected events */ virtual QPtrList<Incidence> selectedIncidences(); /** returns dates of the currently selected events */ virtual DateList selectedDates(); virtual void printPreview(CalPrinter *calPrinter, const QDate &, const QDate &); + bool isMonthView() { return true; } MonthViewCell * selectedCell(); public slots: virtual void updateView(); virtual void updateConfig(); virtual void showDates(const QDate &start, const QDate &end); virtual void showEvents(QPtrList<Event> eventList); |