5 files changed, 75 insertions, 32 deletions

diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 2b5b390..9076943 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,84 +1,84 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.2.5
+Version: 2.2.6
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 
 %description
 This package contains the platform-independent PIM programs from
 www.pi-sync.info, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data 
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 
 After installation, you should have a 
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
 If you want to use that, you have to update your 
 KDE-desktop to version 3.3.0 or higher.
 SuSE 9.2 contains KDE 3.3.0 such that no update is needed.
 Actually - after the (non difficult) configuration is set up -
 with two mouseklicks on the Zaurus,
 the Zaurus syncs with the corresponding  KDE-Pim/Pi 
 program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
 
 If you want to use the KDE-desktop calendar/addressbook applications,
 just install these apps in this package and use them as a syncing tool for the
 Zaurus <-> KDE-desktop sync.
 The sync requires a network connection from your Zaurus to
 the PC. A detailed Sync HowTo is available in the
 Help menu of the applications.
 
 These applications makes it also possible, that you can sync
 (or just export the data to) your mobile phone with your 
 data of the KDE-desktop calendar/addressbook applications.
 This is tested and working for Nokia mobile phones,
 it may work with others as well.
 (More info about that: -> Sync HowTo)
 
 NOTE:
 When using SuSE 9.1 you have to update your KDE to 3.3.x
 and you have to make an online update in SuSE 9.1 to make it
 possible to get the infrared connection working, such that
 you can sync your (Nokia) mobile phone via infrared.
 
 %files
 /opt/kde3/share/applnk/PIM-pi/
 /opt/kdepimpi/
 /usr/lib/libmicro*
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 9814cd5..966efa5 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -807,588 +807,588 @@ void AddresseeEditorWidget::setupTab2_1()
   
   label = new QLabel( i18n( "Manager\'s name:" ), tab2 );
   layout->addWidget( label, 0, 3 );
   mManagerEdit = new KLineEdit( tab2 );
   connect( mManagerEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mManagerEdit );
   layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
   
   label = new QLabel( i18n( "Assistant's name:" ), tab2 );
   layout->addWidget( label, 1, 3 );
   mAssistantEdit = new KLineEdit( tab2 );
   connect( mAssistantEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mAssistantEdit );
   layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
   
   bar = new KSeparator( KSeparator::HLine, tab2 );
   layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
 
   /////////////////////////////////////////////////
   // Personal info
   
   label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
   layout->addMultiCellWidget( label, 4, 5, 0, 0 );
   
   label = new QLabel( i18n( "Nick name:" ), tab2 );
   layout->addWidget( label, 4, 1 );
   mNicknameEdit = new KLineEdit( tab2 );
   connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mNicknameEdit );
   layout->addWidget( mNicknameEdit, 4, 2 );
 
   label = new QLabel( i18n( "Spouse's name:" ), tab2 );
   layout->addWidget( label, 5, 1 );
   mSpouseEdit = new KLineEdit( tab2 );
   connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mSpouseEdit );
   layout->addWidget( mSpouseEdit, 5, 2 );
 
   label = new QLabel( i18n( "Birthday:" ), tab2 );
   layout->addWidget( label, 4, 3 );
   mBirthdayPicker = new KDateEdit( tab2 );
   mBirthdayPicker->setHandleInvalid( true );
   connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
            SLOT( dateChanged( QDate ) ) );
   connect( mBirthdayPicker, SIGNAL( invalidDateEntered() ),
            SLOT( invalidDate() ) );
   connect( mBirthdayPicker, SIGNAL( textChanged( const QString& ) ),
            SLOT( emitModified() ) );
   label->setBuddy( mBirthdayPicker );
   layout->addWidget( mBirthdayPicker, 4, 4 );
   
   label = new QLabel( i18n( "Anniversary:" ), tab2 );
   layout->addWidget( label, 5, 3 );
   mAnniversaryPicker = new KDateEdit( tab2 );
   mAnniversaryPicker->setHandleInvalid( true );
   connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
            SLOT( dateChanged( QDate ) ) );
   connect( mAnniversaryPicker, SIGNAL( invalidDateEntered() ),
            SLOT( invalidDate() ) );
   connect( mAnniversaryPicker, SIGNAL( textChanged( const QString& ) ),
            SLOT( emitModified() ) );
   label->setBuddy( mAnniversaryPicker );
   layout->addWidget( mAnniversaryPicker, 5, 4 );
   
   bar = new KSeparator( KSeparator::HLine, tab2 );
   layout->addMultiCellWidget( bar, 6, 6, 0, 5 );
 */  
    //////////////////////////////////////
   // Notes
   label = new QLabel( i18n( "Note:" ), tab2_2 );
   label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
 //US  layout->addWidget( label, 7, 0 );
   layout->addWidget( label, 0, 0 );
 #ifndef KAB_EMBEDDED    
   mNoteEdit = new QTextEdit( tab2_2 );
   mNoteEdit->setWordWrap( QTextEdit::WidgetWidth );
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #else //KAB_EMBEDDED    
   mNoteEdit = new QMultiLineEdit( tab2_2 );
   mNoteEdit->setWordWrap( QMultiLineEdit::WidgetWidth );
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #endif //KAB_EMBEDDED    
   
   connect( mNoteEdit, SIGNAL( textChanged() ), SLOT( emitModified() ) );
   label->setBuddy( mNoteEdit );
 //US  layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
   layout->addWidget( mNoteEdit, 1, 0);
 
    // Build the layout and add to the tab widget
   layout->activate(); // required
 
   mTabWidget->addTab( tab2_2, i18n( "&Notes" ) );
 }
 
 
 
 void AddresseeEditorWidget::setupTab3()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
   QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
 //US  layout->setColStretch( 2, 1 );
   
   //////////////////////////////////////
   // Geo
   mGeoWidget = new GeoWidget( tab3 );
   // mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
   connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mGeoWidget, 0, 0 );
 /*US
   //////////////////////////////////////
   // Sound
 #ifndef KAB_EMBEDDED    
   mSoundWidget = new SoundWidget( tab3 );
   mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
   connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
 
   //////////////////////////////////////
   // Images
   mImageWidget = new ImageWidget( tab3 );
   mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
   connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mImageWidget, 1, 0, Qt::AlignTop );
 */
 //US  
 /*
   KSeparator* bar = new KSeparator( KSeparator::HLine, tab3 );
   layout->addMultiCellWidget( bar, 1, 1, 0, 0 );
 */ 
   //////////////////////////////////////
   // Keys
   mKeyWidget = new KeyWidget( tab3 );
   //mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() );
   connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
 //US  layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop );
   layout->addWidget( mKeyWidget, 1, 0 );
 
   mTabWidget->addTab( tab3, i18n( "&Misc" ) );
 }
 
 void AddresseeEditorWidget::setupTab3_1()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
 //US  QGridLayout *layout = new QGridLayout( tab3, 2, 3 );
   QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHint() );
   layout->setSpacing( KDialogBase::spacingHint() );
 //US  layout->setColStretch( 2, 1 );
 
 /*US  
   //////////////////////////////////////
   // Geo
   mGeoWidget = new GeoWidget( tab3 );
   mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
   connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mGeoWidget, 0, 0, Qt::AlignTop );
 */
   //////////////////////////////////////
   // Sound
 #ifndef KAB_EMBEDDED    
   mSoundWidget = new SoundWidget( tab3 );
   mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
   connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
 
   //////////////////////////////////////
   // Images
   mImageWidget = new ImageWidget( tab3 );
   mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
   connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mImageWidget, 0, 0, Qt::AlignTop );
 /*US
   //////////////////////////////////////
   // Keys
   mKeyWidget = new KeyWidget( tab3 );
   mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() );
   connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop );
 */
   mTabWidget->addTab( tab3, i18n( "&Images" ) );
 }
 
     
 void AddresseeEditorWidget::load()
 {
 
   // Block signals in case anything tries to emit modified
   // CS: This doesn't seem to work.
   bool block = signalsBlocked();
   blockSignals( true ); 
   mBlockSignals = true; // used for internal signal blocking
 
   mNameEdit->setText( mAddressee.assembledName() );
   
   if ( mAddressee.formattedName().isEmpty() ) {
 //US    KConfig config( "kaddressbookrc" );
     KConfig config( locateLocal("config", "kabcrc") );
     config.setGroup( "General" );
     mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
     mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
   } else {;
     if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::SimpleName ) )
       mFormattedNameType = NameEditDialog::SimpleName;
     else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::FullName ) )
       mFormattedNameType = NameEditDialog::FullName;
     else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::ReverseName ) )
       mFormattedNameType = NameEditDialog::ReverseName;
     else
       mFormattedNameType = NameEditDialog::CustomName;
   }
 
   mFormattedNameLabel->setText( mAddressee.formattedName() );
 
   mAConfig->setUid( mAddressee.uid() );
   if ( mAConfig->automaticNameParsing() ) {
       mNameLabel->hide();
       mNameEdit->show();
   } else {
       mNameEdit->hide();
       mNameLabel->setText( mNameEdit->text() );
       mNameLabel->show();
   }
 
   mRoleEdit->setText( mAddressee.role() );
   mOrgEdit->setText( mAddressee.organization() );
   
 //US  mURLEdit->setURL( mAddressee.url().url() );
   mURLEdit->setText( mAddressee.url().prettyURL() );
 //US??  mURLEdit->home( false );
   
   // mNoteEdit->setText( mAddressee.note() );
   mNoteEdit->setText( mAddressee.note() );
   mEmailWidget->setEmails( mAddressee.emails() );
   mPhoneEditWidget->setPhoneNumbers( mAddressee.phoneNumbers() );
   mAddressEditWidget->setAddresses( mAddressee, mAddressee.addresses() );
   mBirthdayPicker->setDate( mAddressee.birthday().date() );
 
 //US  mAnniversaryPicker->setDate( QDate::fromString( mAddressee.custom(
 //US                               "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate) );
   QDate dt = KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), 
                                                     "%Y-%m-%d");  // = Qt::ISODate
   mAnniversaryPicker->setDate( dt );
 
                                                               
   mNicknameEdit->setText( mAddressee.nickName() );
   mCategoryEdit->setText( mAddressee.categories().join( "," ) );
 
   mGeoWidget->setGeo( mAddressee.geo() );
   mImageWidget->setPhoto( mAddressee.photo() );
   mImageWidget->setLogo( mAddressee.logo() );
   mKeyWidget->setKeys( mAddressee.keys() );
   mSecrecyWidget->setSecrecy( mAddressee.secrecy() );
 #ifndef KAB_EMBEDDED    
   mSoundWidget->setSound( mAddressee.sound() );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::load has to be changed 2");
 #endif //KAB_EMBEDDED    
 
   // Load customs
   mIMAddressEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" ) );
   mSpouseEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ) );
   mChildEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Children" ) );
   mManagerEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-ManagersName" ) );
   mAssistantEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-AssistantsName" ) );
   mDepartmentEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Department" ) );
   mOfficeEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Office" ) );
   mProfessionEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Profession" ) );
   QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
   if ( gen == "female" )
       mGenderBox->setCurrentItem ( 1 ); 
   else if ( gen == "male" )
       mGenderBox->setCurrentItem ( 2 ); 
   else 
       mGenderBox->setCurrentItem ( 0 ); 
   blockSignals( block );
   mBlockSignals = false;
 
   mDirty = false;
 }
 
 void AddresseeEditorWidget::save()
 {
     if ( !dirty() ) {
             return;
     }
  
     mAddressee.setRevision( QDateTime::currentDateTime() ); 
  
   mAddressee.setRole( mRoleEdit->text() );
   mAddressee.setOrganization( mOrgEdit->text() );
   mAddressee.setUrl( KURL( mURLEdit->text() ) );
   mAddressee.setNote( mNoteEdit->text() );
   if ( mBirthdayPicker->inputIsValid() ) {
       QDate da = mBirthdayPicker->date();
       mAddressee.setBirthday( QDateTime( da ) );
       //qDebug("bday %s ",da.toString().latin1());
   }
   else {
     mAddressee.setBirthday( QDateTime() );
     mBirthdayPicker->clear();
   }
   mAddressee.setNickName( mNicknameEdit->text() );
   mAddressee.setCategories( QStringList::split( ",", mCategoryEdit->text() ) );
 
   mAddressee.setGeo( mGeoWidget->geo() );
   mAddressee.setPhoto( mImageWidget->photo() );
   mAddressee.setLogo( mImageWidget->logo() );
   mAddressee.setKeys( mKeyWidget->keys() );
 #ifndef KAB_EMBEDDED    
   mAddressee.setSound( mSoundWidget->sound() );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::save sound not supported");
 #endif //KAB_EMBEDDED    
   mAddressee.setSecrecy( mSecrecyWidget->secrecy() );
 
   // save custom fields
   mAddressee.insertCustom( "KADDRESSBOOK", "X-IMAddress", mIMAddressEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", mSpouseEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-Children", mChildEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", mManagerEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", mAssistantEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-Department", mDepartmentEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-Office", mOfficeEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-Profession", mProfessionEdit->text() );
   if ( mAnniversaryPicker->inputIsValid() ) {
     QString dt = KGlobal::locale()->formatDate(mAnniversaryPicker->date(), true, KLocale::ISODate);
     mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
   }
   else {
     mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" );
     mAnniversaryPicker->clear();
   }
   int gen = mGenderBox->currentItem ();
   if ( gen == 1 )
     mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "female");
   else if ( gen == 2 )
     mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "male");
   else 
     mAddressee.removeCustom( "KADDRESSBOOK", "X-Gender" );
                       
   // Save the email addresses
   QStringList emails = mAddressee.emails();
   QStringList::Iterator iter;
   for ( iter = emails.begin(); iter != emails.end(); ++iter )
     mAddressee.removeEmail( *iter );
   
   emails = mEmailWidget->emails();
   bool first = true;
   for ( iter = emails.begin(); iter != emails.end(); ++iter ) {
     mAddressee.insertEmail( *iter, first );
     first = false;
   }
   
   // Save the phone numbers
   KABC::PhoneNumber::List phoneNumbers;
   KABC::PhoneNumber::List::Iterator phoneIter;
   phoneNumbers = mAddressee.phoneNumbers();
   for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end();
         ++phoneIter )
     mAddressee.removePhoneNumber( *phoneIter );
     
   phoneNumbers = mPhoneEditWidget->phoneNumbers();
   for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end();
         ++phoneIter )
     mAddressee.insertPhoneNumber( *phoneIter );
-
+  mAddressee.makePhoneNumbersOLcompatible();
   // Save the addresses
   KABC::Address::List addresses;
   KABC::Address::List::Iterator addressIter;
   addresses = mAddressee.addresses();
   for ( addressIter = addresses.begin(); addressIter != addresses.end();
         ++addressIter )
     mAddressee.removeAddress( *addressIter );
     
   addresses = mAddressEditWidget->addresses();
   for ( addressIter = addresses.begin(); addressIter != addresses.end();
         ++addressIter )
     mAddressee.insertAddress( *addressIter );
   mDirty = false;
 }
 
 bool AddresseeEditorWidget::dirty()
 {
 
     if ( ! mDirty ) {
         if ( mBirthdayPicker->inputIsValid() ) {
             QDate da = mBirthdayPicker->date();
             if ( !(da ==  mAddressee.birthday().date()))
                 mDirty = true;
         }
         else {
             mBirthdayPicker->clear();
         }
         if ( mAnniversaryPicker->inputIsValid() ) {
             QDate da = mAnniversaryPicker->date();
             if ( da != KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), 
                                                     "%Y-%m-%d"))
                 mDirty = true;
         }
         else {
             mAnniversaryPicker->clear();
         }
     }
   return mDirty;
 }
 
 void AddresseeEditorWidget::nameTextChanged( const QString &text )
 {
     if ( mBlockSignals )
         return;
   // use the addressee class to parse the name for us
     mAConfig->setUid( mAddressee.uid() );
   if ( mAConfig->automaticNameParsing() ) {
     if ( !mAddressee.formattedName().isEmpty() ) {
          QString fn = mAddressee.formattedName();
         mAddressee.setNameFromString( text );
         mAddressee.setFormattedName( fn );
     } else {
       // use extra addressee to avoid a formatted name assignment
       Addressee addr;
       addr.setNameFromString( text );
       mAddressee.setPrefix( addr.prefix() );
       mAddressee.setGivenName( addr.givenName() );
       mAddressee.setAdditionalName( addr.additionalName() );
       mAddressee.setFamilyName( addr.familyName() );
       mAddressee.setSuffix( addr.suffix() );
     }
   }
   nameBoxChanged();
 
  
   emitModified();
 }
 
 void AddresseeEditorWidget::nameBoxChanged()
 {
   KABC::Addressee addr;
   mAConfig->setUid( mAddressee.uid() );
   if ( mAConfig->automaticNameParsing() ) {
     addr.setNameFromString( mNameEdit->text() );
     mNameLabel->hide();
     mNameEdit->show();
   } else {
     addr = mAddressee;
     mNameEdit->hide();
     mNameLabel->setText( mNameEdit->text() );
     mNameLabel->show();
   }
 
   if ( mFormattedNameType != NameEditDialog::CustomName ) {
     mFormattedNameLabel->setText( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
     mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
   }
 }
 
 void AddresseeEditorWidget::nameButtonClicked()
 {
   // show the name dialog.
   NameEditDialog dialog( mAddressee, mFormattedNameType, this );
   
   if ( KApplication::execDialog( &dialog) ) {
     if ( dialog.changed() ) {
       mAddressee.setFamilyName( dialog.familyName() );
       mAddressee.setGivenName( dialog.givenName() );
       mAddressee.setPrefix( dialog.prefix() );
       mAddressee.setSuffix( dialog.suffix() );
       mAddressee.setAdditionalName( dialog.additionalName() );
       mFormattedNameType = dialog.formattedNameType();
       if ( mFormattedNameType == NameEditDialog::CustomName ) {
         mFormattedNameLabel->setText( dialog.customFormattedName() );
         mAddressee.setFormattedName( dialog.customFormattedName() );
       }
       // Update the name edit.
       bool block = mNameEdit->signalsBlocked();
       mNameEdit->blockSignals( true );
       mNameEdit->setText( mAddressee.assembledName() );
       mNameEdit->blockSignals( block );
 
       // Update the combo box.
       nameBoxChanged();
     
       emitModified();
     }
   }
 }
 
 void AddresseeEditorWidget::categoryButtonClicked()
 {
   // Show the category dialog
   if ( mCategoryDialog == 0 ) {
     mCategoryDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), this );
     connect( mCategoryDialog, SIGNAL( categoriesSelected( const QStringList& ) ),
              SLOT(categoriesSelected( const QStringList& ) ) );
     connect( mCategoryDialog, SIGNAL( editCategories() ), SLOT( editCategories() ) );
   }
 
   mCategoryDialog->setCategories();
   mCategoryDialog->setSelected( QStringList::split( ",", mCategoryEdit->text() ) );
   mCategoryDialog->show();
   mCategoryDialog->raise();
 }
 
 void AddresseeEditorWidget::categoriesSelected( const QStringList &list )
 {
   mCategoryEdit->setText( list.join( "," ) );
 }
 
 void AddresseeEditorWidget::editCategories()
 {
   if ( mCategoryEditDialog == 0 ) {
     mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), this );
     connect( mCategoryEditDialog, SIGNAL( categoryConfigChanged() ),
              SLOT( categoryButtonClicked() ) );
   }
   
   mCategoryEditDialog->show();
   mCategoryEditDialog->raise();
 }
 
 void AddresseeEditorWidget::emitModified()
 {
   mDirty = true;
 
   KABC::Addressee::List list;
 
   if ( mIsExtension && !mBlockSignals ) {
     save();
     list.append( mAddressee );
   }
 
   emit modified( list );
 }
 
 void AddresseeEditorWidget::dateChanged( QDate )
 {
   emitModified();
 }
 
 //US invalid dates are handdled by the KDateEdit widget itself
 void AddresseeEditorWidget::invalidDate()
 {
   KMessageBox::sorry( this, i18n( "You must specify a valid date" ) );
 }
 
 
 void AddresseeEditorWidget::pageChanged( QWidget *wdg )
 {
 #ifndef KAB_EMBEDDED    
   if ( wdg )
     KAcceleratorManager::manage( wdg );
 #else //KAB_EMBEDDED    
 //US 
 #endif //KAB_EMBEDDED    
     
 }
 
 QString AddresseeEditorWidget::title() const
 {
   return i18n( "Contact Editor" );
 }
 
 QString AddresseeEditorWidget::identifier() const
 {
   return i18n( "contact_editor" );
 }
 
 #ifndef KAB_EMBEDDED    
 #include "addresseeeditorwidget.moc"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 997fc05..9e7e221 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -1,486 +1,522 @@
 /*
     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 <qlayout.h>
 #include <qlabel.h>
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qstring.h>
 #include <qlistbox.h>
 #include <qlistview.h>
 #include <qbuttongroup.h>
 #include <qhbox.h>
+#include <qcursor.h>
 
 #include <kbuttonbox.h>
 #include <klistview.h>
 #include <kapplication.h>
 #include <qapplication.h>
 #include <kconfig.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 
 #include <kabc/phonenumber.h>
 
 #include "typecombo.h"
 
 #include "phoneeditwidget.h"
 
 PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
-  : QScrollView(parent,name)
-{
-    setFrameStyle ( QFrame::Panel | QFrame::Plain );
-    setLineWidth ( 1 ); 
-    setMidLineWidth ( 1 ); 
-    mw = new QWidget ( viewport() );
-    addChild(mw);
-    setResizePolicy( AutoOneFit );
+  : QWidget(parent,name)
+{
+    QGridLayout* gridLayout = new QGridLayout ( this, 2,2 );
+
+    QLabel *temp = new QLabel( "", this );
+    temp->setAlignment( Qt::AlignCenter );
+    temp->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
+    gridLayout->addWidget( temp, 1, 0 );
+    QPushButton *addBut = new QPushButton ( "add", this );
+    addBut->setPixmap ( SmallIcon("plus"));
+    addBut->setMaximumSize( addBut->sizeHint().height(),addBut->sizeHint().height() );
+    connect(addBut,SIGNAL(clicked ()),SLOT(addNumber()));
+    gridLayout->addWidget( addBut, 0, 0 );
+
+    sv = new QScrollView( this );
+    sv->setFrameStyle ( QFrame::Panel | QFrame::Plain );
+    sv->setLineWidth ( 1 ); 
+    sv->setMidLineWidth ( 1 ); 
+    mw = new QWidget ( sv->viewport() );
+    sv->addChild(mw);
+    sv->setResizePolicy( QScrollView::AutoOneFit );
     mainLayout = new QVBoxLayout ( mw );
     mainLayout->setMargin( 2 );
     mainLayout->setSpacing( 2 );
-    QWidget* hb = new QWidget ( mw );
-    mainLayout->add( hb );
-    QHBoxLayout* hbLayout = new QHBoxLayout ( hb );
-    QPushButton *addBut = new QPushButton ( "add", hb );
-    hbLayout->add( addBut );
-    addBut->setPixmap ( SmallIcon("plus"));
-    addBut->setMaximumSize( addBut->sizeHint().height(),addBut->sizeHint().height() );
-    connect(addBut,SIGNAL(clicked()),SLOT(addNumber()));
-    //QLabel * temp = new QLabel( i18n("Phone Type"), hb );
-    QLabel *temp = new QLabel( i18n("Phone Number"),hb );
-    temp->setAlignment( Qt::AlignCenter );
-    temp->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
-    hbLayout->add( temp );
+    gridLayout->addMultiCellWidget( sv, 0, 1, 1,1 );
     setDefaults();
     mTypeNumberEditList.setAutoDelete( true );
+    mPopup = new QPopupMenu( this );
+    QStringList list = PhoneNumber::supportedTypeListNames();
+    mPopupCount = list.count();
+    int i = 0;
+    while ( i < mPopupCount ) {
+        mPopup->insertItem( list[ i ], i );
+        ++i;
+    }
+    connect(mPopup,SIGNAL(activated(int)),this,SLOT(addNumberInt( int)));
+    
 }
 
 PhoneEditWidget::~PhoneEditWidget()
 {
 }
 void  PhoneEditWidget::setDefaults()
 {
     mTypeNumberEditList.clear();
     PhoneTypeNumberEdit* edit = appendEditCombo();
     KABC::PhoneNumber phoneNumber;
     phoneNumber.setType( KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref );
     edit->setPhoneNumber( phoneNumber  );
     edit = appendEditCombo();
     phoneNumber.setType( KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref );
     edit->setPhoneNumber( phoneNumber  );
     edit = appendEditCombo();
     phoneNumber.setType( KABC::PhoneNumber::Cell );
     edit->setPhoneNumber( phoneNumber  );
 
 }
+void  PhoneEditWidget::addNumberInt( int index )
+{
+    PhoneTypeNumberEdit* edit = appendEditCombo();
+    KABC::PhoneNumber phoneNumber;
+    phoneNumber.setType( PhoneNumber::supportedTypeList()[index] );
+    edit->setPhoneNumber( phoneNumber  );
+    //verticalScrollBar()->setValue( 1024);
+    QTimer::singleShot( 0, this, SLOT ( bottomVisible() ) ); 
+}
+void  PhoneEditWidget::bottomVisible()
+{
+    sv->setContentsPos ( 0, 1024 );
+}
 void  PhoneEditWidget::addNumber()
 {
-
+    int i = 0;
+    while ( i < mPopupCount ) {
+        mPopup->setItemEnabled( i, true );
+        ++i;
+    }
+    PhoneTypeNumberEdit* edit = mTypeNumberEditList.first();
+    while ( edit ) {
+        if ( edit->currentType() < mPopupCount -1 )
+            mPopup->setItemEnabled( edit->currentType(), false );
+        edit = mTypeNumberEditList.next();
+    }
+    mPopup->popup( QCursor::pos() );
 }
 PhoneTypeNumberEdit* PhoneEditWidget::appendEditCombo()
 {
     PhoneTypeNumberEdit* edit = new PhoneTypeNumberEdit( mw );
     connect ( edit, SIGNAL ( typeChange( int , int) ), this, SIGNAL ( typeChange( int , int)) );
     connect ( edit, SIGNAL ( modified() ), this, SIGNAL ( modified() ) );
     connect ( edit, SIGNAL ( deleteMe( PhoneTypeNumberEdit* ) ), this, SLOT ( deleteEdit(  PhoneTypeNumberEdit*) ) );
     connect ( this, SIGNAL ( typeChange( int , int)), edit, SLOT ( typeExternalChanged( int, int)) );
 
     mainLayout->add( edit );
     mTypeNumberEditList.append( edit );
     return edit;
 }
 
 void PhoneEditWidget::deleteEdit(  PhoneTypeNumberEdit* ew )
 {
     mPendingDelete = ew;
     QTimer::singleShot( 0, this, SLOT ( pendingDelete() ) ); 
 }
 void PhoneEditWidget::pendingDelete()
 { 
     mTypeNumberEditList.removeRef( mPendingDelete );
     emit modified();
 }
 
 void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &li )
 {
     if ( li.isEmpty() ) {
         setDefaults();
         return;
     }   
     mTypeNumberEditList.clear();
     KABC::PhoneNumber::List::Iterator it; 
     KABC::PhoneNumber::List list = li;
     PhoneTypeNumberEdit* edit = 0;//mTypeNumberEditList.first();
     for ( it = list.begin(); it != list.end(); ++it ) {
         if ( edit ) {
             edit->setPhoneNumber( (*it ) );
             edit = mTypeNumberEditList.next();
         } else {
             PhoneTypeNumberEdit* editNew = appendEditCombo();
             editNew->setPhoneNumber( (*it ) );
         }
     }
     while ( edit ) {
         edit->hide();
         edit = mTypeNumberEditList.next();
     }
 }
 KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers()
 {
   KABC::PhoneNumber::List retList;
 
   PhoneTypeNumberEdit* edit = mTypeNumberEditList.first();
   while ( edit ) {
       if ( edit->isValid() ) {
           retList.append( edit->phoneNumber());
       }
       edit = mTypeNumberEditList.next();
 
   }
   return retList;
 }
 
 #if 0
 PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QGridLayout *layout = new QGridLayout( this, 4, 1 );
 //US  layout->setSpacing( KDialog::spacingHint() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
 
 
 
  QLabel* label = new QLabel( this );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
   label->setAlignment( AlignCenter );
 //US  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
   layout->addWidget( label, 0, 0 ); 
 
   QPushButton *editButton = new QPushButton( i18n( "Edit Phone Numbers..." ),
                                              this ); 
   if ( QApplication::desktop()->width() < 640 ) 
       layout->addWidget( editButton, 0, 1 );
   else
       layout->addMultiCellWidget( editButton, 0, 0, 1, 3);
 
   mPrefCombo = new PhoneTypeCombo( mPhoneList, this );
   mPrefEdit = new KLineEdit( this );
   //mPrefEdit->setMinimumWidth( int(mPrefEdit->sizeHint().width() * 1.5) );
   mPrefCombo->setLineEdit( mPrefEdit );
   layout->addWidget( mPrefCombo, 1, 0 );
   layout->addWidget( mPrefEdit, 1, 1 );
   int x = 1, y = 2;
   if ( QApplication::desktop()->width() < 640 ) {
       ++x;
       y = 0;
   }
   mSecondCombo = new PhoneTypeCombo( mPhoneList, this );
   mSecondEdit = new KLineEdit( this );
   mSecondCombo->setLineEdit( mSecondEdit );
   layout->addWidget( mSecondCombo, x, y++ );
   layout->addWidget( mSecondEdit, x, y++ );
 
   y = 0;
   ++x;
   mThirdCombo = new PhoneTypeCombo( mPhoneList, this );
   mThirdEdit = new KLineEdit( this );
   mThirdCombo->setLineEdit( mThirdEdit );
   layout->addWidget( mThirdCombo, x, y++ );
   layout->addWidget( mThirdEdit, x, y++ );
   if ( QApplication::desktop()->width() < 640 ) {
       ++x;
       y = 0;
   }
   mFourthCombo = new PhoneTypeCombo( mPhoneList, this );
   mFourthEdit = new KLineEdit( this );
   mFourthCombo->setLineEdit( mFourthEdit );
   layout->addWidget( mFourthCombo, x, y++ );
   layout->addWidget( mFourthEdit, x, y++ );
 
   // Four numbers don't fit in the current dialog
   if ( QApplication::desktop()->width() < 640 ) {
       mFourthCombo->hide();
       mFourthEdit->hide();
   } else {
       QFontMetrics fm ( font () ) ;
       int wid = fm.width( "Messenger" ) +60;
       mPrefCombo->setMaximumWidth( wid  );
       mSecondCombo->setMaximumWidth( wid  );
       mThirdCombo->setMaximumWidth( wid );
       mFourthCombo->setMaximumWidth( wid );
   }
  
 
   connect( mPrefEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( slotPrefEditChanged() ) );
   connect( mSecondEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( slotSecondEditChanged() ) );
   connect( mThirdEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( slotThirdEditChanged() ) );
   connect( mFourthEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( slotFourthEditChanged() ) );
 
   connect( editButton, SIGNAL( clicked() ), SLOT( edit() ) );
 
   connect( mPrefCombo, SIGNAL( activated( int ) ),
            SLOT( updatePrefEdit() ) );
   connect( mSecondCombo, SIGNAL( activated( int ) ),
            SLOT( updateSecondEdit() ) );
   connect( mThirdCombo, SIGNAL( activated( int ) ),
            SLOT( updateThirdEdit() ) );
   connect( mFourthCombo, SIGNAL( activated( int ) ),
            SLOT( updateFourthEdit() ) );
 }
 
 PhoneEditWidget::~PhoneEditWidget()
 {
 }
 
 void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &list )
 {
   mPhoneList.clear();
 
   // Insert types for existing numbers.
   mPrefCombo->insertTypeList( list );
 
   QValueList<int> defaultTypes;
   defaultTypes << KABC::PhoneNumber::Home;
   defaultTypes << KABC::PhoneNumber::Work;
   defaultTypes << KABC::PhoneNumber::Cell;
   defaultTypes << ( KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
   defaultTypes << ( KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax );
 
   // Insert default types.
   // Doing this for mPrefCombo is enough because the list is shared by all
   // combos.
   QValueList<int>::ConstIterator it;
   for( it = defaultTypes.begin(); it != defaultTypes.end(); ++it ) {
     if ( !mPrefCombo->hasType( *it ) )
       mPrefCombo->insertType( list, *it, PhoneNumber( "", *it ) );
   }
 
   updateCombos();
 
   mPrefCombo->selectType( defaultTypes[ 0 ] );
   mSecondCombo->selectType( defaultTypes[ 1 ] );
   mThirdCombo->selectType( defaultTypes[ 2 ] );
   mFourthCombo->selectType( defaultTypes[ 3 ] );
 
   updateLineEdits();
 }
 
 void PhoneEditWidget::updateLineEdits()
 {
   updatePrefEdit();
   updateSecondEdit();
   updateThirdEdit();
   updateFourthEdit();
 }
 
 void PhoneEditWidget::updateCombos()
 {
   mPrefCombo->updateTypes();
   mSecondCombo->updateTypes();
   mThirdCombo->updateTypes();
   mFourthCombo->updateTypes();
 }
 
 KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers()
 {
   KABC::PhoneNumber::List retList;
 
   KABC::PhoneNumber::List::Iterator it;
   for ( it = mPhoneList.begin(); it != mPhoneList.end(); ++it )
     if ( !(*it).number().isEmpty() )
       retList.append( *it );
 
   return retList;
 }
 
 void PhoneEditWidget::edit()
 {
   PhoneEditDialog dlg( mPhoneList, this );
 
   if ( dlg.exec() ) {
     if ( dlg.changed() ) {
       KABC::PhoneNumber::List list = dlg.phoneNumbers();
       setPhoneNumbers( list );
       updateCombos();
       updateLineEdits();
       emit modified();
     }
   }
 }
 
 void PhoneEditWidget::updatePrefEdit()
 {
   updateEdit( mPrefCombo );
 }
 
 void PhoneEditWidget::updateSecondEdit()
 {
   updateEdit( mSecondCombo );
 }
 
 void PhoneEditWidget::updateThirdEdit()
 {
   updateEdit( mThirdCombo );
 }
 
 void PhoneEditWidget::updateFourthEdit()
 {
   updateEdit( mFourthCombo );
 }
 
 void PhoneEditWidget::updateEdit( PhoneTypeCombo *combo )
 {
   QLineEdit *edit = combo->lineEdit();
   if ( !edit )
     return;
 
 #if 0
   if ( edit == mPrefEdit ) kdDebug(5720) << " prefEdit" << endl;
   if ( edit == mSecondEdit ) kdDebug(5720) << " secondEdit" << endl;
   if ( edit == mThirdEdit ) kdDebug(5720) << " thirdEdit" << endl;
   if ( edit == mFourthEdit ) kdDebug(5720) << " fourthEdit" << endl;
 #endif
 
   PhoneNumber::List::Iterator it = combo->selectedElement();
   if ( it != mPhoneList.end() ) {
     edit->setText( (*it).number() );
   } else {
     kdDebug(5720) << "PhoneEditWidget::updateEdit(): no selected element" << endl;
   }
 }
 
 void PhoneEditWidget::slotPrefEditChanged()
 {
   updatePhoneNumber( mPrefCombo );
 }
 
 void PhoneEditWidget::slotSecondEditChanged()
 {
   updatePhoneNumber( mSecondCombo );
 }
 
 void PhoneEditWidget::slotThirdEditChanged()
 {
   updatePhoneNumber( mThirdCombo );
 }
 
 void PhoneEditWidget::slotFourthEditChanged()
 {
   updatePhoneNumber( mFourthCombo );
 }
 
 void PhoneEditWidget::updatePhoneNumber( PhoneTypeCombo *combo )
 {
   QLineEdit *edit = combo->lineEdit();
   if ( !edit ) return;
 
   PhoneNumber::List::Iterator it = combo->selectedElement();
   if ( it != mPhoneList.end() ) {
     (*it).setNumber( edit->text() );
   } 
 
   updateOtherEdit( combo, mPrefCombo );
   updateOtherEdit( combo, mSecondCombo );
   updateOtherEdit( combo, mThirdCombo );
   updateOtherEdit( combo, mFourthCombo );
 
   emit modified();
 }
 
 void PhoneEditWidget::updateOtherEdit( PhoneTypeCombo *combo, PhoneTypeCombo *otherCombo )
 {
   if ( combo == otherCombo ) return;
 
   if ( combo->currentItem() == otherCombo->currentItem() ) {
     updateEdit( otherCombo );
   }
 }
 
 ///////////////////////////////////////////
 // PhoneEditDialog
 
 class PhoneViewItem : public QListViewItem
 {
 public:
   PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number );
 
   void setPhoneNumber( const KABC::PhoneNumber &number )
   {
     mPhoneNumber = number;
     makeText();
   }
 
   QString key() { return mPhoneNumber.id(); }
   QString country() { return ""; }
   QString region() { return ""; }
   QString number() { return ""; }
 
   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() );
    */
 
   setText( 0, mPhoneNumber.number() );
   setText( 1, mPhoneNumber.typeLabel() );
 }
 
 PhoneEditDialog::PhoneEditDialog( const KABC::PhoneNumber::List &list, QWidget *parent, const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Phone Numbers" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, true)
 {
   mPhoneNumberList = list;
 
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index c730c7b..df5aff9 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -1,287 +1,294 @@
 #ifndef PHONEEDITWIDGET_H
 #define PHONEEDITWIDGET_H
 /*                                                                      
     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 <qpopupmenu.h>
 
 #include <qptrlist.h>
 #include <qscrollview.h>
 
 #include "addresseeconfig.h"
 #include "typecombo.h"
 
 class QButtonGroup;
 class QCheckBox;
 class PhoneTypeNumberEdit;
 
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kabc/phonenumber.h>
 
 typedef TypeCombo<KABC::PhoneNumber> PhoneTypeCombo;
 
 /**
   Widget for editing phone numbers.
 */
-class PhoneEditWidget : public QScrollView
+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();
     void  typeChange( int oldType, int newType );
 
   private slots:
+    void bottomVisible();
+    void addNumberInt( int );
     void deleteEdit(  PhoneTypeNumberEdit* ew );
     void addNumber();
     void pendingDelete();
   protected:
 
   private:
+    QScrollView* sv;
+    QPopupMenu *mPopup;
+    int mPopupCount;
     PhoneTypeNumberEdit* mPendingDelete;
     void setDefaults();
     PhoneTypeNumberEdit* appendEditCombo();
     QWidget* mw;
     QVBoxLayout* mainLayout;
     QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList;
     
     KABC::PhoneNumber::List mPhoneList;
 };
   
 
 
 
 
 #if 0
 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 );
 
   sig_nals:
     void modified();
     void  typeChange( int oldType, int newType );
 
   private sl_ots:
     void edit();
 
     void updatePrefEdit();
     void updateSecondEdit();
     void updateThirdEdit();
     void updateFourthEdit();
 
     void slotPrefEditChanged();
     void slotSecondEditChanged();
     void slotThirdEditChanged();
     void slotFourthEditChanged();
   
   protected:
     void updateLineEdits();
     void updateCombos();
 
   private:
     QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList;
     void updateEdit( PhoneTypeCombo *combo );
     void updatePhoneNumber( PhoneTypeCombo *combo );
     void updateOtherEdit( PhoneTypeCombo *combo, PhoneTypeCombo *otherCombo );
 
     PhoneTypeCombo *mPrefCombo;
     PhoneTypeCombo *mSecondCombo;
     PhoneTypeCombo *mThirdCombo;
     PhoneTypeCombo *mFourthCombo;
     
     KLineEdit *mPrefEdit;
     KLineEdit *mSecondEdit;
     KLineEdit *mThirdEdit;
     KLineEdit *mFourthEdit;
 
     KABC::PhoneNumber::List mPhoneList;
 };
   
 /**
   Dialog for editing lists of phonenumbers.
 */
 class PhoneEditDialog : public KDialogBase
 {
   Q___OBJECT
   
   public:
     PhoneEditDialog( const KABC::PhoneNumber::List &list, QWidget *parent, const char *name = 0 );
     ~PhoneEditDialog();
     
     const KABC::PhoneNumber::List &phoneNumbers();
     bool changed() const;
     
   protected s__lots:
     void slotAddPhoneNumber();
     void slotRemovePhoneNumber();
     void slotEditPhoneNumber();
     void slotSelectionChanged();
 
   private:
     KABC::PhoneNumber::List mPhoneNumberList;
     KABC::PhoneNumber::TypeList mTypeList;
     KComboBox *mTypeBox;
     KListView *mListView;
 
     QPushButton *mRemoveButton;
     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;
 };
 #endif
 
 class PhoneTypeNumberEdit : public QWidget
 {
   Q_OBJECT
 public:
     PhoneTypeNumberEdit( QWidget *parent, const char *name = 0 ) :QWidget( parent )
       {
           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 ) ) );
           connect( mNumber  , SIGNAL (  textChanged ( const QString & ) ), 
                    this, SLOT (  textChanged ( const QString & ) ) );
           mCombo->insertStringList(  PhoneNumber::supportedTypeListNames() );
       }
         ~PhoneTypeNumberEdit() {
             // qDebug("~PhoneTypeNumberEdit() ");
         }
   void setPhoneNumber( const KABC::PhoneNumber &phoneNumber )
   {
       mPhoneNumber = phoneNumber;
       int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() );
       mCombo->setCurrentItem( index );
       mNumber->setText( mPhoneNumber.number() );
       show();
-
+      mNumber->setFocus();
   }
   KABC::PhoneNumber phoneNumber()
       {
           mPhoneNumber.setNumber( mNumber->text() );
           int index = mCombo->currentItem();
           mPhoneNumber.setType( PhoneNumber::supportedTypeList()[index]  );
           return mPhoneNumber;
       }
   bool isValid()
   {
       if ( mNumber->text().isEmpty() )return false;
       return true;
   }
+  int currentType()
+  {
+      return mCombo->currentItem();
+  }
   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()
   { 
       emit deleteMe( this );
   }
   void comboTypeChange( int index )
   {
       int old = mPhoneNumber.type();
       int newT = PhoneNumber::supportedTypeList()[index];
       if ( old != newT ) {
           emit modified();
-          emit typeChange ( old, newT );
+          if ( newT != PhoneNumber::Voice )
+              emit typeChange ( old, newT );
           mPhoneNumber.setType(newT );
       }
 
   }
-  int currentType()
-  {
-      return mCombo->currentItem();
-  }
   void textChanged ( const QString & )
   {
       emit modified();
   }
  signals:
 void  typeChange( int oldType, int newType );
  void modified();
  void deleteMe(  PhoneTypeNumberEdit* );
 
 private:
   KABC::PhoneNumber mPhoneNumber;
   QPushButton* mMinusButton;
   KComboBox *mCombo;
   KLineEdit *mNumber;
 };
 
 #endif
diff --git a/version b/version
index 6c3e9c6..4f24d24 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.2.5";
+version = "2.2.6";