Back to main tree. Back to main tree.

Back to main tree. Waiting for moving to feature freeze ..

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
@@ -25,12 +25,14 @@
 
 #include <qmainwindow.h>
 #include <qvaluelist.h>
 #include <qstringlist.h>
 #include <qlineedit.h>
 #include "ofloatbar.h"
+#include "abview.h"
+#include "abconfig.h"
 
 class ContactEditor;
 class AbLabel;
 class AbTable;
 class QPEToolBar;
 class QPopupMenu;
@@ -41,46 +43,44 @@ class QAction;
 class LetterPicker;
 
 class AddressbookWindow: public QMainWindow
 {
         Q_OBJECT
 public:
+        enum EntryMode { NewEntry=0, EditEntry };
+
         AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
         ~AddressbookWindow();
 
 protected:
         void resizeEvent( QResizeEvent * e );
-        void showList();
-        void showView();
-        enum EntryMode { NewEntry=0, EditEntry };
+
         void editPersonal();
         void editEntry( EntryMode );
         void closeEvent( QCloseEvent *e );
         bool save();
 
 public slots:
         void flush();
         void reload();
         void appMessage(const QCString &, const QByteArray &);
         void setDocument( const QString & );
-        void slotFindNext();
-        void slotFindPrevious();
 #ifdef __DEBUG_RELEASE
         void slotSave();
 #endif
 
 private slots:
         void importvCard();
         void slotListNew();
-        void slotListView();
+        /* void slotListView(); */
         void slotListDelete();
         void slotViewBack();
         void slotViewEdit();
         void slotPersonalView();
         void listIsEmpty( bool );
-        void slotSettings();
+        /*  void slotSettings();  */
         void writeMail();
         void slotBeam();
         void beamDone( Ir * );
         void slotSetCategory( int );
         void slotSetLetter( char );
         void slotUpdateToolbar();
@@ -89,48 +89,49 @@ private slots:
         void slotFindOpen();
         void slotFindClose();
         void slotFind();
         void slotNotFound();
         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;
 
         // Searching stuff
         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;
 };
 
 #endif