1 files changed, 55 insertions, 54 deletions
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 34ca85d..bf36407 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -37,72 +37,73 @@ class LetterPicker;
 class AddressbookWindow: public QMainWindow
 {
-    Q_OBJECT
+        Q_OBJECT
 public:
-    AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+        AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
-    ~AddressbookWindow();
+        ~AddressbookWindow();
 protected:
-    void resizeEvent( QResizeEvent * e );
+        void resizeEvent( QResizeEvent * e );
-    void showList();
+        void showList();
-    void showView();
+        void showView();
-    enum EntryMode { NewEntry=0, EditEntry };
+        enum EntryMode { NewEntry=0, EditEntry };
-    void editPersonal();
+        void editPersonal();
-    void editEntry( EntryMode );
+        void editEntry( EntryMode );
-    void closeEvent( QCloseEvent *e );
+        void closeEvent( QCloseEvent *e );
-    bool save();
+        bool save();
 public slots:
-    void flush();
+        void flush();
-    void reload();
+        void reload();
-    void appMessage(const QCString &, const QByteArray &);
+        void appMessage(const QCString &, const QByteArray &);
-    void setDocument( const QString & );
+        void setDocument( const QString & );
 private slots:
-    void importvCard();
+        void importvCard();
-    void slotListNew();
+        void slotListNew();
-    void slotListView();
+        void slotListView();
-    void slotListDelete();
+        void slotListDelete();
-    void slotViewBack();
+        void slotViewBack();
-    void slotViewEdit();
+        void slotViewEdit();
-    void slotPersonalView();
+        void slotPersonalView();
-    void listIsEmpty( bool );
+        void listIsEmpty( bool );
-    void slotSettings();
+        void slotSettings();
-    void writeMail();
+        void writeMail();
-    void slotBeam();
+        void slotBeam();
-    void beamDone( Ir * );
+        void beamDone( Ir * );
-    void slotFind();
+        void slotFind();
-    void slotSetCategory( int );
+        void slotSetCategory( int );
-    void slotSetLetter( char );
+        void slotSetLetter( char );
-    void slotUpdateToolbar();
+        void slotUpdateToolbar();
-    void slotSetFont(int);
+        void slotSetFont(int);
 private:
-    void initFields();  // inititialize our fields...
+        void initFields();  // inititialize our fields...
-    AbLabel *abView();
+        AbLabel *abView();
-    void populateCategories();
+        void populateCategories();
+        QPopupMenu *catMenu, *fontMenu;
+        QPEToolBar *listTools;
+        QToolButton *deleteButton;
+        QValueList<int> allFields, orderedFields;
+        QStringList slOrderedFields;
+        enum Panes { paneList=0, paneView, paneEdit };
+        ContactEditor *abEditor;
+        AbLabel *mView;
+        LetterPicker *pLabel;
+        AbTable *abList;
+        QWidget *listContainer;
-    QPopupMenu *catMenu, *fontMenu;
+        QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, *actionPersonal, *actionMail;
-    QPEToolBar *listTools;
-    QToolButton *deleteButton;
-    QValueList<int> allFields,
-              orderedFields;
-    QStringList slOrderedFields;
-    enum Panes { paneList=0, paneView, paneEdit };
-    ContactEditor *abEditor;
-    AbLabel *mView;
-    LetterPicker *pLabel;
-    AbTable *abList;
-    QWidget *listContainer;
-    QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam,
+        bool bAbEditFirstTime;
-  *actionPersonal, *actionMail;
+        int viewMargin;
-    bool bAbEditFirstTime;
+        bool syncing;
-    int viewMargin;
+        QFont *defaultFont;
+        int startFontSize;
-    bool syncing;
+        bool isLoading;
-    QFont *defaultFont;
-    int startFontSize;
 };
 #endif

diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h index 34ca85d..bf36407 100644 --- a/core/pim/addressbook/addressbook.h +++ b/core/pim/addressbook/addressbook.h
@@ -37,72 +37,73 @@ class LetterPicker;
37		37
38	class AddressbookWindow: public QMainWindow	38	class AddressbookWindow: public QMainWindow
39	{	39	{
40	Q_OBJECT	40	Q_OBJECT
41	public:	41	public:
42	AddressbookWindow( QWidget parent = 0, const char name = 0, WFlags f = 0 );	42	AddressbookWindow( QWidget parent = 0, const char name = 0, WFlags f = 0 );
43	~AddressbookWindow();	43	~AddressbookWindow();
44		44
45	protected:	45	protected:
46	void resizeEvent( QResizeEvent * e );	46	void resizeEvent( QResizeEvent * e );
47	void showList();	47	void showList();
48	void showView();	48	void showView();
49	enum EntryMode { NewEntry=0, EditEntry };	49	enum EntryMode { NewEntry=0, EditEntry };
50	void editPersonal();	50	void editPersonal();
51	void editEntry( EntryMode );	51	void editEntry( EntryMode );
52	void closeEvent( QCloseEvent *e );	52	void closeEvent( QCloseEvent *e );
53	bool save();	53	bool save();
54		54
55	public slots:	55	public slots:
56	void flush();	56	void flush();
57	void reload();	57	void reload();
58	void appMessage(const QCString &, const QByteArray &);	58	void appMessage(const QCString &, const QByteArray &);
59	void setDocument( const QString & );	59	void setDocument( const QString & );
60		60
61	private slots:	61	private slots:
62	void importvCard();	62	void importvCard();
63	void slotListNew();	63	void slotListNew();
64	void slotListView();	64	void slotListView();
65	void slotListDelete();	65	void slotListDelete();
66	void slotViewBack();	66	void slotViewBack();
67	void slotViewEdit();	67	void slotViewEdit();
68	void slotPersonalView();	68	void slotPersonalView();
69	void listIsEmpty( bool );	69	void listIsEmpty( bool );
70	void slotSettings();	70	void slotSettings();
71	void writeMail();	71	void writeMail();
72	void slotBeam();	72	void slotBeam();
73	void beamDone( Ir * );	73	void beamDone( Ir * );
74	void slotFind();	74	void slotFind();
75	void slotSetCategory( int );	75	void slotSetCategory( int );
76	void slotSetLetter( char );	76	void slotSetLetter( char );
77	void slotUpdateToolbar();	77	void slotUpdateToolbar();
78	void slotSetFont(int);	78	void slotSetFont(int);
		79
79	private:	80	private:
80	void initFields(); // inititialize our fields...	81	void initFields(); // inititialize our fields...
81	AbLabel *abView();	82	AbLabel *abView();
82	void populateCategories();	83	void populateCategories();
		84
		85	QPopupMenu catMenu, fontMenu;
		86	QPEToolBar *listTools;
		87	QToolButton *deleteButton;
		88	QValueList<int> allFields, orderedFields;
		89	QStringList slOrderedFields;
		90	enum Panes { paneList=0, paneView, paneEdit };
		91	ContactEditor *abEditor;
		92	AbLabel *mView;
		93	LetterPicker *pLabel;
		94	AbTable *abList;
		95	QWidget *listContainer;
83		96
84	QPopupMenu catMenu, fontMenu;	97	QAction actionNew, actionEdit, actionTrash, actionFind, actionBeam, actionPersonal, *actionMail;
85	QPEToolBar *listTools;
86	QToolButton *deleteButton;
87	QValueList<int> allFields,
88	orderedFields;
89	QStringList slOrderedFields;
90	enum Panes { paneList=0, paneView, paneEdit };
91	ContactEditor *abEditor;
92	AbLabel *mView;
93	LetterPicker *pLabel;
94	AbTable *abList;
95	QWidget *listContainer;
96		98
97	QAction actionNew, actionEdit, actionTrash, actionFind, *actionBeam,	99	bool bAbEditFirstTime;
98	actionPersonal, actionMail;	100	int viewMargin;
99		101
100	bool bAbEditFirstTime;	102	bool syncing;
101	int viewMargin;	103	QFont *defaultFont;
		104	int startFontSize;
102		105
103	bool syncing;	106	bool isLoading;
104	QFont *defaultFont;
105	int startFontSize;
106	};	107	};
107		108
108	#endif	109	#endif