1 files changed, 77 insertions, 2 deletions

diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index 7fe4bc0..0241cf0 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -3,58 +3,62 @@
 /*                                                                      
     This file is part of KAddressBook.                                  
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                         
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <kdialogbase.h>
+#include <kiconloader.h>
+#include <qpushbutton.h>
+#include <qlayout.h>
+
 
 #include "addresseeconfig.h"
 #include "typecombo.h"
 
 class QButtonGroup;
 class QCheckBox;
 
+#include <klineedit.h>
+#include <kcombobox.h>
 class KListView;
-class KLineEdit;
-class KComboBox;
 
 typedef TypeCombo<KABC::PhoneNumber> PhoneTypeCombo;
 
 /**
   Widget for editing phone numbers.
 */
 class PhoneEditWidget : public QWidget
 {
   Q_OBJECT
 
   public:
     PhoneEditWidget( QWidget *parent, const char *name = 0 );
     ~PhoneEditWidget();
     
     void setPhoneNumbers( const KABC::PhoneNumber::List &list );
     KABC::PhoneNumber::List phoneNumbers();
 
     void updateTypeCombo( const KABC::PhoneNumber::List&, KComboBox* );
     KABC::PhoneNumber currentPhoneNumber( KComboBox*, int );
 
   signals:
     void modified();
 
   private slots:
@@ -122,26 +126,97 @@ class PhoneEditDialog : public KDialogBase
     QPushButton *mEditButton;
 
     bool mChanged;
 };
 
 /**
   Dialog for editing phone number types.
 */
 class PhoneTypeDialog : public KDialogBase
 {
   Q_OBJECT
 public:
   PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber, QWidget *parent, const char *name = 0 );
 
   KABC::PhoneNumber phoneNumber();
 
 private:
   KABC::PhoneNumber mPhoneNumber;
   KABC::PhoneNumber::TypeList mTypeList;
 
   QButtonGroup *mGroup;
   QCheckBox *mPreferredBox;
   KLineEdit *mNumber;
 };
+class PhoneTypeNumberEdit : public QWidget
+{
+  Q_OBJECT
+public:
+  PhoneTypeNumberEdit( QWidget *parent, const char *name = 0 )
+      {
+          QHBoxLayout * lay = new QHBoxLayout( this );
+          lay->setSpacing( KDialogBase::spacingHintSmall() );
+          lay->setMargin( KDialogBase::marginHintSmall() );
+          mMinusButton = new QPushButton ( this );
+          mMinusButton->setPixmap ( SmallIcon("minus"));
+          mCombo = new KComboBox( this );
+          mNumber = new KLineEdit( this );
+          lay->addWidget( mMinusButton  );
+          lay->addWidget( mCombo );
+          lay->addWidget( mNumber  );
+          connect( mMinusButton , SIGNAL ( clicked() ), this, SLOT ( deleteNumber() ) );
+          connect( mCombo , SIGNAL ( activated ( int ) ), this, SLOT ( comboTypeChange( int ) ) );
+          mCombo->insertStringList(  PhoneNumber::supportedTypeListNames() );
+      }
+
+  void setPhoneNumber( const KABC::PhoneNumber &phoneNumber )
+  {
+      mPhoneNumber = phoneNumber;
+      int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() );
+      mCombo->setCurrentItem( index );
+      mNumber->setText( mPhoneNumber.number() );
+      show();
+
+  }
+  KABC::PhoneNumber phoneNumber()
+      {
+          mPhoneNumber.setNumber( mNumber->text() );
+          int index = mCombo->currentItem();
+          mPhoneNumber.setType( PhoneNumber::supportedTypeList()[index]  );
+          return mPhoneNumber;
+
+      }
+  private slots:
+  void  typeExternalChanged( int oldType, int newType )
+  {
+      if ( mPhoneNumber.type() == newType ) {
+          mPhoneNumber.setType(oldType);
+          int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() );
+          mCombo->setCurrentItem( index );
+      }
+
+  }
+  void deleteNumber()
+  { 
+      hide();
+  }
+  void comboTypeChange( int index )
+  {
+      int old = mPhoneNumber.type();
+      int newT = PhoneNumber::supportedTypeList()[index];
+      if ( old != newT ) {
+          mPhoneNumber.setType(newT );
+          emit typeChange ( old, newT );
+      }
+
+  }
+ signals:
+void  typeChange( int oldType, int newType );
+
+private:
+  KABC::PhoneNumber mPhoneNumber;
+  QPushButton* mMinusButton;
+  KComboBox *mCombo;
+  KLineEdit *mNumber;
+};
 
 #endif