added today but to datepicker

3 files changed, 15 insertions, 1 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 3d8edfc..62c8447 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -8,2 +8,4 @@ Added icon for the stealth new week view and made navigation more user friendly
 
+Added a "go today" button to the datepicker.
+
 
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index c13734f..77793c4 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -49,2 +49,3 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
     selectYear(new QToolButton(this)),
+    todayBut(new QToolButton(this)),
     //line(new QLineEdit(this)),
@@ -68,2 +69,3 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
   monthBackward->setPixmap(SmallIcon("1leftarrowB"));
+  todayBut->setPixmap(SmallIcon("today"));
   setDate(dt); // set button texts
@@ -77,2 +79,3 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
   connect(selectYear, SIGNAL(clicked()), SLOT(selectYearClicked()));
+  connect(todayBut, SIGNAL(clicked()), SLOT(goToday()));
   //connect(line, SIGNAL(returnPressed()), SLOT(lineEnterPressed()));
@@ -138,3 +141,5 @@ KDatePicker::resizeEvent(QResizeEvent*)
     //line->setGeometry(0, height()-sizes[0].height(), width(), sizes[0].height());
-    lineDate->setGeometry(0, height()-sizes[0].height(), width(), sizes[0].height());
+    int todaywid = todayBut->sizeHint().width();
+todayBut->setGeometry(0, height()-sizes[0].height(),todaywid, sizes[0].height());
+    lineDate->setGeometry(0+todaywid, height()-sizes[0].height(), width()-todaywid, sizes[0].height());
     // ----- adjust the table:
@@ -172,2 +177,7 @@ KDatePicker::date() const
 
+void KDatePicker::goToday()
+{
+    slotSetDate( QDate::currentDate() );
+
+}
 void KDatePicker::slotSetDate( QDate date )
diff --git a/libkdepim/kdatepicker.h b/libkdepim/kdatepicker.h
index 6625357..3db9a89 100644
--- a/libkdepim/kdatepicker.h
+++ b/libkdepim/kdatepicker.h
@@ -109,2 +109,3 @@ protected:
   void resizeEvent(QResizeEvent*);
+  QToolButton *todayBut;
   /// the year forward button
@@ -143,2 +144,3 @@ protected slots:
     void slotSetDate(QDate);
+    void goToday();
 signals: