1 files changed, 23 insertions, 22 deletions

diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 8027ccf..4c1e2f2 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -30,2 +30,4 @@
 #include "ofloatbar.h"
+#include "abview.h"
+#include "abconfig.h"
 
@@ -46,2 +48,4 @@ class AddressbookWindow: public QMainWindow
 public:
+	enum EntryMode { NewEntry=0, EditEntry };
+
 	AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
@@ -51,5 +55,3 @@ protected:
 	void resizeEvent( QResizeEvent * e );
-	void showList();
-	void showView();
-	enum EntryMode { NewEntry=0, EditEntry };
+
 	void editPersonal();
@@ -64,4 +66,2 @@ public slots:
 	void setDocument( const QString & );
-	void slotFindNext();
-	void slotFindPrevious();
 #ifdef __DEBUG_RELEASE
@@ -73,3 +73,3 @@ private slots:
 	void slotListNew();
-	void slotListView();
+/* 	void slotListView(); */
 	void slotListDelete();
@@ -79,3 +79,3 @@ private slots:
 	void listIsEmpty( bool );
-	void slotSettings();
+/*  	void slotSettings();  */
 	void writeMail();
@@ -94,2 +94,6 @@ private slots:
 
+	void slotViewSwitched( int );
+	void slotListView();
+	void slotCardView();
+
 	void slotConfig();
@@ -97,16 +101,15 @@ private slots:
 private:
-	void initFields();  // inititialize our fields...
-	AbLabel *abView();
+	//	void initFields();  // inititialize our fields...
+	// AbLabel *abView();
 	void populateCategories();
 
-	QPopupMenu *catMenu, *fontMenu;
+	QPopupMenu *catMenu;
 	QPEToolBar *listTools;
 	QToolButton *deleteButton;
-	QValueList<int> allFields, orderedFields;
-	QStringList slOrderedFields;
+	//	QValueList<int> allFields, orderedFields;
+	//	QStringList slOrderedFields;
 	enum Panes { paneList=0, paneView, paneEdit };
 	ContactEditor *abEditor;
-	AbLabel *mView;
 	LetterPicker *pLabel;
-	AbTable *abList;
+	AbView* m_abView;
 	QWidget *listContainer;
@@ -116,8 +119,2 @@ private:
 	QLineEdit* searchEdit;
-	bool useRegExp;
-	bool doNotifyWrapAround;
-	bool caseSensitive;
-
-	bool m_useQtMail;
-	bool m_useOpieMail;
 
@@ -125,3 +122,2 @@ private:
 
-	bool bAbEditFirstTime;
 	int viewMargin;
@@ -130,5 +126,10 @@ private:
 	QFont *defaultFont;
-	int startFontSize;
+	int m_curFontSize;
 
 	bool isLoading;
+
+	AbConfig m_config;
+
+	QAction* m_tableViewButton;
+	QAction* m_cardViewButton;
 };