1 files changed, 21 insertions, 11 deletions

diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index a392aa7..065dfb7 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -32,5 +32,4 @@
 #include <qpe/fontdatabase.h>
 
-#include <qmainwindow.h>
 #include <qdialog.h>
 
@@ -46,4 +45,7 @@ class QToolButton;
 class SampleWindow;
 class OFontSelector;
+class QListView;
+class QListViewItem;
+class Config;
 
 class Appearance : public QDialog
@@ -69,17 +71,21 @@ protected slots:
     void saveSchemeClicked();
     void deleteSchemeClicked();
+    
+    void tabChanged ( QWidget * );
+    
+    void addExcept ( );
+    void delExcept ( );
+    void upExcept ( );
+    void downExcept ( );
+    void clickedExcept ( QListViewItem *, const QPoint &, int );
 
 private:
-	void loadStyles ( QListBox * );
-	void loadDecos ( QListBox * );
-    void loadColors ( QListBox * );
-
     void changeText();
 	
-	QWidget *createStyleTab ( QWidget *parent );
-	QWidget *createDecoTab ( QWidget *parent );
-	QWidget *createFontTab ( QWidget *parent );
-	QWidget *createColorTab ( QWidget *parent );
-	QWidget *createGuiTab ( QWidget *parent );
+	QWidget *createStyleTab ( QWidget *parent, Config &cfg );
+	QWidget *createDecoTab ( QWidget *parent, Config &cfg );
+	QWidget *createFontTab ( QWidget *parent, Config &cfg );
+	QWidget *createColorTab ( QWidget *parent, Config &cfg );
+	QWidget *createAdvancedTab ( QWidget *parent, Config &cfg );
 
 private:
@@ -93,5 +99,5 @@ private:
     int  m_original_deco;
     int  m_original_tabstyle;
-    bool  m_original_tabpos;
+    bool m_original_tabpos;
     
     QListBox *    m_style_list;
@@ -109,4 +115,8 @@ private:
     QRadioButton *m_tabstyle_top;
     QRadioButton *m_tabstyle_bottom;
+
+	QWidget *     m_advtab;
+    QListView *   m_except;
+    QCheckBox *   m_force;
 };