[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kaddressbook
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-07-05 18:55:32
Message-ID: 20100705185532.65FE1AC8E6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1146336 by tokoe:

Add all standard fields to the ContactFields class

BUG: 243407


 M  +1 -0      CMakeLists.txt  
 M  +38 -2     contactfields.cpp  
 M  +8 -1      contactfields.h  
 A             tests (directory)  
 A             tests/CMakeLists.txt  
 A             tests/contactfieldstest.cpp   [License: UNKNOWN]


--- trunk/KDE/kdepim/kaddressbook/CMakeLists.txt #1146335:1146336
@@ -10,6 +10,7 @@
 
 add_subdirectory(icons)
 add_subdirectory(printing)
+add_subdirectory(tests)
 if(QGPGME_FOUND)
   add_definitions(-DQGPGME_FOUND)
 endif(QGPGME_FOUND)
--- trunk/KDE/kdepim/kaddressbook/contactfields.cpp #1146335:1146336
@@ -67,6 +67,12 @@
     case Organization: return KABC::Addressee::organizationLabel(); break;
     case Note: return KABC::Addressee::noteLabel(); break;
     case Homepage: return KABC::Addressee::urlLabel(); break;
+    case BlogFeed: return i18n( "Blog Feed" ); break;
+    case Profession: return i18n( "Profession" ); break;
+    case Office: return i18n( "Office" ); break;
+    case Manager: return i18n( "Manager" ); break;
+    case Assistant: return i18n( "Assistant" ); break;
+    case Spouse: return i18n( "Spouse" ); break;
   }
 
   return QString();
@@ -117,7 +123,13 @@
          << Role
          << Organization
          << Note
-         << Homepage;
+         << Homepage
+         << BlogFeed
+         << Profession
+         << Office
+         << Manager
+         << Assistant
+         << Spouse;
 
   return fields;
 }
@@ -341,6 +353,24 @@
         contact.insertAddress( address );
       }
       break;
+    case BlogFeed:
+      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( \
"BlogFeed" ), value ); +      break;
+    case Profession:
+      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( \
"X-Profession" ), value ); +      break;
+    case Office:
+      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( \
"X-Office" ), value ); +      break;
+    case Manager:
+      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( \
"X-ManagersName" ), value ); +      break;
+    case Assistant:
+      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( \
"X-AssistantsName" ), value ); +      break;
+    case Spouse:
+      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( \
"X-SpousesName" ), value ); +      break;
   }
 }
 
@@ -359,7 +389,7 @@
       {
         const QDateTime birthday = contact.birthday();
         if ( birthday.isValid() )
-          return birthday.toString( Qt::ISODate );
+          return birthday.date().toString( Qt::ISODate );
         else
           return QString();
       }
@@ -495,6 +525,12 @@
     case Organization: return contact.organization(); break;
     case Note: return contact.note(); break;
     case Homepage: return contact.url().url(); break;
+    case BlogFeed: return contact.custom( QLatin1String( "KADDRESSBOOK" ), \
QLatin1String( "BlogFeed" ) ); +    case Profession: return contact.custom( \
QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-Profession" ) ); +    case Office: \
return contact.custom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-Office" ) \
); +    case Manager: return contact.custom( QLatin1String( "KADDRESSBOOK" ), \
QLatin1String( "X-ManagersName" ) ); +    case Assistant: return contact.custom( \
QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-AssistantsName" ) ); +    case \
Spouse: return contact.custom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( \
"X-SpousesName" ) );  }
 
   return QString();
--- trunk/KDE/kdepim/kaddressbook/contactfields.h #1146335:1146336
@@ -79,7 +79,14 @@
       Role,
       Organization,
       Note,
-      Homepage
+      Homepage,
+
+      BlogFeed,
+      Profession,
+      Office,
+      Manager,
+      Assistant,
+      Spouse
     };
 
     /**


[prev in list] [next in list] [prev in thread] [next in thread]