| author | zautrix <zautrix> | 2005-07-02 12:29:31 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-07-02 12:29:31 (UTC) |
| commit | 7b7c582bbb9908ec65c778b70baa6b2c2aa457fc (patch) (side-by-side diff) | |
| tree | e1e1fb9e039f804d44317b5743ba5aae00fdcc9a | |
| parent | 98273ae9af4d39181ace21fe3dfade141e5f8afb (diff) | |
| download | kdepimpi-7b7c582bbb9908ec65c778b70baa6b2c2aa457fc.zip kdepimpi-7b7c582bbb9908ec65c778b70baa6b2c2aa457fc.tar.gz kdepimpi-7b7c582bbb9908ec65c778b70baa6b2c2aa457fc.tar.bz2 | |
Z 5500 fixes
| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
| -rw-r--r-- | kabc/addresseeview.cpp | 26 | ||||
| -rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 2 | ||||
| -rw-r--r-- | korganizer/searchdialog.cpp | 2 |
4 files changed, 18 insertions, 14 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index c18a241..b2f2704 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -96,3 +96,3 @@ { "Gender:","Geschlecht:" },
-{ "ALIEN (gender undefined)","ALIEN (Geschlecht unbekannt)" },
+{ "ALIEN (undefined)","ALIEN (undefiniert)" },
{ "female","weiblich" },
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 2691d9a..f3cfb23 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp @@ -236,7 +236,9 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) if ( !tempX.isEmpty() ) { - notes += QString( - "<tr><td align=\"right\"><b>%1</b></td>" - "<td align=\"left\">%2</td></tr>" ) - .arg( i18n( "" ) ) - .arg( i18n(tempX) ); + if ( tempX == "male" || tempX == "female" ) { + notes += QString( + "<tr><td align=\"right\"><b>%1</b></td>" + "<td align=\"left\">%2</td></tr>" ) + .arg( i18n( "" ) ) + .arg( i18n(tempX) ); + } } @@ -329,8 +331,10 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); - tempX = KGlobal::locale()->formatDate(dt, true); - notes += QString( - "<tr><td align=\"right\"><b>%1</b></td>" - "<td align=\"left\">%2</td></tr>" ) - .arg( i18n( "Anniversary" ) ) - .arg( tempX ); + if ( dt.isValid () ) { + tempX = KGlobal::locale()->formatDate(dt, true); + notes += QString( + "<tr><td align=\"right\"><b>%1</b></td>" + "<td align=\"left\">%2</td></tr>" ) + .arg( i18n( "Anniversary" ) ) + .arg( tempX ); + } } diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 5334a0e..29abd6f 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -708,3 +708,3 @@ void AddresseeEditorWidget::setupTab2() mGenderBox = new QComboBox ( tab2 ); - mGenderBox->insertItem ( i18n( "ALIEN (gender undefined)" )); + mGenderBox->insertItem ( i18n( "ALIEN (undefined)" )); mGenderBox->insertItem ( i18n( "female" )); diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 72359df..d0865c3 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -126,3 +126,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) QWidget *rangeWidget = new QWidget(topFrame); - QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); + QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()-3); rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); |