1 files changed, 14 insertions, 11 deletions

diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 477f85b..6cbd556 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -30,272 +30,274 @@ 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( -1 ),
 	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 )
 {
+	qWarning("AbView::c'tor");
 	// Load default database and handle syncing myself.. !
 	m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false ),
 	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 )
 {
-	//	qWarning("AbView::setView( Views view )");
+	qWarning("AbView::setView( Views view )");
  	m_curr_View = view;
  	load();
 }
 
 void AbView::addEntry( const OContact &newContact )
 {
-	//	qWarning("abview:AddContact");
+	qWarning("abview:AddContact");
 	m_contactdb->add ( newContact );
 	load();
 
 }
 void AbView::removeEntry( const int UID )
 {
-	//	qWarning("abview:RemoveContact");
+	qWarning("abview:RemoveContact");
 	m_contactdb->remove( UID );
 	load();
 }
 
 void AbView::replaceEntry( const OContact &contact )
 {
-	//	qWarning("abview:ReplaceContact");
+	qWarning("abview:ReplaceContact");
 	m_contactdb->replace( contact );
 	load();
 
 }
 
 OContact AbView::currentEntry()
 {
 	OContact 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()
 {
 	//	qWarning("abView:Save data");
 
 	return m_contactdb->save();
 }
 
 void AbView::load()
 {
-	//	qWarning("abView:Load data");
+	qWarning("abView:Load data");
 
 	// Letter Search is stopped at this place
 	emit signalClearLetterPicker();
 
 	if ( m_inPersonal )
 		// VCard Backend does not sort.. 
 		m_list = m_contactdb->allRecords();
 	else{
 		m_list = m_contactdb->sorted( true, 0, 0, 0 );
+		if ( m_curr_category != -1 )
 		clearForCategory();
 	}
 
 	qWarning ("Number of contacts: %d", m_list.count());
 
 	updateView( true );
 
 }
 
 void AbView::reload()
 {
-	//	qWarning( "void AbView::reload()" );
+        qWarning( "void AbView::reload()" );
 
 	m_contactdb->reload();
 	load();
 }
 
 void AbView::clear()
 {
 	// :SX
 }
 
 void AbView::setShowByCategory( const QString& cat )
 {
-	//	qWarning("AbView::setShowCategory( const QString& cat )");
+	qWarning("AbView::setShowCategory( const QString& cat )");
 
 	int intCat = 0;
 
 	// All (cat == NULL) will be stored as -1
 	if ( cat.isNull() )
 		intCat = -1;
 	else
 		intCat = mCat.id("Contacts", cat );
 
 	// Just do anything if we really change the category
 	if ( intCat != m_curr_category ){
 		//		qWarning ("Categories: Selected %s.. Number: %d", cat.latin1(), m_curr_category);
 
 		m_curr_category = intCat;
 		emit signalClearLetterPicker();
 
 		load();
 	}
 
 }
 
 void AbView::setShowToView( Views view )
 {
-	//	qWarning("void AbView::setShowToView( View %d )", view);
-
-	//	qWarning ("Change the View (Category is: %d)", m_curr_category);
+       	qWarning("void AbView::setShowToView( View %d )", view);
 
 	if ( m_curr_View != view ){
+		qWarning ("Change the View (Category is: %d)", m_curr_category);
 		m_prev_View = m_curr_View;
 		m_curr_View = view;
 
 		updateView();
 	}
 
 }
 
 void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 {
 	qWarning("void AbView::setShowByLetter( %c, %d )", c, mode );
 
 	assert( mode < AbConfig::LASTELEMENT );
 
 	OContact 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( OContactAccess::WildCards | OContactAccess::IgnoreCase ) ){
 			return;
 		}
 
 		switch( mode ){
 		case AbConfig::LastName:
 			query.setLastName( QString("%1*").arg(c) );
 			break;
 		case AbConfig::FileAs:
 			query.setFileAs( QString("%1*").arg(c) );
 			break;
 		default:
 			qWarning( "Unknown Searchmode for AbView::setShowByLetter ! -> %d", mode );
 			qWarning( "I will ignore it.." );
 			return;
 		}
 		m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase );
+		if ( m_curr_category != -1 )
 		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);
+	qWarning ("void AbView::showPersonal( %d )", personal);
 
 	if ( personal ){
 
 		if ( m_inPersonal )
 			return;
 
 		// Now switch to vCard Backend and load data.
 		// The current default backend will be stored
 		// to avoid unneeded load/stores.
 		m_storedDB = m_contactdb;
 
 		OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
 									  addressbookPersonalVCardName() );
 		m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
 
 		m_inPersonal = true;
 		m_curr_View = CardView;
 
 	}else{
 
 		if ( !m_inPersonal )
 			return;
 
 		// Remove vCard Backend and restore default
@@ -341,48 +343,49 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 	if ( cat.isEmpty() )
 		category = m_curr_category;
 	else{
 		category = mCat.id("Contacts", cat );
 	}
 
 	//	qWarning ("Find in Category %d", category);
 
 	QRegExp r( str );
 	r.setCaseSensitive( caseSensitive );
 	r.setWildcard( !useRegExp );
 
 	// Get all matching entries out of the database
 	m_list = m_contactdb->matchRegexp( r );
 
 	//	qWarning( "found: %d", m_list.count() );
 	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 )
 	clearForCategory();
 
 	// Now show all found entries
 	updateView( true );
 }
 
 void AbView::offSearch()
 {
 	m_inSearch = false;
 
 	load();
 }
 
 void AbView::slotSwitch(){
 	//	qWarning("AbView::slotSwitch()");
 
 	m_prev_View = m_curr_View;
 	switch ( (int) m_curr_View ){
 	case TableView:
 		qWarning("Switching to CardView");
 		m_curr_View = CardView;
 		break;
 	case CardView:
 		qWarning("Switching to TableView");