1 files changed, 95 insertions, 0 deletions

diff --git a/core/pim/addressbook/ocontactfields.cpp b/core/pim/addressbook/ocontactfields.cpp
index 0da6a4f..75a7641 100644
--- a/core/pim/addressbook/ocontactfields.cpp
+++ b/core/pim/addressbook/ocontactfields.cpp
@@ -3,12 +3,14 @@
 
 #include <qstringlist.h>
 #include <qobject.h>
 
 // We should use our own enum in the future ..
 #include <qpe/recordfields.h>
+#include <qpe/config.h>
+#include <opie/ocontact.h>
 
 /*!
   \internal
   Returns a  list of details field names for a contact.
 */
 QStringList OContactFields::untrdetailsfields( bool sorted )
@@ -269,6 +271,99 @@ QMap<QString, int> OContactFields::trFieldsToId()
         for( it = idtostr.begin(); it != idtostr.end(); ++it )
                 ret_map.insert( *it, it.key() );
         
 
         return ret_map;
 }
+
+OContactFields::OContactFields():
+        fieldOrder( DEFAULT_FIELD_ORDER ),
+        changedFieldOrder( false )
+{
+        // Get the global field order from the config file and
+        // use it as a start pattern
+        Config cfg ( "AddressBook" );
+        cfg.setGroup( "ContactFieldOrder" );
+        globalFieldOrder = cfg.readEntry( "General", DEFAULT_FIELD_ORDER );
+}
+
+OContactFields::~OContactFields(){
+
+        // We will store the fieldorder into the config file
+        // to reuse it for the future.. 
+        if ( changedFieldOrder ){
+                Config cfg ( "AddressBook" );
+                cfg.setGroup( "ContactFieldOrder" );
+                cfg.writeEntry( "General", globalFieldOrder );
+        }
+}
+
+
+
+void OContactFields::saveToRecord( OContact &cnt ){
+
+        qDebug("ocontactfields saveToRecord: >%s<",fieldOrder.latin1());
+
+        // Store fieldorder into this contact.
+        cnt.setCustomField( CONTACT_FIELD_ORDER_NAME, fieldOrder );
+
+        globalFieldOrder = fieldOrder;
+        changedFieldOrder = true;
+
+}
+
+void OContactFields::loadFromRecord( const OContact &cnt ){
+        qDebug("ocontactfields loadFromRecord");
+        qDebug("loading >%s<",cnt.fullName().latin1());
+
+        // Get fieldorder for this contact. If none is defined,
+        // we will use the global one from the config file..
+
+        fieldOrder = cnt.customField( CONTACT_FIELD_ORDER_NAME );
+
+        qDebug("fieldOrder from contact>%s<",fieldOrder.latin1());
+
+        if (fieldOrder.isEmpty()){
+                fieldOrder = globalFieldOrder;
+        }
+
+
+        qDebug("effective fieldOrder in loadFromRecord >%s<",fieldOrder.latin1());
+}
+
+void OContactFields::setFieldOrder( int num, int index ){
+        qDebug("qcontactfields setfieldorder pos %i -> %i",num,index);
+
+        fieldOrder[num] = QString::number( index )[0];
+
+        // We will store this new fieldorder globally to 
+        // remember it for contacts which have none
+        globalFieldOrder = fieldOrder;
+        changedFieldOrder = true;
+
+        qDebug("fieldOrder >%s<",fieldOrder.latin1());
+}
+
+int OContactFields::getFieldOrder( int num, int defIndex ){
+        qDebug("ocontactfields getFieldOrder");
+        qDebug("fieldOrder >%s<",fieldOrder.latin1());
+
+        // Get index of combo as char..
+        QChar poschar = fieldOrder[num];
+
+        bool ok;
+        int ret = 0;
+        // Convert char to number..
+        if ( !( poschar == QChar::null ) )
+                ret = QString( poschar ).toInt(&ok, 10);
+        else
+                ok = false;
+
+        // Return default value if index for
+        // num was not set or if anything else happened..
+        if ( !ok ) ret = defIndex;
+
+        qDebug("returning >%i<",ret);
+
+        return ret;
+
+}