3 files changed, 24 insertions, 6 deletions

diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index d710541..5c69010 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -52,33 +52,33 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name )
 
 
 {
 //US  setWrapPolicy( QTextEdit::AtWordBoundary );
   setLinkUnderline( false );
   // setVScrollBarMode( QScrollView::AlwaysOff );
   //setHScrollBarMode( QScrollView::AlwaysOff );
 
 //US  QStyleSheet *sheet = styleSheet();
 //US  QStyleSheetItem *link = sheet->item( "a" );
 //US  link->setColor( KGlobalSettings::linkColor() );
 
 }
 
 void AddresseeView::setSource(const QString& n)
 {
-  qDebug("********AddresseeView::setSource %s", n.latin1());
+    //qDebug("********AddresseeView::setSource %s", n.latin1());
 
   if ( n.left( 6 ) == "mailto" )
     ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
   else if ( n.left( 7 ) == "phoneto" )
     ExternalAppHandler::instance()->callByPhone(  n.mid(8) );
   else if ( n.left( 5 ) == "faxto" )
     ExternalAppHandler::instance()->callByFax(  n.mid(6) );
   else if ( n.left( 5 ) == "smsto" )
     ExternalAppHandler::instance()->callBySMS(  n.mid(6) );
   else if ( n.left( 7 ) == "pagerto" )
     ExternalAppHandler::instance()->callByPager(  n.mid(8) );
 
 }
 void AddresseeView::setAddressee( const KABC::Addressee& addr )
 {
   ExternalAppHandler* eah = ExternalAppHandler::instance();
@@ -111,33 +111,39 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
             "<tr><td align=\"right\"><b>%1</b></td>"
            "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" )
           .arg( type )
           .arg( name )
           .arg( *emailIt )
           .arg( *emailIt );
       ++emailIt;
     } else {
       dynamicPart += QString(
             "<tr><td align=\"right\"><b>%1</b></td>"
            "<td align=\"left\">%2</td></tr>" )
           .arg( type )
           .arg( *emailIt );
       ++emailIt;
     }
   }
-
+  if ( mAddressee.birthday().date().isValid() ) {
+      dynamicPart += QString(
+            "<tr><td align=\"right\"><b>%1</b></td>"
+           "<td align=\"left\">%2</td></tr>" )
+          .arg( i18n ("Birthday") )
+          .arg( KGlobal::locale()->formatDate( mAddressee.birthday().date()  ,true) );
+  }
   KABC::PhoneNumber::List phones = mAddressee.phoneNumbers();
   KABC::PhoneNumber::List::ConstIterator phoneIt;
   QString extension;
   int phonetype;
   QString sms;
   for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
     phonetype = (*phoneIt).type();
     if (ksmsAvail &&
         (
                  ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) ||
          ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell)
         )
        )
     {
       sms = QString("<a href=\"smsto:%1  \">(sms)</a>" )
               .arg( (*phoneIt).number() );
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 5fb948a..c4c0081 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -111,33 +111,39 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
     dayName = KGlobal::locale()->weekDayName(i).lower();
     if (i >= currentDay)
       mKeywordMap[dayName] = i - currentDay;
     else
       mKeywordMap[dayName] = 7 - currentDay + i;
   }
 
   mTextChanged = false;
   mHandleInvalid = false;
   QWidget::setTabOrder( mDateEdit, mDateButton );
 }
 
 KDateEdit::~KDateEdit()
 {
   delete mDateFrame;
 }
-
+void KDateEdit::clear()
+{
+  bool b = mDateEdit->signalsBlocked();
+  mDateEdit->blockSignals(true);
+  mDateEdit->setText("");
+  mDateEdit->blockSignals(b);
+}
 void KDateEdit::setDate(QDate newDate)
 {
   if (!newDate.isValid() && !mHandleInvalid)
     return;
   if ( readDate() ==  newDate )
       return;
   QString dateString = "";
   if(newDate.isValid())
     dateString = KGlobal::locale()->formatDate( newDate, dateFormShort );
 
   mTextChanged = false;
 
   // We do not want to generate a signal here, since we explicity setting
   // the date
   bool b = mDateEdit->signalsBlocked();
   mDateEdit->blockSignals(true);
@@ -450,37 +456,42 @@ QDate KDateEdit::readDate() const
 
   return date;
 }
 
 bool KDateEdit::eventFilter(QObject *, QEvent *e)
 {
   // We only process the focus out event if the text has changed
   // since we got focus
   if ((e->type() == QEvent::FocusOut) && mTextChanged)
   {
     lineEnterPressed();
     mTextChanged = false;
   }
   // switch dateFormShort by double klick with mouse
   else if (e->type() == QEvent::MouseButtonDblClick)
   {
-    dateFormShort = dateFormShort?false:true;
-    mDateEdit->setText(KGlobal::locale()->formatDate(readDate(),dateFormShort));
+      toggleDateFormat();
   }
   else if (e->type() == QEvent::FocusIn) 
   {
     maxDay = readDate().day();
   }
 
   return false;
 }
+void KDateEdit::toggleDateFormat()
+{
+    dateFormShort = ! dateFormShort;
+    mDateEdit->setText(KGlobal::locale()->formatDate(readDate(),dateFormShort));
+    
+}
 
 void KDateEdit::textChanged(const QString &)
 {
   if(mHandleInvalid && mDateEdit->text().stripWhiteSpace().isEmpty()) {
     QDate date; //invalid date
     emit(dateChanged(date));
   } else  {
     mTextChanged = true;
   }
     maxDay = readDate().day();
 }
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h
index 742d843..cf3b90a 100644
--- a/libkdepim/kdateedit.h
+++ b/libkdepim/kdateedit.h
@@ -65,33 +65,34 @@ class KDateEdit : public QHBox
     /** @return The date entered. This will not
     * modify the display of the date, but only return it.
     */
     QDate date() const;
 
     /** @param handleInvalid If true the date edit accepts invalid dates
     * and displays them as the empty ("") string. It also returns an invalid date.
     * If false (default) invalid dates are not accepted and instead the date
     * of today will be returned.
     */
     void setHandleInvalid(bool handleInvalid);
 
     /** Checks for a focus out event. The display of the date is updated
     * to display the proper date when the focus leaves.
     */
     virtual bool eventFilter(QObject *o, QEvent *e);
-
+    void toggleDateFormat();
+    void clear();
   signals:
     /** This signal is emitted whenever the user modifies the date. This
     * may not get emitted until the user presses enter in the line edit or
     * focus leaves the widget (ie: the user confirms their selection).
     */
     void dateChanged(QDate);
     void returnPressed();
   public slots:
     /** Sets the date.
     *
     * @param date The new date to display. This date must be valid or
     * it will not be displayed.
     */
     void setDate(QDate date);
     // set Date with key_up key_down to relation of cursor Position
     // and set selection from begin to end of single date