-rw-r--r-- | libkdepim/addresseeview.cpp | 10 | ||||
-rw-r--r-- | libkdepim/kdateedit.cpp | 17 | ||||
-rw-r--r-- | libkdepim/kdateedit.h | 3 |
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 | |||
@@ -67,3 +67,3 @@ void AddresseeView::setSource(const QString& n) | |||
67 | { | 67 | { |
68 | qDebug("********AddresseeView::setSource %s", n.latin1()); | 68 | //qDebug("********AddresseeView::setSource %s", n.latin1()); |
69 | 69 | ||
@@ -126,3 +126,9 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
126 | } | 126 | } |
127 | 127 | if ( mAddressee.birthday().date().isValid() ) { | |
128 | dynamicPart += QString( | ||
129 | "<tr><td align=\"right\"><b>%1</b></td>" | ||
130 | "<td align=\"left\">%2</td></tr>" ) | ||
131 | .arg( i18n ("Birthday") ) | ||
132 | .arg( KGlobal::locale()->formatDate( mAddressee.birthday().date() ,true) ); | ||
133 | } | ||
128 | KABC::PhoneNumber::List phones = mAddressee.phoneNumbers(); | 134 | KABC::PhoneNumber::List phones = mAddressee.phoneNumbers(); |
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index 5fb948a..c4c0081 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp | |||
@@ -126,3 +126,9 @@ KDateEdit::~KDateEdit() | |||
126 | } | 126 | } |
127 | 127 | void KDateEdit::clear() | |
128 | { | ||
129 | bool b = mDateEdit->signalsBlocked(); | ||
130 | mDateEdit->blockSignals(true); | ||
131 | mDateEdit->setText(""); | ||
132 | mDateEdit->blockSignals(b); | ||
133 | } | ||
128 | void KDateEdit::setDate(QDate newDate) | 134 | void KDateEdit::setDate(QDate newDate) |
@@ -465,4 +471,3 @@ bool KDateEdit::eventFilter(QObject *, QEvent *e) | |||
465 | { | 471 | { |
466 | dateFormShort = dateFormShort?false:true; | 472 | toggleDateFormat(); |
467 | mDateEdit->setText(KGlobal::locale()->formatDate(readDate(),dateFormShort)); | ||
468 | } | 473 | } |
@@ -475,2 +480,8 @@ bool KDateEdit::eventFilter(QObject *, QEvent *e) | |||
475 | } | 480 | } |
481 | void KDateEdit::toggleDateFormat() | ||
482 | { | ||
483 | dateFormShort = ! dateFormShort; | ||
484 | mDateEdit->setText(KGlobal::locale()->formatDate(readDate(),dateFormShort)); | ||
485 | |||
486 | } | ||
476 | 487 | ||
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h index 742d843..cf3b90a 100644 --- a/libkdepim/kdateedit.h +++ b/libkdepim/kdateedit.h | |||
@@ -80,3 +80,4 @@ class KDateEdit : public QHBox | |||
80 | virtual bool eventFilter(QObject *o, QEvent *e); | 80 | virtual bool eventFilter(QObject *o, QEvent *e); |
81 | 81 | void toggleDateFormat(); | |
82 | void clear(); | ||
82 | signals: | 83 | signals: |