Removed unused files and starting with WhatsThis..

6 files changed, 92 insertions, 356 deletions

diff --git a/core/pim/addressbook/addresssettings.cpp b/core/pim/addressbook/addresssettings.cpp
deleted file mode 100644
index 2a9413c..0000000
--- a/core/pim/addressbook/addresssettings.cpp
+++ b/dev/null
@@ -1,136 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qt Palmtop Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-
-#include "addresssettings.h"
-
-#include <qpe/config.h>
-#include <opie/ocontact.h>
-
-#include <qfile.h>
-#include <qlistbox.h>
-
-#include <stdlib.h>
-
-AddressSettings::AddressSettings( QWidget *parent, const char *name )
-     : AddressSettingsBase( parent, name, TRUE )
-{
-    init();
-}
-
-AddressSettings::~AddressSettings()
-{
-}
-
-void AddressSettings::init()
-{
-    QStringList slFields = OContact::trfields();
-    // Make this match what is in initFields
-    slFields.remove( tr("Name Title") );
-    slFields.remove( tr("First Name") );
-    slFields.remove( tr("Last Name") );
-    slFields.remove( tr("File As") );
-    slFields.remove( tr("Default Email") );
-    slFields.remove( tr("Notes") );
-    slFields.remove( tr("Gender") );
-
-
-    for( QStringList::Iterator it = slFields.begin();
-	 it != slFields.end(); ++it ) {
-	fieldListBox->insertItem( *it );
-    }
-
-    Config cfg( "AddressBook" );
-
-    cfg.setGroup( "Version" );
-    int version;
-    version = cfg.readNumEntry( "version" );
-    if ( version >= ADDRESSVERSION ) {
-	int i = 0;
-	int p = 0;
-	cfg.setGroup( "ImportantCategory" );
-	QString zn = cfg.readEntry( "Category" + QString::number(i),
-				    QString::null );
-	while ( !zn.isNull() ) {
-	    for ( int m = i; m < (int)fieldListBox->count(); m++ ) {
-		if ( fieldListBox->text( m ) == zn ) {
-		    if ( m != p ) {
-			fieldListBox->removeItem( m );
-			fieldListBox->insertItem( zn, p );
-		    }
-		    p++;
-		    break;
-		}
-	    }
-	    zn = cfg.readEntry( "Category" + QString::number(++i),
-				QString::null );
-	}
-
-	fieldListBox->setCurrentItem( 0 );
-    } else {
-	QString str;
-	str = getenv("HOME");
-
-	str += "/Settings/AddressBook.conf";
-	QFile::remove( str );
-    }
-}
-
-void AddressSettings::itemUp()
-{
-    int i = fieldListBox->currentItem();
-    if ( i > 0 ) {
-	QString item = fieldListBox->currentText();
-	fieldListBox->removeItem( i );
-	fieldListBox->insertItem( item, i-1 );
-	fieldListBox->setCurrentItem( i-1 );
-    }
-}
-
-void AddressSettings::itemDown()
-{
-    int i = fieldListBox->currentItem();
-    if ( i < (int)fieldListBox->count() - 1 ) {
-	QString item = fieldListBox->currentText();
-	fieldListBox->removeItem( i );
-	fieldListBox->insertItem( item, i+1 );
-	fieldListBox->setCurrentItem( i+1 );
-    }
-}
-
-void AddressSettings::accept()
-{
-    save();
-    QDialog::accept();
-}
-
-
-void AddressSettings::save()
-{
-    Config cfg( "AddressBook" );
-    cfg.setGroup( "Version" );
-    // *** To change the version change it here...
-    cfg.writeEntry( "version", QString::number(ADDRESSVERSION) );
-    cfg.setGroup( "ImportantCategory" );
-
-    for ( int i = 0; i < (int)fieldListBox->count(); i++ ) {
-	cfg.writeEntry( "Category"+QString::number(i), fieldListBox->text(i) );
-    }
-}
diff --git a/core/pim/addressbook/addresssettings.h b/core/pim/addressbook/addresssettings.h
deleted file mode 100644
index 0fdfa77..0000000
--- a/core/pim/addressbook/addresssettings.h
+++ b/dev/null
@@ -1,47 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qt Palmtop Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#ifndef _ADDRESSSETTINGS_H_
-#define _ADDRESSSETTINGS_H_
-
-#include <qlist.h>
-#include <qstringlist.h>
-#include "addresssettingsbase.h"
-
-const int ADDRESSVERSION = 3;
-
-class AddressSettings : public AddressSettingsBase
-{
-    Q_OBJECT
-public:
-    AddressSettings( QWidget *parent = 0, const char *name = 0 );
-    ~AddressSettings();
-
-protected:
-    void accept();
-    virtual void itemUp();
-    virtual void itemDown();
-
-private:
-    void init();
-    void save();
-};
-
-#endif  // _ADDRESSSETTINGS_H_
diff --git a/core/pim/addressbook/addresssettingsbase.ui b/core/pim/addressbook/addresssettingsbase.ui
deleted file mode 100644
index f0eb7e8..0000000
--- a/core/pim/addressbook/addresssettingsbase.ui
+++ b/dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>AddressSettingsBase</class>
-<comment>/**********************************************************************
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qt Palmtop Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-** $Id$
-**
-**********************************************************************/</comment>
-<widget>
-    <class>QDialog</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>AddressSettingsBase</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>240</width>
-            <height>207</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Arrange Edit Fields</string>
-    </property>
-    <property>
-        <name>layoutMargin</name>
-    </property>
-    <property>
-        <name>layoutSpacing</name>
-    </property>
-    <grid>
-        <property stdset="1">
-            <name>margin</name>
-            <number>6</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget row="1"  column="0"  rowspan="3"  colspan="1" >
-            <class>QListBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>fieldListBox</cstring>
-            </property>
-        </widget>
-        <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>lblExplain</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>1</hsizetype>
-                    <vsizetype>1</vsizetype>
-                </sizepolicy>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>MShape</enum>
-            </property>
-            <property stdset="1">
-                <name>frameShadow</name>
-                <enum>MShadow</enum>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Select the field order:</string>
-            </property>
-            <property stdset="1">
-                <name>alignment</name>
-                <set>AlignTop|AlignLeft</set>
-            </property>
-            <property>
-                <name>hAlign</name>
-            </property>
-            <property>
-                <name>vAlign</name>
-            </property>
-        </widget>
-        <widget row="1"  column="1" >
-            <class>QPushButton</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>upButton</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Up</string>
-            </property>
-            <property stdset="1">
-                <name>autoRepeat</name>
-                <bool>true</bool>
-            </property>
-        </widget>
-        <widget row="2"  column="1" >
-            <class>QPushButton</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>downButton</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Down</string>
-            </property>
-            <property stdset="1">
-                <name>autoRepeat</name>
-                <bool>true</bool>
-            </property>
-        </widget>
-        <spacer row="3"  column="1" >
-            <property>
-                <name>name</name>
-                <cstring>Spacer2</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>upButton</sender>
-        <signal>clicked()</signal>
-        <receiver>AddressSettingsBase</receiver>
-        <slot>itemUp()</slot>
-    </connection>
-    <connection>
-        <sender>downButton</sender>
-        <signal>clicked()</signal>
-        <receiver>AddressSettingsBase</receiver>
-        <slot>itemDown()</slot>
-    </connection>
-    <slot access="protected">itemUp()</slot>
-    <slot access="protected">itemDown()</slot>
-</connections>
-</UI>
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index f5c0c5b..f2f4141 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -12,24 +12,27 @@
 #include <opie/ocontact.h>
 
 ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
 	ConfigDlg_Base(parent, name, true )
 {
 	contFields = OContactFields::trfields();
 
 	// We add all Fields into the Listbox
 	for (uint i=0; i < contFields.count(); i++) {
 		allFieldListBox->insertItem( contFields[i] );
 	}
 
+	// Reset Widget Flags: This was not changeable by designer :(
+	setWFlags ( WStyle_ContextHelp );	
+
 	// Set Pics to Buttons and Tabs
 	m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) );
 	m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) );
 	m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );
 	m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );
 	
 
 	// Get the translation maps between Field ID and translated strings
 	m_mapStrToID = OContactFields::trFieldsToId();
 	m_mapIDToStr = OContactFields::idToTrFields();
 
 	connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) );
diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui
index 8ae2578..308e138 100644
--- a/core/pim/addressbook/configdlg_base.ui
+++ b/core/pim/addressbook/configdlg_base.ui
@@ -1,27 +1,28 @@
 <!DOCTYPE UI><UI>
 <class>ConfigDlg_Base</class>
 <author>Stefan Eilers</author>
+<include location="global">qwhatsthis.h</include>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>Configuration</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>282</width>
+            <width>284</width>
             <height>327</height>
         </rect>
     </property>
     <property stdset="1">
         <name>sizePolicy</name>
         <sizepolicy>
             <hsizetype>5</hsizetype>
             <vsizetype>5</vsizetype>
         </sizepolicy>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -53,24 +54,28 @@
                 <name>sizePolicy</name>
                 <sizepolicy>
                     <hsizetype>7</hsizetype>
                     <vsizetype>7</vsizetype>
                 </sizepolicy>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
+            <property>
+                <name>whatsThis</name>
+                <string>Click on tab to select one</string>
+            </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Widget5</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Misc</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
@@ -101,129 +106,161 @@
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QButtonGroup</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>ButtonGroup1</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>title</name>
                                     <string>Query Style</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Settings for the search query style</string>
+                                </property>
                                 <vbox>
                                     <property stdset="1">
                                         <name>margin</name>
                                         <number>11</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
                                         <number>6</number>
                                     </property>
                                     <widget>
                                         <class>QRadioButton</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>m_useRegExp</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Use Regular Expressions</string>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>Search widget expects regular expressions if selected</string>
+                                        </property>
                                     </widget>
                                     <widget>
                                         <class>QRadioButton</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>m_useWildCard</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Use Wildcards (*,?)</string>
                                         </property>
                                         <property stdset="1">
                                             <name>checked</name>
                                             <bool>true</bool>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>Search widget just expects simple wildcards</string>
+                                        </property>
                                     </widget>
                                 </vbox>
                             </widget>
                             <widget>
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_useCaseSensitive</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Case Sensitive</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>If selected, search differs between upper and lower chars</string>
+                                </property>
                             </widget>
                         </vbox>
                     </widget>
                     <widget>
                         <class>QButtonGroup</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>ButtonGroup3</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
                             <string>Font</string>
                         </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string></string>
+                        </property>
                         <hbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_smallFont</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Small</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Font size for list- and card view</string>
+                                </property>
                             </widget>
                             <widget>
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_normalFont</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Normal</string>
                                 </property>
                                 <property stdset="1">
                                     <name>checked</name>
                                     <bool>true</bool>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Font size for list- and card view</string>
+                                </property>
                             </widget>
                             <widget>
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_largeFont</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Large</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Font size for list- and card view</string>
+                                </property>
                             </widget>
                         </hbox>
                     </widget>
                     <spacer>
                         <property>
                             <name>name</name>
                             <cstring>Spacer3</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Vertical</enum>
                         </property>
@@ -261,58 +298,70 @@
                         <number>6</number>
                     </property>
                     <widget>
                         <class>QButtonGroup</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>ButtonGroup2</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
                             <string>Mail</string>
                         </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string>Fontsettings for list and card view</string>
+                        </property>
                         <vbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_useQtMail</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Prefer QT-Mail </string>
                                 </property>
                                 <property stdset="1">
                                     <name>checked</name>
                                     <bool>true</bool>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Use Sharp's mail application if available</string>
+                                </property>
                             </widget>
                             <widget>
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_useOpieMail</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Prefer Opie-Mail</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Use OPIE mail if installed</string>
+                                </property>
                             </widget>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel1</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
@@ -394,96 +443,116 @@ is provided free !</string>
                                         <hsizetype>1</hsizetype>
                                         <vsizetype>0</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Up</string>
                                 </property>
                                 <property stdset="1">
                                     <name>autoRepeat</name>
                                     <bool>true</bool>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Move selected attribute one line up</string>
+                                </property>
                             </widget>
                             <widget row="1"  column="2" >
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_downButton</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>1</hsizetype>
                                         <vsizetype>0</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Down</string>
                                 </property>
                                 <property stdset="1">
                                     <name>autoRepeat</name>
                                     <bool>true</bool>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Move selected attribute one line down</string>
+                                </property>
                             </widget>
                             <widget row="4"  column="0"  rowspan="1"  colspan="2" >
                                 <class>QListBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>allFieldListBox</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>7</hsizetype>
                                         <vsizetype>7</vsizetype>
                                     </sizepolicy>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>List of all available attributes</string>
+                                </property>
                             </widget>
                             <widget row="3"  column="0" >
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_addButton</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>1</hsizetype>
                                         <vsizetype>0</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Add</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Add selected attribute from list below to the upper list</string>
+                                </property>
                             </widget>
                             <widget row="3"  column="1" >
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_removeButton</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>1</hsizetype>
                                         <vsizetype>0</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Remove</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Remove the selected attribute from the upper list</string>
+                                </property>
                             </widget>
                             <spacer row="2"  column="2" >
                                 <property>
                                     <name>name</name>
                                     <cstring>Spacer23</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
                                     <enum>Vertical</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>sizeType</name>
@@ -522,24 +591,28 @@ is provided free !</string>
                                 <class>QListBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>fieldListBox</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>7</hsizetype>
                                         <vsizetype>7</vsizetype>
                                     </sizepolicy>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</string>
+                                </property>
                             </widget>
                         </grid>
                     </widget>
                 </vbox>
             </widget>
         </widget>
     </vbox>
 </widget>
 <tabstops>
     <tabstop>configDlg_base</tabstop>
     <tabstop>m_useQtMail</tabstop>
     <tabstop>m_useOpieMail</tabstop>
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 0b65a10..df97b85 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -38,44 +38,45 @@
 #include <qmultilineedit.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qmainwindow.h>
 #include <qvaluelist.h>
 #include <qpopupmenu.h> 
 #include <qlistbox.h> 
 #include <qhbox.h>
 #include <qaction.h>
 #include <qiconset.h> 
 #include <qmessagebox.h> 
+#include <qwhatsthis.h>
 
 #include <assert.h>
 
 static inline bool containsAlphaNum( const QString &str );
 static inline bool constainsWhiteSpace( const QString &str );
 
 // helper functions, convert our comma delimited list to proper
 // file format...
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
 		     QString &strAll );
 
 // helper convert from file format to comma delimited...
 void parseEmailTo( const QString &strDefaultEmail,
 		   const QString &strOtherEmail, QString &strBack );
 
 ContactEditor::ContactEditor(	const OContact &entry,
 				QWidget *parent,
 				const char *name,
-				WFlags fl )
-	: QDialog( parent, name, TRUE, fl ),
+				WFlags )
+	: QDialog( parent, name, TRUE, WStyle_ContextHelp ),
 	  defaultEmailChooserPosition( -1 ),
 	  m_personalView ( false ),
 	  cmbDefaultEmail( 0 ),
 	  initializing ( false )
 {
 
 	initializing = true;
 
 	init();
 	setEntry( entry );
 // 	cmbDefaultEmail = 0;
 // 	defaultEmailChooserPosition = -1;
@@ -139,80 +140,92 @@ void ContactEditor::init() {
 	svGeneral->setResizePolicy( QScrollView::AutoOneFit );
 	// svGeneral->setHScrollBarMode( QScrollView::AlwaysOff );
 	// svGeneral->setVScrollBarMode( QScrollView::AlwaysOff );
 	svGeneral->setFrameStyle( QFrame::NoFrame );
 
 	QWidget *container = new QWidget( svGeneral->viewport() );
 	svGeneral->addChild( container );
 
 	QGridLayout *gl = new QGridLayout( container, 1, 1, 2, 4 );
 	gl->setResizeMode( QLayout::FreeResize );
 
 	btnFullName = new QPushButton( tr( "Full Name..." ), container );
+	QWhatsThis::add( btnFullName, tr( "Press to enter last- middle and firstname" ) );
 	gl->addWidget( btnFullName, 0, 0 );
 	txtFullName = new QLineEdit( container );
+	QWhatsThis::add( txtFullName, tr( "Enter fullname directly ! If you have a lastname with multiple words ( for instance \"de la Guerra\"), please write <lastname>,<firstnames> like this: \"de la Guerra, Carlos Pedro\"" ) );
 	gl->addWidget( txtFullName, 0, 1 );
 
 	QLabel *l = new QLabel( tr( "Job Title" ), container );
+	QWhatsThis::add( l, tr( "The jobtitle.." ) );
 	gl->addWidget( l, 1, 0 );
 	txtJobTitle = new QLineEdit( container );
+	QWhatsThis::add( txtJobTitle, tr( "The jobtitle.." ) );
 	gl->addWidget( txtJobTitle, 1, 1 );
 
 	l = new QLabel( tr("Suffix"), container );
+	QWhatsThis::add( l, tr( "Something like \"jr.\".." ) );
 	gl->addWidget( l, 2, 0 );
 	txtSuffix = new QLineEdit( container );
+	QWhatsThis::add( txtSuffix, tr( "Something like \"jr.\".." ) );
 	gl->addWidget( txtSuffix, 2, 1 );
 
 	l = new QLabel( tr( "Organization" ), container );
+	QWhatsThis::add( l, tr( "The working place of the contact" ) );
 	gl->addWidget( l, 3, 0 );
 	txtOrganization = new QLineEdit( container );
+	QWhatsThis::add( txtOrganization, tr( "The working place of the contact" ) );
 	gl->addWidget( txtOrganization, 3, 1 );
 
 	// Chooser 1 
 	cmbChooserField1 = new QComboBox( FALSE, container );
+	QWhatsThis::add( cmbChooserField1, tr( "Press to select attribute to change" ) );
 	cmbChooserField1->setMaximumWidth( 90 );
 	gl->addWidget( cmbChooserField1, 4, 0 );
 	// Textfield for chooser 1.
 	// Now use Widgetstack to contain the textfield and the default-email combo !
 	m_widgetStack1 = new QWidgetStack( container );
 	txtChooserField1 = new QLineEdit( m_widgetStack1 );
 	m_widgetStack1 -> addWidget( txtChooserField1, TextField );
 	gl->addWidget( m_widgetStack1, 4, 1 );
 	m_widgetStack1 -> raiseWidget( TextField );
 
 	// Chooser 2
 	cmbChooserField2 = new QComboBox( FALSE, container );
+	QWhatsThis::add( cmbChooserField2, tr( "Press to select attribute to change" ) );
 	cmbChooserField2->setMaximumWidth( 90 );
 	gl->addWidget( cmbChooserField2, 5, 0 );
 	// Textfield for chooser 2
 	// Now use WidgetStack to contain the textfield and the default-email combo!
 	m_widgetStack2 = new QWidgetStack( container );
 	txtChooserField2 = new QLineEdit( m_widgetStack2 );
 	m_widgetStack2 -> addWidget( txtChooserField2, TextField );
 	gl->addWidget( m_widgetStack2, 5, 1 );
 	m_widgetStack2 -> raiseWidget( TextField );
 
 	// Chooser 3
 	cmbChooserField3 = new QComboBox( FALSE, container );
+	QWhatsThis::add( cmbChooserField3, tr( "Press to select attribute to change" ) );
 	cmbChooserField3->setMaximumWidth( 90 );
 	gl->addWidget( cmbChooserField3, 6, 0 );
 	// Textfield for chooser 2
 	// Now use WidgetStack to contain the textfield and the default-email combo!
 	m_widgetStack3 = new QWidgetStack( container );
 	txtChooserField3 = new QLineEdit( m_widgetStack3 );
 	m_widgetStack3 -> addWidget( txtChooserField3, TextField );
 	gl->addWidget( m_widgetStack3, 6, 1 );
 	m_widgetStack3 -> raiseWidget( TextField );
 
 	l = new QLabel( tr( "File As" ), container );
+	QWhatsThis::add( l, tr( "Press to select how to store the name (and howto show it in the listview)" ) );
 	gl->addWidget( l, 7, 0 );
 	cmbFileAs = new QComboBox( TRUE, container );
 	gl->addWidget( cmbFileAs, 7, 1 );
 
 	labCat = new QLabel( tr( "Category" ), container );
 	gl->addWidget( labCat, 8, 0 );
 	cmbCat = new CategorySelect( container );
 	gl->addWidget( cmbCat, 8, 1 );
 	labCat->show();
 	cmbCat->show();
 
 	btnNote = new QPushButton( tr( "Notes..." ), container );