4 files changed, 42 insertions, 29 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 9880e2d..92dbdc8 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -169,5 +169,4 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
     default_view->setCheckable(TRUE);
 
-    
     Config config("DateBook");
     config.setGroup("Main");
@@ -313,42 +312,55 @@ QDate DateBook::currentDate()
 }
 
-void DateBook::viewDay()
-{
+void DateBook::view(int v, const QDate &d) {
+    if (v==DAY) {
     initDay();
     dayAction->setOn( TRUE );
-    QDate d = currentDate();
     dayView->setDate( d );
     views->raiseWidget( dayView );
     dayView->redraw();
-}
-
-void DateBook::viewWeek()
-{
+    } else if (v==WEEK) {
     initWeek();
     weekAction->setOn( TRUE );
-    QDate d = currentDate();
     weekView->setDate( d );
     views->raiseWidget( weekView );
     weekView->redraw();
-}
-
-void DateBook::viewWeekLst() {
+    } else if (v==WEEKLST) {
     initWeekLst();
     weekLstAction->setOn( TRUE );
-    QDate d=currentDate();
     weekLstView->setDate(d);
     views->raiseWidget( weekLstView );
     weekLstView->redraw();
-}
-
-void DateBook::viewMonth()
-{
+    } else if (v==MONTH) {
     initMonth();
     monthAction->setOn( TRUE );
-    QDate d = currentDate();
     monthView->setDate( d.year(), d.month(), d.day() );
     views->raiseWidget( monthView );
     monthView->redraw();
 }
+}
+
+void DateBook::viewDefault(const QDate &d) {
+  Config config("DateBook");
+  config.setGroup("Main");
+  int current=config.readNumEntry("defaultview", DAY);
+
+  view(current,d);
+}
+
+void DateBook::viewDay() {
+  view(DAY,currentDate());
+}
+
+void DateBook::viewWeek() {
+    view(WEEK,currentDate());
+}
+
+void DateBook::viewWeekLst() {
+    view(WEEKLST,currentDate());
+}
+
+void DateBook::viewMonth() {
+    view(MONTH,currentDate());
+}
 
 void DateBook::editEvent( const Event &e )
@@ -419,8 +431,6 @@ void DateBook::addEvent( const Event &e )
 void DateBook::showDay( int year, int month, int day )
 {
-    initDay();
-    dayView->setDate( year, month, day );
-    views->raiseWidget( dayView );
-    dayAction->setOn( TRUE );
+    QDate d(year, month, day);
+    view(DAY,d);
 }
 
@@ -690,7 +700,6 @@ void DateBook::changeWeek( bool m )
 void DateBook::slotToday()
 {
-    // we need to view today
-    QDate dt = QDate::currentDate();
-    showDay( dt.year(), dt.month(), dt.day() );
+    // we need to view today using default view
+    viewDefault(QDate::currentDate());
 }
 
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index fcdbfec..2ffcdbe 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -53,4 +53,6 @@ protected:
     void closeEvent( QCloseEvent *e );
 
+    void view(int v, const QDate &d);
+
 public slots:
     void flush();
@@ -71,4 +73,6 @@ private slots:
     void slotDoFind( const QString &, const QDate &, bool, bool, int );
 
+    void viewDefault(const QDate &d);
+
     void viewDay();
     void viewWeek();
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 05e36be..dc141c0 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -47,5 +47,5 @@ DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent,
 }
 DateBookWeekLstHeader::~DateBookWeekLstHeader(){}
-void DateBookWeekLstHeader::setDate(QDate d) {
+void DateBookWeekLstHeader::setDate(const QDate &d) {
     date=d;
 
@@ -243,5 +243,5 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
 
 
-void DateBookWeekLst::setDate( QDate &d ) {
+void DateBookWeekLst::setDate(const QDate &d) {
     int w,y;
     calcWeek(d,w,y,onMonday);
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index d2a07cc..39c956d 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -23,5 +23,5 @@ public:
                           WFlags fl = 0 );
     ~DateBookWeekLstHeader();
-    void setDate(QDate d);
+    void setDate(const QDate &d);
     
 public slots:
@@ -98,5 +98,5 @@ public:
                      const char *name = 0 );
     void setDate( int y, int w );
-    void setDate( QDate &d );
+    void setDate(const QDate &d );
     int week() const { return _week; };
     QDate date() const;