improve support for BigScreen

2 files changed, 510 insertions, 470 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 9e5eede..ba12e55 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -27,6 +27,30 @@
 
 */
 
+#include "appearance.h"
+#include "editScheme.h"
+#include "stylelistitem.h"
+#include "decolistitem.h"
+#include "colorlistitem.h"
+#include "exceptlistitem.h"
+#include "sample.h"
+
+/* OPIE */
+#include <opie/ofontselector.h>
+#include <opie/odevice.h>
+#include <opie/ofiledialog.h>
+#include <opie/otabwidget.h>
+
+#include <qpe/config.h>
+#include <qpe/global.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/qpemessagebox.h>
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpestyle.h>
+#include <qpe/lightstyle.h>
+#include <qpe/styleinterface.h>
+
+/* QT */
 #include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -49,31 +73,6 @@
 #include <qvbox.h>
 #include <qwhatsthis.h>
 
-#include <qpe/config.h>
-#include <qpe/global.h>
-#include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/qpemessagebox.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpestyle.h>
-#include <qpe/lightstyle.h>
-#include <qpe/qlibrary.h>
-#include <qpe/styleinterface.h>
-
-#include <opie/ofontselector.h>
-#include <opie/odevice.h>
-#include <opie/ofiledialog.h>
-#include <opie/otabwidget.h>
-
-#include "appearance.h"
-#include "editScheme.h"
-#include "stylelistitem.h"
-#include "decolistitem.h"
-#include "colorlistitem.h"
-#include "exceptlistitem.h"
-#include "sample.h"
-
-
 using namespace Opie;
 
 
@@ -81,27 +80,30 @@ class DefaultWindowDecoration : public WindowDecorationInterface
 {
 public:
     DefaultWindowDecoration() : ref(0) {}
-    QString name() const {
-	return "Default";
+    QString name() const
+    {
+        return "Default";
     }
-QPixmap icon() const {
-	return QPixmap();
+    QPixmap icon() const
+    {
+        return QPixmap();
     }
-    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
-	*iface = 0;
-	if ( uuid == IID_QUnknown )
-	    *iface = this;
-	else if ( uuid == IID_WindowDecoration )
-	    *iface = this;
-
-	if ( *iface )
-	    (*iface)->addRef();
-	return QS_OK;
+    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface )
+    {
+        *iface = 0;
+        if ( uuid == IID_QUnknown )
+            *iface = this;
+        else if ( uuid == IID_WindowDecoration )
+            *iface = this;
+
+        if ( *iface )
+            (*iface)->addRef();
+        return QS_OK;
     }
     Q_REFCOUNT
 
 private:
-	ulong ref;
+    ulong ref;
 };
 
 
@@ -117,12 +119,12 @@ QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg )
 
     m_style_list = new QListBox( tab, "m_style_list" );
     vertLayout->addWidget( m_style_list );
-	QWhatsThis::add( m_style_list, tr( "Styles control the way items such as buttons and scroll bars appear in all applications.\n\nClick here to select an available style." ) );
+    QWhatsThis::add( m_style_list, tr( "Styles control the way items such as buttons and scroll bars appear in all applications.\n\nClick here to select an available style." ) );
 
     m_style_settings = new QPushButton ( tr( "Settings..." ), tab );
     connect ( m_style_settings, SIGNAL( clicked ( )), this, SLOT( styleSettingsClicked ( )));
     vertLayout-> addWidget ( m_style_settings );
-	QWhatsThis::add( m_style_settings, tr( "Click here to configure the currently selected style.\n\nNote:  This option is not available for all styles." ) );
+    QWhatsThis::add( m_style_settings, tr( "Click here to configure the currently selected style.\n\nNote:  This option is not available for all styles." ) );
 
     QString s = cfg. readEntry ( "Style", "Light" );
 
@@ -134,36 +136,39 @@ QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg )
     m_style_list-> insertItem ( new StyleListItem ( "Light", new LightStyle ( )));
     m_style_list-> insertItem ( new StyleListItem ( "QPE", new QPEStyle ( )));
 #endif
-	{
-		QString path = QPEApplication::qpeDir ( );
-		path.append( "/plugins/styles/" );
-		QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
-
-		for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
-			QString libstr = path;
-			libstr.append( "/" );
-			libstr.append( *it );
-			QLibrary *lib = new QLibrary ( libstr );
-			StyleInterface *iface;
-
-			if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface ) {
-				StyleListItem *slit = new StyleListItem ( lib, iface );
-				m_style_list-> insertItem ( slit );
-
-				if ( slit-> key ( ) == s )
-					m_style_list-> setCurrentItem ( slit );
-			}
-			else
-				delete lib;
-		}
-	}
+
+    {
+        QString path = QPEApplication::qpeDir ( );
+        path.append( "/plugins/styles/" );
+        QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
+
+        for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
+        {
+            QString libstr = path;
+            libstr.append( "/" );
+            libstr.append( *it );
+            QLibrary *lib = new QLibrary ( libstr );
+            StyleInterface *iface;
+
+            if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface )
+            {
+                StyleListItem *slit = new StyleListItem ( lib, iface );
+                m_style_list-> insertItem ( slit );
+
+                if ( slit-> key ( ) == s )
+                    m_style_list-> setCurrentItem ( slit );
+            }
+            else
+                delete lib;
+        }
+    }
 
     m_original_style = m_style_list-> currentItem ( );
     styleClicked ( m_original_style );
 
     connect( m_style_list, SIGNAL( highlighted( int ) ), this, SLOT( styleClicked( int ) ) );
 
-	return tab;
+    return tab;
 }
 
 QWidget *Appearance::createDecoTab ( QWidget *parent, Config &cfg )
@@ -173,44 +178,46 @@ QWidget *Appearance::createDecoTab ( QWidget *parent, Config &cfg )
 
     m_deco_list = new QListBox( tab, "m_deco_list" );
     vertLayout->addWidget( m_deco_list );
-	QWhatsThis::add( m_deco_list, tr( "Window decorations control the way the application title bar and its buttons appear.\n\nClick here to select an available decoration." ) );
+    QWhatsThis::add( m_deco_list, tr( "Window decorations control the way the application title bar and its buttons appear.\n\nClick here to select an available decoration." ) );
 
     QString s = cfg. readEntry ( "Decoration", "libflat.so" );
 
     m_deco_list-> insertItem ( new DecoListItem ( "QPE" ));
 
-	{
-		QString path = QPEApplication::qpeDir();
-		path.append( "/plugins/decorations/" );
-		QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
-
-		for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
-			QString libstr = path;
-			libstr.append( "/" );
-			libstr.append( *it );
-			QLibrary *lib = new QLibrary ( libstr );
-			WindowDecorationInterface *iface;
-
-			if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK ) {
-				DecoListItem *dlit = new DecoListItem ( lib, iface );
-				m_deco_list-> insertItem ( dlit );
-
-				if ( dlit-> key ( ) == s )
-					m_deco_list-> setCurrentItem ( dlit );
-			}
-			else
-				delete lib;
-		}
-	}
+    {
+        QString path = QPEApplication::qpeDir();
+        path.append( "/plugins/decorations/" );
+        QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
+
+        for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
+        {
+            QString libstr = path;
+            libstr.append( "/" );
+            libstr.append( *it );
+            QLibrary *lib = new QLibrary ( libstr );
+            WindowDecorationInterface *iface;
+
+            if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK )
+            {
+                DecoListItem *dlit = new DecoListItem ( lib, iface );
+                m_deco_list-> insertItem ( dlit );
+
+                if ( dlit-> key ( ) == s )
+                    m_deco_list-> setCurrentItem ( dlit );
+            }
+            else
+                delete lib;
+        }
+    }
 
     m_original_deco = m_deco_list-> currentItem ( );
     if ( m_deco_list-> currentItem  ( ) < 0 )
-    	m_deco_list-> setCurrentItem ( 0 );
+        m_deco_list-> setCurrentItem ( 0 );
     decoClicked ( m_original_deco );
 
     connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) );
 
-	return tab;
+    return tab;
 }
 
 QWidget *Appearance::createFontTab ( QWidget *parent, Config &cfg )
@@ -221,7 +228,7 @@ QWidget *Appearance::createFontTab ( QWidget *parent, Config &cfg )
 
     m_fontselect = new OFontSelector ( false, parent, "FontTab" );
     m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
-	QWhatsThis::add( m_fontselect, tr( "Select the desired name, style and size of the default font applications will use." ) );
+    QWhatsThis::add( m_fontselect, tr( "Select the desired name, style and size of the default font applications will use." ) );
 
     connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
              this, SLOT( fontClicked ( const QFont & )));
@@ -238,23 +245,24 @@ QWidget *Appearance::createColorTab ( QWidget *parent, Config &cfg )
     m_color_list = new QListBox ( tab );
     gridLayout->addMultiCellWidget ( m_color_list, 0, 3, 0, 0 );
     connect( m_color_list, SIGNAL( highlighted( int ) ), this, SLOT( colorClicked( int ) ) );
-	QWhatsThis::add( m_color_list, tr( "Color schemes are a collection of colors which are used for various parts of the display.\n\nClick here to select an available scheme." ) );
+    QWhatsThis::add( m_color_list, tr( "Color schemes are a collection of colors which are used for various parts of the display.\n\nClick here to select an available scheme." ) );
 
-	m_color_list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), cfg ));
+    m_color_list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), cfg ));
 
-	QString path = QPEApplication::qpeDir ( );
-	path.append( "/etc/colors/" );
+    QString path = QPEApplication::qpeDir ( );
+    path.append( "/etc/colors/" );
     QStringList sl = QDir ( path ). entryList ( "*.scheme" );
 
-	for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
-		QString name = (*it). left ((*it). find ( ".scheme" ));
-		QString pathstr = path;
-		pathstr.append( *it );
-		Config config ( pathstr, Config::File );
-		config. setGroup ( "Colors" );
+    for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
+    {
+        QString name = (*it). left ((*it). find ( ".scheme" ));
+        QString pathstr = path;
+        pathstr.append( *it );
+        Config config ( pathstr, Config::File );
+        config. setGroup ( "Colors" );
 
-		m_color_list-> insertItem ( new ColorListItem ( name, config ));
-	}
+        m_color_list-> insertItem ( new ColorListItem ( name, config ));
+    }
 
     m_color_list-> setCurrentItem ( 0 );
 
@@ -262,19 +270,19 @@ QWidget *Appearance::createColorTab ( QWidget *parent, Config &cfg )
     tempButton->setText( tr( "Edit..." ) );
     connect( tempButton, SIGNAL( clicked() ), this, SLOT( editSchemeClicked() ) );
     gridLayout->addWidget( tempButton, 0, 1 );
-	QWhatsThis::add( tempButton, tr( "Click here to change the colors in the current color scheme." ) );
+    QWhatsThis::add( tempButton, tr( "Click here to change the colors in the current color scheme." ) );
 
     tempButton = new QPushButton( tab, "deleteSchemeButton" );
     tempButton->setText( tr( "Delete" ) );
     connect( tempButton, SIGNAL( clicked() ), this, SLOT( deleteSchemeClicked() ) );
     gridLayout->addWidget( tempButton, 1, 1 );
-	QWhatsThis::add( tempButton, tr( "Click here to delete the color scheme selected in the list to the left." ) );
+    QWhatsThis::add( tempButton, tr( "Click here to delete the color scheme selected in the list to the left." ) );
 
     tempButton = new QPushButton( tab, "saveSchemeButton" );
     tempButton->setText( tr( "Save" ) );
     connect( tempButton, SIGNAL( clicked() ), this, SLOT( saveSchemeClicked() ) );
     gridLayout->addWidget( tempButton, 2, 1 );
-	QWhatsThis::add( tempButton, tr( "Click here to name and save the current color scheme." ) );
+    QWhatsThis::add( tempButton, tr( "Click here to name and save the current color scheme." ) );
 
     return tab;
 }
@@ -284,92 +292,93 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
     QWidget *tab = new QWidget ( parent );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
 
-	QGridLayout *lay = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
-
-	m_force = new QCheckBox ( tr( "Force styling for all applications." ), tab );
-	m_force-> setChecked ( cfg. readBoolEntry ( "ForceStyle" ));
-	lay-> addMultiCellWidget ( m_force, 0, 0, 0, 1 );
-	QWhatsThis::add( m_force, tr( "Click here to allow all applications to use global appearance settings." ) );
-
-	QLabel *l = new QLabel ( tab );
-	l-> setText ( QString ( "<p>%1</p>" ). arg ( tr( "Disable styling for these applications ( <b>*</b> can be used as a wildcard):" )));
-	lay-> addMultiCellWidget ( l, 1, 1, 0, 1 );
-	QWhatsThis::add( l, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
-
-	m_except = new QListView ( tab );
-	m_except-> addColumn ( Resource::loadIconSet ( "appearance" ), "", 24 );
-	m_except-> addColumn ( Resource::loadIconSet ( "font" ), "", 24 );
-	m_except-> addColumn ( Resource::loadIconSet ( "appearance/deco" ), "", 24 );
-	m_except-> addColumn ( tr( "Binary file(s)" ));
-	m_except-> setColumnAlignment ( 0, AlignCenter );
-	m_except-> setColumnAlignment ( 1, AlignCenter );
-	m_except-> setColumnAlignment ( 2, AlignCenter );
-	m_except-> setAllColumnsShowFocus ( true );
-	m_except-> setMinimumHeight ( 30 );
-	m_except-> header ( )-> setClickEnabled ( false );
-	m_except-> header ( )-> setResizeEnabled ( false );
-	m_except-> header ( )-> setMovingEnabled ( false );
-	m_except-> setSorting ( -1 );
-	lay-> addMultiCellWidget ( m_except, 2, 6, 0, 0 );
-	QWhatsThis::add( m_except, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
-
-	connect ( m_except, SIGNAL( clicked ( QListViewItem *, const QPoint &, int )), this, SLOT( clickedExcept ( QListViewItem *, const QPoint &, int )));
-
-	QToolButton *tb = new QToolButton ( tab );
-	tb-> setIconSet ( Resource::loadIconSet ( "appearance/add" ));
-	tb-> setFocusPolicy ( QWidget::StrongFocus );
-	lay-> addWidget ( tb, 2, 1 );
-	connect ( tb, SIGNAL( clicked ( )), this, SLOT( addExcept ( )));
-	QWhatsThis::add( tb, tr( "Click here to add an application to the list above." ) );
-
-	tb = new QToolButton ( tab );
-	tb-> setIconSet ( Resource::loadIconSet ( "editdelete" ));
-	tb-> setFocusPolicy ( QWidget::StrongFocus );
-	lay-> addWidget ( tb, 3, 1 );
-	connect ( tb, SIGNAL( clicked ( )), this, SLOT( delExcept ( )));
-	QWhatsThis::add( tb, tr( "Click here to delete the currently selected application." ) );
-
-	tb = new QToolButton ( tab );
-	tb-> setIconSet ( Resource::loadIconSet ( "up" ));
-	tb-> setFocusPolicy ( QWidget::StrongFocus );
-	lay-> addWidget ( tb, 4, 1 );
-	connect ( tb, SIGNAL( clicked ( )), this, SLOT( upExcept ( )));
-	QWhatsThis::add( tb, tr( "Click here to move the currently selected application up in the list." ) );
-
-	tb = new QToolButton ( tab );
-	tb-> setIconSet ( Resource::loadIconSet ( "down" ));
-	tb-> setFocusPolicy ( QWidget::StrongFocus );
-	lay-> addWidget ( tb, 5, 1 );
-	connect ( tb, SIGNAL( clicked ( )), this, SLOT( downExcept ( )));
-	QWhatsThis::add( tb, tr( "Click here to move the currently selected application down in the list." ) );
-
-	lay-> setRowStretch ( 6, 10 );
-	lay-> setColStretch ( 0, 10 );
-
-	QStringList sl = cfg. readListEntry ( "NoStyle", ';' );
-	QListViewItem *lvit = 0;
-	for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
-		int fl = ( *it ). left ( 1 ). toInt ( 0, 32 );
-
-		lvit = new ExceptListItem ( m_except, lvit, ( *it ). mid ( 1 ), fl & 0x01, fl & 0x02, fl & 0x04 );
-	}
-
-
-	vertLayout-> addSpacing ( 3 );
-	QFrame *f = new QFrame ( tab );
-	f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
-	vertLayout-> addWidget ( f );
-	vertLayout-> addSpacing ( 3 );
+    QGridLayout *lay = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
+
+    m_force = new QCheckBox ( tr( "Force styling for all applications." ), tab );
+    m_force-> setChecked ( cfg. readBoolEntry ( "ForceStyle" ));
+    lay-> addMultiCellWidget ( m_force, 0, 0, 0, 1 );
+    QWhatsThis::add( m_force, tr( "Click here to allow all applications to use global appearance settings." ) );
+
+    QLabel *l = new QLabel ( tab );
+    l-> setText ( QString ( "<p>%1</p>" ). arg ( tr( "Disable styling for these applications ( <b>*</b> can be used as a wildcard):" )));
+    lay-> addMultiCellWidget ( l, 1, 1, 0, 1 );
+    QWhatsThis::add( l, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
+
+    m_except = new QListView ( tab );
+    m_except-> addColumn ( Resource::loadIconSet ( "appearance" ), "", 24 );
+    m_except-> addColumn ( Resource::loadIconSet ( "font" ), "", 24 );
+    m_except-> addColumn ( Resource::loadIconSet ( "appearance/deco" ), "", 24 );
+    m_except-> addColumn ( tr( "Binary file(s)" ));
+    m_except-> setColumnAlignment ( 0, AlignCenter );
+    m_except-> setColumnAlignment ( 1, AlignCenter );
+    m_except-> setColumnAlignment ( 2, AlignCenter );
+    m_except-> setAllColumnsShowFocus ( true );
+    m_except-> setMinimumHeight ( 30 );
+    m_except-> header ( )-> setClickEnabled ( false );
+    m_except-> header ( )-> setResizeEnabled ( false );
+    m_except-> header ( )-> setMovingEnabled ( false );
+    m_except-> setSorting ( -1 );
+    lay-> addMultiCellWidget ( m_except, 2, 6, 0, 0 );
+    QWhatsThis::add( m_except, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
+
+    connect ( m_except, SIGNAL( clicked ( QListViewItem *, const QPoint &, int )), this, SLOT( clickedExcept ( QListViewItem *, const QPoint &, int )));
+
+    QToolButton *tb = new QToolButton ( tab );
+    tb-> setIconSet ( Resource::loadIconSet ( "appearance/add" ));
+    tb-> setFocusPolicy ( QWidget::StrongFocus );
+    lay-> addWidget ( tb, 2, 1 );
+    connect ( tb, SIGNAL( clicked ( )), this, SLOT( addExcept ( )));
+    QWhatsThis::add( tb, tr( "Click here to add an application to the list above." ) );
+
+    tb = new QToolButton ( tab );
+    tb-> setIconSet ( Resource::loadIconSet ( "editdelete" ));
+    tb-> setFocusPolicy ( QWidget::StrongFocus );
+    lay-> addWidget ( tb, 3, 1 );
+    connect ( tb, SIGNAL( clicked ( )), this, SLOT( delExcept ( )));
+    QWhatsThis::add( tb, tr( "Click here to delete the currently selected application." ) );
+
+    tb = new QToolButton ( tab );
+    tb-> setIconSet ( Resource::loadIconSet ( "up" ));
+    tb-> setFocusPolicy ( QWidget::StrongFocus );
+    lay-> addWidget ( tb, 4, 1 );
+    connect ( tb, SIGNAL( clicked ( )), this, SLOT( upExcept ( )));
+    QWhatsThis::add( tb, tr( "Click here to move the currently selected application up in the list." ) );
+
+    tb = new QToolButton ( tab );
+    tb-> setIconSet ( Resource::loadIconSet ( "down" ));
+    tb-> setFocusPolicy ( QWidget::StrongFocus );
+    lay-> addWidget ( tb, 5, 1 );
+    connect ( tb, SIGNAL( clicked ( )), this, SLOT( downExcept ( )));
+    QWhatsThis::add( tb, tr( "Click here to move the currently selected application down in the list." ) );
+
+    lay-> setRowStretch ( 6, 10 );
+    lay-> setColStretch ( 0, 10 );
+
+    QStringList sl = cfg. readListEntry ( "NoStyle", ';' );
+    QListViewItem *lvit = 0;
+    for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
+    {
+        int fl = ( *it ). left ( 1 ). toInt ( 0, 32 );
+
+        lvit = new ExceptListItem ( m_except, lvit, ( *it ). mid ( 1 ), fl & 0x01, fl & 0x02, fl & 0x04 );
+    }
+
+
+    vertLayout-> addSpacing ( 3 );
+    QFrame *f = new QFrame ( tab );
+    f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
+    vertLayout-> addWidget ( f );
+    vertLayout-> addSpacing ( 3 );
 
 
     QGridLayout* gridLayout = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
 
-	int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1;
-	bool tabtop = ( cfg. readEntry ( "TabPosition", "Top" ) == "Top" );
+    int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1;
+    bool tabtop = ( cfg. readEntry ( "TabPosition", "Top" ) == "Top" );
 
     QLabel* label = new QLabel( tr( "Tab style:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
-	QWhatsThis::add( label, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
+    QWhatsThis::add( label, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
 
     QButtonGroup* btngrp = new QButtonGroup( tab, "buttongroup" );
     btngrp-> hide ( );
@@ -382,72 +391,75 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
     m_tabstyle_list-> insertItem ( tr( "Drop down list w/icons" ));
     m_tabstyle_list-> setCurrentItem ( style );
     gridLayout-> addMultiCellWidget ( m_tabstyle_list, 0, 0, 1, 2 );
-	QWhatsThis::add( m_tabstyle_list, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
+    QWhatsThis::add( m_tabstyle_list, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
 
     m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" );
     btngrp-> insert ( m_tabstyle_top );
     gridLayout-> addWidget( m_tabstyle_top, 1, 1 );
-	QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) );
+    QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) );
 
     m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" );
     btngrp-> insert ( m_tabstyle_bottom );
     gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 );
-	QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) );
+    QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) );
 
     m_tabstyle_top-> setChecked ( tabtop );
     m_tabstyle_bottom-> setChecked ( !tabtop );
 
-	m_original_tabstyle = style;
-	m_original_tabpos = tabtop;
-
-	vertLayout-> addSpacing ( 3 );
-	QHBoxLayout *rotLay = new QHBoxLayout ( vertLayout, 3 );
-
-	QLabel* rotlabel = new QLabel( tr( "Rotation direction:" ), tab );
-	m_rotdir_cw = new QRadioButton( tab, "rotdir_cw" );
-	QPixmap cw1 = Resource::loadIconSet("redo"). pixmap( );
-	m_rotdir_ccw = new QRadioButton( tab, "rotdir_ccw" );
-	QImage ccwImage = cw1. convertToImage( ). mirror( 1, 0 );
-	QPixmap ccw1;
-	m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
-	QPixmap flip1 = Resource::loadIconSet("pass"). pixmap( );
-	QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
-
-	rotbtngrp-> hide ( );
-	rotbtngrp-> setExclusive ( true );
-	rotbtngrp-> insert ( m_rotdir_cw );
-	rotbtngrp-> insert ( m_rotdir_ccw );
-	rotbtngrp-> insert ( m_rotdir_flip );
-
-	ccw1. convertFromImage( ccwImage );
-	m_rotdir_cw-> setPixmap( cw1 );
-	m_rotdir_ccw-> setPixmap( ccw1 );
-	m_rotdir_flip-> setPixmap( flip1 );
-
-	rotLay-> addWidget ( rotlabel, 0 );
-	rotLay-> addWidget ( m_rotdir_cw, 0 );
-	rotLay-> addWidget ( m_rotdir_ccw, 0 );
-	rotLay-> addWidget ( m_rotdir_flip, 0 );
-
-	int rotDirection = cfg.readNumEntry( "rotatedir" );
-	ODirection rot = CW;
-
-	if (rotDirection == -1) {
-		rot = ODevice::inst ( )-> direction ( );
-	} else {
-		rot = (ODirection)rotDirection;
-	}
-
-	m_rotdir_cw-> setChecked ( rot == CW );
-	m_rotdir_ccw-> setChecked ( rot == CCW );
-	m_rotdir_flip-> setChecked ( rot == Flip );
-
-	return tab;
+    m_original_tabstyle = style;
+    m_original_tabpos = tabtop;
+
+    vertLayout-> addSpacing ( 3 );
+    QHBoxLayout *rotLay = new QHBoxLayout ( vertLayout, 3 );
+
+    QLabel* rotlabel = new QLabel( tr( "Rotation direction:" ), tab );
+    m_rotdir_cw = new QRadioButton( tab, "rotdir_cw" );
+    QPixmap cw1 = Resource::loadIconSet("redo"). pixmap( );
+    m_rotdir_ccw = new QRadioButton( tab, "rotdir_ccw" );
+    QImage ccwImage = cw1. convertToImage( ). mirror( 1, 0 );
+    QPixmap ccw1;
+    m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
+    QPixmap flip1 = Resource::loadIconSet("pass"). pixmap( );
+    QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
+
+    rotbtngrp-> hide ( );
+    rotbtngrp-> setExclusive ( true );
+    rotbtngrp-> insert ( m_rotdir_cw );
+    rotbtngrp-> insert ( m_rotdir_ccw );
+    rotbtngrp-> insert ( m_rotdir_flip );
+
+    ccw1. convertFromImage( ccwImage );
+    m_rotdir_cw-> setPixmap( cw1 );
+    m_rotdir_ccw-> setPixmap( ccw1 );
+    m_rotdir_flip-> setPixmap( flip1 );
+
+    rotLay-> addWidget ( rotlabel, 0 );
+    rotLay-> addWidget ( m_rotdir_cw, 0 );
+    rotLay-> addWidget ( m_rotdir_ccw, 0 );
+    rotLay-> addWidget ( m_rotdir_flip, 0 );
+
+    int rotDirection = cfg.readNumEntry( "rotatedir" );
+    ODirection rot = CW;
+
+    if (rotDirection == -1)
+    {
+        rot = ODevice::inst ( )-> direction ( );
+    }
+    else
+    {
+        rot = (ODirection)rotDirection;
+    }
+
+    m_rotdir_cw-> setChecked ( rot == CW );
+    m_rotdir_ccw-> setChecked ( rot == CCW );
+    m_rotdir_flip-> setChecked ( rot == Flip );
+
+    return tab;
 }
 
 
 Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
-    : QDialog ( parent, name, true, WStyle_ContextHelp )
+        : QDialog ( parent, name, true, WStyle_ContextHelp )
 {
     setCaption( tr( "Appearance Settings" ) );
 
@@ -456,71 +468,75 @@ Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
 
     QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 );
 
-	m_sample = new SampleWindow ( this );
+    m_sample = new SampleWindow ( this );
 
-	m_sample-> setDecoration ( new DefaultWindowDecoration ( ) );
-	QWhatsThis::add( m_sample, tr( "This is a preview window.  Look here to see your new appearance as options are changed." ) );
+    m_sample-> setDecoration ( new DefaultWindowDecoration ( ) );
+    QWhatsThis::add( m_sample, tr( "This is a preview window.  Look here to see your new appearance as options are changed." ) );
 
     OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
-	QWidget *styletab;
+    QWidget *styletab;
 
-	m_color_list = 0;
+    m_color_list = 0;
 
- 	tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance", tr( "Style" ));
+    tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance", tr( "Style" ));
     tw-> addTab ( createFontTab ( tw, config ), "font", tr( "Font" ));
     tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) );
     tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) );
-	tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "SettingsIcon", tr( "Advanced" ) );
+    tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "SettingsIcon", tr( "Advanced" ) );
 
-	top-> addWidget ( tw, 10 );
-	top-> addWidget ( m_sample, 1 );
+    top-> addWidget ( tw, 10 );
+    top-> addWidget ( m_sample, 1 );
 
     tw-> setCurrentTab ( styletab );
-	connect ( tw, SIGNAL( currentChanged ( QWidget * )), this, SLOT( tabChanged ( QWidget * )));
+    connect ( tw, SIGNAL( currentChanged ( QWidget * )), this, SLOT( tabChanged ( QWidget * )));
 
     m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false;
 }
 
 Appearance::~Appearance()
-{
-}
+{}
 
 void Appearance::tabChanged ( QWidget *w )
 {
-	if ( w == m_advtab ) {
-		m_sample-> hide ( );
-		updateGeometry ( ); // shouldn't be necessary ...
-	}
-	else
-		m_sample-> show ( );
+    if ( w == m_advtab )
+    {
+        m_sample-> hide ( );
+        updateGeometry ( ); // shouldn't be necessary ...
+    }
+    else
+        m_sample-> show ( );
 }
 
 void Appearance::accept ( )
 {
-	bool newtabpos = m_tabstyle_top-> isChecked ( );
-	int newtabstyle = m_tabstyle_list-> currentItem ( );
+    bool newtabpos = m_tabstyle_top-> isChecked ( );
+    int newtabstyle = m_tabstyle_list-> currentItem ( );
 
     Config config ( "qpe" );
     config. setGroup ( "Appearance" );
 
-    if ( m_style_changed ) {
-	    StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
-	    if ( item )
+    if ( m_style_changed )
+    {
+        StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
+        if ( item )
             config.writeEntry( "Style", item-> key ( ));
-	}
+    }
 
-    if ( m_deco_changed ) {
-	    DecoListItem *item = (DecoListItem *) m_deco_list-> item ( m_deco_list-> currentItem ( ));
-	    if ( item )
+    if ( m_deco_changed )
+    {
+        DecoListItem *item = (DecoListItem *) m_deco_list-> item ( m_deco_list-> currentItem ( ));
+        if ( item )
             config.writeEntry( "Decoration", item-> key ( ));
-	}
+    }
 
-	if (( newtabstyle != m_original_tabstyle ) || ( newtabpos != m_original_tabpos )) {
-		config. writeEntry ( "TabStyle", newtabstyle + 1 );
-		config. writeEntry ( "TabPosition", newtabpos ? "Top" : "Bottom" );
-	}
+    if (( newtabstyle != m_original_tabstyle ) || ( newtabpos != m_original_tabpos ))
+    {
+        config. writeEntry ( "TabStyle", newtabstyle + 1 );
+        config. writeEntry ( "TabPosition", newtabpos ? "Top" : "Bottom" );
+    }
 
-    if ( m_font_changed ) {
+    if ( m_font_changed )
+    {
         config. writeEntry ( "FontFamily", m_fontselect-> fontFamily ( ));
         config. writeEntry ( "FontStyle", m_fontselect-> fontStyle ( ));
         config. writeEntry ( "FontSize", m_fontselect-> fontSize ( ));
@@ -529,151 +545,164 @@ void Appearance::accept ( )
 
     if ( m_color_changed )
     {
-    	ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
-
- 		if ( item )
-			item-> save ( config );
-    }
-
-	ODirection rot;
-	if (m_rotdir_ccw-> isChecked ( )) {
-		rot = CCW;
-	} else if (m_rotdir_cw-> isChecked ( )) {
-		rot = CW;
-	} else {
-		rot = Flip;
-	}
-	config. writeEntry ( "rotatedir", (int)rot );
-
-	m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated
-
-	QStringList sl;
-	QString exceptstr;
-	for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( )) {
-		int fl = 0;
-		fl |= ( it-> noStyle ( ) ? 0x01 : 0 );
-		fl |= ( it-> noFont ( ) ? 0x02 : 0 );
-		fl |= ( it-> noDeco ( ) ? 0x04 : 0 );
-		exceptstr = QString::number ( fl, 32 );
-		exceptstr.append( it-> pattern ( ));
-		sl << exceptstr;
-	}
-	config. writeEntry ( "NoStyle", sl, ';' );
-	config. writeEntry ( "ForceStyle", m_force-> isChecked ( ));
-
-	config. write ( ); // need to flush the config info first
-	Global::applyStyle ( );
-
-	QDialog::accept ( );
+        ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
+
+        if ( item )
+            item-> save ( config );
+    }
+
+    ODirection rot;
+    if (m_rotdir_ccw-> isChecked ( ))
+    {
+        rot = CCW;
+    }
+    else if (m_rotdir_cw-> isChecked ( ))
+    {
+        rot = CW;
+    }
+    else
+    {
+        rot = Flip;
+    }
+    config. writeEntry ( "rotatedir", (int)rot );
+
+    m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated
+
+    QStringList sl;
+    QString exceptstr;
+    for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( ))
+    {
+        int fl = 0;
+        fl |= ( it-> noStyle ( ) ? 0x01 : 0 );
+        fl |= ( it-> noFont ( ) ? 0x02 : 0 );
+        fl |= ( it-> noDeco ( ) ? 0x04 : 0 );
+        exceptstr = QString::number ( fl, 32 );
+        exceptstr.append( it-> pattern ( ));
+        sl << exceptstr;
+    }
+    config. writeEntry ( "NoStyle", sl, ';' );
+    config. writeEntry ( "ForceStyle", m_force-> isChecked ( ));
+
+    config. write ( ); // need to flush the config info first
+    Global::applyStyle ( );
+
+    QDialog::accept ( );
 }
 
 void Appearance::done ( int r )
 {
-	QDialog::done ( r );
-	close ( );
+    QDialog::done ( r );
+    close ( );
 }
 
 
 void Appearance::styleClicked ( int index )
 {
     StyleListItem *sli = (StyleListItem *) m_style_list-> item ( index );
-	m_style_settings-> setEnabled ( sli ? sli-> hasSettings ( ) : false );
+    m_style_settings-> setEnabled ( sli ? sli-> hasSettings ( ) : false );
 
-	if ( m_sample && sli && sli-> style ( )) {
-		int ci = m_color_list ? m_color_list-> currentItem ( ) : -1;
+    if ( m_sample && sli && sli-> style ( ))
+    {
+        int ci = m_color_list ? m_color_list-> currentItem ( ) : -1;
 
-		m_sample-> setStyle2 ( sli-> style ( ), ci < 0 ? palette ( ) : ((ColorListItem *) m_color_list-> item ( ci ))-> palette ( ));
-	}
+        m_sample-> setStyle2 ( sli-> style ( ), ci < 0 ? palette ( ) : ((ColorListItem *) m_color_list-> item ( ci ))-> palette ( ));
+    }
 
-	m_style_changed |= ( index != m_original_style );
+    m_style_changed |= ( index != m_original_style );
 }
 
 void Appearance::styleSettingsClicked ( )
 {
-	StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
+    StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
 
-	if ( item && item-> hasSettings ( )) {
-		QDialog *d = new QDialog ( this, "SETTINGS-DLG", true );
-		QVBoxLayout *vbox = new QVBoxLayout ( d, 3, 0 );
+    if ( item && item-> hasSettings ( ))
+    {
+        QDialog *d = new QDialog ( this, "SETTINGS-DLG", true );
+        QVBoxLayout *vbox = new QVBoxLayout ( d, 3, 0 );
 
-		QWidget *w = item-> settings ( d );
+        QWidget *w = item-> settings ( d );
 
-		if ( w ) {
-			vbox-> addWidget ( w );
+        if ( w )
+        {
+            vbox-> addWidget ( w );
 
-			d-> setCaption ( w-> caption ( ));
+            d-> setCaption ( w-> caption ( ));
 
-		   	d-> showMaximized ( );
-			bool accepted = ( d-> exec ( ) == QDialog::Accepted );
+            bool accepted = ( QPEApplication::execDialog ( d ) == QDialog::Accepted );
 
-			if ( item-> setSettings ( accepted ))
-				m_style_changed = true;
-		}
-		delete d;
-	}
+            if ( item-> setSettings ( accepted ))
+                m_style_changed = true;
+        }
+        delete d;
+    }
 }
 
 void Appearance::decoClicked ( int index )
 {
     DecoListItem *dli = (DecoListItem *) m_deco_list-> item ( index );
 
-	if ( m_sample ) {
-		if ( dli && dli-> interface ( ))
-			m_sample-> setDecoration ( dli-> interface ( ));
-		else
-			m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
-		m_sample-> repaint ( );
-	}
-	m_deco_changed |= ( index != m_original_deco );
+    if ( m_sample )
+    {
+        if ( dli && dli-> interface ( ))
+            m_sample-> setDecoration ( dli-> interface ( ));
+        else
+            m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
+        m_sample-> repaint ( );
+    }
+    m_deco_changed |= ( index != m_original_deco );
 }
 
 void Appearance::fontClicked ( const QFont &f )
 {
-	m_font_changed |= ( f != m_sample-> font ( ));
-	m_sample-> setFont ( f );
+    m_font_changed |= ( f != m_sample-> font ( ));
+    m_sample-> setFont ( f );
 }
 
 void Appearance::colorClicked ( int index )
 {
-	ColorListItem *item = (ColorListItem *) m_color_list-> item ( index );
+    ColorListItem *item = (ColorListItem *) m_color_list-> item ( index );
 
-	if ( item )
-		m_sample-> setPalette ( item-> palette ( ));
+    if ( item )
+        m_sample-> setPalette ( item-> palette ( ));
 
-	m_color_changed |= ( item-> palette ( ) != qApp-> palette ( ));
+    m_color_changed |= ( item-> palette ( ) != qApp-> palette ( ));
 }
 
 
 void Appearance::editSchemeClicked ( )
 {
-	ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
+    ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
-	int cnt = 0;
-	QString labels [QColorGroup::NColorRoles];
-	QColor colors [QColorGroup::NColorRoles];
+    int cnt = 0;
+    QString labels [QColorGroup::NColorRoles];
+    QColor colors [QColorGroup::NColorRoles];
 
-	for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) {
-		QColor col = item-> color ( role );
+    for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ )
+    {
+        QColor col = item-> color ( role );
 
-		if ( col. isValid ( )) {
-			labels [cnt] = item-> label ( role );
-			colors [cnt] = col;
+        if ( col. isValid ( ))
+        {
+            labels [cnt] = item-> label ( role );
+            colors [cnt] = col;
 
-			cnt++;
-		}
-	}
+            cnt++;
+        }
+    }
 
     EditScheme* editdlg = new EditScheme( cnt, labels, colors, this, "editScheme", true );
-    editdlg-> showMaximized ( );
-    if ( editdlg-> exec ( ) == QDialog::Accepted ) {
-    	ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 );
-		cnt = 0;
-
-		for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) {
-			if ( item-> color ( role ). isValid ( )) {
-        		citem-> setColor ( role, colors [cnt] );
-        		cnt++;
-        	}
+    if ( QPEApplication::execDialog( editdlg ) == QDialog::Accepted )
+    {
+        ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 );
+        cnt = 0;
+
+        for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ )
+        {
+            if ( item-> color ( role ). isValid ( ))
+            {
+                citem-> setColor ( role, colors [cnt] );
+                cnt++;
+            }
         }
 
         m_color_list-> setCurrentItem ( 0 );
@@ -687,32 +716,33 @@ void Appearance::editSchemeClicked ( )
 
 void Appearance::saveSchemeClicked()
 {
-	ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
+    ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
-	if ( !item )
-		return;
+    if ( !item )
+        return;
 
-	QDialog *d = new QDialog ( this, 0, true );
-	d-> setCaption ( tr( "Save Scheme" ));
-	QLineEdit *ed = new QLineEdit ( d );
-	( new QVBoxLayout ( d, 3, 3 ))-> addWidget ( ed );
-	ed-> setFocus ( );
+    QDialog *d = new QDialog ( this, 0, true );
+    d-> setCaption ( tr( "Save Scheme" ));
+    QLineEdit *ed = new QLineEdit ( d );
+    ( new QVBoxLayout ( d, 3, 3 ))-> addWidget ( ed );
+    ed-> setFocus ( );
 
-    if ( d-> exec ( ) == QDialog::Accepted ) {
+    if ( d-> exec ( ) == QDialog::Accepted )
+    {
         QString schemename = ed-> text ( );
-		QString filestr = QPEApplication::qpeDir();
-		filestr.append( "/etc/colors/" );
-		filestr.append( schemename );
-		filestr.append( ".scheme" );
+        QString filestr = QPEApplication::qpeDir();
+        filestr.append( "/etc/colors/" );
+        filestr.append( schemename );
+        filestr.append( ".scheme" );
         QFile file ( filestr );
         if ( !file. exists ( ))
         {
-        	QPalette p = item-> palette ( );
+            QPalette p = item-> palette ( );
 
             Config config ( file.name(), Config::File );
             config. setGroup( "Colors" );
 
-			item-> save ( config );
+            item-> save ( config );
 
             config. write ( ); // need to flush the config info first
 
@@ -720,7 +750,7 @@ void Appearance::saveSchemeClicked()
         }
         else
         {
-	        QMessageBox::information ( this, tr( "Save scheme" ), tr( "Scheme does already exist." ));
+            QMessageBox::information ( this, tr( "Save scheme" ), tr( "Scheme does already exist." ));
         }
     }
     delete d;
@@ -728,21 +758,21 @@ void Appearance::saveSchemeClicked()
 
 void Appearance::deleteSchemeClicked()
 {
-	ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
+    ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
-	if ( !item )
-		return;
+    if ( !item )
+        return;
 
     if ( m_color_list-> currentItem ( ) > 0 )
     {
-		if ( QPEMessageBox::confirmDelete ( this, tr( "Delete scheme" ), item-> text ( ) ) )
-		{
-			QString filestr = QPEApplication::qpeDir ( );
-			filestr.append( "/etc/colors/" );
-			filestr.append( item-> text ( ) );
-			filestr.append( ".scheme" );
-			QFile::remove ( filestr );
-			delete item;
+        if ( QPEMessageBox::confirmDelete ( this, tr( "Delete scheme" ), item-> text ( ) ) )
+        {
+            QString filestr = QPEApplication::qpeDir ( );
+            filestr.append( "/etc/colors/" );
+            filestr.append( item-> text ( ) );
+            filestr.append( ".scheme" );
+            QFile::remove ( filestr );
+            delete item;
         }
     }
     else
@@ -754,103 +784,107 @@ void Appearance::deleteSchemeClicked()
 
 void Appearance::addExcept ( )
 {
-	ExceptListItem *it = new ExceptListItem ( m_except, 0, tr( "<new>" ), true, true, true );
-	m_except-> ensureItemVisible ( it );
-	m_except-> setSelected ( it, true );
+    ExceptListItem *it = new ExceptListItem ( m_except, 0, tr( "<new>" ), true, true, true );
+    m_except-> ensureItemVisible ( it );
+    m_except-> setSelected ( it, true );
 }
 
 void Appearance::delExcept ( )
 {
-	if ( m_except-> selectedItem ( )) {
-		m_except-> setFocus ( );
-		delete m_except-> selectedItem ( );
-	}
+    if ( m_except-> selectedItem ( ))
+    {
+        m_except-> setFocus ( );
+        delete m_except-> selectedItem ( );
+    }
 }
 
 void Appearance::upExcept ( )
 {
-	ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
+    ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
 
-	if ( it && it-> itemAbove ( ))
-		it-> itemAbove ( )-> moveItem ( it );
+    if ( it && it-> itemAbove ( ))
+        it-> itemAbove ( )-> moveItem ( it );
 }
 
 void Appearance::downExcept ( )
 {
-	ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
+    ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
 
-	if ( it && it-> itemBelow ( ))
-		it-> moveItem ( it-> itemBelow ( ));
+    if ( it && it-> itemBelow ( ))
+        it-> moveItem ( it-> itemBelow ( ));
 }
 
-class ExEdit : public QLineEdit {
+class ExEdit : public QLineEdit
+{
 public:
-	ExEdit ( ExceptListItem *item )
-		: QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item )
-	{
-		setFrame ( false );
-
-		QRect r = it-> listView ( )-> itemRect ( it );
-
-		int x = it-> listView ( )-> header ( )-> cellPos ( 3 ) - 1;
-		int y = r. y ( );
-		int w = it-> listView ( )-> viewport ( )-> width ( ) - x;
-		int h = r. height ( ); // + 2;
-
-		setText ( it-> pattern ( ));
-		setGeometry ( x, y, w, h );
-
-		qDebug ( "ExEdit: [%s] at %d,%d %d,%d", it->text(2).latin1(),x,y,w,h);
-
-		m_out = true;
-
-		show ( );
-		setFocus ( );
-		selectAll ( );
-		end ( true );
-	}
-
-	virtual void focusOutEvent ( QFocusEvent * )
-	{
-		hide ( );
-		if ( m_out )
-			it-> setPattern ( text ( ));
-		delete this;
-	}
-
-	virtual void keyPressEvent ( QKeyEvent *e )
-	{
-		if ( e-> key ( ) == Key_Return )
-			it-> listView ( )-> setFocus ( );
-		else if ( e-> key ( ) == Key_Escape ) {
-			m_out = false;
-			it-> listView ( )-> setFocus ( );
-		}
-		else
-			QLineEdit::keyPressEvent ( e );
-	}
+    ExEdit ( ExceptListItem *item )
+            : QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item )
+    {
+        setFrame ( false );
+
+        QRect r = it-> listView ( )-> itemRect ( it );
+
+        int x = it-> listView ( )-> header ( )-> cellPos ( 3 ) - 1;
+        int y = r. y ( );
+        int w = it-> listView ( )-> viewport ( )-> width ( ) - x;
+        int h = r. height ( ); // + 2;
+
+        setText ( it-> pattern ( ));
+        setGeometry ( x, y, w, h );
+
+        qDebug ( "ExEdit: [%s] at %d,%d %d,%d", it->text(2).latin1(),x,y,w,h);
+
+        m_out = true;
+
+        show ( );
+        setFocus ( );
+        selectAll ( );
+        end ( true );
+    }
+
+    virtual void focusOutEvent ( QFocusEvent * )
+    {
+        hide ( );
+        if ( m_out )
+            it-> setPattern ( text ( ));
+        delete this;
+    }
+
+    virtual void keyPressEvent ( QKeyEvent *e )
+    {
+        if ( e-> key ( ) == Key_Return )
+            it-> listView ( )-> setFocus ( );
+        else if ( e-> key ( ) == Key_Escape )
+        {
+            m_out = false;
+            it-> listView ( )-> setFocus ( );
+        }
+        else
+            QLineEdit::keyPressEvent ( e );
+    }
 
 private:
-	ExceptListItem *it;
-	bool m_out;
+    ExceptListItem *it;
+    bool m_out;
 };
 
 void Appearance::clickedExcept ( QListViewItem *item, const QPoint &, int c )
 {
-	if ( !item || c < 0 || c > 3 )
-		return;
-
-	ExceptListItem *it = (ExceptListItem *) item;
-
-	if ( c == 0 )
-		it-> setNoStyle ( !it-> noStyle ( ));
-	else if ( c == 1 )
-		it-> setNoFont ( !it-> noFont ( ));
-	else if ( c == 2 )
-		it-> setNoDeco ( !it-> noDeco ( ));
-	else if ( c == 3 ) {
-		m_except-> ensureItemVisible ( it );
-		new ExEdit ( it );
-	}
+    if ( !item || c < 0 || c > 3 )
+        return;
+
+    ExceptListItem *it = (ExceptListItem *) item;
+
+    if ( c == 0 )
+        it-> setNoStyle ( !it-> noStyle ( ));
+    else if ( c == 1 )
+        it-> setNoFont ( !it-> noFont ( ));
+    else if ( c == 2 )
+        it-> setNoDeco ( !it-> noDeco ( ));
+    else if ( c == 3 )
+    {
+        m_except-> ensureItemVisible ( it );
+        new ExEdit ( it );
+    }
 }
 
diff --git a/noncore/settings/appearance2/stylelistitem.h b/noncore/settings/appearance2/stylelistitem.h
index caefad8..b6c72c3 100644
--- a/noncore/settings/appearance2/stylelistitem.h
+++ b/noncore/settings/appearance2/stylelistitem.h
@@ -28,15 +28,21 @@
 #ifndef STYLELISTITEM_H
 #define STYLELISTITEM_H
 
-#include <qlistbox.h>
+/* OPIE */
 #include <qpe/styleinterface.h>
+#include <qpe/qlibrary.h>
+#include <qpe/resource.h>
+
+/* QT */
+#include <qlistbox.h>
+#include <qfileinfo.h>
 
 #include <stdio.h>
 
 class StyleListItem : public QListBoxText {
 public:
-	StyleListItem ( const QString &t, QStyle *sty ) : QListBoxText ( t ) 
-	{ 
+	StyleListItem ( const QString &t, QStyle *sty ) : QListBoxText ( t )
+	{
 		m_lib = 0;
 		m_style_if = 0;
 		m_settings_if = 0;