Fixed a lot of usability stuff .. Some minor bugs were fixed, too ..

7 files changed, 68 insertions, 47 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 1cbee26..93ece13 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -14,47 +14,42 @@ Feature requests:
 
 Known Bugs:
 -----------
 - OK-Key does not switch from Detailview (ablable) to Listview
-- After finising search and after Edit: Clear Picker
-- After Edit: Table position back to edited entry.
-- Combo in Contacteditor: Field "Default-Email" is not correctly implemented and 
-  should be removed by a picker/combo.
 - Name order selected in "contacteditor" not used in list view.
+
 - Language not English (tested with german opie-translation): 
 	1. Configure nicht übersetzt (alles leer).
 	2. Contacteditor nur teilweise übersetzt.
-	3. Kategorie-Picker geht nicht (nur bei Openzaurus).
+	3. Kategorie-Picker geht nicht.
 
 
 Bugs but not in addressbook:
 -----------------------------
 - VCARD: Import of Anniversary does not work correctly (currently disabled)
 - VCARD: If umlaut (äöüß) in address, the parser gets confused..
-- Exporting and reimporting of Jobtitle fails.
+
+- Exporting and reimporting of Jobtitle fails (Could not reproduce this ! (se))
 
 
 Urgent:
 --------
-- Contact-Editor is temporarely reanabled. Wait for replacement.
+- Implement Button Pics
+- Fix start of opie-mail
+
+ContactEditor:
+- Contact-Editor is temporarely reenabled. Wait for replacement.
 - Redesign of Contacteditor
 - Store last settings of combo-boxes
 - Category is on the wrong position after changing to personal and back to normal
 	( Temporarily workaround: Category is never deactivated.. :S )
-- Optimize Table Update...
-- Change MyDialog to Config
-- Implement Button Pics
-- Fix start of opie-mail
+- Personal and Business Web-page is not editable 
 
 Important:
 ----------
 
+- Implement a picker/combo for the default email.
 - After search (Started with Return): KeyFocus should be on Tabelle
-- Searchwidget closed: Selected user is jumping
-- Wenn suchen beendet, dann dauert das Tabellenupdate (was überhaupt überflüssig ist)
-	zu lange..
-
-- Store position and state of toolbar
 
 - IRDA Receive: Contact is added, but start of editor with new entry expected..
 - "What's this" should be added (Deleyed after Feature Freeze)
 
@@ -67,8 +62,11 @@ Less important:
 - Find a smart solution for activating/deactivating the "send email" event
 
 Should be Fixed (not absolute sure, need further validation):
 -------------------------------------------------------------
+- Searchwidget closed: Selected user is jumping
+- Wenn suchen beendet, dann dauert das Tabellenupdate (was überhaupt überflüssig ist)
+	zu lange..
 
 
 Fixed:
 -------
@@ -103,4 +101,9 @@ Fixed:
 - If in Cardview and a category change removes all entries: 
 	There are already entries in Cardview after up/down
 - Personal Details: Anniversary zeigt Fantasie-Werte
 - Unfiled shown just in Category "All" and "Unfiled". 
+- After finising search and after Edit: Clear Picker
+- After Edit: Table position back to edited entry.
+- Optimize Table Update...
+- Change MyDialog to Config
+- Store position and state of toolbar
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 5b40dc1..937aaae 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -50,9 +50,14 @@ void AbLabel::setContacts( const OContactAccess::List& viewList )
 }
 
 int AbLabel::currentEntry_UID()
 {
-	return ( (*m_itCurContact).uid() );
+	OContact contact = *m_itCurContact;
+
+	if ( contact.isEmpty() )
+		return 0;
+	else
+		return ( contact.uid() );
 }
 
 OContact AbLabel::currentEntry()
 {
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 0f4bd5f..7226e82 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -123,17 +123,20 @@ void AbView::replaceEntry( const OContact &contact )
 }
 
 OContact AbView::currentEntry()
 {
+	OContact currentContact;
+
 	switch ( (int) m_curr_View ) {
 	case TableView:
-		return ( m_abTable -> currentEntry() );
+		currentContact = m_abTable -> currentEntry();
 		break;
 	case CardView:
-		return ( m_ablabel -> currentEntry() );
+		currentContact = m_ablabel -> currentEntry();
 		break;
 	}
-	return OContact();
+	m_curr_Contact = currentContact.uid();
+	return currentContact;
 }
 
 bool AbView::save()
 {
@@ -144,19 +147,22 @@ bool AbView::save()
 
 void AbView::load()
 {
 	qWarning("abView:Load data");
+
+	// Letter Search is stopped at this place
+	emit signalClearLetterPicker();
 	
 	if ( m_inPersonal )
 		m_list = m_contactdb->allRecords();
-	else
+	else{
 		m_list = m_contactdb->sorted( true, 0, 0, 0 );
-
-	clearForCategory();
+		clearForCategory();
+	}
 
 	qWarning ("Number of contacts: %d", m_list.count());
 
-	updateView(); 
+	updateView( true ); 
 	
 }
 
 void AbView::reload()
@@ -223,9 +229,9 @@ void AbView::setShowByLetter( char c )
 		m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards );
 		clearForCategory();
 		m_curr_Contact = 0;
 	}
-	updateView();
+	updateView( true );
 }
 
 void AbView::setListOrder( const QValueList<int>& ordered )
 {
@@ -324,9 +330,9 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 	// we will not have a lot of matching entries..
 	clearForCategory();
 	
 	// Now show all found entries
-	updateView();
+	updateView( true );
 }
 
 void AbView::offSearch()
 {
@@ -406,33 +412,36 @@ void AbView::updateListinViews()
 		m_abTable -> setContacts( m_list );
 		m_ablabel -> setContacts( m_list );
 }
 
-void  AbView::updateView()
+void  AbView::updateView( bool newdata )
 {
 	qWarning("AbView::updateView()");
 
 	if ( m_viewStack -> visibleWidget() ){
 		m_viewStack -> visibleWidget() -> clearFocus();
 	}
 
 	// If we switching the view, we have to store some information
-	if ( m_list.count() ){
-		switch ( (int) m_prev_View ) {
-		case TableView:
-			m_curr_Contact = m_abTable -> currentEntry_UID();
-			break;
-		case CardView:
-			m_curr_Contact = m_ablabel -> currentEntry_UID();
-			break;
-		}
-	}else
-		m_curr_Contact = 0;
+	if ( !newdata ){
+		if ( m_list.count() ){
+			switch ( (int) m_prev_View ) {
+			case TableView:
+				m_curr_Contact = m_abTable -> currentEntry_UID();
+				break;
+			case CardView:
+				m_curr_Contact = m_ablabel -> currentEntry_UID();
+				break;
+			}
+		}else
+			m_curr_Contact = 0;
+	}
 	
 	// Feed all views with new lists
-	updateListinViews();
+	if ( newdata )
+		updateListinViews();
 
-	// Inform the world that the view is changed
+	// Tell the world that the view is changed
 	if ( m_curr_View != m_prev_View )
 		emit signalViewSwitched ( (int) m_curr_View );
 
 	m_prev_View = m_curr_View;
diff --git a/core/pim/addressbook/abview.h b/core/pim/addressbook/abview.h
index 2c10cfa..8570fe7 100644
--- a/core/pim/addressbook/abview.h
+++ b/core/pim/addressbook/abview.h
@@ -57,9 +57,9 @@ public slots:
     void slotSwitch(); 
 
 private:
     void updateListinViews();
-    void updateView(); 
+    void updateView( bool newdata = false ); 
     void clearForCategory();
     bool contactCompare( const OContact &cnt, int category );
     void parseName( const QString& name, QString *first, QString *middle,
 		    QString * last );
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 5d588da..055124c 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -652,9 +652,9 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
 	if ( entryMode == EditEntry )
 		abEditor->setEntry( m_abView -> currentEntry() );
 	else if ( entryMode == NewEntry )
 		abEditor->setEntry( entry );
-	// other things may chane the caption.
+	// other things may change the caption.
 	abEditor->setCaption( tr("Edit Address") );
 	
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 	abEditor->showMaximized();
diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui
index 408bfa6..8ae2578 100644
--- a/core/pim/addressbook/configdlg_base.ui
+++ b/core/pim/addressbook/configdlg_base.ui
@@ -11,9 +11,9 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>276</width>
+            <width>282</width>
             <height>327</height>
         </rect>
     </property>
     <property stdset="1">
@@ -23,8 +23,12 @@
             <vsizetype>5</vsizetype>
         </sizepolicy>
     </property>
     <property stdset="1">
+        <name>caption</name>
+        <string>Configuration</string>
+    </property>
+    <property stdset="1">
         <name>sizeGripEnabled</name>
         <bool>true</bool>
     </property>
     <property>
@@ -352,13 +356,13 @@ is provided free !</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>-1</number>
+                        <number>2</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>-1</number>
+                        <number>2</number>
                     </property>
                     <widget>
                         <class>QGroupBox</class>
                         <property stdset="1">
diff --git a/core/pim/addressbook/ocontactfields.cpp b/core/pim/addressbook/ocontactfields.cpp
index 7823a9c..df57efa 100644
--- a/core/pim/addressbook/ocontactfields.cpp
+++ b/core/pim/addressbook/ocontactfields.cpp
@@ -41,9 +41,9 @@ QStringList OContactFields::trphonefields( bool sorted )
     list.append( QObject::tr( "Business Phone" ) );
     list.append( QObject::tr( "Business Fax" ) );
     list.append( QObject::tr( "Business Mobile" ) );
 
-    list.append( QObject::tr( "Default Email" ) );
+    // list.append( QObject::tr( "Default Email" ) );
     list.append( QObject::tr( "Emails" ) );
 
     list.append( QObject::tr( "Home Phone" ) );
     list.append( QObject::tr( "Home Fax" ) );
@@ -137,9 +137,9 @@ QStringList OContactFields::untrphonefields( bool sorted )
     list.append( "Business Phone" );
     list.append( "Business Fax" );
     list.append( "Business Mobile" );
 
-    list.append( "Default Email" );
+    // list.append( "Default Email" );
     list.append( "Emails" );
 
     list.append( "Home Phone" );
     list.append( "Home Fax" );