added a new field of type Resource. This allowes us to display in KAddressbook for each

Addressbookentry its location

3 files changed, 32 insertions, 4 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 5cb194a..d484073 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1507,6 +1507,12 @@ Resource *Addressee::resource() const
     return mData->resource;
 }
 
+//US
+QString Addressee::resourceLabel()
+{
+  return i18n("Resource");
+}
+
 void Addressee::setChanged( bool value )
 {
     detach();
diff --git a/kabc/addressee.h b/kabc/addressee.h
index ee98e03..393d1cc 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -792,6 +792,12 @@ class Addressee
     Resource *resource() const;
 
     /**
+      Return resourcelabel.
+     */
+    //US
+    static QString resourceLabel();
+    
+    /**
 	    Mark addressee as changed.
 	   */
     void setChanged( bool value );
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 41bbfde..bc2e176 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -32,6 +32,7 @@ $Id$
 #include <kglobal.h>
 
 #include "field.h"
+#include "resource.h"
 
 using namespace KABC;
 
@@ -82,7 +83,8 @@ class Field::FieldImpl
       Role,
       Organization,
       Note,
-      Url
+      Url,
+      Resource
     };
 
     int fieldId() { return mFieldId; }
@@ -190,6 +192,8 @@ QString Field::label()
       return Addressee::noteLabel();
     case FieldImpl::Url:
       return Addressee::urlLabel();
+    case FieldImpl::Resource:
+      return Addressee::resourceLabel();
     case FieldImpl::CustomField:
       return mImpl->label();
     default:
@@ -267,6 +271,9 @@ QString Field::value( const KABC::Addressee &a )
         return QString::null;
     case FieldImpl::Url:
       return a.url().prettyURL();
+//US    
+    case FieldImpl::Resource:
+      return a.resource()->resourceName();
     case FieldImpl::HomePhone:
       return a.phoneNumber( PhoneNumber::Home ).number();
     case FieldImpl::BusinessPhone:
@@ -360,6 +367,8 @@ bool Field::setValue( KABC::Addressee &a, const QString &value )
       return true;
     case FieldImpl::CustomField:
       a.insertCustom( mImpl->app(), mImpl->key(), value );
+//US never copy the resourcename back to the adressee. 
+    case FieldImpl::Resource:
     default:
       return false;
   }
@@ -408,6 +417,7 @@ Field::List Field::allFields()
     createField( FieldImpl::Organization, Organization );
     createField( FieldImpl::Note );
     createField( FieldImpl::Url );
+    createField( FieldImpl::Resource );
   }
 
   return mAllFields;
@@ -468,13 +478,13 @@ void Field::saveFields( KConfig *cfg, const QString &identifier,
   QValueList<int> fieldIds;
 
 //US
-//US  qDebug("Field::saveFields to %s %s", cfg->getFileName().latin1(), identifier.latin1());
+//  qDebug("Field::saveFields to %s %s", cfg->getFileName().latin1(), identifier.latin1());
     
   int custom = 0;
   Field::List::ConstIterator it;
   for( it = fields.begin(); it != fields.end(); ++it ) {
 //US  
-//US  qDebug("Field::saveFields field:%i", (*it)->mImpl->fieldId());
+//  qDebug("Field::saveFields field:%i", (*it)->mImpl->fieldId());
     
     fieldIds.append( (*it)->mImpl->fieldId() );
     if( (*it)->isCustom() ) {
@@ -491,6 +501,9 @@ void Field::saveFields( KConfig *cfg, const QString &identifier,
 
 Field::List Field::restoreFields( const QString &identifier )
 {
+//US
+//  qDebug("Field::restoreFields, identifier: %s", identifier.latin1());
+  
   KConfig *cfg = KGlobal::config();
   KConfigGroupSaver( cfg, "KABCFields" );
   cfg->setGroup( "KABCFields" );
@@ -504,7 +517,7 @@ Field::List Field::restoreFields( KConfig *cfg, const QString &identifier )
 {
   QValueList<int> fieldIds = cfg->readIntListEntry( identifier);
 //US
-  qDebug("Field::restoreFields from %s", cfg->getFileName().latin1());
+//  qDebug("Field::restoreFields from %s, identifier: %s", cfg->getFileName().latin1(), identifier.latin1());
   
   Field::List fields;
 
@@ -544,6 +557,9 @@ Field *Field::createCustomField( const QString &label, int category,
   Field *field = new Field( new FieldImpl( FieldImpl::CustomField,
                                            category | CustomCategory,
                                            label, key, app ) );
+//US
+//  qDebug("Field::createCustomField label %s", label.latin1() );
+  
   mCustomFields.append( field );
 
   return field;