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
@@ -1,353 +1,353 @@
 { "file","Datei" },

 { "Choose one file","Wähle eine Datei" },

 { "dir","Verzeichnis" },

 { "Choose a directory with may files","Wähle Verzeichnis" },

 { "ldap","ldap" },

 { "No description available","Keine Beschreibung verfügbar" },

 { "Library files for "%1" not found in paths","Bibliothek für "%1" nicht gefunden" },

 { "qtopia","qtopia" },

 { "Qtopia PIM Addressbook.","Qtopia PIM Adressbuch." },

 { "vCard","vCard" },

 { "vCard Format","vCard Format" },

 { "microkabcformat_binary","microkabcformat_binary" },

 { "Binary","Binary" },

 { "No description available.","Keine Beschreibung verfügbar." },

 { "Department","Abteilung" },

 { "Profession","Beruf" },

 { "Assistant's Name","Name d.Assistenten" },

 { "Manager's Name","Name d.Manager's" },

 { "Spouse's Name","Name d.Ehegatten" },

 { "Office","Büro" },

 { "IM Address","IM Adresse" },

 { "Anniversary","Jahrestag" },

 { "Gender","Geschlecht" },

 { "Children","Kinder" },

 { "FreeBusyUrl","FreeBusyUrl" },

 { "ExternalID","ExternalID" },

 { "Resource loaded: '%1'","Resource geladen: '%1'" },

 { "Select View","Ansicht wählen" },

 { "Modify View...","Ansicht ändern..." },

 { "Add View...","Ansicht hinzufügen..." },

 { "Delete View","Ansicht löschen" },

 { "Refresh View","Ansicht aktualisieren" },

 { "Edit &Filters...","Bearbeite &Filter..." },

 { "Select Filter","Filter wählen" },

 { "Style:","Stil:" },

 { "HTML table style.","HTML tabellen stil." },

 { "Default Table View","Standard Tabellen Ansicht" },

 { "Show Extension Bar","Zeige Extension Bar" },

 { "None","Kein" },

 { "Name...","Name..." },

 { "Role:","Funktion:" },

 { "Organization:","Firma:" },

 { "Formatted name:","Formatt. Name:" },

 { "Edit Phone Numbers...","Bearbeite Telefonnummern..." },

 { "Categories","Kategorien" },

 { "Public","Öffentlich" },

 { "Private","Privat" },

 { "Confidential","Vertraulich" },

 { "&General","Allgemein" },

 { "&Edit Addresses...","B&earbeite Adressen..." },

 { "Edit Email Addresses...","Bearbeite E-Mail Adressen..." },

 { "Email:","Email:" },

 { "URL:","URL:" },

 { "&IM address:","&IM address:" },

 { "&Address","&Adresse" },

 { "Department:","Abteilung:" },

 { "Office:","Büro:" },

 { "Profession:","Beruf:" },

 { "Manager's name:","N.d.Manager's:" },

 { "Assistant's name:","N.d.Assistenten:" },

 { "Nick name:","Spitzname:" },

 { "Spouse's name:","N.d.Ehegatten:" },

 { "Children's names:","N.d.Kinder:" },

 { "Birthday:","Geburtstag:" },

 { " Local Time","Ortszeit" },

 { "Mon","Mo" },

 { "Tue","Di" },

 { "Wed","Mi" },

 { "Thu","Do" },

 { "Fri","Fr" },

 { "Sat","Sa" },

 { "Sun","So" },

 { "January","Januar" },

 { "February","Februar" },

 { "March","März" },

 { "April","April" },

 { "May","Mai" },

 { "June","Juni" },

 { "July","July" },

 { "August","August" },

 { "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" },

 { "Logo","Logo" },

 { "&Images","B&ilder" },

 { "Home","Privat" },

 { "Work","Geschäft" },

 { "Mobile","Handy" },

 { "Fax","Fax" },

 { "Contact Editor","Bearbeite Kontakt" },

 { "&Mail...","&Mail..." },

 { "&Print...","Drucken..." },

 { "&Save","&Speichern" },

 { "&New Contact...","&Neuer Kontakt..." },

 { "Mail &vCard...","Mail &vCard..." },

 { "Selected to phone","Auswahl zum Telefon" },

 { "Beam selected v&Card(s)","Beame ausgewählte v&Card(s)" },

 { "&Beam personal vCard","Beame persönliche vCard" },

 { "&Edit Contact...","Bearbeite Kontakt..." },

 { "&Exit","B&eenden" },

 { "&Copy","Kopieren" },

 { "Cu&t","Ausschneiden" },

 { "&Paste","Einfügen" },

 { "Select &All","Alles auswählen" },

 { "&Undo","Rückgängig machen" },

 { "Re&do","Wiederherstellen" },

 { "&Delete Contact","Lösche Kontakt" },

 { "Configure &Resources...","Konfiguriere &Resourcen..." },

 { "&Configure %1...","Konfiguriere %1..." },

 { "Configure S&hortcuts...","Konfiguriere S&hortcuts..." },

 { "Show Jump Bar","Zeige Jump Bar" },

 { "Show Details","Zeige Details" },

 { "Beam receive enabled","Beam (IR) Empfang AN" },

 { "Set Who Am I","Setze "wer bin ich"" },

 { "Set Categories for Contacts...","Setze Kategorien für Kontakte..." },

 { "Edit Category List...","Editiere Kategorieliste..." },

 { "Remove "voice"...","Entferne "voice"..." },

 { "Import from Outlook...","Importiere aus Outlook..." },

 { "Licence","Lizenz" },

 { "Faq","Fragen + Antworten" },

 { "What's New?","Was ist neu?" },

 { "Sync HowTo","Sync Anleitung" },

 { "&About KAddressBook","Über KAdressBuch" },

 { "Select Incremental Search Field","Selektiere Such Feld" },

 { "Synchronize","Synchronisieren" },

 { "Configure...","Konfigurieren..." },

 { "Enable Pi-Sync","Aktiviere Pi-Sync" },

 { "Multiple sync","Multi Sync" },

 { "Import CSV List...","Importiere CSV-Datei..." },

 { "Export CSV List...","Exportiere CSV-Datei..." },

 { "Import KDE 2 Addressbook...","Importiere KDE 2 Adressbuch..." },

 { "Import vCard...","Importiere vCard..." },

 { "Export vCard 3.0...","Exportiere vCard 3.0..." },

 { "Import Qtopia...","Importiere Qtopia..." },

 { "Export Qtopia...","Exportiere Qtopia..." },

 { "Edit Contact","Bearbeite Kontakt" },

 { "Ok","Ok" },

 { "Apply","Anwenden" },

 { "Cancel","Abbrechen" },

 { "KAddressbook/Pi","KAdressbuch/Pi" },

 { "No Filter","Kein Filter" },

 { "Given Name","Vorname" },

 { "Family Name","Nachname" },

 { "Email Address","E-Mail Adresse" },

 { "All Fields","Alle Felder" },

 { "Question","Frage" },

 { "After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as "other".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?","After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as "other".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?" },

 { "No","Nein" },

 { "Yes","Ja" },

 { "Synchronization Preferences","Einstellungen der Synchronisationsprofile" },

 { "Local device name:","Name dieses Gerätes:" },

 { "New profile","Neues Profil" },

 { "Clone profile","Klone Profil" },

 { "Delete profile","Lösche Profil" },

 { "Profile:","Profil:" },

 { "Ask for every entry on conflict","Frage bei Konflikten nach"},

 { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" },

 { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" },

 { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" }

 { "Force: Take local entry always","Erzwinge: Nimm immer lokalen Eintrag" },

 { "Force: Take remote entry always","Erzwinge: Nimm immer fernen Eintrag" },

 { "Show summary after sync","Zeige Zusammenfassung nach dem Synchronisieren" },

 { "Write back file","Schreibe Datei zurück" },

 { "Remote file (w down/upload command)","Entfernte Datei (via down/upload Kommando)" },

 { "Pre sync (download) command:","Bevor Sync (download) Kommando:" },

 { "Local device name:","Name dieses Gerätes:" },

 { "Ask for preferences before sync","Frage nach Synchronisationseinstellungen vor dem Syncen" },

 { "Sync preferences","Synchronisations Einstellungen" },

 { "Profile kind","Profil Art" },

 { "Local file","Lokale Datei" },

 { "Local file:","Lokale Datei:" },

 { "Post sync (upload) command:","Nach Sync (upload) Kommando:" },

 { "Fill in default values for:","Setze Beispiel Werte ein für:" },

 { "Hint: Use $PWD$ for placeholder of password!","Hinweis: Benutze $PWD$ als Platzhalter für ein Passwort!" },

 { "Synchronization Preferences","Einstellungen der Synchronisationsprofile"},

 { "Device","Gerät:" },

 { "Sync with file \n...%1\nfrom:\n%2\n","Sync mit Datei \n...%1\nvom:\n%2\n" },

 { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n","Synchronisationsübersicht:\n\n %d items lokal hinzugefügt\n %d items entfernt hinzugefügt\n %d items lokal geändert\n %d items entfernt geändert\n %d items lokal gelöscht\n %d items entfernt gelöscht\n" },

 { "Synchronization successful","Synchronisation erfolgreich" },

 { "Sync cancelled or failed. Nothing synced.","Sync abgebrochen oder fehlgeschlagen. Nichts wurde gesynced." },

 { "Sync file \n...%1\ndoes not exist!\nNothing synced!\n","Sync Datei \n...%1\nexistiert nicht!\nNichts wurde gesynced!\n" },

 { "Sync filename(*.ics/*.vcs)","Sync Dateiname(*.ics/*.vcs)" },

 { "Enter password","Passwort eingeben" },

 { "Do you really want\nto remote sync\nwith profile \n","Wollen Sie wirklich\nmit dem entfernten\nProfil syncen: \n" },

 { "Copy remote file to local machine...","Kopiere entfernte Datei auf lokalen Rechner..." },

 { "Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n","Sorry, das Kopierkommando schlug fehl!\nKommando war:\n%1\n \nVersuche Kommando von Kosole um\nDetails für das Fehlschlagen\nzu erfahren.\n" },

 { "Writing back file result: ","Resultat des Dateizurückschreibens: " },

 { "Syncronization sucessfully completed","Synchronisation erfolgreich abgeschlossen" },

 { "Used %1 Client","Benutzter %1 Client" },

 { "No email client installed","Kein Email Klient installiert" },

 { "Userdefined email client","Benutzerdef. Email Klient" },

 { "OM/Pi email client","OM/Pi Email Klient" },

 { "Include in multiple ","Beziehe in mehrfach " },

 { "calendar  ","Kalender  " },

 { "addressbook  ","Adressbuch  " },

 { "pwmanager","PWmanager" },

 { " sync"," Sync ein" },

 { "Write back synced data","Schreibe gesyncte Daten zurück" },

 { "-- Write back (on remote) existing entries only","-- Schreibe nur existierende (entfernte) Einträge zurück" },

 { "-- Write back (calendar) entries in future only","-- Schreibe nur zukünftige Kalender-Einträge zurück" },

 { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " },

 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },

 { "Mobile device (cell phone)","Mobiles Gerät (Handy)" },

 { "Help...","Hilfe..." },

 { "Local file Cal:","Lokale Datei Kal:" },

 { "Local file ABook:","Lokale Datei ABuch:" },

 { "Local file PWMgr:","Lokale Datei PWMgr:" },

 { "Addressbook file (*.vcf) is used by KA/Pi","Adressbuch Datei (*.vcf) wird von KA/Pi genutzt" },

 { "Calendar:","Kalender:" },

 { "AddressBook:","AdressBuch:" },

 { "PWManager:","PWManager:" },

 { "Addressbook file is used by KA/Pi","Adressbuch Datei wird von KA/Pi genutzt" },

 { "ssh/scp","ssh/scp" },

 { "ftp","ftp" },

 { "Password for remote access: (could be the same for each)","Passwort für entfernten Zugriff: (kann dasselbe sein für alle)" },

 { "Remote IP address: (could be the same for each)","Entfernte IP Adresse: (kann dasselbe sein für alle)" },

 { "Remote port number: (should be different for each)","Entfernte Port Nummer: (Sollte für alle unterschiedlich sein)" },

 { "command for downloading remote file to local device","Kommando zum Download der entfernten Datei zum lokalen Gerät" },

 { "command for uploading local temp file to remote device","Kommando zum Upload der lokalen temp. Datei zum entfernten Gerät" },

 { "Insert device where\nphone is connected. E.g.:\n","Füge Device ein, an dem\ndas Handy angeschlossen ist. Z.B.:\n" },

 { "KDE-Pim sync config","KDE-Pim sync Konfig" },

 { "Insert kind of connection,e.g.:\n","Füge Art der Verbindung ein,z.B.:\n" },

 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Model\nautomatisch erkannt\nwerden kann)\nOder füge Model Name ein:\n" },

 { "Port number (Default: %1)","Port Nummer (Default: %1)" },

 { "Password to enable\naccess from remote:","Passwort um entfernten\nZugriff zuzulassen:" },

 { "Automatically start\nat application startup","Starte automatisch\nbeim Programmstart" },

 { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" },

 { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" },

 { "Disable Pi-Sync","Schalte Pi-Sync aus" },

 { "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen "Multi-Syncen"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },

 { "KDE-Pim Sync","KDE-Pim Sync" },

 { "Multiple profiles","Multi-Sync Profile" },

 { "Device: ","Gerät: " },

 { "Multiple sync started.","Multi-Sync gestartet." },

 { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile selektiert für Multi-Sync" },

 { "KDE-Pim sync config","KDE-Pim Sync Konfig" },

 { "Insert kind of connection,e.g.:\n","Füge Art der Verbindung ein, z.B.:\n" },

 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Modell\nautomatisch\erkannt\nwerden kann)\nOder füge Model Name ein:\n" },

 { "KO/Pi config error","KO/Pi Konfig. Fehler" },

 { "Local device name undefined!\nPlease define device name!","Name dieses Gerätes undefiniert!\nBitte Namen angeben!" },

 { "Edit Address Book Filters","Editiere Addressbuch Filter" },

 { "&Add...","Hinzufügen..." },

 { "&Edit...","B&earbeiten..." },

 { "&Remove","Entfe&rne" },

 { "Modify View: ","Ansicht ändern: " },

 { "Fields","Felder" },

 { "Select Fields to Display","Wähle anzuzeigende Felder" },

 { "All","Alles" },

 { "Frequent","Frequent" },

 { "Address","Adresse" },

 { "Email","E-Mail" },

 { "Personal","Persönl." },

 { "Organization","Organisation" },

 { "Custom","Benutzerdefiniert" },

 { "&Selected\nfields:","&Selektierte\nFelder:" },

 { "Formatted Name","Format. Name" },

 { "Additional Names","Mittelname" },

 { "Honorific Prefixes","Namensprefix" },

 { "Honorific Suffixes","Namenssuffix" },

 { "Nick Name","Spitzname" },

 { "Birthday","Geburtstag" },

 { "Home Address Street","Privat Adresse Strasse" },

 { "Home Address Locality","Privat Adresse Stadt" },

 { "Home Address Region","Privat Adresse Bundesland" },

 { "Home Address Postal Code","Privat Adresse PLZ" },

 { "Home Address Country","Privat Adresse Land" },

 { "Home Address Label","Privat Adresse Label" },

 { "Business Address Street","Büro Adresse Strasse" },

 { "Business Address Locality","Büro Adresse Stadt" },

 { "Business Address Region","Büro Adresse Bundesland" },

 { "Business Address Postal Code","Büro Adresse PLZ" },

 { "Business Address Country","Büro Adresse Land" },

 { "Business Address Label","Büro Adresse Label" },

 { "Home Phone","Privat Telefon" },

 { "Business Phone","Büro Telefon" },

 { "Mobile Phone","Handy" },

 { "Home Fax","Privat Fax" },

 { "Business Fax","Büro Fax" },

 { "Car Phone","Autotelefon" },

 { "ISDN","ISDN" },

 { "Pager","Pager" },

 { "Mail Client","Mail Klient" },

 { "Title","Titel" },

 { "Role","Rolle" },

 { "Note","Notiz" },

 { "URL","URL" },

 { "Resource","Resource" },

 { "SIP","SIP" },

 { "Default Filter","Default Filter" },

 { "The default filter will be activated whenever this view is displayed. This feature allows you to configure views that only interact with certain types of information based on the filter. Once the view is activated, the filter can be changed at anytime.","#The default filter will be activated whenever this view is displayed. This feature allows you to configure views that only interact with certain types of information based on the filter. Once the view is activated, the filter can be changed at anytime." },

 { "No default filter","Kein default Filter" },

 { "Use last active filter","Nutze letzen aktiven Filter" },

 { "Use filter:","Nutze Filter:" },

 { "Look & Feel","Look & Feel" },

 { "Row Separator","Reihen Separator" },

 { "Alternating backgrounds","Abwechselnder Hintergrund" },

 { "Single line","Einzelne Zeile" },

 { "Enable background image:","Hintergrundbild:" },

 { "Enable contact tooltips","Contact Tooltips" },

 { "&Enable custom Colors","Benutzerdef. Farben" },

 { "&Colors","Farben" },

 { "If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used.","#If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used." },

 { "Double click or press RETURN on a item to select a color for the related strings in the view.","#Double click or press RETURN on a item to select a color for the related strings in the view." },

 { "&Enable custom fonts","B&enutzerdefinierte Schriften" },

 { "&Text font:","Textschriftart:" },

 { "&Header font:","Titelschriftart:" },

 { "If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data.","#If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data." },

 { "&Fonts","Schri&ften" },

 { "Background Color","Hintergrundfarbe" },

 { "Text Color","Textfarbe" },

 { "Header Background Color","Titel Hintergrundfarbe" },

 { "Header Text Color","Titel Farbe" },

 { "Highlight Color","Auswahlfarbe" },

 { "Highlighted Text Color","Auswahltextfarbe" },

 { "Alternating Background Color","Abwechselnder Hintergrundfarbe" },

 { "Postal","Post" },

 { "Dr.","Dr." },

 { "Miss","Frl." },

 { "Mr.","Herr" },

 { "Mrs.","Frau" },

 { "Ms.","Fr." },

 { "Prof.","Prof." },

 { "I","I" },

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 2691d9a..f3cfb23 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -1,591 +1,595 @@
 /*
     This file is part of libkdepim.
 
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <kabc/address.h>
 #include <kabc/addressee.h>
 #include <kabc/phonenumber.h>
 #include <kglobal.h>
 //US#include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
 //US #include <kstringhandler.h>
 #include <qscrollview.h>
 #include <qregexp.h>
 #include <qfile.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qapplication.h>
 #include <qpushbutton.h>
 #ifdef DESKTOP_VERSION 
 #include <qpaintdevicemetrics.h>
 #include <qprinter.h>
 #include <qpainter.h>
 #endif
 
 
 #include <qstylesheet.h> 
 #include "externalapphandler.h"
 #include <kabc/addresseeview.h>
 
 
 //US #ifndef DESKTOP_VERSION
 //US #include <qtopia/qcopenvelope_qws.h>
 //US #include <qpe/qpeapplication.h>
 //US #endif
 
 //US static int kphoneInstalled = 0;
 
 using namespace KABC;
 bool AddresseeView::sFullDetailsMode = false;
 
 AddresseeView::AddresseeView( QWidget *parent, const char *name )
   : QTextBrowser( parent, 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::printMe()
 {
 #ifdef DESKTOP_VERSION 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
     QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
     if ( dx < dy )
         scale = dx;
     else
         scale = dy;
     p.translate( m.width()/10,0 );
     p.scale( scale, scale );
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
 #endif  
 }
 void AddresseeView::setSource(const QString& n)
 {
     //qDebug("********AddresseeView::setSource %s", n.latin1());
 
    if ( n == "allDetails" ) {
        sFullDetailsMode = true;
        setAddressee( mCurrentContact );
    } else  if ( n == "notAllDetails" ) {
        sFullDetailsMode = false;
        setAddressee( mCurrentContact );
    } else 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) );
    else if ( n.left( 5 ) == "sipto" )
        ExternalAppHandler::instance()->callBySIP(  n.mid(6) );
 
 }
 void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
 {
   bool kemailAvail = ExternalAppHandler::instance()->isEmailAppAvailable();
   // mAddressee = addr;
   // clear view
   //setText( QString::null );
   mCurrentContact = mAddressee;
   if ( mAddressee.isEmpty() ) {
       setText( QString::null);
       return;
   }
 #if 0
   QString name = ( mAddressee.assembledName().isEmpty() ?
                    mAddressee.formattedName() : mAddressee.assembledName() );
 #endif
 
   QString name =  mAddressee.realName();
 
   QString dynamicPart;
 
   dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true );
   QStringList emails = mAddressee.emails();
   QStringList::ConstIterator emailIt;
   QString type = i18n( "Email" );
   emailIt = emails.begin();
   if ( emailIt != emails.end() ) {
     if ( kemailAvail ) {
       dynamicPart += QString(
             "<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) );
   }
   dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(), false );
 
   for ( ; emailIt != emails.end(); ++emailIt ) {
     if ( kemailAvail ) {
       dynamicPart += QString(
         "<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 );
         } else {
       dynamicPart += QString(
         "<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
         .arg( type )
         .arg( *emailIt );
     }
   }
 
 
 
   KABC::Address::List addresses = mAddressee.addresses();
   KABC::Address::List::ConstIterator addrIt;
   for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) {
       if ( true /*(*addrIt).label().isEmpty()*/ ) {
       QString formattedAddress = (*addrIt).formattedAddress().stripWhiteSpace();
 //US      formattedAddress = formattedAddress.replace( '\n', "<br>" );
       //qDebug("adresss %s ",formattedAddress.latin1() );
        formattedAddress = formattedAddress.replace( QRegExp("\n"), "<br>" );
        //qDebug("AddresseeView::setAddressee has to be verified.");
 
       dynamicPart += QString(
         "<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
         .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
         .arg( formattedAddress );
     } else {
 
       dynamicPart += QString(
         "<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
         .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
 //US        .arg( (*addrIt).label().replace( '\n', "<br>" ) );
           .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>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Category" ) )
                 .arg( tempX );
         } 
         tempX = mAddressee.custom( "KADDRESSBOOK", "X-Profession" );
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Profession" ) )
                 .arg( tempX );
         } 
         tempX = mAddressee.custom( "KADDRESSBOOK", "X-Office" );
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Office" ) )
                 .arg( tempX );
         }
         tempX = mAddressee.custom( "KADDRESSBOOK", "X-Department" );
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Department" ) )
                 .arg( tempX );
         } 
         
         tempX = mAddressee.custom( "KADDRESSBOOK", "X-ManagersName" );
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Manager" ) )
                 .arg( tempX );
         } 
         tempX = mAddressee.custom( "KADDRESSBOOK", "X-AssistantsName" );
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Assistant" ) )
                 .arg( tempX );
         } 
         if ( !mAddressee.url().url().isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<td align=\"left\">%2</td></tr>" )
                 .arg( i18n( "Homepage" ) )
                 .arg( mAddressee.url().url() );
         }
         tempX = mAddressee.nickName();
         if ( !tempX.isEmpty() ) {
             notes += QString(
                              "<tr><td align=\"right\"><b>%1</b></td>"
                              "<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 );
         } 
        
       if (  !mAddressee.note().isEmpty() ) {
           notes += QString(
                           "<tr>"
                           "<td align=\"right\" valign=\"top\"><b>%1</b></td>"  // note label
                           "<td align=\"left\">%2</td>"  // note
                           "</tr>" ).arg( i18n( "Notes" ) )
               //US      .arg( mAddressee.note().replace( '\n', "<br>" ) );
               .arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) );
           //qDebug("AddresseeView::setAddressee has to be verified.");
       }
   } else {
       notes = QString(
             "<tr><td align=\"right\"><b>%1</b></td>"
            "<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" )
           .arg( i18n("Details") )
           .arg( i18n("Show!") );
 
 
   }
 
   QString aRole = "";
   QString aOrga = "";
   if ( true /*!mAddressee.role().isEmpty()*/ ) {
       aRole = "<tr>"
           "<td align=\"left\">" + mAddressee.role() + "</td>"
           "</tr>";
   }
   if ( true /*!mAddressee.organization().isEmpty()*/ ) {
       aOrga = "<tr>"
           "<td align=\"left\">" + mAddressee.organization() + "</td>" 
           "</tr>";
   }
   mText = "";
   QString picString = "";
   KABC::Picture picture = mAddressee.photo();
   bool picAvailintern = false;
   bool picAvailUrl = false;
   if (! picture.undefined() ) {
       picAvailintern = (picture.isIntern() && !picture.data().isNull());
       picAvailUrl = !picture.isIntern() &&  QFile::exists(picture.url() );
   }
   if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) {
       picString =  "<img src=\"myimage\" width=\"50\" height=\"70\">";
       if (  picAvailintern ) {
           QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
       } else {
           if ( picAvailUrl ) {
               QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() ));
           } else {
               if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) {
                   static bool setDefaultImageChildren = false;
                   if ( !setDefaultImageChildren ) {
                       QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
                       setDefaultImageChildren = true;
                   }
                   picString =  "<img src=\"familyIcon\" width=\"64\" height=\"64\">";
                   
               } else  if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) {
                   static bool setDefaultImagepouses = false;
                   if ( !setDefaultImagepouses ) {
                       QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
                       setDefaultImagepouses = true;
                   }
                   picString =  "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">";
               } else {
                   QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
                   if ( gen == "male" ) {
                       static bool setDefaultImageMale = false;
                       if ( !setDefaultImageMale ) {
                           QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
                           setDefaultImageMale = true;
                   }
                       picString =  "<img src=\"MaleIcon\" width=\"64\" height=\"64\">";
                       
                   } else if ( gen == "female" ) {
                   static bool setDefaultImageFemale = false;
                   if ( !setDefaultImageFemale ) {
                       QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
                       setDefaultImageFemale = true;
                   }
                   picString =  "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">";
 
                   } else {
                       static bool setDefaultImage = false;
                       if ( !setDefaultImage ) {
                           //qDebug("Setting default pixmap ");
                           QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
                           setDefaultImage = true;
                       }
                       picString =  "<img src=\"defaultIcon\" width=\"64\" height=\"64\">";
                   }
               }
           }
       }
     mText = QString::fromLatin1(
   "<html>"
   "<body text=\"%1\" bgcolor=\"%2\">" // text and background color
   "<table>"
   "<tr>"
   "<td rowspan=\"3\" align=\"right\" valign=\"top\">"
   "%3"
   "</td>"
   "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>"  // name
   "</tr>"
   "%5"  // role
   "%6"  // organization
   "<td colspan=\"2\">&nbsp;</td>"
   "%7"  // dynamic part
   "%8"  // notes
   "</table>"
   "</body>"
   "</html>")
 //US
   .arg( /*KGlobalSettings::textColor().name()*/ "black" )
 //US
   .arg( /*KGlobalSettings::baseColor().name()*/ "white" )
   .arg( picString )
   .arg( name )
   .arg( aRole )
   .arg( aOrga )
   .arg( dynamicPart )
   .arg( notes );
 
   } else { // no picture!
 
 mText = "<table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>";
 #ifdef DESKTOP_VERSION
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>";
     mText += "<font color=\"#FFFFFF\">" + name +"</font></h1>";
 #else
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h3>";
     mText += "<font color=\"#FFFFFF\"> " + name +"</font></h3>";
 #endif
 
     mText += "</td></tr>\n<tr  bgcolor=\"#EAF8FA\"><td>";
 
     mText += "<table><td colspan=\"2\">&nbsp;</td>";
     /*
       mText += QString("<tr><td align=\"right\"><b2>%1</b2></td>"
         "<td align=\"left\"><b>%2</b></td></tr>" )
           .arg( i18n(" ") )
         .arg( name );
     */
       if ( ! mAddressee.role().isEmpty() )
       mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
           .arg( i18n(" ") )
         .arg( mAddressee.role());
       if ( ! mAddressee.organization().isEmpty() )
       mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
           .arg( i18n(" ") )
         .arg( mAddressee.organization());
       mText += dynamicPart;
       mText += notes;
       mText += "</table>";
 
  }
 
   // at last display it...
   setText( mText );
 
 }
 
 QString AddresseeView::getPhoneNumbers(  KABC::PhoneNumber::List phones ,bool preferred )
 {  
   ExternalAppHandler* eah = ExternalAppHandler::instance();
   bool kphoneAvail = eah->isPhoneAppAvailable();
   bool kfaxAvail = eah->isFaxAppAvailable();
   bool ksmsAvail = eah->isSMSAppAvailable();
   bool kpagerAvail = eah->isPagerAppAvailable();
   bool ksipAvail = eah->isSIPAppAvailable();
   QString dynamicPart;
   KABC::PhoneNumber::List::ConstIterator phoneIt;
   QString extension;
   int phonetype;
   QString sms;
   for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
     phonetype = (*phoneIt).type();
     if ( ((phonetype & KABC::PhoneNumber::Pref) == 0 ) == preferred )
         continue;
     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() );
 
     }
     else
       sms = "";
 
     extension = QString::null;
     if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) {
       if (kfaxAvail) extension = "faxto:";
     }
     else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) {
       if (kpagerAvail) extension = "pagerto:";
     }
     else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) {
       if (ksipAvail) extension = "sipto:";
     }
     else if (kphoneAvail) {
       extension = "phoneto:";
     }
     else
       extension = QString::null;
 
       if ( !extension.isEmpty() ) {
           dynamicPart += QString(
                                  "<tr><td align=\"right\"><b>%1</b></td>"
            "<td align=\"left\"><a href=\"%2%3  \">%4</a> %5</td></tr>" )
               .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
               .arg( extension )
               .arg( (*phoneIt).number() )
               .arg( (*phoneIt).number() )
               .arg( sms );
 
       } else {
           dynamicPart += QString(
                                  "<tr><td align=\"right\"><b>%1</b></td>"
                                  "<td align=\"left\">%2 %3</td></tr>" )
               .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
               .arg( (*phoneIt).number() )
               .arg( sms );
       }
   }
   return dynamicPart;
 }
 /*
 KABC::Addressee AddresseeView::addressee() const
 {
   return mAddressee;
 }
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 5334a0e..29abd6f 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -453,513 +453,513 @@ qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
   /* LR
   label = new QLabel( tab1_1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, 0) );
 //US  layout->addMultiCellWidget( label, 5, 6, 3, 3 );
   layout->addMultiCellWidget( label, 6, 7, 0, 0 );
   */
   mEmailWidget = new EmailEditWidget( tab1_1 );
   connect( mEmailWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
 //US  layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
   layout->addMultiCellWidget( mEmailWidget, 5, 6, 0, 1 );
 
   /* LR
   // add the separator
   bar = new KSeparator( KSeparator::HLine, tab1_1 );
 //US  layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
   layout->addMultiCellWidget( bar, 8, 8, 0, 3 );
   
   label = new QLabel( tab1_1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, 0) );
 //US  layout->addMultiCellWidget( label, 8, 9, 3, 3 );
   layout->addMultiCellWidget( label, 9, 10, 0, 0 );
   */
   label = new QLabel( i18n( "URL:" ), tab1_1 );
   mURLEdit = new KLineEdit( tab1_1 );
   connect( mURLEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mURLEdit );
 //US  layout->addWidget( label, 8, 4 );
   layout->addWidget( label, 7,0 );
 //US  layout->addMultiCellWidget( mURLEdit, 8, 8, 5, 6 );
   layout->addWidget( mURLEdit, 7, 1);
 
   label = new QLabel( i18n( "&IM address:" ), tab1_1 );
   mIMAddressEdit = new KLineEdit( tab1_1 );
   connect( mIMAddressEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mIMAddressEdit );
 //US  layout->addWidget( label, 9, 4 );
   layout->addWidget( label, 8, 0 );
 //US  layout->addMultiCellWidget( mIMAddressEdit, 9, 9, 5, 6 );
   layout->addWidget( mIMAddressEdit, 8,1 );
   
 //US  layout->addColSpacing( 6, 50 );
   
 //US  bar = new KSeparator( KSeparator::HLine, tab1_1 );
 //US  layout->addMultiCellWidget( bar, 10, 10, 0, 6 );
 
 /*US  
   ///////////////////////////////////////
   QHBox *categoryBox = new QHBox( tab1 );
   categoryBox->setSpacing( KDialogBase::spacingHintSmall() );
   
   // Categories
   button = new QPushButton( i18n( "Categories" ), categoryBox );
   connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) );
 
   mCategoryEdit = new KLineEdit( categoryBox );
   mCategoryEdit->setReadOnly( true );
   connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( textChanged( const QString& ) ) );
 
   mSecrecyWidget = new SecrecyWidget( categoryBox );
   connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
 
   layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 );
 */  
   // Build the layout and add to the tab widget
   layout->activate(); // required
 
   mTabWidget->addTab( tab1_1, i18n( "&Address" ) );
 }
 
 
 
 void AddresseeEditorWidget::setupTab2()
 {
   // This is the Details tab
   QWidget *tab2 = new QWidget( mTabWidget );
 
   QGridLayout *layout = new QGridLayout( tab2, 8, 3 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   
   ///////////////////////
   // Office info
   
   // Department
   label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, 0 ) );
   layout->addMultiCellWidget( label, 0, 1, 0, 0 );
   
   label = new QLabel( i18n( "Department:" ), tab2 );
   layout->addWidget( label, 0, 1 );
   mDepartmentEdit = new KLineEdit( tab2 );
   connect( mDepartmentEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mDepartmentEdit );
   layout->addWidget( mDepartmentEdit, 0, 2 );
   
   label = new QLabel( i18n( "Office:" ), tab2 );
   layout->addWidget( label, 1, 1 );
   mOfficeEdit = new KLineEdit( tab2 );
   connect( mOfficeEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mOfficeEdit );
   layout->addWidget( mOfficeEdit, 1, 2 );
   
   label = new QLabel( i18n( "Profession:" ), tab2 );
   layout->addWidget( label, 2, 1 );
   mProfessionEdit = new KLineEdit( tab2 );
   connect( mProfessionEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mProfessionEdit );
   layout->addWidget( mProfessionEdit, 2, 2 );
   
   label = new QLabel( i18n( "Manager\'s name:" ), tab2 );
 //US  layout->addWidget( label, 0, 3 );
   layout->addWidget( label, 3, 1 );
   mManagerEdit = new KLineEdit( tab2 );
   connect( mManagerEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mManagerEdit );
 //US  layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
   layout->addWidget( mManagerEdit, 3, 2 );
   
   label = new QLabel( i18n( "Assistant's name:" ), tab2 );
 //US  layout->addWidget( label, 1, 3 );
   layout->addWidget( label, 4, 1 );
   mAssistantEdit = new KLineEdit( tab2 );
   connect( mAssistantEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mAssistantEdit );
 //US  layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
   layout->addWidget( mAssistantEdit, 4, 2 );
   
   bar = new KSeparator( KSeparator::HLine, tab2 );
 //US  layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
   layout->addMultiCellWidget( bar, 5, 5, 0, 2 );
   
   /////////////////////////////////////////////////
   // Personal info
   
   //label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
       //label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
 //US  layout->addMultiCellWidget( label, 4, 5, 0, 0 );
       //layout->addMultiCellWidget( label, 6, 7, 0, 0 );
 
 
       int iii = 6;
 
       if ( QApplication::desktop()->width() == 640 ) {
           QHBox * nbox = new QHBox ( tab2 );
           label = new QLabel( i18n( "Nick name:" )+" ", nbox );
           mNicknameEdit = new KLineEdit(  nbox );
           connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
                    SLOT( textChanged( const QString& ) ) );
           label->setBuddy( mNicknameEdit );
 
           label = new QLabel( " "+i18n( "Spouse's name:" )+" ",  nbox );
           mSpouseEdit = new KLineEdit(  nbox );
           connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
                    SLOT( textChanged( const QString& ) ) );
           label->setBuddy( mSpouseEdit );
           layout->addMultiCellWidget( nbox, iii, iii, 1, 2 );
           ++iii;
 
       } else {
           label = new QLabel( i18n( "Nick name:" ), tab2 );
           layout->addWidget( label, iii, 1 );
           mNicknameEdit = new KLineEdit( tab2 );
           connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
                    SLOT( textChanged( const QString& ) ) );
           label->setBuddy( mNicknameEdit );
           layout->addWidget( mNicknameEdit, iii, 2 );
           ++iii;
 
           label = new QLabel( i18n( "Spouse's name:" ), tab2 );
           layout->addWidget( label, iii, 1 );
           mSpouseEdit = new KLineEdit( tab2 );
           connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
                    SLOT( textChanged( const QString& ) ) );
           label->setBuddy( mSpouseEdit );
           layout->addWidget( mSpouseEdit, iii, 2 );
           ++iii;
       }
 
       label = new QLabel( i18n( "Children's names:" ), tab2 );
       layout->addWidget( label, iii, 1 );
       mChildEdit = new KLineEdit( tab2 );
       connect( mChildEdit, SIGNAL( textChanged( const QString& ) ),
                SLOT( textChanged( const QString& ) ) );
       label->setBuddy( mChildEdit );
       layout->addWidget( mChildEdit, iii, 2 );
       ++iii;
       if ( QApplication::desktop()->width() == 640 ) {
           QHBox * nbox = new QHBox ( tab2 );
           label = new QLabel( i18n( "Birthday:" )+" ", nbox );
           mBirthdayPicker = new KDateEdit(  nbox  );
           //mBirthdayPicker->toggleDateFormat();
           mBirthdayPicker->setHandleInvalid( true );
           connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                    SLOT( dateChanged( QDate ) ) );
            
           label->setBuddy( mBirthdayPicker );
   
           label = new QLabel(  " "+i18n( "Anniversary:" )+" ",  nbox  );
           mAnniversaryPicker = new KDateEdit(  nbox  );
           mAnniversaryPicker->setHandleInvalid( true );
           connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
                    SLOT( dateChanged( QDate ) ) );
            
           label->setBuddy( mAnniversaryPicker );
           layout->addMultiCellWidget( nbox, iii, iii, 1, 2 );
           ++iii;
 
       } else {
 
           label = new QLabel( i18n( "Birthday:" ), tab2 );
           layout->addWidget( label, iii, 1 );
           mBirthdayPicker = new KDateEdit( tab2 );
           //mBirthdayPicker->toggleDateFormat();
           mBirthdayPicker->setHandleInvalid( true );
           connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                    SLOT( dateChanged( QDate ) ) );
            
           label->setBuddy( mBirthdayPicker );
           layout->addWidget( mBirthdayPicker, iii, 2 );
           ++iii;
   
           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
   QWidget *tab2_2 = new QWidget( mTabWidget );
 
   QGridLayout *layout = new QGridLayout( tab2_2, 1, 2 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   
 /*US  
   ///////////////////////
   // Office info
   
   // Department
   label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, 0 ) );
   layout->addMultiCellWidget( label, 0, 1, 0, 0 );
   
   label = new QLabel( i18n( "Department:" ), tab2 );
   layout->addWidget( label, 0, 1 );
   mDepartmentEdit = new KLineEdit( tab2 );
   connect( mDepartmentEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mDepartmentEdit );
   layout->addWidget( mDepartmentEdit, 0, 2 );
   
   label = new QLabel( i18n( "Office:" ), tab2 );
   layout->addWidget( label, 1, 1 );
   mOfficeEdit = new KLineEdit( tab2 );
   connect( mOfficeEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mOfficeEdit );
   layout->addWidget( mOfficeEdit, 1, 2 );
   
   label = new QLabel( i18n( "Profession:" ), tab2 );
   layout->addWidget( label, 2, 1 );
   mProfessionEdit = new KLineEdit( tab2 );
   connect( mProfessionEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mProfessionEdit );
   layout->addWidget( mProfessionEdit, 2, 2 );
   
   label = new QLabel( i18n( "Manager\'s name:" ), tab2 );
   layout->addWidget( label, 0, 3 );
   mManagerEdit = new KLineEdit( tab2 );
   connect( mManagerEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mManagerEdit );
   layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
   
   label = new QLabel( i18n( "Assistant's name:" ), tab2 );
   layout->addWidget( label, 1, 3 );
   mAssistantEdit = new KLineEdit( tab2 );
   connect( mAssistantEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mAssistantEdit );
   layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
   
   bar = new KSeparator( KSeparator::HLine, tab2 );
   layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
 
   /////////////////////////////////////////////////
   // Personal info
   
   label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
   layout->addMultiCellWidget( label, 4, 5, 0, 0 );
   
   label = new QLabel( i18n( "Nick name:" ), tab2 );
   layout->addWidget( label, 4, 1 );
   mNicknameEdit = new KLineEdit( tab2 );
   connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mNicknameEdit );
   layout->addWidget( mNicknameEdit, 4, 2 );
 
   label = new QLabel( i18n( "Spouse's name:" ), tab2 );
   layout->addWidget( label, 5, 1 );
   mSpouseEdit = new KLineEdit( tab2 );
   connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mSpouseEdit );
   layout->addWidget( mSpouseEdit, 5, 2 );
 
   label = new QLabel( i18n( "Birthday:" ), tab2 );
   layout->addWidget( label, 4, 3 );
   mBirthdayPicker = new KDateEdit( tab2 );
   mBirthdayPicker->setHandleInvalid( true );
   connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
            SLOT( dateChanged( QDate ) ) );
   connect( mBirthdayPicker, SIGNAL( invalidDateEntered() ),
            SLOT( invalidDate() ) );
   connect( mBirthdayPicker, SIGNAL( textChanged( const QString& ) ),
            SLOT( emitModified() ) );
   label->setBuddy( mBirthdayPicker );
   layout->addWidget( mBirthdayPicker, 4, 4 );
   
   label = new QLabel( i18n( "Anniversary:" ), tab2 );
   layout->addWidget( label, 5, 3 );
   mAnniversaryPicker = new KDateEdit( tab2 );
   mAnniversaryPicker->setHandleInvalid( true );
   connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
            SLOT( dateChanged( QDate ) ) );
   connect( mAnniversaryPicker, SIGNAL( invalidDateEntered() ),
            SLOT( invalidDate() ) );
   connect( mAnniversaryPicker, SIGNAL( textChanged( const QString& ) ),
            SLOT( emitModified() ) );
   label->setBuddy( mAnniversaryPicker );
   layout->addWidget( mAnniversaryPicker, 5, 4 );
   
   bar = new KSeparator( KSeparator::HLine, tab2 );
   layout->addMultiCellWidget( bar, 6, 6, 0, 5 );
 */  
    //////////////////////////////////////
   // Notes
   label = new QLabel( i18n( "Note:" ), tab2_2 );
   label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
 //US  layout->addWidget( label, 7, 0 );
   layout->addWidget( label, 0, 0 );
 #ifndef KAB_EMBEDDED    
   mNoteEdit = new QTextEdit( tab2_2 );
   mNoteEdit->setWordWrap( QTextEdit::WidgetWidth );
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #else //KAB_EMBEDDED    
   mNoteEdit = new QMultiLineEdit( tab2_2 );
   mNoteEdit->setWordWrap( QMultiLineEdit::WidgetWidth );
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #endif //KAB_EMBEDDED    
   
   connect( mNoteEdit, SIGNAL( textChanged() ), SLOT( emitModified() ) );
   label->setBuddy( mNoteEdit );
 //US  layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
   layout->addWidget( mNoteEdit, 1, 0);
 
    // Build the layout and add to the tab widget
   layout->activate(); // required
 
   mTabWidget->addTab( tab2_2, i18n( "&Notes" ) );
 }
 
 
 
 void AddresseeEditorWidget::setupTab3()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
   QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
 //US  layout->setColStretch( 2, 1 );
   
   //////////////////////////////////////
   // Geo
   mGeoWidget = new GeoWidget( tab3 );
   // mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
   connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mGeoWidget, 0, 0 );
 /*US
   //////////////////////////////////////
   // Sound
 #ifndef KAB_EMBEDDED    
   mSoundWidget = new SoundWidget( tab3 );
   mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
   connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
 
   //////////////////////////////////////
   // Images
   mImageWidget = new ImageWidget( tab3 );
   mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
   connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mImageWidget, 1, 0, Qt::AlignTop );
 */
 //US  
 /*
   KSeparator* bar = new KSeparator( KSeparator::HLine, tab3 );
   layout->addMultiCellWidget( bar, 1, 1, 0, 0 );
 */ 
   //////////////////////////////////////
   // Keys
   mKeyWidget = new KeyWidget( tab3 );
   //mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() );
   connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
 //US  layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop );
   layout->addWidget( mKeyWidget, 1, 0 );
 
   mTabWidget->addTab( tab3, i18n( "&Misc" ) );
 }
 
 void AddresseeEditorWidget::setupTab3_1()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
 //US  QGridLayout *layout = new QGridLayout( tab3, 2, 3 );
   QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHint() );
   layout->setSpacing( KDialogBase::spacingHint() );
 //US  layout->setColStretch( 2, 1 );
 
 /*US  
   //////////////////////////////////////
   // Geo
   mGeoWidget = new GeoWidget( tab3 );
   mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
   connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mGeoWidget, 0, 0, Qt::AlignTop );
 */
   //////////////////////////////////////
   // Sound
 #ifndef KAB_EMBEDDED    
   mSoundWidget = new SoundWidget( tab3 );
   mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
   connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
 
   //////////////////////////////////////
   // Images
   mImageWidget = new ImageWidget( tab3 );
   mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
   connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mImageWidget, 0, 0, Qt::AlignTop );
 /*US
   //////////////////////////////////////
   // Keys
   mKeyWidget = new KeyWidget( tab3 );
   mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() );
   connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop );
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 72359df..d0865c3 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -1,383 +1,383 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qwhatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qhbuttongroup.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 #include <libkdepim/kdateedit.h>
 
 #include "koglobals.h"
 #include "koprefs.h"
 #include "klineedit.h"
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "searchdialog.h"
 
 SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     : QVBox( 0  )
 
 {
     mCalendar = calendar;
     QFrame *topFrame = new QFrame( this ) ;//plainPage();
     QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
 
     // Search expression
     QHBoxLayout *subLayout = new QHBoxLayout();
     layout->addLayout(subLayout);
     /*
     searchLabel = new QLabel(topFrame);
     searchLabel->setText(i18n("Search for:"));
     subLayout->addWidget(searchLabel);
     */
     QPushButton *OkButton = new QPushButton(  i18n("Search for:"), topFrame );
     //OkButton->setDefault( true );
     connect(OkButton,SIGNAL(clicked()),SLOT(doSearch()));
     subLayout->addWidget(OkButton);
     searchEdit = new KLineEdit(topFrame);
     subLayout->addWidget(searchEdit);
 
     mAddItems = new QRadioButton( "+ ", topFrame );
     mSubItems = new QRadioButton( "- ", topFrame );
     mRefineItems = new QRadioButton( "< ", topFrame );
     subLayout->addWidget( mAddItems );
     subLayout->addWidget( mSubItems );
     subLayout->addWidget( mRefineItems );
     QFont fo ( mAddItems->font() );
     fo.setBold( true );
     fo.setPointSize( fo.pointSize() + 2 );
     mAddItems->setFont( fo );
     mSubItems->setFont( fo );
     mRefineItems->setFont( fo );
     connect( mAddItems  , SIGNAL( toggled ( bool ) ),this,SLOT(slot_add( bool )));
     connect( mSubItems , SIGNAL( toggled ( bool ) ),this,SLOT(slot_sub( bool )));
     connect( mRefineItems , SIGNAL( toggled ( bool ) ),this,SLOT(slot_refine( bool )));
 
     QPushButton *togButton = new QPushButton( "", topFrame );
     subLayout->addWidget(togButton);
     connect(togButton,SIGNAL(clicked()),SLOT(toggleCheckboxes()));
     togButton->setPixmap(SmallIcon("1updownarrow"));
     togButton->setMinimumWidth( togButton->sizeHint().height() );
 
     searchEdit->setText("*"); // Find all events by default
     searchEdit->setFocus();
     connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & )));
     connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
     // Subjects to search
     // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
     //                                        topFrame);
 
     incidenceGroup = new QHBox( topFrame );
     layout->addWidget(incidenceGroup);
 
     mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
     //mSearchEvent->setChecked(true);
     mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
     mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup);
 
     subjectGroup = new QHBox( topFrame );
     layout->addWidget(subjectGroup);
 
     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) );
     //listView->setMaximumHeight( 50 );
     listView->readSettings(KOGlobals::config(),"SearchListView Layout");
     connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
 
     setCaption( i18n("KO/Pi Find: "));
 #ifdef DESKTOP_VERSION
     OkButton = new QPushButton(  i18n("Close"), this  );
     connect(OkButton,SIGNAL(clicked()),SLOT(hide()));
 #endif
 }
 
 SearchDialog::~SearchDialog()
 {
   
 }
 void SearchDialog::slot_add( bool b )
 {
     if ( b ) {
         if ( mSubItems->isOn() ) mSubItems->toggle();
         if ( mRefineItems->isOn() ) mRefineItems->toggle();
         setCaption( i18n("Matching items will be added to list"));
     } else
         setCaption( i18n("List will be cleared before search"));
 }
 void SearchDialog::slot_sub( bool b)
 {
   if ( b ) {
         if ( mRefineItems->isOn() ) mRefineItems->toggle();
         if ( mAddItems->isOn() ) mAddItems->toggle();
         setCaption( i18n("Matching items will be removed from list"));
     } else
         setCaption( i18n("List will be cleared before search"));
 }
 void SearchDialog::slot_refine( bool b)
 {
   if ( b ) {
         if ( mSubItems->isOn() ) mSubItems->toggle();
         if ( mAddItems->isOn() ) mAddItems->toggle();
         setCaption( i18n("Search on displayed list only"));
     } else
         setCaption( i18n("List will be cleared before search"));
 }
 void SearchDialog::toggleCheckboxes()
 {
     if ( incidenceGroup->isVisible() ) {
         incidenceGroup->hide() ;
         subjectGroup->hide() ;
         attendeeGroup->hide() ;
     } else {
         incidenceGroup->show() ;
         subjectGroup->show() ;
         attendeeGroup->show() ;
     }
 }
 void SearchDialog::raiseAndSelect()
 {
 
     static int currentState = 0;
 
     if ( !mSearchJournal->isChecked() && !mSearchTodo->isChecked()  && !mSearchEvent->isChecked() )
         currentState = 0;
     int newState = 0;
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
         newState = VIEW_J_VIEW;
     }
     else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
         newState = VIEW_T_VIEW;
     }
     else {
         newState = VIEW_A_VIEW;
     }
     if ( newState != currentState ) {
         if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
             if ( ! mSearchJournal->isChecked() ) {
                 mSearchJournal->setChecked( true );
                 mSearchTodo->setChecked( false );
                 mSearchEvent->setChecked( false );
                 mSummaryCheck->setChecked( true ); 
                 mDescriptionCheck->setChecked( true ); 
 
             }
         }
         else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
             if ( !  mSearchTodo->isChecked()    ) {
                 mSearchTodo->setChecked( true );
                 mSearchJournal->setChecked( false );
                 mSearchEvent->setChecked( false );
             }
         }
         else {
             if ( ! mSearchEvent->isChecked() ) {
                 mSearchEvent->setChecked( true );
                 mSearchJournal->setChecked( false );
                 mSearchTodo->setChecked( false );
             }
         }
     }
     currentState = newState;
     raise();
 }
 void SearchDialog::setFocusToList()
 {
     listView->resetFocus();
 }
 void SearchDialog::accept()
 {
     doSearch();
 }
 void SearchDialog::updateList()
 {
     //listView->updateList();
     if ( isVisible() ) {
         updateView();
         //qDebug("SearchDialog::updated ");
     }
     else {
         listView->clear();
         //qDebug("SearchDialog::cleared ");
 
     }
 }
 void SearchDialog::searchTextChanged( const QString &_text )
 {
 #if 0
     enableButton( KDialogBase::User1, !_text.isEmpty() );
 #endif
 }
 
 void SearchDialog::doSearch()
 {
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     QString st = searchEdit->text();
     if ( st.right(1) != "*")
         st += "*";
     re.setPattern(st);
     if (!mSearchEvent->isChecked() && !mSearchTodo->isChecked() && !mSearchJournal->isChecked() ) {
         KMessageBox::sorry(this,
                            i18n("Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals"));
         return;
     }
     if (!re.isValid() ) {
         KMessageBox::sorry(this,
                            i18n("Invalid search expression,\ncannot perform "
                                 "the search.\nPlease enter a search expression\n"
                                 "using the wildcard characters\n '*' and '?'"
                                 "where needed."));
         return;
     }
     search(re);
     listView->setStartDate( mStartDate->date() );
     listView->showEvents(mMatchedEvents);
     listView->addTodos(mMatchedTodos);
     listView->addJournals(mMatchedJournals);
     if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) {
         setCaption(i18n("No items found. Use '*' and '?' where needed."));
     } else {
         QString mess; 
         mess = mess.sprintf( i18n("%d item(s) found."), mMatchedEvents.count()+ mMatchedJournals.count() + mMatchedTodos.count() );
         setCaption( i18n("KO/Pi Find: ") + mess);
 
     }
     searchEdit->setFocus();
 }
 void SearchDialog::updateConfig()
 {
     listView->updateConfig();
 }
 void SearchDialog::updateView()
 {
     //qDebug("SearchDialog::updateView() %d ", isVisible());
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false); 
     QString st = searchEdit->text();
     if ( st.right(1) != "*")
         st += "*";
     re.setPattern(st);
     mMatchedEvents.clear();
     mMatchedTodos.clear();
     mMatchedJournals.clear();
     if (re.isValid()) {
         search(re);
     }
     listView->setStartDate( mStartDate->date() );
     listView->showEvents(mMatchedEvents);
     listView->addTodos(mMatchedTodos);
     listView->addJournals(mMatchedJournals);
 }
 
 void SearchDialog::search(const QRegExp &re)
 {
     QPtrList<Event> events;
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) events = mMatchedEvents;
         mMatchedEvents.clear();
     } 
     if ( mSearchEvent->isChecked() ) {
         if ( !mRefineItems->isChecked() )
             events = mCalendar->events( mStartDate->date(),
                                                 mEndDate->date(),
                                                 false /*mInclusiveCheck->isChecked()*/ );
 
 
         Event *ev;
         for(ev=events.first();ev;ev=events.next()) {
             if (mSummaryCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                 if (re.search(ev->summary()) != -1) 
 #else
                     if (re.match(ev->summary()) != -1) 
 #endif
                         {   
                             if ( mSubItems->isChecked() )
                                 mMatchedEvents.remove(ev);
                             else {
                                 if ( !mMatchedEvents.contains( ev ) )
                                     mMatchedEvents.append(ev);
                             }
                             continue;
                         }
 #if QT_VERSION >= 0x030000
                 if (re.search(ev->location()) != -1) 
 #else
                     if (re.match(ev->location()) != -1) 
 #endif
                         {   
                             if ( mSubItems->isChecked() )
                                 mMatchedEvents.remove(ev);
                             else{
                                 if ( !mMatchedEvents.contains( ev ) )
                                     mMatchedEvents.append(ev);
                             }
                             continue;
                         }
             }
             if (mDescriptionCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                 if (re.search(ev->description()) != -1)