Z 5500 fixes

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
@@ -81,33 +81,33 @@
 { "September","September" },

 { "October","October" },

 { "November","November" },

 { "December","Dezember" },

 { "tomorrow","Morgen" },

 { "today","Heute" },

 { "yesterday","Gestern" },

 { "Monday","Montag" },

 { "Tuesday","Dienstag" },

 { "Wednesday","Mittwoch" },

 { "Thursday","Donnerstag" },

 { "Friday","Freitag" },

 { "Saturday","Samstag" },

 { "Sunday","Sonntag" },

 { "Anniversary:","Jahrestag:" },

 { "Gender:","Geschlecht:" },

-{ "ALIEN (gender undefined)","ALIEN (Geschlecht unbekannt)" },

+{ "ALIEN (undefined)","ALIEN (undefiniert)" },

 { "female","weiblich" },

 { "male","männlich" },

 { "&Details","&Details" },

 { "Note:","Notiz:" },

 { "&Notes","&Notizen" },

 { "Use geo data","Benutze geo Daten" },

 { "Latitude:","Breitengrad:" },

 { "Longitude:","Längengrad:" },

 { "Edit Geo Data...","Edit geo Daten..." },

 { "Keys:","Schlüssel:" },

 { "Add","Hinzu" },

 { "Remove","Entf." },

 { "Export","Exportiere" },

 { "&Misc","Verschiedenes" },

 { "Photo","Foto" },

 { "Store as URL","Speichere als URL" },

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 2691d9a..f3cfb23 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -221,37 +221,39 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
           .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ );
 
     }
   }
  
  
     QString notes;
     if ( sFullDetailsMode ) {
         notes = QString(
                         "<tr><td align=\"right\"><b>%1</b></td>"
                         "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" )
             .arg( i18n("Details") )
             .arg( i18n("Hide!") );
      
         QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
         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) );
+            }
         } 
 
         
         tempX =  mAddressee.secrecy().asString();
         
         notes += QString(
                          "<tr><td align=\"right\"><b>%1</b></td>"
                          "<td align=\"left\">%2</td></tr>" )
             .arg(  "" )
             .arg( tempX );
         
        
         tempX = mAddressee.categories().join(" - ");
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
@@ -314,38 +316,40 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Nickname" ) )
                 .arg( tempX );
         }
         tempX = mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" );
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Messanger" ) )
                 .arg( tempX );
         }
        
         tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
         if ( !tempX.isEmpty() ) {
             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 );
+            }
         } 
         tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" );
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Spouse" ) )
                 .arg( tempX );
         } 
         tempX = mAddressee.custom( "KADDRESSBOOK", "X-Children" );
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Children" ) )
                 .arg( tempX );
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 5334a0e..29abd6f 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -693,33 +693,33 @@ void AddresseeEditorWidget::setupTab2()
           label = new QLabel( i18n( "Anniversary:" ), tab2 );
           layout->addWidget( label, iii, 1 );
           mAnniversaryPicker = new KDateEdit( tab2 );
           mAnniversaryPicker->setHandleInvalid( true );
           connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
                    SLOT( dateChanged( QDate ) ) );
            
           label->setBuddy( mAnniversaryPicker );
           layout->addWidget( mAnniversaryPicker, iii, 2 );
           ++iii;
 
       }
 
       label = new QLabel( i18n( "Gender:" ), tab2 );
       layout->addWidget( label, iii, 1 );
       mGenderBox = new QComboBox ( tab2 );
-      mGenderBox->insertItem ( i18n( "ALIEN (gender undefined)" ));
+      mGenderBox->insertItem ( i18n( "ALIEN (undefined)" ));
       mGenderBox->insertItem ( i18n( "female" ));
       mGenderBox->insertItem ( i18n( "male" ));
       connect( mGenderBox, SIGNAL(  activated ( const QString & )  ),
                    SLOT( textChanged( const QString& ) ) );
       label->setBuddy( mGenderBox );
       layout->addWidget( mGenderBox, iii, 2 );
       ++iii;
    // Build the layout and add to the tab widget
   layout->activate(); // required
 
   mTabWidget->addTab( tab2, i18n( "&Details" ) );
 }
 
 void AddresseeEditorWidget::setupTab2_1()
 {
   // This is the Details tab
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 72359df..d0865c3 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -111,33 +111,33 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
     mSummaryCheck->setChecked(true);
     mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
     mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
 
     attendeeGroup = new QHBox( topFrame );
     layout->addWidget(attendeeGroup );
     new QLabel( i18n("Attendee:"),attendeeGroup );
     mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup  );
     mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup );
     // Date range
     // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"),
     //                                    topFrame);
     // layout->addWidget(rangeGroup);
 
     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));
     mStartDate = new KDateEdit(rangeWidget);
     rangeLayout->addWidget(mStartDate);
     rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget));
     mEndDate = new KDateEdit(rangeWidget);
     mEndDate->setDate(QDate::currentDate().addDays(365));
     rangeLayout->addWidget(mEndDate);
     QToolButton *wt = QWhatsThis::whatsThisButton (  rangeWidget );
     rangeLayout->addWidget( (QWidget*)wt );
     layout->addWidget(rangeWidget);
     // Results list view
     listView = new KOListView(mCalendar,topFrame);
     layout->addWidget(listView);
     listView->showCompletedTodos();
     //layout->setStretchFactor( listView, 333 );
     //listView->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Expanding) );