- 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
@@ -120,147 +120,161 @@ void Appearance::loadStyles ( QListBox *list )
     list->insertItem( new StyleListItem ( "Motif", new QMotifStyle ( )));
 #endif
 #ifndef QT_NO_STYLE_MOTIFPLUS
     list->insertItem( new StyleListItem ( "MotifPlus", new QMotifPlusStyle ( )));
 #endif
 #ifndef QT_NO_STYLE_PLATINUM
     list->insertItem( new StyleListItem ( "Platinum", new QPlatinumStyle ( )));
 #endif
 #endif
     list->insertItem( new StyleListItem ( "QPE", new QPEStyle ( )));
 
 #if QT_VERSION < 300
 	{
 		QString path = QPEApplication::qpeDir() + "/plugins/styles/";
 		QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
 
 		for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
 			QLibrary *lib = new QLibrary ( path + "/" + *it );
 			StyleInterface *iface;
 
 			if ( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK )
 				list-> insertItem ( new StyleListItem ( lib, iface ));
 			else
 				delete lib;
 		}
 	}
 
 #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 ) {
 			QLibrary *lib = new QLibrary ( path + "/" + *it );
 			WindowDecorationInterface *iface;
 
 			if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK )
 				list-> insertItem ( new DecoListItem ( lib, iface ));
 			else
 				delete lib;
 		}
 	}
 }
 
 void Appearance::loadColors ( QListBox *list )
 {
     list-> clear ( );
     {
     	Config config ( "qpe" );
 		config. setGroup ( "Appearance" );
     
 		list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), config ));
 	}
 
 	QString path = QPEApplication::qpeDir ( ) + "/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" ));
 		Config config ( path + *it, Config::File );
 		config. setGroup ( "Colors" );
 		
 		list-> insertItem ( new ColorListItem ( name, config ));
 	}
 }
 
 
 QWidget *Appearance::createStyleTab ( QWidget *parent )
 {
 	Config config ( "qpe" );
 	config. setGroup ( "Appearance" );
 
     QWidget* tab = new QWidget( parent, "StyleTab" );
     QVBoxLayout* vertLayout = new QVBoxLayout( tab, 4, 4 );
 
     m_style_list = new QListBox( tab, "m_style_list" );
     vertLayout->addWidget( m_style_list );
 
     m_style_settings = new QPushButton ( tr( "Settings..." ), tab );
     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;
 }
 
 QWidget *Appearance::createDecoTab ( QWidget *parent )
 {
 	Config config ( "qpe" );
 	config. setGroup ( "Appearance" );
 
     QWidget* tab = new QWidget( parent, "DecoTab" );
     QVBoxLayout* vertLayout = new QVBoxLayout( tab, 4, 4 );
 
     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 ) ) );
 
 	return tab;
 }
 
 QWidget *Appearance::createFontTab ( QWidget *parent )
 {
 	Config config ( "qpe" );
 	config. setGroup ( "Appearance" );
 
     QString familyStr = config.readEntry( "FontFamily", "Helvetica" );
     QString styleStr = config.readEntry( "FontStyle", "Regular" );
     int size = config.readNumEntry( "FontSize", 10 );
 
     m_fontselect = new OFontSelector ( false, parent, "FontTab" );    
     m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
     
     connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
              this, SLOT( fontClicked ( const QFont & )));
 
     return m_fontselect; 
 }
 
 QWidget *Appearance::createColorTab ( QWidget *parent )
 {
 	Config config ( "qpe" );
 	config. setGroup ( "Appearance" );
@@ -358,64 +372,70 @@ Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
 	
  	tw-> addTab ( styletab = createStyleTab ( tw ), "appearance/styletabicon.png", tr( "Style" ));
     tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" ));
     tw-> addTab ( createColorTab ( tw ), "appearance/colorstabicon.png", tr( "Colors" ) );
     tw-> addTab ( createDecoTab ( tw ), "appearance/decotabicon.png", tr( "Windows" ) );
     tw-> addTab ( createGuiTab ( tw ), "appearance/advancedtabicon.png", tr( "Gui" ) );
 
 	top-> addWidget ( tw, 10 );	
 	top-> addWidget ( m_sample, 1 );
 
     tw-> setCurrentTab ( styletab );
 }
 
 Appearance::~Appearance()
 {
 }
 
 void Appearance::accept ( )
 {
     Config config("qpe");
     config.setGroup( "Appearance" );
 
 	int newtabstyle = m_tabstyle_list-> currentItem ( );
 	bool newtabpos = m_tabstyle_top-> isChecked ( );
 
 
     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 ) {
         config. writeEntry ( "FontFamily", m_fontselect-> fontFamily ( ));
         config. writeEntry ( "FontStyle", m_fontselect-> fontStyle ( ));
         config. writeEntry ( "FontSize", m_fontselect-> fontSize ( ));
     }
 
 
     if ( m_color_changed )
     {
     	ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
  
  		if ( item )   
 			item-> save ( config );
     }
     
 	config. write ( ); // need to flush the config info first
 	Global::applyStyle ( );
 
 	if ( QMessageBox::warning ( this, tr( "Restart" ), tr( "Do you want to restart Opie now?" ),  tr( "Yes" ), tr( "No" ), 0, 0, 1 ) == 0 ) {
 		QCopEnvelope e( "QPE/System", "restart()" );
 	}
 	
 	QDialog::accept ( );
 }
 
 void Appearance::done ( int r )
 {
@@ -440,64 +460,65 @@ void Appearance::styleSettingsClicked ( )
 	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, 4, 0 );
 
 		QWidget *w = item-> settings ( d );
 
 		if ( w ) {
 			vbox-> addWidget ( w );
 
 			d-> setCaption ( w-> caption ( ));
 
 		   	d-> showMaximized ( );
 			bool accepted = ( d-> exec ( ) == QDialog::Accepted );
 
 			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 );
 }
 
 void Appearance::fontClicked ( const QFont &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 );
 
 	if ( item )
 		m_sample-> setPalette ( item-> palette ( ));
 
 	m_color_changed |= ( item-> palette ( ) != qApp-> palette ( ));
 }
 
 
 void Appearance::editSchemeClicked ( )
 {
 	ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
 	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 );
 		
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
@@ -2,105 +2,105 @@
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:       
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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 );		
 	}
 	
 	virtual ~DecoListItem ( )
 	{
 //		if ( m_settings_if )
 //			m_settings_if-> release ( );
 		if ( m_window_if )
 			m_window_if-> release ( );
 		delete m_lib;
 	}
 	
 	bool hasSettings ( ) const
 	{
 //		return ( m_settings_if );
 		return false;
 	}
 
 	QWidget *settings ( QWidget * /*parent*/ )
 	{
 //		return m_settings_if ? m_settings_if-> create ( parent ) : 0;
 		return 0;
 	}
 	
 	bool setSettings ( bool /*accepted*/ ) 
 	{
 //		if ( !m_settings_if )
 //			return false;
 	
 //		if ( accepted )
 //			return m_settings_if-> accept ( );
 //		else {
 //			m_settings_if-> reject ( );
 //			return false;
 //		}
 		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 ( )
 	{
 		return m_window_if;
 	}
 
 private:
 	QLibrary *m_lib;
 	WindowDecorationInterface *m_window_if;
 //	WindowDecorationSettingsInterface *m_settings_if;
 
 };
 
 #endif
\ No newline at end of file
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
@@ -60,53 +60,54 @@ public:
 		if ( m_settings_if )
 			m_settings_if-> release ( );
 		if ( m_style_if )
 			m_style_if-> release ( );
 		delete m_lib;
 	}
 	
 	bool hasSettings ( ) const
 	{
 		return ( m_settings_if );
 	}
 
 	QWidget *settings ( QWidget *parent )
 	{
 		return m_settings_if ? m_settings_if-> create ( parent ) : 0;
 	}
 	
 	bool setSettings ( bool accepted ) 
 	{
 		if ( !m_settings_if )
 			return false;
 	
 		if ( accepted )
 			return m_settings_if-> accept ( );
 		else {
 			m_settings_if-> reject ( );
 			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 ( ) 
 	{
 		return m_style;
 	}
 
 private:
 	QLibrary *m_lib;
 	QStyle *m_style;
 	StyleInterface *m_style_if;
 	StyleSettingsInterface *m_settings_if;
 
 };
 
 
 #endif