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
@@ -17,7 +17,4 @@ 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): 
@@ -25,3 +22,3 @@ Known Bugs:
 	2. Contacteditor nur teilweise übersetzt.
-	3. Kategorie-Picker geht nicht (nur bei Openzaurus).
+	3. Kategorie-Picker geht nicht.
 
@@ -32,3 +29,4 @@ Bugs but not in addressbook:
 - 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))
 
@@ -37,3 +35,7 @@ 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
@@ -42,6 +44,3 @@ Urgent:
 	( 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 
 
@@ -50,8 +49,4 @@ 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
 
@@ -70,2 +65,5 @@ 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..
 
@@ -106 +104,6 @@ Fixed:
 - 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
@@ -53,3 +53,8 @@ int AbLabel::currentEntry_UID()
 {
-	return ( (*m_itCurContact).uid() );
+	OContact contact = *m_itCurContact;
+
+	if ( contact.isEmpty() )
+		return 0;
+	else
+		return ( contact.uid() );
 }
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
@@ -126,11 +126,14 @@ 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;
 }
@@ -147,2 +150,5 @@ void AbView::load()
 	qWarning("abView:Load data");
+
+	// Letter Search is stopped at this place
+	emit signalClearLetterPicker();
 	
@@ -150,6 +156,6 @@ void AbView::load()
 		m_list = m_contactdb->allRecords();
-	else
+	else{
 		m_list = m_contactdb->sorted( true, 0, 0, 0 );
-
-	clearForCategory();
+		clearForCategory();
+	}
 
@@ -157,3 +163,3 @@ void AbView::load()
 
-	updateView(); 
+	updateView( true ); 
 	
@@ -226,3 +232,3 @@ void AbView::setShowByLetter( char c )
 	}
-	updateView();
+	updateView( true );
 }
@@ -327,3 +333,3 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 	// Now show all found entries
-	updateView();
+	updateView( true );
 }
@@ -409,3 +415,3 @@ void AbView::updateListinViews()
 
-void  AbView::updateView()
+void  AbView::updateView( bool newdata )
 {
@@ -418,18 +424,21 @@ void  AbView::updateView()
 	// 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 )
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
@@ -60,3 +60,3 @@ private:
     void updateListinViews();
-    void updateView(); 
+    void updateView( bool newdata = false ); 
     void clearForCategory();
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
@@ -655,3 +655,3 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
 		abEditor->setEntry( entry );
-	// other things may chane the caption.
+	// other things may change the caption.
 	abEditor->setCaption( tr("Edit Address") );
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
@@ -14,3 +14,3 @@
             <y>0</y>
-            <width>276</width>
+            <width>282</width>
             <height>327</height>
@@ -26,2 +26,6 @@
     <property stdset="1">
+        <name>caption</name>
+        <string>Configuration</string>
+    </property>
+    <property stdset="1">
         <name>sizeGripEnabled</name>
@@ -355,3 +359,3 @@ is provided free !</string>
                         <name>margin</name>
-                        <number>-1</number>
+                        <number>2</number>
                     </property>
@@ -359,3 +363,3 @@ is provided free !</string>
                         <name>spacing</name>
-                        <number>-1</number>
+                        <number>2</number>
                     </property>
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
@@ -44,3 +44,3 @@ QStringList OContactFields::trphonefields( bool sorted )
 
-    list.append( QObject::tr( "Default Email" ) );
+    // list.append( QObject::tr( "Default Email" ) );
     list.append( QObject::tr( "Emails" ) );
@@ -140,3 +140,3 @@ QStringList OContactFields::untrphonefields( bool sorted )
 
-    list.append( "Default Email" );
+    // list.append( "Default Email" );
     list.append( "Emails" );