summaryrefslogtreecommitdiff
authoreilers <eilers>2003-03-09 16:59:29 (UTC)
committer eilers <eilers>2003-03-09 16:59:29 (UTC)
commit06d6fd6ae517d560616d0864db29c7d8ae7a0a32 (patch) (side-by-side diff)
tree36e4672fcded6fc2009a5af6a111d1d8d4dc6bb5
parent77c55432622d2821023ac73f47d3215d04cc4f58 (diff)
downloadopie-06d6fd6ae517d560616d0864db29c7d8ae7a0a32.zip
opie-06d6fd6ae517d560616d0864db29c7d8ae7a0a32.tar.gz
opie-06d6fd6ae517d560616d0864db29c7d8ae7a0a32.tar.bz2
Fixed missing table refresh after changing the primary contact order
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/addressbook/abtable.cpp13
-rw-r--r--core/pim/addressbook/abtable.h4
-rw-r--r--core/pim/addressbook/abview.cpp4
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
@@ -173,24 +173,30 @@ void AbTable::setContacts( const OContactAccess::List& viewList )
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];
@@ -308,28 +314,31 @@ void AbTable::clear()
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 );
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
@@ -69,24 +69,28 @@ private:
};
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();
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
@@ -234,24 +234,28 @@ void AbView::setShowByLetter( char c )
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);