- 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
@@ -146,13 +146,13 @@ void Appearance::loadStyles ( QListBox *list )
 
 #endif
 }
 
 void Appearance::loadDecos ( QListBox *list )
 {
-    list-> insertItem ( new DecoListItem ( tr( "Default" )));
+    list-> insertItem ( new DecoListItem ( "QPE" ));
 
         {
                 QString path = QPEApplication::qpeDir() + "/plugins/decorations/";
                 QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
 
                 for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
@@ -205,13 +205,20 @@ QWidget *Appearance::createStyleTab ( QWidget *parent )
     connect ( m_style_settings, SIGNAL( clicked ( )), this, SLOT( styleSettingsClicked ( )));
     vertLayout-> addWidget ( m_style_settings );
 
         loadStyles ( m_style_list );
 
     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 ( );
     styleClicked ( m_original_style );
 
     connect( m_style_list, SIGNAL( highlighted( int ) ), this, SLOT( styleClicked( int ) ) );
 
         return tab;
@@ -228,13 +235,20 @@ QWidget *Appearance::createDecoTab ( QWidget *parent )
     m_deco_list = new QListBox( tab, "m_deco_list" );
     vertLayout->addWidget( m_deco_list );
 
         loadDecos ( m_deco_list );
 
     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 ( );
     if ( m_deco_list-> currentItem  ( ) < 0 )
             m_deco_list-> setCurrentItem ( 0 );
     decoClicked ( m_original_deco );
 
     connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) );
@@ -384,12 +398,18 @@ void Appearance::accept ( )
     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 )
+            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 ( m_font_changed ) {
@@ -466,12 +486,13 @@ void Appearance::decoClicked ( int 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 );
 }
 
 void Appearance::fontClicked ( const QFont &f )
 {
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
@@ -28,22 +28,22 @@
 #ifndef DECOLISTITEM_H
 #define DECOLISTITEM_H
 
 #include <qpe/windowdecorationinterface.h>
 #include <qlistbox.h>
 
-class DecoListItem : public QListBoxText {
+class DecoListItem : public QListBoxPixmap {
 public:
-        DecoListItem ( const QString &t ) : QListBoxText ( t ) 
+        DecoListItem ( const QString &t ) : QListBoxPixmap ( QPixmap ( ), t ) 
         { 
                 m_lib = 0;
                 m_window_if = 0;
         //      m_settings_if = 0;
         }
 
-        DecoListItem ( QLibrary *lib, WindowDecorationInterface *iface ) : QListBoxText ( iface-> name ( ))
+        DecoListItem ( QLibrary *lib, WindowDecorationInterface *iface ) : QListBoxPixmap ( iface-> icon ( ), iface-> name ( ))
         {
                 m_lib = lib;
                 m_window_if = iface;
                 
         //              iface-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &m_settings_if );         
         }
@@ -82,14 +82,14 @@ public:
         //      }
                 return false;
         }
 
         QString key ( )
         {
-                if ( m_window_if )
-                        return QString ( m_window_if-> name ( ));
+                if ( m_lib )
+                        return QFileInfo ( m_lib-> library ( )). fileName ( );
                 else
                         return text ( );
         }
         
         WindowDecorationInterface *interface ( )
         {
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
@@ -86,14 +86,15 @@ public:
                         return false;
                 }
         }
 
         QString key ( )
         {
-                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
                         return text ( );
         }
         
         QStyle *style ( ) 
         {