1 files changed, 98 insertions, 64 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,13 +80,16 @@ class DefaultWindowDecoration : public WindowDecorationInterface
 {
 public:
     DefaultWindowDecoration() : ref(0) {}
-    QString name() const {
+    QString name() const
+    {
 	return "Default";
     }
-QPixmap icon() const {
+    QPixmap icon() const
+    {
 	return QPixmap();
     }
-    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
+    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface )
+    {
 	*iface = 0;
 	if ( uuid == IID_QUnknown )
 	    *iface = this;
@@ -134,19 +136,22 @@ 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 ) {
+        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 ) {
+            if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface )
+            {
 				StyleListItem *slit = new StyleListItem ( lib, iface );
 				m_style_list-> insertItem ( slit );
 
@@ -184,14 +189,16 @@ QWidget *Appearance::createDecoTab ( QWidget *parent, Config &cfg )
 		path.append( "/plugins/decorations/" );
 		QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
 
-		for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
+        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 ) {
+            if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK )
+            {
 				DecoListItem *dlit = new DecoListItem ( lib, iface );
 				m_deco_list-> insertItem ( dlit );
 
@@ -246,7 +253,8 @@ QWidget *Appearance::createColorTab ( QWidget *parent, Config &cfg )
 	path.append( "/etc/colors/" );
     QStringList sl = QDir ( path ). entryList ( "*.scheme" );
 
-	for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
+    for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
+    {
 		QString name = (*it). left ((*it). find ( ".scheme" ));
 		QString pathstr = path;
 		pathstr.append( *it );
@@ -348,7 +356,8 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 
 	QStringList sl = cfg. readListEntry ( "NoStyle", ';' );
 	QListViewItem *lvit = 0;
-	for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
+    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 );
@@ -432,9 +441,12 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 	int rotDirection = cfg.readNumEntry( "rotatedir" );
 	ODirection rot = CW;
 
-	if (rotDirection == -1) {
+    if (rotDirection == -1)
+    {
 		rot = ODevice::inst ( )-> direction ( );
-	} else {
+    }
+    else
+    {
 		rot = (ODirection)rotDirection;
 	}
 
@@ -482,12 +494,12 @@ Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
 }
 
 Appearance::~Appearance()
-{
-}
+{}
 
 void Appearance::tabChanged ( QWidget *w )
 {
-	if ( w == m_advtab ) {
+    if ( w == m_advtab )
+    {
 		m_sample-> hide ( );
 		updateGeometry ( ); // shouldn't be necessary ...
 	}
@@ -503,24 +515,28 @@ void Appearance::accept ( )
     Config config ( "qpe" );
     config. setGroup ( "Appearance" );
 
-    if ( m_style_changed ) {
+    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 ) {
+    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 )) {
+    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 ( ));
@@ -536,11 +552,16 @@ void Appearance::accept ( )
     }
 
 	ODirection rot;
-	if (m_rotdir_ccw-> isChecked ( )) {
+    if (m_rotdir_ccw-> isChecked ( ))
+    {
 		rot = CCW;
-	} else if (m_rotdir_cw-> isChecked ( )) {
+    }
+    else if (m_rotdir_cw-> isChecked ( ))
+    {
 		rot = CW;
-	} else {
+    }
+    else
+    {
 		rot = Flip;
 	}
 	config. writeEntry ( "rotatedir", (int)rot );
@@ -549,7 +570,8 @@ void Appearance::accept ( )
 
 	QStringList sl;
 	QString exceptstr;
-	for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( )) {
+    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 );
@@ -579,7 +601,8 @@ void Appearance::styleClicked ( int index )
     StyleListItem *sli = (StyleListItem *) m_style_list-> item ( index );
 	m_style_settings-> setEnabled ( sli ? sli-> hasSettings ( ) : false );
 
-	if ( m_sample && sli && sli-> style ( )) {
+    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 ( ));
@@ -592,19 +615,20 @@ void Appearance::styleSettingsClicked ( )
 {
 	StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
 
-	if ( item && item-> hasSettings ( )) {
+    if ( item && item-> hasSettings ( ))
+    {
 		QDialog *d = new QDialog ( this, "SETTINGS-DLG", true );
 		QVBoxLayout *vbox = new QVBoxLayout ( d, 3, 0 );
 
 		QWidget *w = item-> settings ( d );
 
-		if ( w ) {
+        if ( w )
+        {
 			vbox-> addWidget ( w );
 
 			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;
@@ -617,7 +641,8 @@ void Appearance::decoClicked ( int index )
 {
     DecoListItem *dli = (DecoListItem *) m_deco_list-> item ( index );
 
-	if ( m_sample ) {
+    if ( m_sample )
+    {
 		if ( dli && dli-> interface ( ))
 			m_sample-> setDecoration ( dli-> interface ( ));
 		else
@@ -652,10 +677,12 @@ void Appearance::editSchemeClicked ( )
 	QString labels [QColorGroup::NColorRoles];
 	QColor colors [QColorGroup::NColorRoles];
 
-	for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) {
+    for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ )
+    {
 		QColor col = item-> color ( role );
 
-		if ( col. isValid ( )) {
+        if ( col. isValid ( ))
+        {
 			labels [cnt] = item-> label ( role );
 			colors [cnt] = col;
 
@@ -664,13 +691,15 @@ void Appearance::editSchemeClicked ( )
 	}
 
     EditScheme* editdlg = new EditScheme( cnt, labels, colors, this, "editScheme", true );
-    editdlg-> showMaximized ( );
-    if ( editdlg-> exec ( ) == QDialog::Accepted ) {
+    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 ( )) {
+        for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ )
+        {
+            if ( item-> color ( role ). isValid ( ))
+            {
         		citem-> setColor ( role, colors [cnt] );
         		cnt++;
         	}
@@ -698,7 +727,8 @@ void Appearance::saveSchemeClicked()
 	( 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/" );
@@ -761,7 +791,8 @@ void Appearance::addExcept ( )
 
 void Appearance::delExcept ( )
 {
-	if ( m_except-> selectedItem ( )) {
+    if ( m_except-> selectedItem ( ))
+    {
 		m_except-> setFocus ( );
 		delete m_except-> selectedItem ( );
 	}
@@ -783,7 +814,8 @@ void Appearance::downExcept ( )
 		it-> moveItem ( it-> itemBelow ( ));
 }
 
-class ExEdit : public QLineEdit {
+class ExEdit : public QLineEdit
+{
 public:
 	ExEdit ( ExceptListItem *item )
 		: QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item )
@@ -822,7 +854,8 @@ public:
 	{
 		if ( e-> key ( ) == Key_Return )
 			it-> listView ( )-> setFocus ( );
-		else if ( e-> key ( ) == Key_Escape ) {
+        else if ( e-> key ( ) == Key_Escape )
+        {
 			m_out = false;
 			it-> listView ( )-> setFocus ( );
 		}
@@ -848,7 +881,8 @@ void Appearance::clickedExcept ( QListViewItem *item, const QPoint &, int c )
 		it-> setNoFont ( !it-> noFont ( ));
 	else if ( c == 2 )
 		it-> setNoDeco ( !it-> noDeco ( ));
-	else if ( c == 3 ) {
+    else if ( c == 3 )
+    {
 		m_except-> ensureItemVisible ( it );
 		new ExEdit ( it );
 	}