3 files changed, 25 insertions, 27 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
@@ -150,25 +150,24 @@ void AbTable::init()
 }
 
 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();
 
         updateVisible();
 
         setPaintingEnabled( TRUE );
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
@@ -33,25 +33,25 @@ QString addressbookPersonalVCardName()
 {
         QString filename = Global::applicationFileName("addressbook",
                                                        "businesscard.vcf");
         return filename;
 }
 
 
 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 )
 {
         odebug << "AbView::c'tor" << oendl;
         // Load default database and handle syncing myself.. !
         m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false );
@@ -148,38 +148,27 @@ bool AbView::save()
                 //odebug << "AbView::Save data" << oendl;
 
         return m_contactdb->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 );
-                } elseif ( 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 );
-        }
-        
+        m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName,
+                                              Opie::OPimContactAccess::FilterCategory, m_curr_category );
+
         // if ( m_curr_category != -1 )
         //      clearForCategory();
 
         odebug << "Number of contacts: " << m_list.count() << oendl;
 
         updateView( true );
 
 }
 
 void AbView::reload()
 {
         odebug << "AbView::::reload()" << oendl;
@@ -190,40 +179,42 @@ void AbView::reload()
 
 void AbView::clear()
 {
         // :SX
 }
 
 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() )
-                intCat = -1;
+        // 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 ){
                 odebug << "Change the View (Category is: " << m_curr_category << ")" << oendl;
                 m_prev_View = m_curr_View;
                 m_curr_View = view;
 
@@ -236,46 +227,51 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 {
         odebug << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
 
         assert( mode < AbConfig::LASTELEMENT );
 
         Opie::OPimContact query;
         if ( c == 0 ){
                 load();
                 return;
         }else{
                 // If the current Backend is unable to solve the query, we will
                 // ignore the request ..
-                if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | 
+                if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards |
                                                       Opie::OPimContactAccess::IgnoreCase ) ){
                         owarn << "Tried to access queryByExample which is not supported by the current backend!!" << oendl;
                         owarn << "I have to ignore this access!" << oendl;
                         return;
                 }
 
                 switch( mode ){
                 case AbConfig::LastName:
                         query.setLastName( QString("%1*").arg(c) );
                         break;
                 case AbConfig::FileAs:
                         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;
         if ( m_abTable ){
                 m_abTable->setOrderedList( ordered );
                 m_abTable->refresh();
         }
@@ -369,25 +365,25 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
         // Get all matching entries out of the database
         m_list = m_contactdb->matchRegexp( r );
 
                 //odebug << "Found: " << m_list.count() << oendl;
         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()
 {
         m_inSearch = false;
 
         load();
 }
@@ -409,48 +405,48 @@ void AbView::slotSwitch(){
         updateView();
 
 }
 
 // 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() );
                         }
                 }
         }
 
 }
 
 bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 {
                 //odebug << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
                 //                              << category << " )" << oendl;
 
         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;
                                 break;
                         }
                 }
         }
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
@@ -845,26 +845,29 @@ void AddressbookWindow::slotWrapAround()
         odebug << "Got wrap signal!" << oendl;
         // if ( doNotifyWrapAround )
         //      QMessageBox::information( this, tr( "End of list" ),
         //                                tr( "End of list. Wrap around now...!" ) + "\n" );
 
 }
 
 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 );
         active_view = view;
 }