author | eilers <eilers> | 2003-03-09 16:59:29 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-03-09 16:59:29 (UTC) |
commit | 06d6fd6ae517d560616d0864db29c7d8ae7a0a32 (patch) (unidiff) | |
tree | 36e4672fcded6fc2009a5af6a111d1d8d4dc6bb5 /core | |
parent | 77c55432622d2821023ac73f47d3215d04cc4f58 (diff) | |
download | opie-06d6fd6ae517d560616d0864db29c7d8ae7a0a32.zip opie-06d6fd6ae517d560616d0864db29c7d8ae7a0a32.tar.gz opie-06d6fd6ae517d560616d0864db29c7d8ae7a0a32.tar.bz2 |
Fixed missing table refresh after changing the primary contact order
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 13 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.h | 4 | ||||
-rw-r--r-- | core/pim/addressbook/abview.cpp | 4 |
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 | |||
@@ -179,12 +179,18 @@ void AbTable::setContacts( const OContactAccess::List& viewList ) | |||
179 | updateVisible(); | 179 | updateVisible(); |
180 | 180 | ||
181 | setPaintingEnabled( TRUE ); | 181 | setPaintingEnabled( TRUE ); |
182 | 182 | ||
183 | } | 183 | } |
184 | 184 | ||
185 | void AbTable::setOrderedList( const QValueList<int> ordered ) | ||
186 | { | ||
187 | intFields = ordered; | ||
188 | } | ||
189 | |||
190 | |||
185 | bool AbTable::selectContact( int UID ) | 191 | bool AbTable::selectContact( int UID ) |
186 | { | 192 | { |
187 | //qWarning( "AbTable::selectContact( %d )", UID ); | 193 | //qWarning( "AbTable::selectContact( %d )", UID ); |
188 | int rows = numRows(); | 194 | int rows = numRows(); |
189 | AbTableItem *abi; | 195 | AbTableItem *abi; |
190 | OContact* foundContact = 0l; | 196 | OContact* foundContact = 0l; |
@@ -314,16 +320,19 @@ void AbTable::refresh() | |||
314 | 320 | ||
315 | setPaintingEnabled( FALSE ); | 321 | setPaintingEnabled( FALSE ); |
316 | for ( int r = 0; r < rows; ++r ) { | 322 | for ( int r = 0; r < rows; ++r ) { |
317 | abi = static_cast<AbTableItem*>( item(r, 0) ); | 323 | abi = static_cast<AbTableItem*>( item(r, 0) ); |
318 | contactItem = findContactContact( contactList[abi], r ); | 324 | contactItem = findContactContact( contactList[abi], r ); |
319 | static_cast<AbTableItem*>( item(r, 1) )->setItem( contactItem.value, abi->text() ); | 325 | static_cast<AbTableItem*>( item(r, 1) )->setItem( contactItem.value, abi->text() ); |
320 | if ( !contactItem.icon.isNull() ) | 326 | if ( !contactItem.icon.isNull() ){ |
321 | static_cast<AbTableItem*>( item(r, 1) )-> | 327 | static_cast<AbTableItem*>( item(r, 1) )-> |
322 | setPixmap( contactItem.icon ); | 328 | setPixmap( contactItem.icon ); |
323 | 329 | }else{ | |
330 | static_cast<AbTableItem*>( item(r, 1) )-> | ||
331 | setPixmap( QPixmap() ); | ||
332 | } | ||
324 | } | 333 | } |
325 | resort(); | 334 | resort(); |
326 | setPaintingEnabled( TRUE ); | 335 | setPaintingEnabled( TRUE ); |
327 | } | 336 | } |
328 | 337 | ||
329 | void AbTable::keyPressEvent( QKeyEvent *e ) | 338 | void AbTable::keyPressEvent( QKeyEvent *e ) |
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 | |||
@@ -75,12 +75,16 @@ class AbTable : public QTable | |||
75 | public: | 75 | public: |
76 | AbTable( const QValueList<int> ordered, QWidget *parent, const char *name=0 ); | 76 | AbTable( const QValueList<int> ordered, QWidget *parent, const char *name=0 ); |
77 | ~AbTable(); | 77 | ~AbTable(); |
78 | 78 | ||
79 | // Set the contacts shown in the table | 79 | // Set the contacts shown in the table |
80 | void setContacts( const OContactAccess::List& viewList ); | 80 | void setContacts( const OContactAccess::List& viewList ); |
81 | |||
82 | // Set the list for primary contacts | ||
83 | void setOrderedList( const QValueList<int> ordered ); | ||
84 | |||
81 | // Selects a contact of a specific UID | 85 | // Selects a contact of a specific UID |
82 | bool selectContact( int UID ); | 86 | bool selectContact( int UID ); |
83 | 87 | ||
84 | // Get the current selected entry | 88 | // Get the current selected entry |
85 | OContact currentEntry(); | 89 | OContact currentEntry(); |
86 | 90 | ||
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 | |||
@@ -240,12 +240,16 @@ void AbView::setShowByLetter( char c ) | |||
240 | updateView( true ); | 240 | updateView( true ); |
241 | } | 241 | } |
242 | 242 | ||
243 | void AbView::setListOrder( const QValueList<int>& ordered ) | 243 | void AbView::setListOrder( const QValueList<int>& ordered ) |
244 | { | 244 | { |
245 | m_orderedFields = ordered; | 245 | m_orderedFields = ordered; |
246 | if ( m_abTable ){ | ||
247 | m_abTable->setOrderedList( ordered ); | ||
248 | m_abTable->refresh(); | ||
249 | } | ||
246 | updateView(); | 250 | updateView(); |
247 | } | 251 | } |
248 | 252 | ||
249 | 253 | ||
250 | QString AbView::showCategory() const | 254 | QString AbView::showCategory() const |
251 | { | 255 | { |