- some changes to get dynamic window decorations working

- new format for style config

3 files changed, 32 insertions, 10 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 43ff24c..8cd54a2 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -151,3 +151,3 @@ void Appearance::loadDecos ( QListBox *list )
 {
-    list-> insertItem ( new DecoListItem ( tr( "Default" )));
+    list-> insertItem ( new DecoListItem ( "QPE" ));
 
@@ -210,3 +210,10 @@ QWidget *Appearance::createStyleTab ( QWidget *parent )
     QString s = config. readEntry ( "Style", "Light" );
-    m_style_list-> setCurrentItem ( m_style_list-> findItem ( s ));
+    
+    for ( uint i = 0; i < m_style_list-> count ( ); i++ ) {
+            if (((StyleListItem *) m_style_list-> item ( i ))-> key ( ) == s ) {
+                m_style_list-> setCurrentItem ( i );
+                break;
+            }
+    }
+    
     m_original_style = m_style_list-> currentItem ( );
@@ -233,3 +240,10 @@ QWidget *Appearance::createDecoTab ( QWidget *parent )
     QString s = config. readEntry ( "Decoration" );
-    m_deco_list-> setCurrentItem ( m_deco_list-> findItem ( s ));
+
+    for ( uint i = 0; i < m_deco_list-> count ( ); i++ ) {
+            if (((DecoListItem *) m_deco_list-> item ( i ))-> key ( ) == s ) {
+                m_deco_list-> setCurrentItem ( i );
+                break;
+            }
+    }
+    
     m_original_deco = m_deco_list-> currentItem ( );
@@ -389,2 +403,8 @@ void Appearance::accept ( )
 
+    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 )) {
@@ -471,2 +491,3 @@ void Appearance::decoClicked ( int index )
                         m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
+                m_sample-> repaint ( );
         }
diff --git a/noncore/settings/appearance2/decolistitem.h b/noncore/settings/appearance2/decolistitem.h
index 23261b1..d190ceb 100644
--- a/noncore/settings/appearance2/decolistitem.h
+++ b/noncore/settings/appearance2/decolistitem.h
@@ -33,5 +33,5 @@
 
-class DecoListItem : public QListBoxText {
+class DecoListItem : public QListBoxPixmap {
 public:
-        DecoListItem ( const QString &t ) : QListBoxText ( t ) 
+        DecoListItem ( const QString &t ) : QListBoxPixmap ( QPixmap ( ), t ) 
         { 
@@ -42,3 +42,3 @@ public:
 
-        DecoListItem ( QLibrary *lib, WindowDecorationInterface *iface ) : QListBoxText ( iface-> name ( ))
+        DecoListItem ( QLibrary *lib, WindowDecorationInterface *iface ) : QListBoxPixmap ( iface-> icon ( ), iface-> name ( ))
         {
@@ -87,4 +87,4 @@ public:
         {
-                if ( m_window_if )
-                        return QString ( m_window_if-> name ( ));
+                if ( m_lib )
+                        return QFileInfo ( m_lib-> library ( )). fileName ( );
                 else
diff --git a/noncore/settings/appearance2/stylelistitem.h b/noncore/settings/appearance2/stylelistitem.h
index c0258e0..e261511 100644
--- a/noncore/settings/appearance2/stylelistitem.h
+++ b/noncore/settings/appearance2/stylelistitem.h
@@ -91,4 +91,5 @@ public:
         {
-                if ( m_style_if )
-                        return QString ( m_style_if-> key ( ));
+                if ( m_lib )
+                        return QFileInfo ( m_lib-> library ( )). fileName ( );
+                        //return QString ( m_style_if-> key ( ));
                 else