3 files changed, 16 insertions, 121 deletions

diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 966efa5..c4083a9 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -160,7 +160,7 @@ void AddresseeEditorWidget::setupTab1()
       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() );
@@ -202,9 +202,14 @@ void AddresseeEditorWidget::setupTab1()
   connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   //label->setBuddy( mRoleEdit );
+  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() ) );
@@ -226,8 +231,8 @@ void AddresseeEditorWidget::setupTab1()
   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 );
@@ -258,8 +263,8 @@ void AddresseeEditorWidget::setupTab1()
 #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 );
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 7e2aec1..5639aa2 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -67,15 +67,17 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
     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 );
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index 0477b6c..fbf9fe7 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -85,121 +85,9 @@ class PhoneEditWidget : public QWidget
     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