commit

5 files changed, 74 insertions, 31 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,9 +1,9 @@
 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
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 9814cd5..966efa5 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -1185,13 +1185,13 @@ void AddresseeEditorWidget::save()
     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 )
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 997fc05..9e7e221 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -28,12 +28,13 @@
 #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>
@@ -48,38 +49,49 @@
 
 #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 );
-    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 );
+  : 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()));
-    //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->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 );
+    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()
@@ -94,15 +106,39 @@ void  PhoneEditWidget::setDefaults()
     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() ) );
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index c730c7b..df5aff9 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -24,12 +24,13 @@
 */                                                                      
 
 #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"
@@ -44,13 +45,13 @@ class PhoneTypeNumberEdit;
 
 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();
@@ -63,18 +64,23 @@ class PhoneEditWidget : public QScrollView
 
   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;
@@ -223,13 +229,13 @@ public:
   {
       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]  );
@@ -237,12 +243,16 @@ public:
       }
   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() );
@@ -256,21 +266,18 @@ public:
   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 );
       }
 
   }
-  int currentType()
-  {
-      return mCombo->currentItem();
-  }
   void textChanged ( const QString & )
   {
       emit modified();
   }
  signals:
 void  typeChange( int oldType, int newType );
diff --git a/version b/version
index 6c3e9c6..4f24d24 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.2.5";
+version = "2.2.6";