Changed phone number sorting in details view

4 files changed, 77 insertions, 67 deletions

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 2dda968..af149a0 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -1,464 +1,475 @@
 /*
     This file is part of libkdepim.
 
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library 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
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <kabc/address.h>
 #include <kabc/addressee.h>
 #include <kabc/phonenumber.h>
 #include <kglobal.h>
 //US#include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
 //US #include <kstringhandler.h>
 #include <qscrollview.h>
 #include <qregexp.h>
 #include <qfile.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qapplication.h>
 #include <qpushbutton.h>
 
 
 #include "externalapphandler.h"
 #include "addresseeview.h"
 
 
 //US #ifndef DESKTOP_VERSION
 //US #include <qtopia/qcopenvelope_qws.h>
 //US #include <qpe/qpeapplication.h>
 //US #endif
 
 //US static int kphoneInstalled = 0;
 
 using namespace KPIM;
 
 AddresseeView::AddresseeView( QWidget *parent, const char *name )
 //US  : KTextBrowser( parent, name )
   : QTextBrowser( parent, name )
 
 
 {
 //US  setWrapPolicy( QTextEdit::AtWordBoundary );
   setLinkUnderline( false );
   // setVScrollBarMode( QScrollView::AlwaysOff );
   //setHScrollBarMode( QScrollView::AlwaysOff );
 
 //US  QStyleSheet *sheet = styleSheet();
 //US  QStyleSheetItem *link = sheet->item( "a" );
 //US  link->setColor( KGlobalSettings::linkColor() );
 
 }
 
 void AddresseeView::setSource(const QString& n)
 {
     //qDebug("********AddresseeView::setSource %s", n.latin1());
 
   if ( n.left( 6 ) == "mailto" )
     ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
   else if ( n.left( 7 ) == "phoneto" )
     ExternalAppHandler::instance()->callByPhone(  n.mid(8) );
   else if ( n.left( 5 ) == "faxto" )
     ExternalAppHandler::instance()->callByFax(  n.mid(6) );
   else if ( n.left( 5 ) == "smsto" )
     ExternalAppHandler::instance()->callBySMS(  n.mid(6) );
   else if ( n.left( 7 ) == "pagerto" )
     ExternalAppHandler::instance()->callByPager(  n.mid(8) );
   else if ( n.left( 5 ) == "sipto" )
     ExternalAppHandler::instance()->callBySIP(  n.mid(6) );
 
 }
 void AddresseeView::setAddressee( const KABC::Addressee& addr )
 {
   ExternalAppHandler* eah = ExternalAppHandler::instance();
   bool kemailAvail = eah->isEmailAppAvailable();
-  bool kphoneAvail = eah->isPhoneAppAvailable();
-  bool kfaxAvail = eah->isFaxAppAvailable();
-  bool ksmsAvail = eah->isSMSAppAvailable();
-  bool kpagerAvail = eah->isPagerAppAvailable();
-  bool ksipAvail = eah->isSIPAppAvailable();
+
 
 
   mAddressee = addr;
   // clear view
   setText( QString::null );
 
   if ( mAddressee.isEmpty() )
     return;
 
   QString name = ( mAddressee.assembledName().isEmpty() ?
                    mAddressee.formattedName() : mAddressee.assembledName() );
 
   QString dynamicPart;
 
+  dynamicPart += getPhoneNumbers( true );
+  qDebug("dynamic preferred %s ",dynamicPart.latin1() );
   QStringList emails = mAddressee.emails();
   QStringList::ConstIterator emailIt;
   QString type = i18n( "Email" );
   emailIt = emails.begin();
   if ( emailIt != emails.end() ) {
     if ( kemailAvail ) {
       dynamicPart += QString(
             "<tr><td align=\"right\"><b>%1</b></td>"
            "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" )
           .arg( type )
           .arg( name )
           .arg( *emailIt )
           .arg( *emailIt );
       ++emailIt;
     } else {
       dynamicPart += QString(
             "<tr><td align=\"right\"><b>%1</b></td>"
            "<td align=\"left\">%2</td></tr>" )
           .arg( type )
           .arg( *emailIt );
       ++emailIt;
     }
   }
   if ( mAddressee.birthday().date().isValid() ) {
       dynamicPart += QString(
             "<tr><td align=\"right\"><b>%1</b></td>"
            "<td align=\"left\">%2</td></tr>" )
           .arg( i18n ("Birthday") )
           .arg( KGlobal::locale()->formatDate( mAddressee.birthday().date()  ,true) );
   }
-  KABC::PhoneNumber::List phones = mAddressee.phoneNumbers();
-  KABC::PhoneNumber::List::ConstIterator phoneIt;
-  QString extension;
-  int phonetype;
-  QString sms;
-  for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
-    phonetype = (*phoneIt).type();
-    if (ksmsAvail &&
-        (
-		 ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) ||
-         ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell)
-        )
-       )
-    {
-      sms = QString("<a href=\"smsto:%1  \">(sms)</a>" )
-              .arg( (*phoneIt).number() );
-
-    }
-    else
-      sms = "";
-
-    extension = QString::null;
-    if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) {
-      if (kfaxAvail) extension = "faxto:";
-    }
-    else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) {
-      if (kpagerAvail) extension = "pagerto:";
-    }
-    else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) {
-      if (ksipAvail) extension = "sipto:";
-    }
-    else if (kphoneAvail) {
-      extension = "phoneto:";
-    }
-    else
-      extension = QString::null;
-
-      if ( !extension.isEmpty() ) {
-          dynamicPart += QString(
-                                 "<tr><td align=\"right\"><b>%1</b></td>"
-           "<td align=\"left\"><a href=\"%2%3  \">%4</a> %5</td></tr>" )
-              .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
-              .arg( extension )
-              .arg( (*phoneIt).number() )
-              .arg( (*phoneIt).number() )
-              .arg( sms );
-
-      } else {
-          dynamicPart += QString(
-                                 "<tr><td align=\"right\"><b>%1</b></td>"
-                                 "<td align=\"left\">%2 %3</td></tr>" )
-              .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
-              .arg( (*phoneIt).number() )
-              .arg( sms );
-      }
-  }
-
+  dynamicPart += getPhoneNumbers( false );
 
   for ( ; emailIt != emails.end(); ++emailIt ) {
     if ( kemailAvail ) {
       dynamicPart += QString(
         "<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" )
         .arg( type )
         .arg( name )
         .arg( *emailIt )
         .arg( *emailIt );
 	} else {
       dynamicPart += QString(
         "<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
         .arg( type )
         .arg( *emailIt );
     }
   }
 
   if ( !mAddressee.url().url().isEmpty() ) {
     dynamicPart += QString(
       "<tr><td align=\"right\"><b>%1</b></td>"
       "<td align=\"left\">%2</td></tr>" )
       .arg( i18n( "Homepage" ) )
 //US      .arg( KStringHandler::tagURLs( mAddressee.url().url() ) );
       .arg( mAddressee.url().url() );
     //qDebug("AddresseeView::setAddressee has to be verified.");
   }
 
   KABC::Address::List addresses = mAddressee.addresses();
   KABC::Address::List::ConstIterator addrIt;
   for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) {
       if ( true /*(*addrIt).label().isEmpty()*/ ) {
       QString formattedAddress = (*addrIt).formattedAddress().stripWhiteSpace();
 //US      formattedAddress = formattedAddress.replace( '\n', "<br>" );
       //qDebug("adresss %s ",formattedAddress.latin1() );
        formattedAddress = formattedAddress.replace( QRegExp("\n"), "<br>" );
        //qDebug("AddresseeView::setAddressee has to be verified.");
 
       dynamicPart += QString(
         "<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
         .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
         .arg( formattedAddress );
     } else {
 
       dynamicPart += QString(
         "<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
         .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
 //US        .arg( (*addrIt).label().replace( '\n', "<br>" ) );
           .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ );
 
     }
   }
 
   QString notes;
   if ( !mAddressee.note().isEmpty() ) {
     notes = QString(
       "<tr>"
       "<td align=\"right\" valign=\"top\"><b>%1</b></td>"  // note label
       "<td align=\"left\">%2</td>"  // note
       "</tr>" ).arg( i18n( "Notes" ) )
 //US      .arg( mAddressee.note().replace( '\n', "<br>" ) );
       .arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) );
     //qDebug("AddresseeView::setAddressee has to be verified.");
   }
 
   QString aRole = "";
   QString aOrga = "";
   if ( true /*!mAddressee.role().isEmpty()*/ ) {
       aRole = "<tr>"
           "<td align=\"left\">" + mAddressee.role() + "</td>"
           "</tr>";
   }
   if ( true /*!mAddressee.organization().isEmpty()*/ ) {
       aOrga = "<tr>"
           "<td align=\"left\">" + mAddressee.organization() + "</td>" ;
           "</tr>";
   }
   mText = "";
   QString picString = "";
   KABC::Picture picture = mAddressee.photo();
   bool picAvailintern = false;
   bool picAvailUrl = false;
   if (! picture.undefined() ) {
       picAvailintern = (picture.isIntern() && !picture.data().isNull());
       picAvailUrl = !picture.isIntern() &&  QFile::exists(picture.url() );
   }
   if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) {
       if (  picAvailintern ) {
           QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
       } else {
           if ( picAvailUrl ) {
               QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() ));
           } else {
           QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) );
           }
       }
       picString =  "<img src=\"myimage\" width=\"50\" height=\"70\">";
     mText = QString::fromLatin1(
   "<html>"
   "<body text=\"%1\" bgcolor=\"%2\">" // text and background color
   "<table>"
   "<tr>"
   "<td rowspan=\"3\" align=\"right\" valign=\"top\">"
   "%3"
   "</td>"
   "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>"  // name
   "</tr>"
   "%5"  // role
   "%6"  // organization
   "<td colspan=\"2\">&nbsp;</td>"
   "%7"  // dynamic part
   "%8"  // notes
   "</table>"
   "</body>"
   "</html>")
 //US
   .arg( /*KGlobalSettings::textColor().name()*/ "black" )
 //US
   .arg( /*KGlobalSettings::baseColor().name()*/ "white" )
   .arg( picString )
   .arg( name )
   .arg( aRole )
   .arg( aOrga )
   .arg( dynamicPart )
   .arg( notes );
 
   } else { // no picture!
 
 mText = "<table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>";
 #ifdef DESKTOP_VERSION
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>";
 #else
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h2>";
 #endif
 
 #ifdef DESKTOP_VERSION
     mText += "<font color=\"#FFFFFF\"> <em>" +  name+"</em></font></h1>";
 #else
     mText += "<font color=\"#FFFFFF\"> <em>" +  name +"</em></font></h2>";
 #endif
     mText += "</td></tr>\n<tr  bgcolor=\"#EAF8FA\"><td>";
 
     mText += "<table><td colspan=\"2\">&nbsp;</td>";
     /*
       mText += QString("<tr><td align=\"right\"><b2>%1</b2></td>"
         "<td align=\"left\"><b>%2</b></td></tr>" )
           .arg( i18n(" ") )
         .arg( name );
     */
       if ( ! mAddressee.role().isEmpty() )
       mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
           .arg( i18n(" ") )
         .arg( mAddressee.role());
       if ( ! mAddressee.organization().isEmpty() )
       mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
         "<td align=\"left\">%2</td></tr>" )
           .arg( i18n(" ") )
         .arg( mAddressee.organization());
       mText += dynamicPart;
       mText += notes;
       mText += "</table>";
 
  }
 
   // at last display it...
   setText( mText );
 
 }
 
+QString AddresseeView::getPhoneNumbers( bool preferred )
+{  
+  ExternalAppHandler* eah = ExternalAppHandler::instance();
+  bool kphoneAvail = eah->isPhoneAppAvailable();
+  bool kfaxAvail = eah->isFaxAppAvailable();
+  bool ksmsAvail = eah->isSMSAppAvailable();
+  bool kpagerAvail = eah->isPagerAppAvailable();
+  bool ksipAvail = eah->isSIPAppAvailable();
+  QString dynamicPart;
+  KABC::PhoneNumber::List phones = mAddressee.phoneNumbers();
+  KABC::PhoneNumber::List::ConstIterator phoneIt;
+  QString extension;
+  int phonetype;
+  QString sms;
+  for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
+    phonetype = (*phoneIt).type();
+    if ( ((phonetype & KABC::PhoneNumber::Pref) == 0 ) == preferred )
+        continue;
+    if (ksmsAvail &&
+        (
+		 ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) ||
+         ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell)
+        )
+       )
+    {
+      sms = QString("<a href=\"smsto:%1  \">(sms)</a>" )
+              .arg( (*phoneIt).number() );
+
+    }
+    else
+      sms = "";
+
+    extension = QString::null;
+    if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) {
+      if (kfaxAvail) extension = "faxto:";
+    }
+    else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) {
+      if (kpagerAvail) extension = "pagerto:";
+    }
+    else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) {
+      if (ksipAvail) extension = "sipto:";
+    }
+    else if (kphoneAvail) {
+      extension = "phoneto:";
+    }
+    else
+      extension = QString::null;
+
+      if ( !extension.isEmpty() ) {
+          dynamicPart += QString(
+                                 "<tr><td align=\"right\"><b>%1</b></td>"
+           "<td align=\"left\"><a href=\"%2%3  \">%4</a> %5</td></tr>" )
+              .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
+              .arg( extension )
+              .arg( (*phoneIt).number() )
+              .arg( (*phoneIt).number() )
+              .arg( sms );
+
+      } else {
+          dynamicPart += QString(
+                                 "<tr><td align=\"right\"><b>%1</b></td>"
+                                 "<td align=\"left\">%2 %3</td></tr>" )
+              .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
+              .arg( (*phoneIt).number() )
+              .arg( sms );
+      }
+  }
+  return dynamicPart;
+}
 KABC::Addressee AddresseeView::addressee() const
 {
   return mAddressee;
 }
 void AddresseeView::addTag(const QString & tag,const QString & text)
 {
     if ( text.isEmpty() )
         return;
     int number=text.contains("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
     QString tmpStr=str;
     if(number !=-1)
         {
             if (number > 0) {
                 int pos=0;
                 QString tmp;
                 for(int i=0;i<=number;i++) {
                     pos=tmpText.find("\n");
                     tmp=tmpText.left(pos);
                     tmpText=tmpText.right(tmpText.length()-pos-1);
                     tmpStr+=tmp+"<br>";
                 }
             }
             else tmpStr += tmpText;
             tmpStr+="</" + tag + ">";
             mText.append(tmpStr);
         }
     else
         {
             str += text + "</" + tag + ">";
             mText.append(str);
         }
 }
 
 AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bool takeloc, QWidget *parent, const char *name ) : KDialogBase(parent,name,
                 true ,i18n("Conflict! Please choose Adressee!"),Ok|User1|Close,Close, false)
 {
     findButton( Close )->setText( i18n("Cancel Sync"));
     findButton( Ok )->setText( i18n("Remote"));
     findButton( User1 )->setText( i18n("Local"));
     QWidget* topframe = new QWidget( this );
     setMainWidget( topframe );
     QBoxLayout* bl;
     if ( QApplication::desktop()->width() < 640 ) {
         bl = new QVBoxLayout( topframe  );
     } else {
         bl = new QHBoxLayout( topframe  );
     }
     QVBox* subframe = new QVBox( topframe );
     bl->addWidget(subframe  );
     QLabel* lab = new QLabel( i18n("Local Addressee"), subframe ); 
     if ( takeloc )
         lab->setBackgroundColor(Qt::green.light() );
     AddresseeView * av = new AddresseeView( subframe );
     av->setAddressee( loc );
     subframe = new QVBox( topframe );
     bl->addWidget(subframe  );
     lab = new QLabel( i18n("Remote Addressee"), subframe  ); 
     if ( !takeloc )
         lab->setBackgroundColor(Qt::green.light() );
     av = new AddresseeView( subframe );
     av->setAddressee( rem );
     QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); 
     QObject::connect(this,SIGNAL(user1Clicked()),this, SLOT(slot_local())); 
 #ifndef DESKTOP_VERSION
     showMaximized();
 #else
     resize ( 640, 400 );
 #endif
 }
 
 int AddresseeChooser::executeD( bool local )
 {
     mSyncResult = 3; 
     if ( local ) 
         findButton( User1 )->setFocus();
     else 
         findButton( Ok )->setFocus();
     exec();
     return mSyncResult;  
 }
 void AddresseeChooser::slot_remote()
 {
     mSyncResult = 2;
     accept();
 }
 void AddresseeChooser::slot_local()
 {
     mSyncResult = 1;
     accept();
 }
diff --git a/kabc/addresseeview.h b/kabc/addresseeview.h
index 689d997..d8a13ee 100644
--- a/kabc/addresseeview.h
+++ b/kabc/addresseeview.h
@@ -1,78 +1,79 @@
 /*
     This file is part of libkdepim.
 
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library 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
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KPIM_ADDRESSEEVIEW_H
 #define KPIM_ADDRESSEEVIEW_H
 
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
 
 //US #include <ktextbrowser.h>
 #include <qtextbrowser.h>
 
 namespace KPIM {
 
 //US class AddresseeView : public KTextBrowser
 class AddresseeView : public QTextBrowser
 {
   public:
     AddresseeView( QWidget *parent = 0, const char *name = 0 );
 
     /**
       Sets the addressee object. The addressee is displayed immediately.
 
       @param addr The addressee object.
      */
     void setAddressee( const KABC::Addressee& addr );
     void setSource(const QString& n);
     /**
       Returns the current addressee object.
      */
     KABC::Addressee addressee() const;
 
   private:
     KABC::Addressee mAddressee;
     QString mText;
+    QString getPhoneNumbers( bool preferred );
     void addTag(const QString & tag,const QString & text);
     class AddresseeViewPrivate;
     AddresseeViewPrivate *d;
 };
 class AddresseeChooser : public KDialogBase
 {
     Q_OBJECT
 
   public:
     AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bool takeloc, QWidget *parent = 0, const char *name = 0 );
 
     int executeD( bool local );
 
   private:
     int mSyncResult;
 
   private slots:
     void slot_remote();
     void slot_local();
 
 };
 
 }
 
 #endif
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 6e94c7e..d7e3925 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -1,223 +1,223 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library 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
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kapplication.h>
 #include <klocale.h>
 
 #include "phonenumber.h"
 
 using namespace KABC;
 
 PhoneNumber::PhoneNumber() :
   mType( Home )
 {
   init();
 }
 
 PhoneNumber::PhoneNumber( const QString &number, int type ) :
   mType( type ), mNumber( number )
 {
   init();
 }
 
 PhoneNumber::~PhoneNumber()
 {
 }
 
 void PhoneNumber::init()
 {
   mId = KApplication::randomString( 8 );
 }
 
 bool PhoneNumber::operator==( const PhoneNumber &p ) const
 {
   if ( mNumber != p.mNumber ) return false;
   if ( mType != p.mType ) return false;
   
   return true;
 }
 
 bool PhoneNumber::operator!=( const PhoneNumber &p ) const
 {
   return !( p == *this );
 }
 
 bool PhoneNumber::simplifyNumber()
 {
     QString Number;
     int i;
     Number = mNumber.stripWhiteSpace ();
     mNumber = "";
     for ( i = 0; i < Number.length(); ++i) {
         if ( Number.at(i).isDigit() || Number.at(i) == '+'|| Number.at(i) == '*'|| Number.at(i) == '#' )
             mNumber += Number.at(i);
     }
     return ( mNumber.length() > 0 );
 }
 // make cellphone compatible
 void PhoneNumber::simplifyType()
 {
  if ( mType & Fax ) mType = Fax;
  else if ( mType & Cell ) mType = Cell;
  else if ( mType & Work  ) mType = Work  ;
  else if ( mType & Home ) mType = Home;
  else  mType = Pref;
 }
 void PhoneNumber::setId( const QString &id )
 {
   mId = id;
 }
 
 QString PhoneNumber::id() const
 {
   return mId;
 }
 
 void PhoneNumber::setNumber( const QString &number )
 {
   mNumber = number;
 }
 
 QString PhoneNumber::number() const
 {
   return mNumber;
 }
 
 void PhoneNumber::setType( int type )
 {
   mType = type;
 }
 
 int PhoneNumber::type() const
 {
   return mType;
 }
 
 QString PhoneNumber::typeLabel() const
 {
   QString label;
   bool first = true;
 
   TypeList list = typeList();
 
   TypeList::Iterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     if ( ( type() & (*it) ) && ( (*it) != Pref ) ) {
       label.append( ( first ? "" : "/" ) + typeLabel( *it ) );
       if ( first )
         first = false;
     }
   }
 
   return label;
 }
 
 QString PhoneNumber::label() const
 {
   return typeLabel( type() );
 }
 
 PhoneNumber::TypeList PhoneNumber::typeList()
 {
   TypeList list;
   
   list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video
        << Bbs << Modem << Car << Isdn << Pcs << Pager << Sip;
 
   return list;
 }
 
 QString PhoneNumber::label( int type )
 {
   return typeLabel( type );
 }
 
 QString PhoneNumber::typeLabel( int type )
 {
   QString typeString;
   
   if ((type & Home) == Home)
     typeString += i18n("Home");
   else if ((type & Work) == Work)
     typeString += i18n("Work");
    
   if (!typeString.isEmpty())
     typeString += " ";
       
   if ((type & Cell) == Cell)
     typeString += i18n("Mobile");
   else if ((type & Fax) == Fax)
     typeString += i18n("Fax");
   else if ((type & Msg) == Msg)
     typeString += i18n("Messenger");
   else if ((type & Voice) == Voice) {
 // add nothing in case of the Voice flag
 //    typeString += i18n("Voice");
   }
   else if ((type & Video) == Video)
     typeString += i18n("Video");
   else if ((type & Bbs) == Bbs)
     typeString += i18n("Mailbox");
   else if ((type & Modem) == Modem)
     typeString += i18n("Modem");
   else if ((type & Car) == Car)
     typeString += i18n("Car");
   else if ((type & Isdn) == Isdn)
     typeString += i18n("ISDN");
   else if ((type & Pcs) == Pcs)
     typeString += i18n("PCS");
   else if ((type & Pager) == Pager)
     typeString += i18n("Pager");
   else if ((type & Sip) == Sip)
     typeString += i18n("SIP");
     
   // add the prefered flag    
   if (!typeString.isEmpty())
     typeString += " ";
-
+  /*
   if ((type & Pref) == Pref)
     typeString += i18n("(p)");
-
+  */
   //if we still have no match, return "other"        
   if (typeString.isEmpty())
     return i18n("Other");
     
     
   return typeString;
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const PhoneNumber &phone )
 {
     return s << phone.mId << phone.mType << phone.mNumber;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, PhoneNumber &phone )
 {
     s >> phone.mId >> phone.mType >> phone.mNumber;
 
     return s;
 }
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 78b9941..19bb676 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -1,532 +1,530 @@
 /*
     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 <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 *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() ) {
       mPhoneList = dlg.phoneNumbers();
       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() );
-  } else {
-    kdDebug(5720) << "PhoneEditWidget::updatePhoneNumber(): no selected element"
-              << endl;
   }
 
   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 )
 {
   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;
 
   QWidget *page = plainPage();
 
   QGridLayout *layout = new QGridLayout( page, 1, 2 );
   layout->setSpacing( spacingHint() );
 
   mListView = new KListView( page );
   mListView->setAllColumnsShowFocus( true );
   mListView->addColumn( i18n( "Number" ) );
   mListView->addColumn( i18n( "Type" ) );
 
   KButtonBox *buttonBox = new KButtonBox( page, Vertical );
 
   buttonBox->addButton( i18n( "&Add..." ), this, SLOT( slotAddPhoneNumber() ) );
   mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, SLOT( slotEditPhoneNumber() ) );
   mEditButton->setEnabled( false );
   mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, SLOT( slotRemovePhoneNumber() ) );
   mRemoveButton->setEnabled( false );
   buttonBox->layout();
 
   layout->addWidget( mListView, 0, 0 );
   layout->addWidget( buttonBox, 0, 1 );
 
   connect( mListView, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged()) );
   connect( mListView, SIGNAL(doubleClicked( QListViewItem *, const QPoint &, int  )), this, SLOT( slotEditPhoneNumber()));
 
   KABC::PhoneNumber::List::Iterator it;
   for ( it = mPhoneNumberList.begin(); it != mPhoneNumberList.end(); ++it )
     new PhoneViewItem( mListView, *it );
 
   mChanged = false;
 }
 
 PhoneEditDialog::~PhoneEditDialog()
 {
 }
 
 void PhoneEditDialog::slotAddPhoneNumber()
 {
   KABC::PhoneNumber tmp( "", 0 );
   PhoneTypeDialog dlg( tmp, this );
 
   if ( dlg.exec() ) {
     KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
     mPhoneNumberList.append( phoneNumber );
     new PhoneViewItem( mListView, phoneNumber );
 
     mChanged = true;
   }
 }
 
 void PhoneEditDialog::slotRemovePhoneNumber()
 {
   PhoneViewItem *item = static_cast<PhoneViewItem*>( mListView->currentItem() );
   if ( !item )
     return;
 
   mPhoneNumberList.remove( item->phoneNumber() );
   QListViewItem *currItem = mListView->currentItem();
   mListView->takeItem( currItem );
   delete currItem;
 
   mChanged = true;
 }
 
 void PhoneEditDialog::slotEditPhoneNumber()
 {
   PhoneViewItem *item = static_cast<PhoneViewItem*>( mListView->currentItem() );
   if ( !item )
     return;
 
   PhoneTypeDialog dlg( item->phoneNumber(), this );
 
   if ( dlg.exec() ) {
     slotRemovePhoneNumber();
     KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
     mPhoneNumberList.append( phoneNumber );
     new PhoneViewItem( mListView, phoneNumber );
 
     mChanged = true;
   }
 }
 
 void PhoneEditDialog::slotSelectionChanged()
 {
   bool state = ( mListView->currentItem() != 0 );
 
   mRemoveButton->setEnabled( state );
   mEditButton->setEnabled( state );
 }
 
 const KABC::PhoneNumber::List &PhoneEditDialog::phoneNumbers()
 {
   return mPhoneNumberList;
 }
 
 bool PhoneEditDialog::changed() const
 {
   return mChanged;
 }
 
 ///////////////////////////////////////////
 // PhoneTypeDialog
 PhoneTypeDialog::PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber,
                                QWidget *parent, const char *name)
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Phone Number" ),
                 KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                 parent, name, true), mPhoneNumber( phoneNumber )
 {
   QWidget *page = plainPage();
   QLabel *label = 0;
   QGridLayout *layout = new QGridLayout( page, 3, 2, marginHint(), spacingHint() );
 
   label = new QLabel( i18n( "Number:" ), page );
   layout->addWidget( label, 0, 0 );
   mNumber = new KLineEdit( page );
   layout->addWidget( mNumber, 0, 1 );
 
   mPreferredBox = new QCheckBox( i18n( "This is the preferred phone number" ), page );
   layout->addMultiCellWidget( mPreferredBox, 1, 1, 0, 1 );
 
   mGroup = new QButtonGroup( 2, Horizontal, i18n( "Types" ), page );
   layout->addMultiCellWidget( mGroup, 2, 2, 0, 1 );
 
   // fill widgets
   mNumber->setText( mPhoneNumber.number() );
 
   mTypeList = KABC::PhoneNumber::typeList();
   mTypeList.remove( KABC::PhoneNumber::Pref );
 
   KABC::PhoneNumber::TypeList::Iterator it;
   for ( it = mTypeList.begin(); it != mTypeList.end(); ++it )
     new QCheckBox( KABC::PhoneNumber::typeLabel( *it ), mGroup );
 
   for ( int i = 0; i < mGroup->count(); ++i ) {
     int type = mPhoneNumber.type();
     QCheckBox *box = (QCheckBox*)mGroup->find( i );
     box->setChecked( type & mTypeList[ i ] );
   }
 
   mPreferredBox->setChecked( mPhoneNumber.type() & KABC::PhoneNumber::Pref );
 }
 
 KABC::PhoneNumber PhoneTypeDialog::phoneNumber()
 {
   mPhoneNumber.setNumber( mNumber->text() );
 
   int type = 0;
   for ( int i = 0; i < mGroup->count(); ++i ) {
     QCheckBox *box = (QCheckBox*)mGroup->find( i );
     if ( box->isChecked() )
       type += mTypeList[ i ];
   }
 
   if ( mPreferredBox->isChecked() )
     mPhoneNumber.setType( type | KABC::PhoneNumber::Pref );
   else
     mPhoneNumber.setType( type & ~KABC::PhoneNumber::Pref );
 
   return mPhoneNumber;
 }
 
 #ifndef KAB_EMBEDDED
 #include "phoneeditwidget.moc"
 #endif //KAB_EMBEDDED