3 files changed, 19 insertions, 2 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index a829dc2..a2617fa 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -121,128 +121,134 @@ void AbPickItem::setContentFromEditor( QWidget *w )
 AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name )
         : QTable( parent, name ),
           lastSortCol( -1 ),
           asc( TRUE ),
           intFields( order ),
           enablePainting( true ),
           columnVisible( true ),
           countNested( 0 )
 {
                 //qWarning("C'tor start");
 
         setSelectionMode( NoSelection );
         init();
         setSorting( TRUE );
         connect( this, SIGNAL(clicked(int,int,int,const QPoint &)),
                  this, SLOT(itemClicked(int,int)) );
 
         contactList.clear();
                 //qWarning("C'tor end");
 }
 
 AbTable::~AbTable()
 {
 }
 
 void AbTable::init()
 {
         // :SX showChar = '\0';
         setNumRows( 0 );
         setNumCols( 2 );
         
         horizontalHeader()->setLabel( 0, tr( "Full Name" ));
         horizontalHeader()->setLabel( 1, tr( "Contact" ));
         setLeftMargin( 0 );
         verticalHeader()->hide();
         columnVisible = true;
 }
 
 void AbTable::setContacts( const OContactAccess::List& viewList )
 {
                 //qWarning("AbTable::setContacts()");
 
         clear();
         m_viewList = viewList;
 
         setSorting( false );
         setPaintingEnabled( FALSE );
         
         OContactAccess::List::Iterator it;
         setNumRows( m_viewList.count() );
         int row = 0;
         for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
                 insertIntoTable( *it, row++ );
         
         setSorting( true );
 
         resort();
 
         updateVisible();
 
         setPaintingEnabled( TRUE );
 
 }
 
+void AbTable::setOrderedList( const QValueList<int> ordered )
+{
+        intFields = ordered;
+}
+
+
 bool AbTable::selectContact( int UID )
 {
                 //qWarning( "AbTable::selectContact( %d )", UID );
         int rows = numRows();
         AbTableItem *abi;
         OContact* foundContact = 0l;
         bool found = false;
 
         setPaintingEnabled( FALSE );
         for ( int r = 0; r < rows; ++r ) {
                 abi = static_cast<AbTableItem*>( item(r, 0) );
                 foundContact = &contactList[abi];
                 if ( foundContact -> uid() == UID ){
                         ensureCellVisible( r, 0 );
                         setCurrentCell( r, 0 );
                         found = true;
                         break;
                 }
         }
 
         if ( !found ){
                 ensureCellVisible( 0,0 );
                 setCurrentCell( 0, 0 );
         }
 
         setPaintingEnabled( TRUE );
 
         return true;
 }
 
 void AbTable::insertIntoTable( const OContact& cnt, int row )
 {
                 //qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row );
         QString strName;
         ContactItem contactItem;
         
         strName = findContactName( cnt );
         contactItem = findContactContact( cnt, row );
         
         AbTableItem *ati;
         ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value );
         contactList.insert( ati, cnt );
         setItem( row, 0, ati );
         ati = new AbTableItem( this, QTableItem::Never, contactItem.value, strName);
         if ( !contactItem.icon.isNull() )
                 ati->setPixmap( contactItem.icon );
         setItem( row, 1, ati );
         
         //### cannot do this; table only has two columns at this point
         //    setItem( row, 2, new AbPickItem( this ) );
         
 }
 
 
 
 void AbTable::columnClicked( int col )
 {
         if ( !sorting() )
                 return;
         
         if ( lastSortCol == -1 )
                 lastSortCol = col;
         
         if ( col == lastSortCol ) {
@@ -256,132 +262,135 @@ void AbTable::columnClicked( int col )
 }
 
 void AbTable::resort()
 {
                 //qWarning( "void AbTable::resort()" );
         setPaintingEnabled( FALSE );
         if ( sorting() ) {
                 if ( lastSortCol == -1 )
                         lastSortCol = 0;
                 sortColumn( lastSortCol, asc, TRUE );
                 //QMessageBox::information( this, "resort", "resort" );
                 updateVisible();
         }
         setPaintingEnabled( TRUE );
 }
 
 OContact AbTable::currentEntry()
 {
                 //qWarning( "OContact AbTable::currentEntry()" );
         OContact cnt;
         AbTableItem *abItem;
         abItem = static_cast<AbTableItem*>(item( currentRow(), 0 ));
         if ( abItem ) {
                 cnt = contactList[abItem];
                 //cnt = contactList[currentRow()];
         }
         return cnt;
 }
 
 int AbTable::currentEntry_UID()
 {
         return ( currentEntry().uid() );
 }
 
 void AbTable::clear()
 {
                 //qWarning( "void AbTable::clear()" );
         contactList.clear();
 
         setPaintingEnabled( FALSE );
         for ( int r = 0; r < numRows(); ++r ) {
                 for ( int c = 0; c < numCols(); ++c ) {
                         if ( cellWidget( r, c ) )
                                 clearCellWidget( r, c );
                         clearCell( r, c );
                 }
         }
         setNumRows( 0 );
         setPaintingEnabled( TRUE );
 }
 
 // Refresh updates column 2 if the contactsettings changed
 void AbTable::refresh()
 {
                 //qWarning( "void AbTable::refresh()" );
         int rows = numRows();
         AbTableItem *abi;
         ContactItem contactItem;
 
         setPaintingEnabled( FALSE );
         for ( int r = 0; r < rows; ++r ) {
                 abi = static_cast<AbTableItem*>( item(r, 0) );
                 contactItem = findContactContact( contactList[abi], r );
                 static_cast<AbTableItem*>( item(r, 1) )->setItem( contactItem.value, abi->text() );
-                if ( !contactItem.icon.isNull() )
+                if ( !contactItem.icon.isNull() ){
                         static_cast<AbTableItem*>( item(r, 1) )->
                                 setPixmap( contactItem.icon );
-
+                }else{
+                        static_cast<AbTableItem*>( item(r, 1) )->
+                                setPixmap( QPixmap() );
+                }
         }
         resort();
         setPaintingEnabled( TRUE );
 }
 
 void AbTable::keyPressEvent( QKeyEvent *e )
 {
         char key = toupper( e->ascii() );
         
         if ( key >= 'A' && key <= 'Z' )
                 moveTo( key );
         
                 //qWarning("Received key ..");
         switch( e->key() ) {
         case Qt::Key_Space:
         case Qt::Key_Return:
         case Qt::Key_Enter:
                 emit signalSwitch();
                 break;
         // case Qt::Key_Up:
         //      qWarning("a");
         //      emit signalKeyUp();
         //      break;
         // case Qt::Key_Down:
         //      qWarning("b");
         //      emit signalKeyDown();
         //      break;
         default:
                 QTable::keyPressEvent( e );
         }
                 
 }
 
 void AbTable::moveTo( char c )
 {
         qWarning( "void AbTable::moveTo( char c )" );
         
         int rows = numRows();
         QString value;
         AbTableItem *abi;
         int r;
         if ( asc ) {
                 r = 0;
                 while ( r < rows-1) {
                         abi = static_cast<AbTableItem*>( item(r, 0) );
                         QChar first = abi->key()[0];
                         //### is there a bug in QChar to char comparison???
                         if ( first.row() || first.cell() >= c )
                                 break;
                         r++;
                 }
         } else {
                 //### should probably disable reverse sorting instead
                 r = rows - 1;
                 while ( r > 0 ) {
                         abi = static_cast<AbTableItem*>( item(r, 0) );
                         QChar first = abi->key()[0];
                         //### is there a bug in QChar to char comparison???
                         if ( first.row() || first.cell() >= c )
                                 break;
                         r--;
                 }
         }
         setCurrentCell( r, currentColumn() );
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index 4e6b294..0f7bc29 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -17,128 +17,132 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef ABTABLE_H
 #define ABTABLE_H
 
 #include <qpe/categories.h>
 #include <opie/ocontact.h>
 #include <opie/ocontactaccess.h>
 
 #include <qmap.h>
 #include <qtable.h>
 #include <qstringlist.h>
 #include <qcombobox.h>
 #include <qpixmap.h> 
 
 class AbTableItem : public QTableItem
 {
 public:
     AbTableItem( QTable *t, EditType et, const QString &s,
                  const QString &secondSortKey);
     QString entryKey() const;
     void setEntryKey( const QString & k );
     virtual int alignment() const;
     virtual QString key() const;
     void setItem( const QString &txt, const QString &secondKey );
 
 private:
     QString sortKey;
 };
 
 // This is a simple container, storing all contact
 // information
 class ContactItem
 {
  public:
         QPixmap icon;
         QString value;
 };
 
 class AbPickItem : public QTableItem
 {
 public:
     AbPickItem( QTable *t );
 
     QWidget *createEditor() const;
     void setContentFromEditor( QWidget *w );
 
 private:
     QGuardedPtr<QComboBox> cb;
 };
 
 class AbTable : public QTable
 {
     Q_OBJECT
 
 public:
     AbTable( const QValueList<int> ordered, QWidget *parent, const char *name=0 );
     ~AbTable();
 
     // Set the contacts shown in the table
     void setContacts( const OContactAccess::List& viewList );
+
+    // Set the list for primary contacts
+    void setOrderedList( const QValueList<int> ordered );
+
     // Selects a contact of a specific UID
     bool selectContact( int UID );
     
     // Get the current selected entry
     OContact currentEntry();
 
     // Get the UID of the current selected Entry
     int currentEntry_UID();
 
     QString findContactName( const OContact &entry );
 
     void init();
     void clear();
     void refresh();
 
     void show();
     void setPaintingEnabled( bool e );
     void viewportPaintEvent( QPaintEvent* e);
     void paintCell(QPainter* p, int row, int col,  const QRect&, bool );
 
     // addresspicker mode (What's that ? se)
     void setChoiceNames( const QStringList& list);
     QStringList choiceNames() const;
     void setChoiceSelection( const QValueList<int>& list );
     QStringList choiceSelection(int index) const;
 
 signals:
     void signalSwitch();
     void signalEditor();
     void signalKeyDown();
     void signalKeyUp();
 
 protected:
     virtual void keyPressEvent( QKeyEvent *e );
 
 //     int rowHeight( int ) const;
 //     int rowPos( int row ) const;
 //     virtual int rowAt( int pos ) const;
 
 
 protected slots:
     void moveTo( char );
     virtual void columnClicked( int col );
     void itemClicked(int,int col);
     void rowHeightChanged( int row );
 
 private:
     void insertIntoTable( const OContact &cnt, int row );
     ContactItem findContactContact( const OContact &entry, int row );
     void fitColumns();
     void resizeRows();
     void realignTable();
     void resort();
     void updateVisible();
 
     int lastSortCol;
     bool asc;
     QMap<AbTableItem*, OContact> contactList;
     QValueList<int> intFields;
     QStringList choicenames;
     bool enablePainting;
     bool columnVisible;
     int countNested;
 
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 7da0992..b89b794 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -182,128 +182,132 @@ void AbView::clear()
 void AbView::setShowByCategory( const QString& cat )
 {
                 //qWarning("AbView::setShowCategory( const QString& cat )");
 
         int intCat = 0;
 
         // All (cat == NULL) will be stored as -1
         if ( cat.isNull() )
                 intCat = -1;
         else
                 intCat = mCat.id("Contacts", cat );
 
         // Just do anything if we really change the category
         if ( intCat != m_curr_category ){
                         //      qWarning ("Categories: Selected %s.. Number: %d", cat.latin1(), m_curr_category);
 
                 m_curr_category = intCat;
                 emit signalClearLetterPicker();
 
                 load();
         }
 
 }
 
 void AbView::setShowToView( Views view )
 {
                 //qWarning("void AbView::setShowToView( View %d )", view);
 
                 //qWarning ("Change the View (Category is: %d)", m_curr_category);
 
         if ( m_curr_View != view ){
                 m_prev_View = m_curr_View;
                 m_curr_View = view;
 
                 updateView();
         }
 
 }
 
 void AbView::setShowByLetter( char c )
 {
                 //qWarning("void AbView::setShowByLetter( %c )", c );
         OContact query;
         if ( c == 0 ){
                 load();
                 return;
         }else{
                 // If the current Backend is unable to solve the query, we will 
                 // ignore the request ..
                 if ( ! m_contactdb->hasQuerySettings( OContactAccess::WildCards | OContactAccess::IgnoreCase ) ){
                         return;
                 }
 
                 query.setLastName( QString("%1*").arg(c) );
                 m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase );
                 clearForCategory();
                 m_curr_Contact = 0;
         }
         updateView( true );
 }
 
 void AbView::setListOrder( const QValueList<int>& ordered )
 {
         m_orderedFields = ordered;
+        if ( m_abTable ){
+                m_abTable->setOrderedList( ordered );
+                m_abTable->refresh();
+        }
         updateView();
 }
 
 
 QString AbView::showCategory() const
 {
         return mCat.label( "Contacts", m_curr_category );
 }
 
 void AbView::showPersonal( bool personal )
 {
                 //qWarning ("void AbView::showPersonal( %d )", personal);
 
         if ( personal ){
 
                 if ( m_inPersonal )
                         return;
 
                 // Now switch to vCard Backend and load data.
                 // The current default backend will be stored
                 // to avoid unneeded load/stores.
                 m_storedDB = m_contactdb;
 
                 OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
                                                                           addressbookPersonalVCardName() );
                 m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
 
                 m_inPersonal = true;
                 m_curr_View = CardView;
 
         }else{
 
                 if ( !m_inPersonal )
                         return;
 
                 // Remove vCard Backend and restore default
                 m_contactdb->save();
                 delete m_contactdb;
 
                 m_contactdb = m_storedDB;
                 m_storedDB = 0l;
 
                 m_curr_View = TableView;
                 m_inPersonal = false;
 
         }
         load();
 }
 
 QStringList AbView::categories()
 {
         mCat.load( categoryFileName() );
         QStringList categoryList = mCat.labels( "Contacts" );
         return categoryList;
 }
 
 // BEGIN: Slots
 void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
                          bool , QString cat )
 {
                 //qWarning( "void AbView::slotDoFind" );
 
         // We reloading the data: Deselect Letterpicker
         emit signalClearLetterPicker();