many fixes

1 files changed, 25 insertions, 2 deletions

diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 19bb676..a435959 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -204,25 +204,26 @@ KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers()
     if ( !(*it).number().isEmpty() )
       retList.append( *it );
 
   return retList;
 }
 
 void PhoneEditWidget::edit()
 {
   PhoneEditDialog dlg( mPhoneList, this );
 
   if ( dlg.exec() ) {
     if ( dlg.changed() ) {
-      mPhoneList = dlg.phoneNumbers();
+      KABC::PhoneNumber::List list = dlg.phoneNumbers();
+      setPhoneNumbers( list );
       updateCombos();
       updateLineEdits();
       emit modified();
     }
   }
 }
 
 void PhoneEditWidget::updatePrefEdit()
 {
   updateEdit( mPrefCombo );
 }
 
@@ -330,24 +331,27 @@ public:
 
   KABC::PhoneNumber phoneNumber() { return mPhoneNumber; }
 
 private:
   void makeText();
 
   KABC::PhoneNumber mPhoneNumber;
 };
 
 PhoneViewItem::PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number )
   : QListViewItem( parent ), mPhoneNumber( number )
 {
+#ifdef DESKTOP_VERSION
+    setRenameEnabled ( 0, true );
+#endif
   makeText();
 }
 
 void PhoneViewItem::makeText()
 {
   /**
    * Will be used in future versions of kaddressbook/libkabc
 
     setText( 0, mPhoneNumber.country() );
     setText( 1, mPhoneNumber.region() );
     setText( 2, mPhoneNumber.number() );
     setText( 3, mPhoneNumber.typeLabel() );
@@ -397,28 +401,45 @@ PhoneEditDialog::PhoneEditDialog( const KABC::PhoneNumber::List &list, QWidget *
 }
 
 PhoneEditDialog::~PhoneEditDialog()
 {
 }
 
 void PhoneEditDialog::slotAddPhoneNumber()
 {
   KABC::PhoneNumber tmp( "", 0 );
   PhoneTypeDialog dlg( tmp, this );
 
   if ( dlg.exec() ) {
+      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;
   }
 }
 
 void PhoneEditDialog::slotRemovePhoneNumber()
 {
   PhoneViewItem *item = static_cast<PhoneViewItem*>( mListView->currentItem() );
   if ( !item )
     return;
 
   mPhoneNumberList.remove( item->phoneNumber() );
   QListViewItem *currItem = mListView->currentItem();
@@ -495,24 +516,26 @@ PhoneTypeDialog::PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber,
 
   KABC::PhoneNumber::TypeList::Iterator it;
   for ( it = mTypeList.begin(); it != mTypeList.end(); ++it )
     new QCheckBox( KABC::PhoneNumber::typeLabel( *it ), mGroup );
 
   for ( int i = 0; i < mGroup->count(); ++i ) {
     int type = mPhoneNumber.type();
     QCheckBox *box = (QCheckBox*)mGroup->find( i );
     box->setChecked( type & mTypeList[ i ] );
   }
 
   mPreferredBox->setChecked( mPhoneNumber.type() & KABC::PhoneNumber::Pref );
+  mNumber->setFocus();
+  mNumber->setSelection( 0, 1024);
 }
 
 KABC::PhoneNumber PhoneTypeDialog::phoneNumber()
 {
   mPhoneNumber.setNumber( mNumber->text() );
 
   int type = 0;
   for ( int i = 0; i < mGroup->count(); ++i ) {
     QCheckBox *box = (QCheckBox*)mGroup->find( i );
     if ( box->isChecked() )
       type += mTypeList[ i ];
   }