1 files changed, 110 insertions, 2 deletions

diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 4c6231d..0d46ba7 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -56,25 +56,80 @@ void PhoneNumber::init()
 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 );
 }
+void PhoneNumber::makeCompat()
+{
+    mType = getCompatType( mType );
+}
+int PhoneNumber::getCompatType( int type )
+{
+  
+    if ((type & Cell) == Cell) {
+        if ((type & Work) == Work)
+            return Car;
+        return Cell;
+    }
+  if ((type & Home) == Home) {
+      if ((type & Pref) == Pref) 
+          return (Home | Pref);
+      if ((type & Fax) == Fax) 
+          return (Home | Fax);
+      return  (Home);
+  }
+  if ((type & Work) == Work) {
+      if ((type & Pref) == Pref) 
+          return (Work| Pref);
+      if ((type & Fax) == Fax) 
+          return (Fax |Work);
+      if ((type & Msg) == Msg) {
+          if ((type & Voice) == Voice)
+              return ( Msg | Voice |Work);
+          return ( Msg | Work);
+      }
+      return  Work;
+  }
+  if ((type & Pcs) == Pcs) {
+      if ((type & Pref) == Pref) 
+          return Pcs | Pref;
+      return  Pcs;
+  }
+  if ((type & Car) == Car)
+      return Car;
+  if ((type & Pager) == Pager)
+      return Pager;
+  if ((type & Isdn) == Isdn)
+      return Isdn;
+  if ((type & Video) == Video)
+      return Video;
+
+  if ((type & Msg) == Msg)
+      return Msg;
+  if ((type & Fax) == Fax)
+    return Fax;
+
+  if ((type & Pref) == Pref)
+      return  Pref;
 
+  return Voice;
+
+}
 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 );
 }
@@ -154,38 +209,90 @@ QString PhoneNumber::typeLabel() const
 }
 
 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;
+       << Bbs << Modem << Car << Isdn << Pcs << Pager;
 
   return list;
 }
 
 QString PhoneNumber::label( int type )
 {
   return typeLabel( type );
 }
 
 QString PhoneNumber::typeLabel( int type )
 {
-  QString typeString;
+  if ((type & Cell) == Cell)
+      return i18n("Mobile");
+  if ((type & Home) == Home) {
+      if ((type & Pref) == Pref) 
+          return i18n("Home");
+      if ((type & Fax) == Fax) 
+          return i18n("Fax (Home)");
+      return  i18n("Home2");
+  }
   
+  if ((type & Work) == Work) {
+      if ((type & Pref) == Pref) 
+          return i18n("Work");
+      if ((type & Fax) == Fax) 
+          return i18n("Fax (Work)");
+      if ((type & Msg) == Msg) {
+          if ((type & Voice) == Voice)
+              return i18n("Assistent");
+          return i18n("Company");
+      }
+      return  i18n("Work2");
+  }
+  if ((type & Pcs) == Pcs) {
+      if ((type & Pref) == Pref) 
+          return i18n("SIP");
+      return i18n("VoIP");
+  }
+  if ((type & Car) == Car)
+      return i18n("Mobile2 (Work)");
+  if ((type & Pager) == Pager)
+      return i18n("Pager");
+  if ((type & Isdn) == Isdn)
+      return i18n("ISDN");
+  if ((type & Video) == Video)
+      return i18n("Video");
+
+  if ((type & Msg) == Msg)
+      return i18n("Callback");
+  if ((type & Fax) == Fax)
+    return i18n("Fax (Other)");
+
+  if ((type & Pref) == Pref)
+      return i18n("Primary");
+
+
+  return i18n("Other");
+
+
+#if 0
+
+
+
+  QString typeString;
+
 
   if ((type & Cell) == Cell)
     typeString += i18n("Mobile") +" ";
   if ((type & Home) == Home)
     typeString += i18n("Home")+" ";
   else if ((type & Work) == Work)
     typeString += i18n("Work")+" ";
    
    if ((type & Sip) == Sip)
     typeString += i18n("SIP")+" ";
   if ((type & Car) == Car)
     typeString += i18n("Car")+" ";
@@ -211,24 +318,25 @@ QString PhoneNumber::typeLabel( int type )
   if ((type & Pref) == Pref)
     typeString += i18n("(p)");
   */
   //if we still have no match, return "other"        
   if (typeString.isEmpty()) {
       if ((type & Voice) == Voice)
           return i18n("Voice");
       else
           return i18n("Other");
   }
       
   return typeString.stripWhiteSpace();
+#endif
 }
 
 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;