1 files changed, 58 insertions, 22 deletions

diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 997fc05..9e7e221 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -10,117 +10,153 @@
     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();
 }