6 files changed, 105 insertions, 66 deletions

diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 6d8de91..1914f71 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -70,12 +70,15 @@ OContact AbLabel::currentEntry()
 
 bool AbLabel::selectContact( int UID )
 {
 
-        for ( m_itCurContact = m_viewList.begin(); m_itCurContact != m_viewList.end(); ++m_itCurContact){
-                if ( (*m_itCurContact).uid() == UID )
+        for ( int r = 0; r < m_viewList.count(); ++r ) {
+                if ( m_viewList.uidAt( r ) == UID ){
+                        m_itCurContact.setCurrent( r );
                         break;
+                }
         }
+
         sync();
 
         return true;
 }
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
@@ -43,8 +43,10 @@
 #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
@@ -111,8 +113,10 @@ void AbPickItem::setContentFromEditor( QWidget *w )
         else
                 QTableItem::setContentFromEditor( w );
 }
 
+#endif
+
 /*!
   \class AbTable abtable.h
   
   \brief QTable based class for showing a list of entries
@@ -134,9 +138,9 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
         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()
@@ -157,9 +161,9 @@ void AbTable::init()
 }
 
 void AbTable::setContacts( const OContactAccess::List& viewList )
 {
-                //qWarning("AbTable::setContacts()");
+        qWarning("AbTable::setContacts()");
 
         clear();
         m_viewList = viewList;
 
@@ -167,15 +171,15 @@ void AbTable::setContacts( const OContactAccess::List& viewList )
         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 );
@@ -189,25 +193,24 @@ void AbTable::setOrderedList( const QValueList<int> 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 );
@@ -217,11 +220,12 @@ bool AbTable::selectContact( int UID )
 
         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 );
@@ -239,9 +243,9 @@ void AbTable::insertIntoTable( const OContact& cnt, int row )
         //### cannot do this; table only has two columns at this point
         //    setItem( row, 2, new AbPickItem( this ) );
         
 }
-
+#endif
 
 
 void AbTable::columnClicked( int col )
 {
@@ -262,9 +266,10 @@ void AbTable::columnClicked( int col )
 }
 
 void AbTable::resort()
 {
-                //qWarning( "void AbTable::resort()" );
+        qWarning( "void AbTable::resort() NOT POSSIBLE !!" );
+#if 0
         setPaintingEnabled( FALSE );
         if ( sorting() ) {
                 if ( lastSortCol == -1 )
                         lastSortCol = 0;
@@ -272,21 +277,14 @@ void AbTable::resort()
                 //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()
 {
@@ -294,10 +292,10 @@ int AbTable::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 ) {
@@ -312,9 +310,11 @@ void AbTable::clear()
 
 // 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;
 
@@ -332,8 +332,10 @@ void AbTable::refresh()
                 }
         }
         resort();
         setPaintingEnabled( TRUE );
+
+#endif
 }
 
 void AbTable::keyPressEvent( QKeyEvent *e )
 {
@@ -364,10 +366,11 @@ void AbTable::keyPressEvent( QKeyEvent *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;
@@ -393,11 +396,14 @@ void AbTable::moveTo( char c )
                         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;
@@ -409,9 +415,9 @@ QString AbTable::findContactName( const OContact &entry )
                 }
         }
         return str;
 }
-
+#endif
 
 
 void AbTable::resizeRows() {
         /*
@@ -505,8 +511,9 @@ void AbTable::show()
         realignTable();
         QTable::show();
 }
 
+#if 0
 void AbTable::setChoiceNames( const QStringList& list)
 {
         choicenames = list;
         if ( choicenames.isEmpty() ) {
@@ -519,8 +526,9 @@ void AbTable::setChoiceNames( const QStringList& list)
                 horizontalHeader()->setLabel( 2, tr( "Pick" ));
         }
         fitColumns();
 }
+#endif
 
 void AbTable::itemClicked(int,int col)
 {
                 //qWarning( "AbTable::itemClicked(int, col:%d)", col);
@@ -531,13 +539,15 @@ void AbTable::itemClicked(int,int col)
                 emit signalSwitch();
         }
 }
 
+#if 0
 QStringList AbTable::choiceNames() const
 {
         return choicenames;
 }
 
+#endif
 void AbTable::setChoiceSelection( const QValueList<int>& list )
 {
         intFields = list;
 }
@@ -559,10 +569,8 @@ QStringList AbTable::choiceSelection(int /*index*/) const
         return r;
 }
 
 
-
-
 void AbTable::updateVisible()
 {
                 //qWarning("void AbTable::updateVisible()");
 
@@ -629,8 +637,12 @@ 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() ) );
@@ -646,19 +658,34 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
     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 )
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index 0f7bc29..b9ebe27 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -31,8 +31,9 @@
 #include <qstringlist.h>
 #include <qcombobox.h>
 #include <qpixmap.h> 
 
+#if 0
 class AbTableItem : public QTableItem
 {
 public:
     AbTableItem( QTable *t, EditType et, const QString &s,
@@ -46,8 +47,10 @@ public:
 private:
     QString sortKey;
 };
 
+#endif
+
 // This is a simple container, storing all contact
 // information
 class ContactItem
 {
@@ -55,8 +58,9 @@ class ContactItem
         QPixmap icon;
         QString value;
 };
 
+#if 0
 class AbPickItem : public QTableItem
 {
 public:
     AbPickItem( QTable *t );
@@ -67,8 +71,10 @@ public:
 private:
     QGuardedPtr<QComboBox> cb;
 };
 
+#endif
+
 class AbTable : public QTable
 {
     Q_OBJECT
 
@@ -90,9 +96,9 @@ public:
 
     // Get the UID of the current selected Entry
     int currentEntry_UID();
 
-    QString findContactName( const OContact &entry );
+    // QString findContactName( const OContact &entry );
 
     void init();
     void clear();
     void refresh();
@@ -102,10 +108,10 @@ public:
     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 setChoiceNames( const QStringList& list);
+    // QStringList choiceNames() const;
     void setChoiceSelection( const QValueList<int>& list );
     QStringList choiceSelection(int index) const;
 
 signals:
@@ -128,9 +134,9 @@ protected slots:
     void itemClicked(int,int col);
     void rowHeightChanged( int row );
 
 private:
-    void insertIntoTable( const OContact &cnt, int row );
+    // void insertIntoTable( const OContact &cnt, int row );
     ContactItem findContactContact( const OContact &entry, int row );
     void fitColumns();
     void resizeRows();
     void realignTable();
@@ -138,9 +144,9 @@ private:
     void updateVisible();
 
     int lastSortCol;
     bool asc;
-    QMap<AbTableItem*, OContact> contactList;
+    // QMap<AbTableItem*, OContact> contactList;
     QValueList<int> intFields;
     QStringList choicenames;
     bool enablePainting;
     bool columnVisible;
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 477f85b..6cbd556 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -50,8 +50,9 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
         m_viewStack( 0l ),
         m_abTable( 0l ),
         m_orderedFields( ordered )
 {
+        qWarning("AbView::c'tor");
         // Load default database and handle syncing myself.. !
         m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false ),
         mCat.load( categoryFileName() );
 
@@ -96,30 +97,30 @@ AbView::~AbView()
 
 
 void AbView::setView( Views view )
 {
-                //qWarning("AbView::setView( Views view )");
+        qWarning("AbView::setView( Views view )");
          m_curr_View = view;
          load();
 }
 
 void AbView::addEntry( const OContact &newContact )
 {
-                //qWarning("abview:AddContact");
+        qWarning("abview:AddContact");
         m_contactdb->add ( newContact );
         load();
 
 }
 void AbView::removeEntry( const int UID )
 {
-                //qWarning("abview:RemoveContact");
+        qWarning("abview:RemoveContact");
         m_contactdb->remove( UID );
         load();
 }
 
 void AbView::replaceEntry( const OContact &contact )
 {
-                //qWarning("abview:ReplaceContact");
+        qWarning("abview:ReplaceContact");
         m_contactdb->replace( contact );
         load();
 
 }
@@ -148,9 +149,9 @@ bool AbView::save()
 }
 
 void AbView::load()
 {
-                //qWarning("abView:Load data");
+        qWarning("abView:Load data");
 
         // Letter Search is stopped at this place
         emit signalClearLetterPicker();
 
@@ -158,9 +159,10 @@ void AbView::load()
                 // VCard Backend does not sort.. 
                 m_list = m_contactdb->allRecords();
         else{
                 m_list = m_contactdb->sorted( true, 0, 0, 0 );
-                clearForCategory();
+                if ( m_curr_category != -1 )
+                        clearForCategory();
         }
 
         qWarning ("Number of contacts: %d", m_list.count());
 
@@ -169,9 +171,9 @@ void AbView::load()
 }
 
 void AbView::reload()
 {
-                //qWarning( "void AbView::reload()" );
+        qWarning( "void AbView::reload()" );
 
         m_contactdb->reload();
         load();
 }
@@ -182,9 +184,9 @@ void AbView::clear()
 }
 
 void AbView::setShowByCategory( const QString& cat )
 {
-                //qWarning("AbView::setShowCategory( const QString& cat )");
+        qWarning("AbView::setShowCategory( const QString& cat )");
 
         int intCat = 0;
 
         // All (cat == NULL) will be stored as -1
@@ -206,13 +208,12 @@ void AbView::setShowByCategory( const QString& cat )
 }
 
 void AbView::setShowToView( Views view )
 {
-                //qWarning("void AbView::setShowToView( View %d )", view);
-
-                //qWarning ("Change the View (Category is: %d)", m_curr_category);
+               qWarning("void AbView::setShowToView( View %d )", view);
 
         if ( m_curr_View != view ){
+                qWarning ("Change the View (Category is: %d)", m_curr_category);
                 m_prev_View = m_curr_View;
                 m_curr_View = view;
 
                 updateView();
@@ -249,9 +250,10 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
                         qWarning( "I will ignore it.." );
                         return;
                 }
                 m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase );
-                clearForCategory();
+                if ( m_curr_category != -1 )
+                        clearForCategory();
                 m_curr_Contact = 0;
         }
         updateView( true );
 }
@@ -273,9 +275,9 @@ QString AbView::showCategory() const
 }
 
 void AbView::showPersonal( bool personal )
 {
-                //qWarning ("void AbView::showPersonal( %d )", personal);
+        qWarning ("void AbView::showPersonal( %d )", personal);
 
         if ( personal ){
 
                 if ( m_inPersonal )
@@ -361,9 +363,10 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 
         // 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();
+        if ( m_curr_category != -1 )
+                clearForCategory();
 
         // Now show all found entries
         updateView( true );
 }
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 03c96c8..0ba024e 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -247,9 +247,9 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
 
         QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) );
 
-        m_abView->load();
+        // m_abView->load(); // Already done by c'tor .
 
         // Letter Picker
         pLabel = new LetterPicker( listContainer );
         connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h
index 9621826..790aa95 100644
--- a/core/pim/addressbook/version.h
+++ b/core/pim/addressbook/version.h
@@ -1,9 +1,9 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
 #define MAINVERSION  "1"
-#define SUBVERSION   "0"
+#define SUBVERSION   "1"
 #define PATCHVERSION "0"
 
 #define APPNAME "OPIE_ADDRESSBOOK"