From c0fa26aa3b33c293853bdd7d028ddb0545e33c85 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Thu, 31 Mar 2005 11:26:51 +0000
Subject: many fixes

---
(limited to 'kaddressbook/phoneeditwidget.cpp')

diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 19bb676..a435959 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -213,7 +213,8 @@ void PhoneEditWidget::edit()
 
   if ( dlg.exec() ) {
     if ( dlg.changed() ) {
-      mPhoneList = dlg.phoneNumbers();
+      KABC::PhoneNumber::List list = dlg.phoneNumbers();
+      setPhoneNumbers( list );
       updateCombos();
       updateLineEdits();
       emit modified();
@@ -338,7 +339,10 @@ private:
 
 PhoneViewItem::PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number )
   : QListViewItem( parent ), mPhoneNumber( number )
-{
+{ 
+#ifdef DESKTOP_VERSION
+    setRenameEnabled ( 0, true );
+#endif
   makeText();
 }
 
@@ -406,11 +410,28 @@ void PhoneEditDialog::slotAddPhoneNumber()
   PhoneTypeDialog dlg( tmp, this );
 
   if ( dlg.exec() ) {
-    KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
-    mPhoneNumberList.append( phoneNumber );
-    new PhoneViewItem( mListView, phoneNumber );
-
-    mChanged = true;
+      QListViewItem* i = mListView->firstChild();
+      KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
+      bool insert = true;
+      while ( i ) {
+          PhoneViewItem* p = ( PhoneViewItem* ) i;
+          KABC::PhoneNumber pn = p->phoneNumber();
+          if ( (pn.type() | KABC::PhoneNumber::Pref)  == (phoneNumber.type() | KABC::PhoneNumber::Pref)  ) {
+              if ( p->text(0).isEmpty()) {
+                  p->setPhoneNumber( phoneNumber  );
+                  mPhoneNumberList.remove( pn );
+                  mPhoneNumberList.append( phoneNumber );
+                  insert = false;
+                  break;
+              }
+          }
+          i = i->nextSibling();
+      }
+      if ( insert ) {
+          mPhoneNumberList.append( phoneNumber );
+          new PhoneViewItem( mListView, phoneNumber );
+      }
+      mChanged = true;
   }
 }
 
@@ -504,6 +525,8 @@ PhoneTypeDialog::PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber,
   }
 
   mPreferredBox->setChecked( mPhoneNumber.type() & KABC::PhoneNumber::Pref );
+  mNumber->setFocus();
+  mNumber->setSelection( 0, 1024);
 }
 
 KABC::PhoneNumber PhoneTypeDialog::phoneNumber()
--
cgit v0.9.0.2