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
@@ -1,812 +1,821 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** Copyright (c) 2002 Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 
 #include <qpe/categoryselect.h>
 #include <qpe/config.h>
 #include <qpe/stringutil.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/timestring.h>
 #include <qpe/resource.h>
 
 #include <opie/orecordlist.h>
 
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 
 #include "abtable.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <ctype.h> //toupper() for key hack
 
 /*!
   \class AbTableItem abtable.h
   
   \brief QTableItem based class for showing a field of an entry
 */
 
 AbTableItem::AbTableItem( QTable *t, EditType et, const QString &s,
                           const QString &secondSortKey)
         : QTableItem( t, et, s )
 {
         //    sortKey = s.lower() + QChar( '\0' ) + secondSortKey.lower();
         sortKey = Qtopia::buildSortKey( s, secondSortKey );
 }
 
 int AbTableItem::alignment() const
 {
         return AlignLeft|AlignVCenter;
 }
 
 QString AbTableItem::key() const
 {
         return sortKey;
 }
 
 // A way to reset the item, without out doing a delete or a new...
 void AbTableItem::setItem( const QString &txt, const QString &secondKey )
 {
         setText( txt );
         sortKey = Qtopia::buildSortKey( txt, secondKey );
         
         //    sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower();
 }
 
 /*!
   \class AbPickItem abtable.h
   
   \brief QTableItem based class for showing slection of an entry
 */
 
 AbPickItem::AbPickItem( QTable *t ) :
         QTableItem(t, WhenCurrent, "?")
 {
 }
 
 QWidget *AbPickItem::createEditor() const
 {
         QComboBox* combo = new QComboBox( table()->viewport() );
         ( (AbPickItem*)this )->cb = combo;
         AbTable* t = static_cast<AbTable*>(table());
         QStringList c = t->choiceNames();
         int cur = 0;
         for (QStringList::ConstIterator it = c.begin(); it!=c.end(); ++it) {
                 if ( *it == text() )
                         cur = combo->count();
                 combo->insertItem(*it);
         }
         combo->setCurrentItem(cur);
         return combo;
 }
 
 void AbPickItem::setContentFromEditor( QWidget *w )
 {
         if ( w->inherits("QComboBox") )
                 setText( ( (QComboBox*)w )->currentText() );
         else
                 QTableItem::setContentFromEditor( w );
 }
 
 /*!
   \class AbTable abtable.h
   
   \brief QTable based class for showing a list of entries
 */
 
 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 ) {
                 asc = !asc;
         } else {
                 lastSortCol = col;
                 asc = TRUE;
         }
         //QMessageBox::information( this, "resort", "columnClicked" );
         resort();
 }
 
 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() );
 }
 
 
 QString AbTable::findContactName( const OContact &entry )
 {
         // We use the fileAs, then company, defaultEmail
         QString str;
         str = entry.fileAs();
         if ( str.isEmpty() ) {
                 str = entry.company();
                 if ( str.isEmpty() ) {
                         str = entry.defaultEmail();
                 }
         }
         return str;
 }
 
 
 
 void AbTable::resizeRows() {
         /*
           if (numRows()) {
           for (int i = 0; i < numRows(); i++) {
           setRowHeight( i, size );
           }
           }
           updateVisible();
         */
 }
 
 
 void AbTable::realignTable()
 {
                 //qWarning( "void AbTable::realignTable()" );
 
         setPaintingEnabled( FALSE );
 
         resizeRows();
         fitColumns();
 
         setPaintingEnabled( TRUE );
 
 }
 
 
 
 
 #if QT_VERSION <= 230
 #ifndef SINGLE_APP
 void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 {
         // Region of the rect we should draw
         QRegion reg( QRect( cx, cy, cw, ch ) );
         // Subtract the table from it
         reg = reg.subtract( QRect( QPoint( 0, 0 ), tableSize() ) );
         // And draw the rectangles (transformed as needed)
         QArray<QRect> r = reg.rects();
         for (unsigned int i=0; i<r.count(); i++)
                 p->fillRect( r[i], colorGroup().brush( QColorGroup::Base ) );
 }
 #endif
 #endif
 
 
 // int AbTable::rowHeight( int ) const
 // {
 //     return 18;
 // }
 
 // int AbTable::rowPos( int row ) const
 // {
 //     return 18*row;
 // }
 
 // int AbTable::rowAt( int pos ) const
 // {
 //     return QMIN( pos/18, numRows()-1 );
 // }
 
 
 
 void AbTable::fitColumns()
 {
                 //qWarning( "void AbTable::fitColumns()" );
         int contentsWidth = visibleWidth() / 2; // :SX Why too low
         // Fix to better value
         // contentsWidth = 130; 
 
         setPaintingEnabled( FALSE );
         
         if ( columnVisible == false ){
                 showColumn(0);
                 columnVisible = true;
         }
         
                 //qWarning("Width: %d", contentsWidth);
 
         setColumnWidth( 0, contentsWidth );
         adjustColumn(1);
         if ( columnWidth(1) < contentsWidth )
                 setColumnWidth( 1, contentsWidth );
 
         setPaintingEnabled( TRUE );
 }
 
 void AbTable::show()
 {
                 //qWarning( "void AbTable::show()" );
         realignTable();
         QTable::show();
 }
 
 void AbTable::setChoiceNames( const QStringList& list)
 {
         choicenames = list;
         if ( choicenames.isEmpty() ) {
                 // hide pick column
                 setNumCols( 2 );
         } else {
                 // show pick column
                 setNumCols( 3 );
                 setColumnWidth( 2, fontMetrics().width(tr( "Pick" ))+8 );
                 horizontalHeader()->setLabel( 2, tr( "Pick" ));
         }
         fitColumns();
 }
 
 void AbTable::itemClicked(int,int col)
 {
                 //qWarning( "AbTable::itemClicked(int, col:%d)", col);
         if ( col == 2 ) {
                 return;
         } else {
                         //      qWarning ("Emitting signalSwitch()");
                 emit signalSwitch();
         }
 }
 
 QStringList AbTable::choiceNames() const
 {
         return choicenames;
 }
 
 void AbTable::setChoiceSelection( const QValueList<int>& list )
 {
         intFields = list;
 }
 
 QStringList AbTable::choiceSelection(int /*index*/) const
 {
         QStringList r;
         /* ######
            
         QString selname = choicenames.at(index);
         for (each row) {
         OContact *c = contactForRow(row);
         if ( text(row,2) == selname ) {
         r.append(c->email);
         }
         }
         
         */
         return r;
 }
 
 
 
 
 void AbTable::updateVisible()
 {
                 //qWarning("void AbTable::updateVisible()");
 
         int visible,
                 totalRows,
                 row,
                 selectedRow = 0;
                 
         visible = 0;
         
         setPaintingEnabled( FALSE );
 
         realignTable();
 
         totalRows = numRows();
         for ( row = 0; row < totalRows; row++ ) {
                 if ( rowHeight(row) == 0 ) {
                         showRow( row );
                         adjustRow( row );
                         if ( isSelected( row,0 ) || isSelected( row,1 ) )
                                 selectedRow = row;
                 }
                 visible++;
         }
 
         if ( selectedRow )
                 setCurrentCell( selectedRow, 0 );
 
         if ( !visible )
                 setCurrentCell( -1, 0 );
         
         setPaintingEnabled( TRUE );
 }
 
 
 void AbTable::setPaintingEnabled( bool e )
 {
                 //qWarning("IN void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested );
 
         if ( e ) {
                 if ( countNested > 0 )
                         --countNested;
                 if ( ! countNested ){
                         setUpdatesEnabled( true );
                         enablePainting = true;
                         rowHeightChanged( 0 );
                         viewport()->update();
                 }
         } else {
                 ++countNested;
                 enablePainting = false;
                 setUpdatesEnabled( false );
         }
                 //qWarning("OUT void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested );
 }
 
 void AbTable::viewportPaintEvent( QPaintEvent* e ) {
                 //qWarning(" void AbTable::viewportPaintEvent( QPaintEvent* e ) -> %d", enablePainting);
         if ( enablePainting )
                 QTable::viewportPaintEvent( e );
 }
 
 void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool ) {
     const QColorGroup &cg = colorGroup();
 
     p->save();
 
     // Paint alternating background bars
     if (  (row % 2 ) == 0 ) {
         p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
         p->setPen( QPen( cg.text() ) );
     }
     else {
         p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) );
         p->setPen( QPen( cg.buttonText() ) );
     }
 
     QFont f = p->font();
     QFontMetrics fm(f);
 
     int marg = 2;
     int x = 0;
     int y = ( cr.height() - 14 ) / 2;
 
     QPixmap pic = pixmap( row, col );
     if ( !pic.isNull() )
     {
         p->drawPixmap( x + marg, y, pixmap( row, col ) );
         p->drawText( x + marg + pixmap( row, col ).width() + 4,2 + fm.ascent(), text( row, col ) );
     }
     else
     {
         p->drawText( x + marg,2 + fm.ascent(), text( row, col ) );
     }
 
     p->restore();
 }
 
 void AbTable::rowHeightChanged( int row )
 {
         if ( enablePainting )
                 QTable::rowHeightChanged( row );
 }
 ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ )
 {
 
         ContactItem item;
 
         item.value = "";
 
         for ( QValueList<int>::ConstIterator it = intFields.begin();
               it != intFields.end(); ++it ) {
                 switch ( *it ) {
                 default:
                         break;
                 case Qtopia::Title:
                         item.value = entry.title();
                         break;
                 case Qtopia::Suffix:
                         item.value = entry.suffix();
                         break;
                 case Qtopia::FileAs:
                         item.value = entry.fileAs();
                         break;
                 case Qtopia::DefaultEmail:
                         item.value = entry.defaultEmail();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/email" );
                         break;
                 case Qtopia::Emails:
                         item.value = entry.emails();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/email" );
                         break;
                 case Qtopia::HomeStreet:
                         item.value = entry.homeStreet();
                         break;
                 case Qtopia::HomeCity:
                         item.value = entry.homeCity();
                         break;
                 case Qtopia::HomeState:
                         item.value = entry.homeState();
                         break;
                 case Qtopia::HomeZip:
                         item.value = entry.homeZip();
                         break;
                 case Qtopia::HomeCountry:
                         item.value = entry.homeCountry();
                         break;
                 case Qtopia::HomePhone:
                         item.value = entry.homePhone();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/phonehome" );
                         break;
                 case Qtopia::HomeFax:
                         item.value = entry.homeFax();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/faxhome" );
                         break;
                 case Qtopia::HomeMobile:
                         item.value = entry.homeMobile();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/mobilehome" );
                         break;
                 case Qtopia::HomeWebPage:
                         item.value = entry.homeWebpage();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/webpagehome" );
                         break;
                 case Qtopia::Company:
                         item.value = entry.company();
                         break;
                 case Qtopia::BusinessCity:
                         item.value = entry.businessCity();
                         break;
                 case Qtopia::BusinessStreet:
                         item.value = entry.businessStreet();
                         break;
                 case Qtopia::BusinessZip:
                         item.value = entry.businessZip();
                         break;
                 case Qtopia::BusinessCountry:
                         item.value = entry.businessCountry();
                         break;
                 case Qtopia::BusinessWebPage:
                         item.value = entry.businessWebpage();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/webpagework" );
                         break;
                 case Qtopia::JobTitle:
                         item.value = entry.jobTitle();
                         break;
                 case Qtopia::Department:
                         item.value = entry.department();
                         break;
                 case Qtopia::Office:
                         item.value = entry.office();
                         break;
                 case Qtopia::BusinessPhone:
                         item.value = entry.businessPhone();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/phonework" );
                         break;
                 case Qtopia::BusinessFax:
                         item.value = entry.businessFax();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/faxwork" );
                         break;
                 case Qtopia::BusinessMobile:
                         item.value = entry.businessMobile();
                         if ( !item.value.isEmpty() )
                                 item.icon = Resource::loadPixmap( "addressbook/mobilework" );
                         break;
                 case Qtopia::BusinessPager:
                         item.value = entry.businessPager();
                         break;
                 case Qtopia::Profession:
                         item.value = entry.profession();
                         break;
                 case Qtopia::Assistant:
                         item.value = entry.assistant();
                         break;
                 case Qtopia::Manager:
                         item.value = entry.manager();
                         break;
                 case Qtopia::Spouse:
                         item.value = entry.spouse();
                         break;
                 case Qtopia::Gender:
                         item.value = entry.gender();
                         break;
                 case Qtopia::Birthday:
                         if ( ! entry.birthday().isNull() ){
                                 item.value = TimeString::numberDateString( entry.birthday() );
                         }
                         break;
                 case Qtopia::Anniversary:
                         if ( ! entry.anniversary().isNull() ){
                                 item.value = TimeString::numberDateString( entry.anniversary() );
                         }
                         break;
                 case Qtopia::Nickname:
                         item.value = entry.nickname();
                         break;
                 case Qtopia::Children:
                         item.value = entry.children();
                         break;
                 case Qtopia::Notes:
                         item.value = entry.notes();
                         break;
                 }
                 if ( !item.value.isEmpty() )
                         break;
         }
         return item;
 }
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
@@ -1,148 +1,152 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** Copyright (c) 2002 Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** 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;
 
     OContactAccess::List m_viewList;
 
 };
 #endif // ABTABLE_H
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
@@ -1,475 +1,479 @@
 /**********************************************************************
 ** Copyright (c) 2002 Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **
 **********************************************************************/
 
 #include "abview.h"
 
 #include <qlayout.h>
 
 #include <qpe/global.h>
 
 #include <opie/ocontactaccessbackend_vcard.h>
 
 
 // Is defined in LibQPE
 extern QString categoryFileName();
 
 QString addressbookPersonalVCardName()
 {
         QString filename = Global::applicationFileName("addressbook",
                                                        "businesscard.vcf");
         return filename;
 }
 
 
 AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
         QWidget(parent),
         mCat(0),
         m_inSearch( false ),
         m_inPersonal( false ),
         m_curr_category( -1 ),
         m_curr_View( TableView ),
         m_prev_View( TableView ),
         m_curr_Contact ( 0 ),
         m_contactdb ( 0l ),
         m_storedDB ( 0l ),
         m_viewStack( 0l ),
         m_abTable( 0l ),
         m_orderedFields( ordered )
 {
         // Load default database and handle syncing myself.. !
         m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false ),
         mCat.load( categoryFileName() );
 
         // Create Layout and put WidgetStack into it.
           QVBoxLayout *vb = new QVBoxLayout( this );
          m_viewStack = new QWidgetStack( this );
         vb->addWidget( m_viewStack );
 
         // Creat TableView
          QVBox* tableBox = new QVBox( m_viewStack );
          m_abTable = new AbTable( m_orderedFields, tableBox, "table" );
         m_abTable->setCurrentCell( 0, 0 );
         m_abTable->setFocus();
 
         // Add TableView to WidgetStack and raise it
         m_viewStack -> addWidget( tableBox , TableView );
 
         // Create CardView and add it to WidgetStack
          QVBox* cardBox = new QVBox( m_viewStack );
         m_ablabel = new AbLabel( cardBox, "CardView");
         m_viewStack -> addWidget( cardBox , CardView );
 
         // Connect views to me
         connect ( m_abTable, SIGNAL( signalSwitch( void ) ),
                   this, SLOT( slotSwitch( void ) ) );
         connect ( m_ablabel, SIGNAL( signalOkPressed( void ) ),
                   this, SLOT( slotSwitch( void ) ) );
 
         load();
 }
 
 AbView::~AbView()
 {
         m_contactdb -> save();
         delete m_contactdb;
 
         if ( m_storedDB ){
                 m_storedDB -> save();
                 delete m_storedDB;
         }
 }
 
 
 void AbView::setView( Views view )
 {
                 //qWarning("AbView::setView( Views view )");
          m_curr_View = view;
          load();
 }
 
 void AbView::addEntry( const OContact &newContact )
 {
                 //qWarning("abview:AddContact");
         m_contactdb->add ( newContact );
         load();
 
 }
 void AbView::removeEntry( const int UID )
 {
                 //qWarning("abview:RemoveContact");
         m_contactdb->remove( UID );
         load();
 }
 
 void AbView::replaceEntry( const OContact &contact )
 {
                 //qWarning("abview:ReplaceContact");
         m_contactdb->replace( contact );
         load();
 
 }
 
 OContact AbView::currentEntry()
 {
         OContact currentContact;
 
         switch ( (int) m_curr_View ) {
         case TableView:
                 currentContact = m_abTable -> currentEntry();
                 break;
         case CardView:
                 currentContact = m_ablabel -> currentEntry();
                 break;
         }
         m_curr_Contact = currentContact.uid();
         return currentContact;
 }
 
 bool AbView::save()
 {
                 //qWarning("abView:Save data");
 
         return m_contactdb->save();
 }
 
 void AbView::load()
 {
                 //qWarning("abView:Load data");
 
         // Letter Search is stopped at this place
         emit signalClearLetterPicker();
 
         if ( m_inPersonal )
                 // VCard Backend does not sort.. 
                 m_list = m_contactdb->allRecords();
         else{
                 m_list = m_contactdb->sorted( true, 0, 0, 0 );
                 clearForCategory();
         }
 
                 //qWarning ("Number of contacts: %d", m_list.count());
 
         updateView( true );
 
 }
 
 void AbView::reload()
 {
                 //qWarning( "void AbView::reload()" );
 
         m_contactdb->reload();
         load();
 }
 
 void AbView::clear()
 {
         // :SX
 }
 
 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();
 
         // Use the current Category if nothing else selected
         int category = 0;
 
         if ( cat.isEmpty() )
                 category = m_curr_category;
         else{
                 category = mCat.id("Contacts", cat );
         }
 
                 //qWarning ("Find in Category %d", category);
 
         QRegExp r( str );
         r.setCaseSensitive( caseSensitive );
         r.setWildcard( !useRegExp );
 
         // Get all matching entries out of the database
         m_list = m_contactdb->matchRegexp( r );
 
                 //qWarning( "found: %d", m_list.count() );
         if ( m_list.count() == 0 ){
                 emit signalNotFound();
                 return;
         }
 
         // Now remove all contacts with wrong category (if any selected)
         // This algorithm is a litte bit ineffective, but
         // we will not have a lot of matching entries..
         clearForCategory();
 
         // Now show all found entries
         updateView( true );
 }
 
 void AbView::offSearch()
 {
         m_inSearch = false;
 
         load();
 }
 
 void AbView::slotSwitch(){
                 //qWarning("AbView::slotSwitch()");
 
         m_prev_View = m_curr_View;
         switch ( (int) m_curr_View ){
         case TableView:
                 qWarning("Switching to CardView");
                 m_curr_View = CardView;
                 break;
         case CardView:
                 qWarning("Switching to TableView");
                 m_curr_View = TableView;
                 break;
         }
         updateView();
 
 }
 
 // END: Slots
 
 void AbView::clearForCategory()
 {
         OContactAccess::List::Iterator it;
         // Now remove all contacts with wrong category if any category selected
 
         OContactAccess::List allList = m_list;
         if ( m_curr_category != -1 ){
                 for ( it = allList.begin(); it != allList.end(); ++it ){
                         if ( !contactCompare( *it, m_curr_category ) ){
                                         //                      qWarning("Removing %d", (*it).uid());
                                 m_list.remove( (*it).uid() );
                         }
                 }
         }
 
 }
 
 bool AbView::contactCompare( const OContact &cnt, int category )
 {
                 //qWarning ("bool AbView::contactCompare( const OContact &cnt, %d )", category);
 
         bool returnMe;
         QArray<int> cats;
         cats = cnt.categories();
 
                 //qWarning ("Number of categories: %d", cats.count() );
 
         returnMe = false;
         if ( cats.count() == 0 && category == 0 )
                 // Contacts with no category will just shown on "All" and "Unfiled"
                 returnMe = true;
         else {
                 int i;
                 for ( i = 0; i < int(cats.count()); i++ ) {
                                 //              qWarning("Comparing %d with %d",cats[i],category );
                         if ( cats[i] == category ) {
                                 returnMe = true;
                                 break;
                         }
                 }
         }
                 //qWarning ("Return: %d", returnMe);
         return returnMe;
 }
 
 // In Some rare cases we have to update all lists..
 void AbView::updateListinViews()
 {
                 m_abTable -> setContacts( m_list );
                 m_ablabel -> setContacts( m_list );
 }
 
 void  AbView::updateView( bool newdata )
 {
                 //qWarning("AbView::updateView()");
 
         if ( m_viewStack -> visibleWidget() ){
                 m_viewStack -> visibleWidget() -> clearFocus();
         }
 
         // If we switching the view, we have to store some information
         if ( !newdata ){
                 if ( m_list.count() ){
                         switch ( (int) m_prev_View ) {
                         case TableView:
                                 m_curr_Contact = m_abTable -> currentEntry_UID();
                                 break;
                         case CardView:
                                 m_curr_Contact = m_ablabel -> currentEntry_UID();
                                 break;
                         }
                 }else
                         m_curr_Contact = 0;
         }
 
         // Feed all views with new lists
         if ( newdata )
                 updateListinViews();
 
         // Tell the world that the view is changed
         if ( m_curr_View != m_prev_View )
                 emit signalViewSwitched ( (int) m_curr_View );
 
         m_prev_View = m_curr_View;
 
         // Switch to new View
         switch ( (int) m_curr_View ) {
         case TableView:
                 m_abTable -> setChoiceSelection( m_orderedFields );
                 if ( m_curr_Contact != 0 )
                         m_abTable -> selectContact ( m_curr_Contact );
                 m_abTable -> setFocus();
                 break;
         case CardView:
                 if ( m_curr_Contact != 0 )
                         m_ablabel -> selectContact( m_curr_Contact );
                 m_ablabel -> setFocus();
                 break;
         }
 
         // Raise the current View
         m_viewStack -> raiseWidget( m_curr_View );
 }