5 files changed, 13 insertions, 1 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 3908dbb..47cd488 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1991,7 +1991,10 @@ void CalendarView::writeFilterSettings(KConfig *config)
 
 void CalendarView::goToday()
 {
-    mNavigator->selectToday();
+    if ( mViewManager->currentView()->isMonthView() )
+        mNavigator->selectTodayMonth();
+    else
+        mNavigator->selectToday();
 }
 
 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
@@ -199,6 +199,12 @@ void DateNavigator::selectWorkWeek( const QDate &d )
   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();
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h
index 747e3d3..4a19e17 100644
--- a/korganizer/datenavigator.h
+++ b/korganizer/datenavigator.h
@@ -61,6 +61,7 @@ class DateNavigator : public QObject
     void selectWeekByDay( int weekDay, const QDate & );
    
     void selectToday();
+    void selectTodayMonth();
    
     void selectPreviousYear();
     void selectPreviousMonth();
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
@@ -134,6 +134,7 @@ class BaseView : public QWidget
 
     /** Return if this view is a view for displaying events. */
     virtual bool isEventView() { return false; }
+    virtual bool isMonthView() { return false; }
     
   public slots:
     /**
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index d976246..e94952f 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -200,6 +200,7 @@ class KOMonthView: public KOEventView
 
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
+    bool isMonthView() { return true; }
 
     MonthViewCell * selectedCell();
   public slots: