author | drw <drw> | 2005-03-16 17:45:28 (UTC) |
---|---|---|
committer | drw <drw> | 2005-03-16 17:45:28 (UTC) |
commit | 44209002d51056e0d198b63463ebc686b41e8cd8 (patch) (side-by-side diff) | |
tree | d61069f16d8382959065cf7fe43d4e68ad448daf | |
parent | d16a2a4e0617f21cba0e399dbe5ffa17d76886b9 (diff) | |
download | opie-44209002d51056e0d198b63463ebc686b41e8cd8.zip opie-44209002d51056e0d198b63463ebc686b41e8cd8.tar.gz opie-44209002d51056e0d198b63463ebc686b41e8cd8.tar.bz2 |
Fixed: 1. Category handling - all other apps and libopie2 use -1 for unfiled and 0 for all, addressbook flipped them, 2. Letter picker record selection, 3. sort resulting records after letter picker selected them
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 1 | ||||
-rw-r--r-- | core/pim/addressbook/abview.cpp | 36 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 7 |
3 files changed, 21 insertions, 23 deletions
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 0be7d1a..49e66ad 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp @@ -154,17 +154,16 @@ void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) odebug << "AbTable::setContacts()" << oendl; clear(); m_viewList = viewList; setSorting( false ); setPaintingEnabled( FALSE ); - Opie::OPimContactAccess::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(); diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp index 6be19f8..34035fd 100644 --- a/core/pim/addressbook/abview.cpp +++ b/core/pim/addressbook/abview.cpp @@ -37,17 +37,17 @@ QString addressbookPersonalVCardName() } AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): QWidget(parent), mCat(0), m_inSearch( false ), m_inPersonal( false ), - m_curr_category( -1 ), + m_curr_category( 0 ), 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 ) @@ -152,29 +152,18 @@ bool AbView::save() void AbView::load() { odebug << "AbView::Load data" << oendl; // Letter Search is stopped at this place emit signalClearLetterPicker(); - if ( m_curr_category == 0 ) { - // Show unfiled m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, - Opie::OPimContactAccess::DoNotShowWithCategory, 0 ); - } else if ( m_curr_category != -1 ){ - // Just show selected category - m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, - Opie::OPimBase::FilterCategory, m_curr_category ); - } else { - // Show all categories - m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, - Opie::OPimBase::FilterOff, 0 ); - } + Opie::OPimContactAccess::FilterCategory, m_curr_category ); // if ( m_curr_category != -1 ) // clearForCategory(); odebug << "Number of contacts: " << m_list.count() << oendl; updateView( true ); @@ -194,32 +183,34 @@ void AbView::clear() } void AbView::setShowByCategory( const QString& cat ) { odebug << "AbView::setShowCategory( const QString& cat )" << oendl; int intCat = 0; - // All (cat == NULL) will be stored as -1 - if ( cat.isNull() ) + // Unfiled will be stored as -1 + if ( cat == tr( "Unfiled" ) ) intCat = -1; + else if ( cat.isNull() ) + intCat = 0; else intCat = mCat.id("Contacts", cat ); // Just do anything if we really change the category if ( intCat != m_curr_category ){ // odebug << "Categories: Selected " << cat << ".. Number: " // << m_curr_category << oendl; m_curr_category = intCat; emit signalClearLetterPicker(); - load(); } + m_curr_category = intCat; } void AbView::setShowToView( Views view ) { odebug << "void AbView::setShowToView( View " << view << " )" << oendl; if ( m_curr_View != view ){ @@ -260,18 +251,23 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) query.setFileAs( QString("%1*").arg(c) ); break; default: owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl << "I will ignore it.." << oendl; return; } m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ); - if ( m_curr_category != -1 ) + + if ( m_curr_category != 0 ) clearForCategory(); + + // Sort filtered results + m_list = m_contactdb->sorted( m_list, true, Opie::OPimContactAccess::SortFileAsName, + Opie::OPimContactAccess::FilterCategory, m_curr_category ); m_curr_Contact = 0; } updateView( true ); } void AbView::setListOrder( const QValueList<int>& ordered ) { m_orderedFields = ordered; @@ -373,17 +369,17 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, 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.. - if ( m_curr_category != -1 ) + if ( m_curr_category != 0 ) clearForCategory(); // Now show all found entries updateView( true ); } void AbView::offSearch() { @@ -413,17 +409,17 @@ void AbView::slotSwitch(){ // END: Slots void AbView::clearForCategory() { Opie::OPimContactAccess::List::Iterator it; // Now remove all contacts with wrong category if any category selected Opie::OPimContactAccess::List allList = m_list; - if ( m_curr_category != -1 ){ + if ( m_curr_category != 0 ){ for ( it = allList.begin(); it != allList.end(); ++it ){ if ( !contactCompare( *it, m_curr_category ) ){ //odebug << "Removing " << (*it).uid() << oendl; m_list.remove( (*it).uid() ); } } } @@ -436,17 +432,17 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) bool returnMe; QArray<int> cats; cats = cnt.categories(); // odebug << "Number of categories: " << cats.count() << oendl; returnMe = false; - if ( cats.count() == 0 && category == 0 ) + if ( cats.count() == 0 && category == -1 ) // Contacts with no category will just shown on "All" and "Unfiled" returnMe = true; else { int i; for ( i = 0; i < int(cats.count()); i++ ) { //odebug << "Comparing " << cats[i] << " with " << category << oendl; if ( cats[i] == category ) { returnMe = true; diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 6984501..faae0a9 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -849,18 +849,21 @@ void AddressbookWindow::slotWrapAround() } void AddressbookWindow::slotSetCategory( const QString &category ) { odebug << "void AddressbookWindow::slotSetCategory( " << category << " )" << oendl; // Tell the view about the selected category - m_config.setCategory( category ); - m_abView -> setShowByCategory( category ); + QString cat = category; + if ( cat == tr( "All" ) ) + cat = QString::null; + m_config.setCategory( cat ); + m_abView -> setShowByCategory( cat ); } void AddressbookWindow::slotViewSwitched( int view ) { odebug << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl; // Tell the view about the selected view m_abView -> setShowToView ( (AbView::Views) view ); |