Complete redesign of internal structure. Now, there exist a cetral view

class which manages the current implemented views table and card...

2 files changed, 412 insertions, 0 deletions

diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
new file mode 100644
index 0000000..d35e392
--- a/dev/null
+++ b/core/pim/addressbook/abview.cpp
@@ -0,0 +1,331 @@
+#include "abview.h"
+
+// Is defined in LibQPE
+extern QString categoryFileName();
+
+#include <qlayout.h>
+
+AbView::AbView ( QWidget* parent, const QValueList<int>& ordered, const QStringList& slOrderedFields ):
+	QWidget(parent),
+	mCat(0),
+	m_inSearch( false ),
+	m_curr_category( 0 ),
+	m_curr_View( TableView ),
+	m_prev_View( TableView ),
+	m_curr_Contact ( 0 ),
+	m_contactdb ( "addressbook", 0l, 0l, false ), // Handle syncing myself.. !
+	m_viewStack( 0l ),
+	m_abTable( 0l ),
+	m_orderedFields( ordered ),
+	m_slOrderedFields( slOrderedFields )
+{
+	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();
+}
+
+void AbView::setView( Views view )
+{
+	qWarning("AbView::setView( Views view )");
+ 	m_curr_View = view;
+ 	load();
+}
+
+void AbView::addEntry( const OContact &newContact )
+{
+	qWarning("abview:AddContact");
+	m_contactdb.add ( newContact );
+	load();
+	
+}
+void AbView::removeEntry( const int UID )
+{
+	qWarning("abview:RemoveContact");
+	m_contactdb.remove( UID );
+	load();
+}
+
+void AbView::replaceEntry( const OContact &contact )
+{
+	qWarning("abview:ReplaceContact");
+	m_contactdb.replace( contact );
+	load();
+
+}
+
+OContact AbView::currentEntry()
+{
+	switch ( (int) m_curr_View ) {
+	case TableView:
+		return ( m_abTable -> currentEntry() );
+		break;
+	case CardView:
+		return ( m_ablabel -> currentEntry() );
+		break;
+	}
+	return OContact();
+}
+
+bool AbView::save()
+{
+	qWarning("abView:Save data");
+
+	return m_contactdb.save();
+}
+
+// :SX Add: Just load for specific Category
+void AbView::load()
+{
+	qWarning("abView:Load data");
+	
+	m_list = m_contactdb.allRecords();
+	clearForCategory();
+	m_curr_Contact = 0;
+	
+	qWarning ("Number of contacts: %d", m_list.count());
+
+	updateView(); 
+	
+}
+
+void AbView::reload()
+{
+	m_contactdb.reload();
+	load();
+}
+
+void AbView::clear()
+{
+	// :SX
+}
+
+void AbView::setShowByCategory( Views view, const QString& cat )
+{
+	qWarning("AbView::setShowCategory( Views view, const QString& cat )");
+	m_curr_View = view;
+
+	emit signalClearLetterPicker();
+
+	if ( !cat.isNull() ) 
+		m_curr_category = mCat.id("Contacts", cat );
+	else
+		m_curr_category = -1; // Set to all
+
+	qWarning ("Categories: Selected %s.. Number: %d", cat.latin1(), m_curr_category);
+
+	load();
+
+}
+void AbView::setShowByLetter( char c )
+{
+	qWarning("void AbView::setShowByLetter( %c )", c );
+	OContact query;
+	if ( c == 0 ){
+		load();
+		return;
+	}else{
+		query.setLastName( QString("%1*").arg(c) );
+		m_list = m_contactdb.queryByExample( query, OContactAccess::WildCards );
+		clearForCategory();
+		m_curr_Contact = 0;
+	}
+	updateView();
+}
+
+QString AbView::showCategory() const 
+{
+	return mCat.label( "Contacts", m_curr_category );
+}
+
+void AbView::showContact( const OContact& cnt )
+{
+	qWarning ("void AbView::showContact( const OContact& cnt )");
+	// :SX
+}
+
+QStringList AbView::categories() 
+{
+	mCat.load( categoryFileName() );
+	QStringList categoryList = mCat.labels( "Contacts" );
+	return categoryList;
+}
+ 
+// BEGIN: Slots 
+void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, 
+			 bool , QString cat = QString::null )
+{
+	qWarning( "void AbView::slotDoFind" );
+	// Use the current Category if nothing else selected
+
+	int category = 0;
+
+	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..
+	clearForCategory();
+	
+	// Now show all found entries
+	updateView();
+}
+
+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");
+		m_curr_View = TableView;
+		break;
+	}
+	updateView();
+	
+}
+
+// END: Slots
+
+void AbView::clearForCategory()
+{
+	OContactAccess::List::Iterator it;
+	// Now remove all contacts with wrong category if any category selected
+	// This algorithm is a litte bit ineffective
+	if ( m_curr_category != -1 ){
+		for ( it = m_list.begin(); it != m_list.end(); ++it ){
+			if ( !contactCompare( *it, m_curr_category ) ){ 
+				qWarning("Removing %d", (*it).uid());
+				m_list.remove( (*it).uid() );
+				it = m_list.begin();
+			}
+		}
+	}
+}
+
+bool AbView::contactCompare( const OContact &cnt, int category )
+{
+	qWarning ("bool AbView::contactCompare( const OContact &cnt, %d )", category);
+
+	bool returnMe;
+	QArray<int> cats;
+	cats = cnt.categories();
+
+	qWarning ("Number of categories: %d", cats.count() );
+
+	returnMe = false;
+	if ( cats.count() == 0  )
+		returnMe = true;
+	else {
+		int i;
+		for ( i = 0; i < int(cats.count()); i++ ) {
+			qWarning("Comparing %d with %d",cats[i],category );
+			if ( cats[i] == category ) {
+				returnMe = true;
+				break;
+			}
+		}
+	}
+	qWarning ("Return: %d", returnMe);
+	return returnMe;
+}
+
+void  AbView::updateView()
+{
+	qWarning("AbView::updateView()");
+
+	if ( m_viewStack -> visibleWidget() ){
+		m_viewStack -> visibleWidget() -> clearFocus();
+	}
+
+	// If we switching the view, we have to store some information
+	if ( m_prev_View != m_curr_View ){
+		switch ( (int) m_prev_View ) {
+		case TableView:
+			m_curr_Contact = m_abTable -> currentEntry_UID();
+			break;
+		case CardView:
+			m_curr_Contact = m_ablabel -> currentEntry_UID();
+			break;
+		}
+	}
+	
+	m_prev_View = m_curr_View;
+
+	// Switch to new View
+	switch ( (int) m_curr_View ) {
+	case TableView:
+		m_abTable -> setContacts( m_list );
+		if ( m_curr_Contact != 0 )
+			m_abTable -> selectContact ( m_curr_Contact );
+		m_abTable -> setFocus();
+		emit signalViewSwitched ( (int) m_curr_View );
+		break;
+	case CardView:
+		m_ablabel -> setContacts( m_list );
+		if ( m_curr_Contact != 0 )
+			m_ablabel -> selectContact( m_curr_Contact );
+		m_ablabel -> setFocus();
+		emit signalViewSwitched ( (int) m_curr_View );
+		break;
+	}
+	
+	// Raise the current View
+	m_viewStack -> raiseWidget( m_curr_View );
+}
+
+
diff --git a/core/pim/addressbook/abview.h b/core/pim/addressbook/abview.h
new file mode 100644
index 0000000..4d35338
--- a/dev/null
+++ b/core/pim/addressbook/abview.h
@@ -0,0 +1,81 @@
+#ifndef _ABVIEW_H_
+#define _ABVIEW_H_
+
+#include <qwidget.h>
+#include <qwidgetstack.h> 
+
+#include <qpe/categories.h>
+#include <opie/ocontact.h>
+#include <opie/ocontactaccess.h>
+
+#include "contacteditor.h"
+#include "abtable.h"
+#include "ablabel.h"
+
+class AbView: public QWidget
+{
+    Q_OBJECT
+
+public:
+    enum Views{ TableView=0, CardView, PhoneBook, CompanyBook, EmailBook };
+
+    AbView( QWidget* parent, const QValueList<int>& ordered, const QStringList& slOrderedFields );
+
+    bool save();
+    void load();
+    void reload();
+    void clear();
+
+    void setView( Views view );
+    void showContact( const OContact& cnt );
+    void setShowByCategory( Views view, const QString& cat );
+    void setShowByLetter( char c );
+    // Add Entry and put to current
+    void addEntry( const OContact &newContact );
+    void removeEntry( const int UID );
+    void replaceEntry( const OContact &contact );
+    OContact currentEntry();
+
+    void inSearch()  { m_inSearch = true; }
+    void offSearch();
+
+    QString showCategory() const;
+    QStringList categories();
+
+signals:
+	void signalNotFound();
+	void signalClearLetterPicker();
+	void signalViewSwitched ( int );
+
+public slots:
+    void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, 
+		     bool backwards, QString category = QString::null );
+    void slotSwitch(); 
+
+private:
+    void updateView(); 
+    void clearForCategory();
+    bool contactCompare( const OContact &cnt, int category );
+    void parseName( const QString& name, QString *first, QString *middle,
+		    QString * last );
+
+    Categories mCat;
+    bool m_inSearch;
+    int m_curr_category;
+    Views m_curr_View;
+    Views m_prev_View;
+    int m_curr_Contact;
+    
+    OContactAccess m_contactdb;
+    OContactAccess::List m_list;
+
+    QWidgetStack* m_viewStack;
+    AbTable* m_abTable;
+    AbLabel* m_ablabel;
+
+    QValueList<int> m_orderedFields;
+    QStringList m_slOrderedFields; 
+};
+
+
+#endif