Speed optimization fix:

Startup and usability improved if a lot of contacts are stored. Left speed bootleneck is the xml
file..

1 files changed, 70 insertions, 43 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index a2617fa..4705c78 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -35,24 +35,26 @@
 #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
 
+#if 0
+
 /*!
   \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 );
@@ -103,245 +105,245 @@ QWidget *AbPickItem::createEditor() const
 	combo->setCurrentItem(cur);
 	return combo;
 }
 
 void AbPickItem::setContentFromEditor( QWidget *w )
 {
 	if ( w->inherits("QComboBox") )
 		setText( ( (QComboBox*)w )->currentText() );
 	else
 		QTableItem::setContentFromEditor( w );
 }
 
+#endif
+
 /*!
   \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();
+	// 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()");
+	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++ );
+//	int row = 0;
+// 	for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
+// 		insertIntoTable( *it, row++ );
 	
-	setSorting( true );
+// 	setSorting( true );
 
-	resort();
+// 	resort();
 
 	updateVisible();
 
 	setPaintingEnabled( TRUE );
 
 }
 
 void AbTable::setOrderedList( const QValueList<int> ordered )
 {
 	intFields = ordered;
 }
 
 
 bool AbTable::selectContact( int UID )
 {
-	//	qWarning( "AbTable::selectContact( %d )", UID );
+	qWarning( "AbTable::selectContact( %d )", UID );
 	int rows = numRows();
-	AbTableItem *abi;
 	OContact* foundContact = 0l;
 	bool found = false;
 
 	setPaintingEnabled( FALSE );
+	qWarning( "search start" );
 	for ( int r = 0; r < rows; ++r ) {
-		abi = static_cast<AbTableItem*>( item(r, 0) );
-		foundContact = &contactList[abi];
-		if ( foundContact -> uid() == UID ){
+		if ( m_viewList.uidAt( r ) == UID ){
 			ensureCellVisible( r, 0 );
 			setCurrentCell( r, 0 );
 			found = true;
 			break;
 		}
 	}
+	qWarning( "search end" );
 
 	if ( !found ){
 		ensureCellVisible( 0,0 );
 		setCurrentCell( 0, 0 );
 	}
 
 	setPaintingEnabled( TRUE );
 
 	return true;
 }
 
+#if 0
 void AbTable::insertIntoTable( const OContact& cnt, int row )
 {
-	//	qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", 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 ) );
 	
 }
-
+#endif
 
 
 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()" );
+	qWarning( "void AbTable::resort() NOT POSSIBLE !!" );
+#if 0
 	setPaintingEnabled( FALSE );
 	if ( sorting() ) {
 		if ( lastSortCol == -1 )
 			lastSortCol = 0;
 		sortColumn( lastSortCol, asc, TRUE );
 		//QMessageBox::information( this, "resort", "resort" );
 		updateVisible();
 	}
 	setPaintingEnabled( TRUE );
+#endif
 }
 
 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;
+{	
+	return m_viewList[currentRow()];
 }
 
 int AbTable::currentEntry_UID()
 {
 	return ( currentEntry().uid() );
 }
 
 void AbTable::clear()
 {
-	//	qWarning( "void AbTable::clear()" );
-	contactList.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()" );
+	qWarning( "void AbTable::refresh() NOT IMPLEMENTED !!" );
+
+#if 0
 	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() ){
 			static_cast<AbTableItem*>( item(r, 1) )->
 				setPixmap( contactItem.icon );
 		}else{
 			static_cast<AbTableItem*>( item(r, 1) )->
 				setPixmap( QPixmap() );
 		}
 	}
 	resort();
 	setPaintingEnabled( TRUE );
+
+#endif
 }
 
 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:
@@ -356,26 +358,27 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 // 	case Qt::Key_Down:
 // 		qWarning("b");
 // 		emit signalKeyDown();
 // 		break;
 	default:
 		QTable::keyPressEvent( e );
 	}
 		
 }
 
 void AbTable::moveTo( char c )
 {
-	qWarning( "void AbTable::moveTo( char c )" );
+	qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" );
 	
+#if 0
 	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;
@@ -385,41 +388,44 @@ void AbTable::moveTo( char c )
 		//### 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() );
-}
 
+#endif
+}
 
+#if 0
+// Useless.. Nobody uses it .. (se)
 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;
 }
-
+#endif
 
 
 void AbTable::resizeRows() {
 	/*
 	  if (numRows()) {
 	  for (int i = 0; i < numRows(); i++) {
 	  setRowHeight( i, size );
 	  }
 	  }
 	  updateVisible();
 	*/
 }
@@ -497,80 +503,82 @@ void AbTable::fitColumns()
 		setColumnWidth( 1, contentsWidth );
 
 	setPaintingEnabled( TRUE );
 }
 
 void AbTable::show()
 {
 	//	qWarning( "void AbTable::show()" );
 	realignTable();
 	QTable::show();
 }
 
+#if 0
 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();
 }
+#endif
 
 void AbTable::itemClicked(int,int col)
 {
 	//	qWarning( "AbTable::itemClicked(int, col:%d)", col);
 	if ( col == 2 ) {
 		return;
 	} else {
 		//		qWarning ("Emitting signalSwitch()");
 		emit signalSwitch();
 	}
 }
 
+#if 0
 QStringList AbTable::choiceNames() const
 {
 	return choicenames;
 }
 
+#endif
 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 );
@@ -621,52 +629,71 @@ void AbTable::setPaintingEnabled( bool e )
 
 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();
 
+    //qWarning( "Paint row: %d", row );
+
+    OContact act_contact = m_viewList[row];
+
     // 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 ) );
-    }
+    QString nameText    = act_contact.fileAs();
+
+    switch( col ){
+	    case 0: 
+		    p->drawText( x + marg,2 + fm.ascent(), nameText );
+	    break;
+	    case 1:{
+
+		    ContactItem contactItem = findContactContact( act_contact, 0 );
+		    QPixmap contactPic  = contactItem.icon; /* pixmap( row, col ); */
+		    QString contactText = contactItem.value;
+			    
+		    if ( !contactPic.isNull() )
+			    {
+				    p->drawPixmap( x + marg, y, contactPic );
+				    p->drawText( x + marg + contactPic.width() 
+						 + 4,2 + fm.ascent(), contactText );
+			    }
+		    else
+			    {
+				    p->drawText( x + marg,2 + fm.ascent(), contactText );
+			    }
+	    }
+	    break;
 
+    }
     p->restore();
 }
 
 void AbTable::rowHeightChanged( int row )
 {
 	if ( enablePainting )
 		QTable::rowHeightChanged( row );
 }
 ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ )
 {
 
 	ContactItem item;