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
@@ -29,4 +29,6 @@
 #include <qlineedit.h>
 #include "ofloatbar.h"
+#include "abview.h"
+#include "abconfig.h"
 
 class ContactEditor;
@@ -45,4 +47,6 @@ class AddressbookWindow: public QMainWindow
         Q_OBJECT
 public:
+        enum EntryMode { NewEntry=0, EditEntry };
+
         AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
         ~AddressbookWindow();
@@ -50,7 +54,5 @@ public:
 protected:
         void resizeEvent( QResizeEvent * e );
-        void showList();
-        void showView();
-        enum EntryMode { NewEntry=0, EditEntry };
+
         void editPersonal();
         void editEntry( EntryMode );
@@ -63,6 +65,4 @@ public slots:
         void appMessage(const QCString &, const QByteArray &);
         void setDocument( const QString & );
-        void slotFindNext();
-        void slotFindPrevious();
 #ifdef __DEBUG_RELEASE
         void slotSave();
@@ -72,5 +72,5 @@ private slots:
         void importvCard();
         void slotListNew();
-        void slotListView();
+        /* void slotListView(); */
         void slotListDelete();
         void slotViewBack();
@@ -78,5 +78,5 @@ private slots:
         void slotPersonalView();
         void listIsEmpty( bool );
-        void slotSettings();
+        /*  void slotSettings();  */
         void writeMail();
         void slotBeam();
@@ -93,21 +93,24 @@ private slots:
         void slotWrapAround();
 
+        void slotViewSwitched( int );
+        void slotListView();
+        void slotCardView();
+
         void slotConfig();
 
 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;
 
@@ -115,21 +118,19 @@ private:
         OFloatBar* searchBar;
         QLineEdit* searchEdit;
-        bool useRegExp;
-        bool doNotifyWrapAround;
-        bool caseSensitive;
-
-        bool m_useQtMail;
-        bool m_useOpieMail;
 
         QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, *actionPersonal, *actionMail;
 
-        bool bAbEditFirstTime;
         int viewMargin;
 
         bool syncing;
         QFont *defaultFont;
-        int startFontSize;
+        int m_curFontSize;
 
         bool isLoading;
+
+        AbConfig m_config;
+
+        QAction* m_tableViewButton;
+        QAction* m_cardViewButton;
 };