Fixing problem with categories: "unfiled" and "all" show the same list.

Previous patch removed correct use of the pim backend. Therefore I had reimplemented it.

1 files changed, 15 insertions, 5 deletions

diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 34035fd..8a2db96 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -32,261 +32,271 @@ extern QString categoryFileName();
 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( 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 );
         m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
         mCat.load( categoryFileName() );
 
         // Create Layout and put WidgetStack into it.
           QVBoxLayout *vb = new QVBoxLayout( this );
          m_viewStack = new QWidgetStack( this );
         vb->addWidget( m_viewStack );
 
         // Creat TableView
          QVBox* tableBox = new QVBox( m_viewStack );
          m_abTable = new AbTable( m_orderedFields, tableBox, "table" );
         m_abTable->setCurrentCell( 0, 0 );
         m_abTable->setFocus();
 
         // Add TableView to WidgetStack and raise it
         m_viewStack -> addWidget( tableBox , TableView );
 
         // Create CardView and add it to WidgetStack
          QVBox* cardBox = new QVBox( m_viewStack );
         m_ablabel = new AbLabel( cardBox, "CardView");
         m_viewStack -> addWidget( cardBox , CardView );
 
         // Connect views to me
         connect ( m_abTable, SIGNAL( signalSwitch(void) ),
                   this, SLOT( slotSwitch(void) ) );
         connect ( m_ablabel, SIGNAL( signalOkPressed(void) ),
                   this, SLOT( slotSwitch(void) ) );
 
         load();
 }
 
 AbView::~AbView()
 {
         m_contactdb -> save();
         delete m_contactdb;
 
         if ( m_storedDB ){
                 m_storedDB -> save();
                 delete m_storedDB;
         }
 }
 
 
 void AbView::setView( Views view )
 {
         odebug << "AbView::setView( Views view )" << oendl;
          m_curr_View = view;
          load();
 }
 
 void AbView::addEntry( const Opie::OPimContact &newContact )
 {
         odebug << "AbView::AddContact" << oendl;
         m_contactdb->add ( newContact );
         load();
 
 }
 void AbView::removeEntry( const int UID )
 {
         odebug << "AbView;:RemoveContact" << oendl;
         m_contactdb->remove( UID );
         load();
 }
 
 void AbView::replaceEntry( const Opie::OPimContact &contact )
 {
         odebug << "AbView::ReplaceContact" << oendl;
         m_contactdb->replace( contact );
         load();
 
 }
 
 Opie::OPimContact AbView::currentEntry()
 {
         Opie::OPimContact currentContact;
 
         switch ( (int) m_curr_View ) {
         case TableView:
                 currentContact = m_abTable -> currentEntry();
                 break;
         case CardView:
                 currentContact = m_ablabel -> currentEntry();
                 break;
         }
         m_curr_Contact = currentContact.uid();
         return currentContact;
 }
 
 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();
 
-        m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName,
-                                              Opie::OPimContactAccess::FilterCategory, m_curr_category );
-
-        // if ( m_curr_category != -1 )
-        //      clearForCategory();
+        odebug << "selected Category: " << m_curr_category << oendl;
+        
+        if ( m_curr_category == -1 ) {
+                // Show just unfiled contacts
+                m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, 
+                                              Opie::OPimContactAccess::DoNotShowWithCategory, 0 );
+                } elseif ( m_curr_category == 0 ){
+                // Just show all contacts
+                m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, 
+                                              Opie::OPimBase::FilterOff, 0 );
+        } else {
+                // Show contacts with given categories
+                m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName, 
+                                              Opie::OPimBase::FilterCategory, m_curr_category );
+        }
 
         odebug << "Number of contacts: " << m_list.count() << oendl;
 
         updateView( true );
 
 }
 
 void AbView::reload()
 {
         odebug << "AbView::::reload()" << oendl;
 
         m_contactdb->reload();
         load();
 }
 
 void AbView::clear()
 {
         // :SX
 }
 
 void AbView::setShowByCategory( const QString& cat )
 {
         odebug << "AbView::setShowCategory( const QString& cat )" << oendl;
 
         int intCat = 0;
 
         // 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;
 
                 updateView();
         }
 
 }
 
 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 |
                                                       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 != 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();
         }
         updateView();
 }
 
 
 QString AbView::showCategory() const
 {
         return mCat.label( "Contacts", m_curr_category );
 }
 
 void AbView::showPersonal( bool personal )
 {
         odebug << "void AbView::showPersonal( " << personal << " )" << oendl;
 
         if ( personal ){