fixx

3 files changed, 18 insertions, 123 deletions

diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 966efa5..c4083a9 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -1,518 +1,523 @@
 /*                                                                      
     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 <qcheckbox.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qapplication.h>
 
 #ifndef KAB_EMBEDDED    
 #include <qtextedit.h>
 
 #include <kaccelmanager.h>
 #include "keywidget.h"
 #include "soundwidget.h"
 
 #else //KAB_EMBEDDED    
 #include <qmultilineedit.h>
 #endif //KAB_EMBEDDED    
 
 
 #include "keywidget.h"
 #include "geowidget.h"
 #include "imagewidget.h"
 #include "nameeditdialog.h"
 #include "phoneeditwidget.h"
 #include "secrecywidget.h"
 
 
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
 #include <ksqueezedtextlabel.h>
 
 #include <libkdepim/categoryeditdialog.h>
 #include <libkdepim/categoryselectdialog.h>
 
 #include <libkdepim/kdateedit.h>
 
 #include "addresseditwidget.h"
 #include "emaileditwidget.h"
 #include "kabcore.h"
 #include "kabprefs.h"
 
 #include "addresseeeditorwidget.h"
 
 
 
 AddresseeEditorWidget::AddresseeEditorWidget( KABCore *core, bool isExtension,
                                               QWidget *parent, const char *name )
   : ExtensionWidget( core, parent, name ), mIsExtension( isExtension ),
     mBlockSignals( false )
 { 
 
     mAConfig = AddresseeConfig::instance();
     
   mFormattedNameType = NameEditDialog::CustomName;
   initGUI();
   mCategoryDialog = 0;
   mCategoryEditDialog = 0;
 
   // Load the empty addressee as defaults
   load();
  
   mDirty = false;
 }
 
 AddresseeEditorWidget::~AddresseeEditorWidget()
 {
   kdDebug(5720) << "~AddresseeEditorWidget()" << endl;
 }  
   
 void AddresseeEditorWidget::contactsSelectionChanged()
 {
   KABC::Addressee::List list = selectedContacts();
 
   mAddressee = list[ 0 ];
   load();
 }
 
 void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr )
 {
   mAddressee = addr;
   load();
 }
 
 const KABC::Addressee &AddresseeEditorWidget::addressee()
 {
   return mAddressee;
 }
 
 void AddresseeEditorWidget::textChanged( const QString& )
 {
   emitModified();
 }
   
 void AddresseeEditorWidget::initGUI()
 {
   QVBoxLayout *layout = new QVBoxLayout( this );
 
   mTabWidget = new QTabWidget( this );
   layout->addWidget( mTabWidget );
 
   setupTab1();
   setupTab1_1();
   setupTab2();
   setupTab2_1();
   setupTab3();
   setupTab3_1();
 
   mNameEdit->setFocus();
   
   connect( mTabWidget, SIGNAL( currentChanged(QWidget*) ),
            SLOT( pageChanged(QWidget*) ) );
 }
 
 void AddresseeEditorWidget::setupTab1()
 {
   // This is the General tab
   QWidget *tab1 = new QWidget( mTabWidget );
 
 //US  QGridLayout *layout = new QGridLayout( tab1, 11, 7 );
   bool horLayout = false;
   int maxCol = 1;
   if ( QApplication::desktop()->width() == 640 || QApplication::desktop()->width() == 320 ) {
       horLayout = true;
       maxCol = 3;
   }
-  QGridLayout *layout = new QGridLayout( tab1, 8-maxCol, maxCol );
+  QGridLayout *layout = new QGridLayout( tab1, 7-maxCol, maxCol );
 
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   QPushButton *button;
   
   //////////////////////////////////
   // Upper left group (person info)
   
   // Person icon
   /* LR
   label = new QLabel( tab1 );
 //US ambiguous call. 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, 0, 1, 0, 0 );
   */
   // First name
   button = new QPushButton( i18n( "Name..." ), tab1 );
 //US  QToolTip::add( button, i18n( "Edit the contact's name" ) );
   mNameEdit = new KLineEdit( tab1, "mNameEdit" );
   connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( nameTextChanged( const QString& ) ) );
   connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) );
   
   mNameLabel = new KSqueezedTextLabel( tab1 );
   mNameLabel->hide();
   
   layout->addWidget( button, 0, 0 );
   layout->addWidget( mNameEdit, 0, 1 );
   layout->addWidget( mNameLabel, 0, 1 );
   
   button = new QPushButton( i18n( "Role:" ), tab1 );
   connect( button, SIGNAL( clicked() ), SLOT( setRole2FN() ) );
   //label = new QLabel( i18n( "Role:" ), tab1 );
   mRoleEdit = new KLineEdit( tab1 );
   connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   //label->setBuddy( mRoleEdit );
-  layout->addWidget( button, 1, 0 );
-  layout->addWidget( mRoleEdit, 1, 1 );
-  
+  if ( horLayout ) {
+      layout->addWidget( button, 0, 2 );
+      layout->addWidget( mRoleEdit, 0, 3 );
+      
+  } else {
+      layout->addWidget( button, 1, 0 );
+      layout->addWidget( mRoleEdit, 1, 1 );
+  }
   // Organization
   button = new QPushButton( i18n( "Organization:" ), tab1 );
   connect( button, SIGNAL( clicked() ), SLOT( setCompany2FN() ) );
   //label = new QLabel( i18n( "Organization:" ), tab1 );
   mOrgEdit = new KLineEdit( tab1 );
   //label->setBuddy( mOrgEdit );
   connect( mOrgEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( textChanged( const QString& ) ) );
   if ( horLayout ) {
       layout->addWidget( button, 1, 2 );
       layout->addWidget( mOrgEdit, 1, 3 );
 
   } else {
       layout->addWidget( button, 2, 0 );
       layout->addWidget( mOrgEdit, 2, 1 );
   }
   
   // File as (formatted name)
   label = new QLabel( i18n( "Format.n.:" ), tab1 );
   mFormattedNameLabel = new KSqueezedTextLabel( tab1 );
   if ( horLayout ) {
-      layout->addWidget( label, 0,2 );
-      layout->addWidget( mFormattedNameLabel, 0, 3 );
+      layout->addWidget( label, 1,0 );
+      layout->addWidget( mFormattedNameLabel, 1, 1 );
   } else {
       layout->addWidget( label, 3, 0 );
       layout->addWidget( mFormattedNameLabel, 3, 1 );
   }
   /* LR
   // Left hand separator. This separator doesn't go all the way
   // across so the dialog still flows from top to bottom
   bar = new KSeparator( KSeparator::HLine, tab1 );
   layout->addMultiCellWidget( bar, 4, 4, 0, 2 );
   */
   //////////////////////////////////////
 
   /* LR
   // Phone numbers (upper right)
   label = new QLabel( tab1 );
 //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 ) );
 //US  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
   layout->addMultiCellWidget( label, 5, 6, 0, 0 );
   */
   mPhoneEditWidget = new PhoneEditWidget( tab1 );
   connect( mPhoneEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
 //US  layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); 
   int iii;
 #ifndef DESKTOP_VERSION
   iii = 7;
 #else
   iii = 8;
 #endif
-  layout->addMultiCellWidget( mPhoneEditWidget, 4, iii, 0, maxCol ); 
-  ++iii;
+  layout->addMultiCellWidget( mPhoneEditWidget, 5-maxCol,  5-maxCol+4, 0, maxCol ); 
+  iii = 6-maxCol+4;
   /* LR
   bar = new KSeparator( KSeparator::HLine, tab1 );
 //US  layout->addMultiCellWidget( bar, 4, 4, 3, 6 );
   layout->addMultiCellWidget( bar, 9, 9, 0, 2 );
   */
 /*US  
   //////////////////////////////////////
   // Addresses (lower left)
   label = new QLabel( tab1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop, 0 ) );
   layout->addMultiCellWidget( label, 5, 6, 0, 0 );
   
   mAddressEditWidget = new AddressEditWidget( tab1 );
   connect( mAddressEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
   layout->addMultiCellWidget( mAddressEditWidget, 5, 9, 1, 2 );
 
   //////////////////////////////////////
   // Email / Web (lower right)
   label = new QLabel( tab1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, 0) );
   layout->addMultiCellWidget( label, 5, 6, 3, 3 );
 
   mEmailWidget = new EmailEditWidget( tab1 );
   connect( mEmailWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
   layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
 
   // add the separator
   bar = new KSeparator( KSeparator::HLine, tab1 );
   layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
 
   label = new QLabel( tab1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, 0) );
   layout->addMultiCellWidget( label, 8, 9, 3, 3 );
 
   label = new QLabel( i18n( "URL:" ), tab1 );
   mURLEdit = new KLineEdit( tab1 );
   connect( mURLEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mURLEdit );
   layout->addWidget( label, 8, 4 );
   layout->addMultiCellWidget( mURLEdit, 8, 8, 5, 6 );
 
   label = new QLabel( i18n( "&IM address:" ), tab1 );
   mIMAddressEdit = new KLineEdit( tab1 );
   connect( mIMAddressEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mIMAddressEdit );
   layout->addWidget( label, 9, 4 );
   layout->addMultiCellWidget( mIMAddressEdit, 9, 9, 5, 6 );
   
   layout->addColSpacing( 6, 50 );
   
   bar = new KSeparator( KSeparator::HLine, tab1 );
   layout->addMultiCellWidget( bar, 10, 10, 0, 6 );
 */  
   ///////////////////////////////////////
       QHBox *categoryBox = new QHBox( tab1 ,"cato");
   categoryBox->setSpacing( KDialogBase::spacingHint() );
   categoryBox->setMargin( KDialogBase::marginHintSmall() );
   
   // Categories
   button = new QPushButton( i18n( "Categories" ), categoryBox );
   connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) );
 
   mCategoryEdit = new KLineEdit( categoryBox );
   mCategoryEdit->setReadOnly( true );
   connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( textChanged( const QString& ) ) );
 
   mSecrecyWidget = new SecrecyWidget( categoryBox );
   connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
 
 //US  layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 );
   layout->addMultiCellWidget( categoryBox, iii, iii, 0, maxCol );
   
   // Build the layout and add to the tab widget
   layout->activate(); // required
 
   mTabWidget->addTab( tab1, i18n( "&General" ) );
 }
 
 void AddresseeEditorWidget::setRole2FN()
 {
     if ( mRoleEdit->text().isEmpty() ) return;
     mFormattedNameType = NameEditDialog::CustomName;
     mAddressee.setFormattedName( mRoleEdit->text() ); 
     mFormattedNameLabel->setText( mRoleEdit->text() );
     mDirty = true;
 }
 void AddresseeEditorWidget::setCompany2FN()
 {
     if (  mOrgEdit->text().isEmpty() ) return;
     mFormattedNameType = NameEditDialog::CustomName;
     mAddressee.setFormattedName( mOrgEdit->text() );
     mFormattedNameLabel->setText( mOrgEdit->text() );
     mDirty = true;
 }
 
 void AddresseeEditorWidget::setupTab1_1()
 {
   // This is the Address tab
   QWidget *tab1_1 = new QWidget( mTabWidget );
 
 //US  QGridLayout *layout = new QGridLayout( tab1_1, 11, 7 );
   QGridLayout *layout = new QGridLayout( tab1_1, 7, 2 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   QPushButton *button;
 
 /*US    
   //////////////////////////////////
   // Upper left group (person info)
   
   // Person icon
   label = new QLabel( tab1 );
 //US ambiguous call. 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, 0, 1, 0, 0 );
   
   // First name
   button = new QPushButton( i18n( "Name..." ), tab1 );
   QToolTip::add( button, i18n( "Edit the contact's name" ) );
   mNameEdit = new KLineEdit( tab1, "mNameEdit" );
   connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( nameTextChanged( const QString& ) ) );
   connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) );
   
 #ifndef KAB_EMBEDDED    
   mNameLabel = new KSqueezedTextLabel( tab1 );
   mNameLabel->hide();
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 #endif //KAB_EMBEDDED    
   
   layout->addWidget( button, 0, 1 );
   layout->addWidget( mNameEdit, 0, 2 );
   
 #ifndef KAB_EMBEDDED    
   layout->addWidget( mNameLabel, 0, 2 );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 #endif //KAB_EMBEDDED    
   
   label = new QLabel( i18n( "Role:" ), tab1 );
   mRoleEdit = new KLineEdit( tab1 );
   connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   label->setBuddy( mRoleEdit );
   layout->addWidget( label, 1, 1 );
   layout->addWidget( mRoleEdit, 1, 2 );
   
   // Organization
   label = new QLabel( i18n( "Organization:" ), tab1 );
   mOrgEdit = new KLineEdit( tab1 );
   label->setBuddy( mOrgEdit );
   connect( mOrgEdit, SIGNAL( textChanged( const QString& ) ), 
            SLOT( textChanged( const QString& ) ) );
   layout->addWidget( label, 2, 1 );
   layout->addWidget( mOrgEdit, 2, 2 );
   
   // File as (formatted name)
   label = new QLabel( i18n( "Formatted name:" ), tab1 );
 #ifndef KAB_EMBEDDED    
   mFormattedNameLabel = new KSqueezedTextLabel( tab1 );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 #endif //KAB_EMBEDDED    
   layout->addWidget( label, 3, 1 );
 #ifndef KAB_EMBEDDED    
   layout->addWidget( mFormattedNameLabel, 3, 2 );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 #endif //KAB_EMBEDDED    
   
   // Left hand separator. This separator doesn't go all the way
   // across so the dialog still flows from top to bottom
   bar = new KSeparator( KSeparator::HLine, tab1 );
   layout->addMultiCellWidget( bar, 4, 4, 0, 2 );
   
   //////////////////////////////////////
   // Phone numbers (upper right)
   label = new QLabel( tab1 );
 //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 ) );
   layout->addMultiCellWidget( label, 0, 1, 3, 3 );
   
   mPhoneEditWidget = new PhoneEditWidget( tab1 );
   connect( mPhoneEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
   layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); 
 
   bar = new KSeparator( KSeparator::HLine, tab1 );
   layout->addMultiCellWidget( bar, 4, 4, 3, 6 );
 */  
   //////////////////////////////////////
   // Addresses (lower left)
   /* LR 
   label = new QLabel( tab1_1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop, 0 ) );
 //US  layout->addMultiCellWidget( label, 5, 6, 0, 0 );
   layout->addMultiCellWidget( label, 0, 1, 0, 0 );
   */
   
   mAddressEditWidget = new AddressEditWidget( tab1_1 );
   connect( mAddressEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
 //US  layout->addMultiCellWidget( mAddressEditWidget, 5, 9, 1, 2 );
   layout->addMultiCellWidget( mAddressEditWidget, 0, 4, 0, 1 );
 
 //US  
 /* LR
   bar = new KSeparator( KSeparator::HLine, tab1_1 );
   layout->addMultiCellWidget( bar, 5, 5, 0, 3 );
 */
   
   //////////////////////////////////////
   // Email / Web (lower right)
   /* LR
   label = new QLabel( tab1_1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, 0) );
 //US  layout->addMultiCellWidget( label, 5, 6, 3, 3 );
   layout->addMultiCellWidget( label, 6, 7, 0, 0 );
   */
   mEmailWidget = new EmailEditWidget( tab1_1 );
   connect( mEmailWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
 //US  layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
   layout->addMultiCellWidget( mEmailWidget, 5, 6, 0, 1 );
 
   /* LR
   // add the separator
   bar = new KSeparator( KSeparator::HLine, tab1_1 );
 //US  layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
   layout->addMultiCellWidget( bar, 8, 8, 0, 3 );
   
   label = new QLabel( tab1_1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, 0) );
 //US  layout->addMultiCellWidget( label, 8, 9, 3, 3 );
   layout->addMultiCellWidget( label, 9, 10, 0, 0 );
   */
   label = new QLabel( i18n( "URL:" ), tab1_1 );
   mURLEdit = new KLineEdit( tab1_1 );
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 7e2aec1..5639aa2 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -1,334 +1,336 @@
 /*
     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 <qtimer.h>
 #include <qapplication.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 )
   : 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 ) );
     QPushButton *addBut = new QPushButton ( "add", this );
     addBut->setPixmap ( SmallIcon("plus"));
     addBut->setMaximumSize( addBut->sizeHint().height(),addBut->sizeHint().height() );
     connect(addBut,SIGNAL(clicked ()),SLOT(addNumber()));
 
     sv = new QScrollView( this );
-    sv->setFrameStyle ( QFrame::Panel | QFrame::Plain );
-    sv->setLineWidth ( 1 ); 
-    sv->setMidLineWidth ( 1 ); 
+    sv->setFrameStyle ( QFrame::Plain );
+    sv->setLineWidth ( 0 ); 
+    sv->setMidLineWidth ( 0 ); 
     mw = new QWidget ( sv->viewport() );
     sv->addChild(mw);
     sv->setResizePolicy( QScrollView::AutoOneFit );
     mainLayout = new QVBoxLayout ( mw );
     mainLayout->setMargin( 0 );
     mainLayout->setSpacing( 0 );
+    gridLayout->setMargin( 2 );
+    gridLayout->setSpacing( 4 );
     if ( QApplication::desktop()->width() == 240 || QApplication::desktop()->width() == 480 ) {
         gridLayout->addWidget( addBut, 0, 0 );
         gridLayout->addWidget( temp, 0, 1 );
         gridLayout->addMultiCellWidget( sv, 1,1 , 0,1 );
     } else {
         gridLayout->addWidget( temp, 1, 0 );
         gridLayout->addWidget( addBut, 0, 0 );
         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 list2 = li;
     KABC::PhoneNumber::List list ;
 
     PhoneNumber::TypeList  tList = PhoneNumber::supportedTypeList();
     int i = 0;
     int max = tList.count();
     while ( i < max-1 ) {
         for ( it = list2.begin(); it != list2.end(); ++it ) {
             if ( (*it).type() == tList[i] ) {
                 list.append( (*it ) ); 
                 break; 
             }
         }
         ++i;   
     }
     for ( it = list2.begin(); it != list2.end(); ++it ) {
             if ( (*it).type() == tList[ max-1 ] )
                 list.append( (*it ) );  
     }
     for ( it = list.begin(); it != list.end(); ++it ) {
             PhoneTypeNumberEdit* editNew = appendEditCombo();
             editNew->setPhoneNumber( (*it ) );
     }
     
 }
 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.
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index 0477b6c..fbf9fe7 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -1,295 +1,183 @@
 #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 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( 2 );
           lay->setMargin( 0 );
           mMinusButton = new QPushButton ( this );
           mMinusButton->setPixmap ( SmallIcon("minus"));
           mCombo = new KComboBox( this );
           mNumber = new KLineEdit( this );
           mMinusButton->setMaximumHeight( mNumber->sizeHint().height() + 6);
           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();
           if ( newT != PhoneNumber::Voice )
               emit typeChange ( old, newT );
           mPhoneNumber.setType(newT );
       }
 
   }
   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