4 files changed, 55 insertions, 8 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 39d14bb..7f592e9 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -53,2 +53,3 @@ struct Addressee::AddresseeData : public KShared
   QString formattedName;
+  QString defaultFormattedName;
   QString familyName;
@@ -749,2 +750,9 @@ void Addressee::setFormattedName( const QString &formattedName )
 }
+void Addressee::setDefaultFormattedName( const QString &formattedName )
+{
+  if ( formattedName == mData->defaultFormattedName ) return;
+  detach();
+  mData->empty = false;
+  mData->defaultFormattedName = formattedName;
+}
 
@@ -754,2 +762,6 @@ QString Addressee::formattedName() const
 }
+QString Addressee::defaultFormattedName() const
+{
+  return mData->defaultFormattedName;
+}
 
@@ -760,2 +772,7 @@ QString Addressee::formattedNameLabel()
 
+QString Addressee::defaultFormattedNameLabel()
+{
+  return i18n("Def.Formatted Name");
+}
+
 
@@ -982,2 +999,10 @@ QString Addressee::mobilePhoneLabel()
 }
+QString Addressee::mobileWorkPhoneLabel()
+{
+  return i18n("Mobile (work)");
+}
+QString Addressee::mobileHomePhoneLabel()
+{
+  return i18n("Mobile (home)");
+}
 
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 8051fec..0d688f8 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -156,2 +156,3 @@ class Addressee
     void setFormattedName( const QString &formattedName );
+    void setDefaultFormattedName( const QString &formattedName );
     /**
@@ -160,2 +161,3 @@ class Addressee
     QString formattedName() const;
+    QString defaultFormattedName() const;
     /**
@@ -164,2 +166,3 @@ class Addressee
     static QString formattedNameLabel();
+    static QString defaultFormattedNameLabel();
 
@@ -330,2 +333,4 @@ class Addressee
     static QString mobilePhoneLabel();
+    static QString mobileWorkPhoneLabel();
+    static QString mobileHomePhoneLabel();
 
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 89d0b77..5c561c3 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -88,3 +88,6 @@ class Field::FieldImpl
       Resource,
-      Sip
+      Sip,
+      DefaultFormattedName,
+      MobileWorkPhone,
+      MobileHomePhone
     };
@@ -128,2 +131,4 @@ QString Field::label()
       return Addressee::formattedNameLabel();
+    case FieldImpl::DefaultFormattedName:
+      return Addressee::defaultFormattedNameLabel();
     case FieldImpl::FamilyName:
@@ -172,2 +177,6 @@ QString Field::label()
       return Addressee::mobilePhoneLabel();
+    case FieldImpl::MobileHomePhone:
+      return Addressee::mobileHomePhoneLabel();
+    case FieldImpl::MobileWorkPhone:
+      return Addressee::mobileWorkPhoneLabel();
     case FieldImpl::HomeFax:
@@ -241,2 +250,4 @@ QString Field::value( const KABC::Addressee &a )
       return a.formattedName();
+    case FieldImpl::DefaultFormattedName:
+      return a.defaultFormattedName();
     case FieldImpl::FamilyName:
@@ -290,2 +301,6 @@ QString Field::value( const KABC::Addressee &a )
       return a.phoneNumber( PhoneNumber::Cell ).number();
+    case FieldImpl::MobileWorkPhone:
+      return a.phoneNumber( PhoneNumber::Cell  | PhoneNumber::Work ).number();
+    case FieldImpl::MobileHomePhone:
+      return a.phoneNumber( PhoneNumber::Cell | PhoneNumber::Home  ).number();
     case FieldImpl::HomeFax:
@@ -395,2 +410,3 @@ Field::List Field::allFields()
     createField( FieldImpl::FormattedName, Frequent );
+    createField( FieldImpl::DefaultFormattedName, Frequent );
     createField( FieldImpl::FamilyName, Frequent );
@@ -418,2 +434,4 @@ Field::List Field::allFields()
     createField( FieldImpl::MobilePhone, Frequent );
+    createField( FieldImpl::MobileHomePhone, Frequent );
+    createField( FieldImpl::MobileWorkPhone, Frequent );
     createField( FieldImpl::HomeFax );
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 041effc..4c6231d 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -179,12 +179,11 @@ QString PhoneNumber::typeLabel( int type )
   
+
+  if ((type & Cell) == Cell)
+    typeString += i18n("Mobile") +" ";
   if ((type & Home) == Home)
-    typeString += i18n("Home");
+    typeString += i18n("Home")+" ";
   else if ((type & Work) == Work)
-    typeString += i18n("Work");
+    typeString += i18n("Work")+" ";
    
-  if (!typeString.isEmpty())
-    typeString += " ";
-  if ((type & Cell) == Cell)
-    typeString += i18n("Mobile") +" ";
-  if ((type & Sip) == Sip)
+   if ((type & Sip) == Sip)
     typeString += i18n("SIP")+" ";