adjusted to new OFontSelector c'tor

2 files changed, 2 insertions, 2 deletions

diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 75a3de5..6288f5f 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -54,445 +54,445 @@ public:
 		m_large = pix;
 		m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 ));
 	}
 	
 	void sizeChange ( )
 	{
 		calcRect ( );
 		repaint ( );
 	}
 	
 	QPixmap *pixmap ( ) const 
 	{
 		if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) 
 			return (QPixmap *) &m_small;
 		else
 			return (QPixmap *) &m_large;
 	}
 	
 private:
 	QPixmap m_large, m_small;
 };
 
 class SampleView : public QIconView {
 public:
 	SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name )
 	{
 		setItemsMovable ( false );
 		setAutoArrange ( true );
 		setSorting ( true );
 		setFrameStyle ( QFrame::NoFrame );
 		setSpacing ( 4 );
 		setMargin ( 0 );
 		setSelectionMode ( QIconView::NoSelection );
 		setBackgroundMode ( PaletteBase );
 		setViewMode ( TabConfig::Icon );
 		calculateGrid ( Bottom );
 
 
 		new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "DateBook" ));
 		new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
 		new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
 		
 		setBackgroundType ( TabConfig::Ruled, QString::null );
 		
 		setMaximumHeight ( firstItem ( )-> height ( ) + 16 );
 	}           
 
 	void setViewMode ( TabConfig::ViewMode m )
 	{
 		viewport ( )-> setUpdatesEnabled ( false );
 		
 		switch ( m ) {
 			case TabConfig::List:				
 				setItemTextPos( QIconView::Right );
 				break;
 			case TabConfig::Icon:
 				setItemTextPos( QIconView::Bottom );
 				break;
 		}
 //		hideOrShowItems ( false );
 
 		for ( QIconViewItem *it = firstItem ( ); it; it = it-> nextItem ( ))
 			((SampleItem *) it )-> sizeChange ( );
 		arrangeItemsInGrid ( true );
 		viewport ( )-> setUpdatesEnabled ( true );
 		update ( );
 	} 
 
 
 	void setBackgroundType( TabConfig::BackgroundType t, const QString &val )
 	{
 		switch ( t ) {
 			case TabConfig::Ruled: {
 				QPixmap bg ( width ( ), 9 );
 				QPainter painter ( &bg );
 				for ( int i = 0; i < 3; i++ ) {
 					painter. setPen ( white );
 					painter. drawLine ( 0, i*3, width()-1, i*3 );
 					painter. drawLine ( 0, i*3+1, width()-1, i*3+1 );
 					painter. setPen ( colorGroup().background().light(105) );
 					painter. drawLine ( 0, i*3+2, width()-1, i*3+2 );
 				}
 				painter.end ( );
 				setBackgroundPixmap ( bg );
 				break;
 			}
 
 			case TabConfig::SolidColor: {
 				setBackgroundPixmap ( QPixmap ( ));
 				if ( val. isEmpty ( ))
 					setBackgroundColor ( colorGroup ( ). base ( ));
 				else
 					setBackgroundColor ( val );
 				break;
 			}
 
 			case TabConfig::Image: {
 				qDebug( "Loading image: %s", val.latin1() );
 				QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val ));
 				if ( bg. isNull ( )) {
 					QImageIO imgio;
 					imgio. setFileName ( val );
 					QSize ds = qApp-> desktop ( )-> size ( );
 					QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr
 					imgio. setParameters ( param. arg ( ds. width ( )). arg ( ds. height ( )). latin1 ( ));
 					imgio. read ( );
 					bg = imgio. image ( );
 				}
 				setBackgroundPixmap ( bg );
 				break;
 			}
 		}
 		m_bgtype = t;
 		viewport ( )-> update ( );
 	}
 
 	void setTextColor ( const QColor &tc )
 	{
 		m_textcolor = tc;
 		QColorGroup cg = colorGroup ( );
 		cg. setColor ( QColorGroup::Text, tc );
 		setPalette ( QPalette ( cg, cg, cg ));
 		viewport ( )-> update ( );
 	}
 
 	void setViewFont ( const QFont &f )
 	{
 		setFont ( f );
 	}
 	
 	void setItemTextPos ( ItemTextPos pos )
 	{
 		calculateGrid ( pos );
 		QIconView::setItemTextPos( pos );
 	}
 	                    
 	void calculateGrid ( ItemTextPos pos )
 	{
 		int dw = QApplication::desktop ( )-> width ( );
 		int viewerWidth = dw - style ( ).scrollBarExtent ( ). width ( );
 		if ( pos == Bottom ) {
 			int cols = 3;
 			if ( viewerWidth <= 200 )
 				cols = 2;
 			else if ( viewerWidth >= 400 )
 				cols = viewerWidth/96;
 			setSpacing ( 4 );
 			setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
 			setGridY ( fontMetrics ( ). height ( ) * 2 + 24 );
 		} 
 		else {
 			int cols = 2;
 			if ( viewerWidth < 150 )
 				cols = 1;
 			else if ( viewerWidth >= 400 )
 				cols = viewerWidth / 150;
 			setSpacing ( 2 );
 			setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
 			setGridY ( fontMetrics ( ). height ( ) + 2 );
 		}
 	}
                                                                                                                                                                   
 	void paletteChange( const QPalette &p )
 	{
 		static bool excllock = false;
 		
 		if ( excllock )
 			return;
 		excllock = true;
 	
 		unsetPalette ( );
 		QIconView::paletteChange ( p );
 		if ( m_bgtype == TabConfig::Ruled )
 			setBackgroundType ( TabConfig::Ruled, QString::null );
 		QColorGroup cg = colorGroup ( );
 		cg.setColor ( QColorGroup::Text, m_textcolor );
 		setPalette ( QPalette ( cg, cg, cg ));
 		
 		excllock = false;
 	}
                             
 	void setBackgroundPixmap ( const QPixmap &pm ) 
 	{
 		m_bgpix = pm;
 	}
 	
 	void setBackgroundColor ( const QColor &c ) 
 	{
 		m_bgcolor = c;
 	}
 	
 	void drawBackground ( QPainter *p, const QRect &r )
 	{
 		if ( !m_bgpix. isNull ( )) {
 			p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), 
  			                                          ( r. y ( ) + contentsY ( )) % m_bgpix. height ( )));
 		} 
 		else
 			p-> fillRect ( r, m_bgcolor );
 	}
 	
 private:
 	QColor m_textcolor;
 	QColor m_bgcolor;
 	QPixmap m_bgpix;
 	TabConfig::BackgroundType m_bgtype;
 };
 
 
 
 TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) 
 	: QDialog ( parent, name, modal, fl ), m_tc ( tc )
 {
 	setCaption ( tr( "Edit Tab" ));
 	
 	QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
 	
 	OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
 	QWidget *bgtab;
 	       
 	tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" ));
 	tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" ));
 	tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) );	                           
 	
 	tw-> setCurrentTab ( bgtab );                                       
 	
 	QWidget *sample = new QVBox ( this );	
 	QTabBar *tb = new QTabBar ( sample );
 	QString name ( tr( "Previewing %1" ). arg ( tabname ));
 	
 	tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name ));
 	
 	m_sample = new SampleView ( sample );
 			
 	lay-> addWidget ( tw, 10 );
 	lay-> addWidget ( sample, 1 );
 	
 	m_iconsize-> setButton ( tc. m_view );
 	iconSizeClicked ( tc. m_view );
 	m_iconcolor-> setColor ( QColor ( m_tc. m_text_color ));
 	iconColorClicked ( m_iconcolor-> color ( ));
 	m_bgtype-> setButton ( tc. m_bg_type );
 	m_solidcolor-> setColor ( QColor ( tc. m_bg_color ));
 	m_bgimage = tc. m_bg_image;
 	bgTypeClicked ( tc. m_bg_type );
 	m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic ));
 	fontClicked ( m_fontselect-> selectedFont ( ));
 }
 
 
 TabDialog::~TabDialog ( )
 {
 }
 
 QWidget *TabDialog::createFontTab ( QWidget *parent )
 {
-    m_fontselect = new OFontSelector ( parent, "FontTab" );    
+    m_fontselect = new OFontSelector ( false, parent, "FontTab" );    
     
     connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
              this, SLOT( fontClicked ( const QFont & )));
 
     return m_fontselect; 
 }
 
 QWidget *TabDialog::createBgTab ( QWidget *parent )
 {
     QWidget *tab = new QWidget( parent, "AdvancedTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 );
         
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
     gridLayout-> setColStretch ( 1, 10 );
 
     QLabel* label = new QLabel( tr( "Type:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     m_bgtype = new QButtonGroup( tab, "buttongroup" );
     m_bgtype-> hide ( );
     m_bgtype-> setExclusive ( true );
 
 	QRadioButton *rb;
     rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" );
     m_bgtype-> insert ( rb, TabConfig::Ruled );
     gridLayout-> addWidget( rb, 0, 1 );
 
 	QHBoxLayout *hb = new QHBoxLayout ( );
 	hb-> setSpacing ( 4 );
 
     rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
     m_bgtype-> insert ( rb, TabConfig::SolidColor ); 
     hb-> addWidget ( rb );
 	hb-> addSpacing ( 10 );
     
 	m_solidcolor = new OColorButton ( tab );
 	connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & )));
 	hb-> addWidget ( m_solidcolor );
 	hb-> addStretch ( 10 );
 
     gridLayout-> addLayout ( hb, 1, 1 );
 
 	hb = new QHBoxLayout ( );
 	hb-> setSpacing ( 4 );
 	
 	rb = new QRadioButton( tr( "Image" ), tab, "image" );
     m_bgtype-> insert ( rb, TabConfig::Image );
     hb-> addWidget( rb );
     hb-> addSpacing ( 10 );
     
 	m_imagebrowse = new QPushButton ( tr( "Select..." ), tab );
 	connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( )));
 	hb-> addWidget ( m_imagebrowse );
 	hb-> addStretch ( 10 );
 	
     gridLayout-> addLayout ( hb, 2, 1 );
 
 	QPushButton *p = new QPushButton ( tr( "Default" ), tab );	
 	connect ( p, SIGNAL( clicked ( )), this, SLOT( bgDefaultClicked ( )));
 	gridLayout-> addWidget ( p, 3, 1 );
 
 	connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int )));
 
 	vertLayout-> addStretch ( 10 );
 
 	return tab;
 }
 
 QWidget *TabDialog::createIconTab ( QWidget *parent )
 {
     QWidget *tab = new QWidget( parent, "AdvancedTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 );
         
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
     gridLayout-> setColStretch ( 1, 10 );
 
     QLabel* label = new QLabel( tr( "Size:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     m_iconsize = new QButtonGroup( tab, "buttongroup" );
     m_iconsize-> hide ( );
     m_iconsize-> setExclusive ( true );
 
 	QRadioButton *rb;
     rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" );
     m_iconsize-> insert ( rb, TabConfig::List );
     gridLayout-> addWidget( rb, 0, 1 );
     
     rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" );
     m_iconsize-> insert ( rb, TabConfig::Icon );
     gridLayout-> addWidget( rb, 1, 1 );
 
 	connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int )));
 
 //	vertLayout-> addSpacing ( 8 );
 
 //	gridLayout = new QGridLayout ( vertLayout );
 	gridLayout-> addRowSpacing ( 2, 8 );
 	
 	label = new QLabel ( tr( "Color:" ), tab );
 	gridLayout-> addWidget ( label, 3, 0 );
 	
 	m_iconcolor = new OColorButton ( tab );
 	connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & )));
 	gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft );        	
 
 	vertLayout-> addStretch ( 10 );
 
 	return tab;
 }
 
 
 void TabDialog::iconSizeClicked ( int s )
 {
 	m_sample-> setViewMode ((TabConfig::ViewMode) s );
 }
 
 void TabDialog::fontClicked ( const QFont &f )
 {
 	m_sample-> setViewFont ( f );
 }
 
 void TabDialog::bgTypeClicked ( int t )
 {
 	QString s;
 
 	if ( m_bgtype-> id ( m_bgtype-> selected ( )) != t )
 		m_bgtype-> setButton ( t );
 		
 	m_solidcolor-> setEnabled ( t == TabConfig::SolidColor );
 	m_imagebrowse-> setEnabled ( t == TabConfig::Image );
 
 	if ( t == TabConfig::SolidColor )
 		s = m_solidcolor-> color ( ). name ( );
 	else if ( t == TabConfig::Image )
 		s = Resource::findPixmap ( m_bgimage );
 		
 	m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s );
 }
 
 void TabDialog::bgColorClicked ( const QColor & )
 {
 	bgTypeClicked ( TabConfig::SolidColor );
 }
 
 void TabDialog::iconColorClicked ( const QColor &col )
 {
 	m_sample-> setTextColor ( col );
 }
 
 void TabDialog::bgImageClicked ( )
 {
 	// ### use OFileSelector here ###
 	// this is just a quick c&p from the old appearance app
 
 	MimeTypes types;
 	QStringList list;
 	list << "image/*";	
 	types. insert ( "Images", list );
 	
 	QString file = OFileDialog::getOpenFileName ( 1, "/", QString::null, types );
 	if ( !file. isEmpty ( )) {
 		m_bgimage = DocLnk ( file ). file ( );
 		bgTypeClicked ( TabConfig::Image );
 	}                                                                    
 }
 
 void TabDialog::bgDefaultClicked ( )
 {
 	m_bgimage = "launcher/opie-background";
 	bgTypeClicked ( TabConfig::Image );
 }
 
 void TabDialog::accept ( )
 {
 	m_tc. m_view = (TabConfig::ViewMode) m_iconsize-> id ( m_iconsize-> selected ( ));
 	m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( ));
 	m_tc. m_bg_color = m_solidcolor-> color ( ). name ( );
 	m_tc. m_bg_image = m_bgimage;
 	m_tc. m_text_color = m_iconcolor-> color ( ). name ( );
 	
 	QFont f = m_fontselect-> selectedFont ( );
 	
 	m_tc. m_font_family = f. family ( );
 	m_tc. m_font_size = f. pointSize ( );
 	m_tc. m_font_weight = f. weight ( );
 	m_tc. m_font_italic = f. italic ( );
 	
 	QDialog::accept ( );
 }
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index a5d216c..e269aec 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -1,510 +1,510 @@
 /*
                              This file is part of the OPIE Project
                              Copyright (c)  2002 Trolltech AS <info@trolltech.com>
                =.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>               
              .=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.
 
 */
 
 #include "appearance.h"
 #include "editScheme.h"
 
 #include <opie/ofiledialog.h>
 #include <opie/otabwidget.h>
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qaction.h>
 #include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdialog.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qmessagebox.h>
 #include <qmultilineedit.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #if QT_VERSION >= 300
 #include <qstylefactory.h>
 #else
 #include <qwindowsstyle.h>
 #include <qpe/qpestyle.h>
 #include <qpe/lightstyle.h>
 #include <qpe/qlibrary.h>
 #include <qpe/styleinterface.h>
 #endif
 #include <qtabwidget.h>
 #include <qtoolbutton.h>
 #include <qvgroupbox.h>
 #include <qwidget.h>
 
 #include "stylelistitem.h"
 #include "decolistitem.h"
 #include "colorlistitem.h"
 
 #include "sample.h"
 
 #include <opie/ofontselector.h>
 
 
 class DefaultWindowDecoration : public WindowDecorationInterface
 {
 public:
     DefaultWindowDecoration() : ref(0) {}
     QString name() const {
 	return "Default";
     }
     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;
     }
     Q_REFCOUNT
 
 private:
 	ulong ref;
 };
 
 
 
 void Appearance::loadStyles ( QListBox *list )
 {
 #if QT_VERSION >= 300
     list->insertStringList(QStyleFactory::styles());
 #else
     list->insertItem( new StyleListItem ( "Windows", new QWindowsStyle ( )));
     list->insertItem( new StyleListItem ( "Light", new LightStyle ( )));
 #ifndef QT_NO_STYLE_MOTIF
     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" )));
 
 	{
 		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 ));
     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 ));
     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 ( parent, "FontTab" );    
+    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" );
 
 
     QWidget *tab = new QWidget( parent, "ColorTab" );
     QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 4, 4 );
     gridLayout->setRowStretch ( 3, 10 );
 
     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 ) ) );
 
     loadColors ( m_color_list );
     m_color_list-> setCurrentItem ( 0 );
 
     QPushButton* tempButton = new QPushButton( tab, "editSchemeButton" );
     tempButton->setText( tr( "Edit..." ) );
     connect( tempButton, SIGNAL( clicked() ), this, SLOT( editSchemeClicked() ) );
     gridLayout->addWidget( tempButton, 0, 1 );
 
     tempButton = new QPushButton( tab, "deleteSchemeButton" );
     tempButton->setText( tr( "Delete" ) );
     connect( tempButton, SIGNAL( clicked() ), this, SLOT( deleteSchemeClicked() ) );
     gridLayout->addWidget( tempButton, 1, 1 );
 
     tempButton = new QPushButton( tab, "saveSchemeButton" );
     tempButton->setText( tr( "Save" ) );
     connect( tempButton, SIGNAL( clicked() ), this, SLOT( saveSchemeClicked() ) );
     gridLayout->addWidget( tempButton, 2, 1 );
 
     return tab;
 }
 
 QWidget *Appearance::createGuiTab ( QWidget *parent )
 {
 	Config config ( "qpe" );
 	config. setGroup ( "Appearance" );
 
     QWidget *tab = new QWidget( parent, "AdvancedTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 );
         
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
 
 	int style = config. readNumEntry ( "TabStyle", 2 ) - 1;
 	bool tabtop = ( config. readEntry ( "TabPosition", "Top" ) == "Top" );
 
     QLabel* label = new QLabel( tr( "Tab style:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     QButtonGroup* btngrp = new QButtonGroup( tab, "buttongroup" );
     btngrp-> hide ( );
     btngrp-> setExclusive ( true );
 
     m_tabstyle_list = new QComboBox ( false, tab, "tabstyle" );
     m_tabstyle_list-> insertItem ( tr( "Tabs" ));
     m_tabstyle_list-> insertItem ( tr( "Tabs w/icons" ));
     m_tabstyle_list-> insertItem ( tr( "Drop down list" ));
     m_tabstyle_list-> insertItem ( tr( "Drop down list w/icons" ));
     m_tabstyle_list-> setCurrentItem ( style );
     gridLayout-> addMultiCellWidget ( m_tabstyle_list, 0, 0, 1, 2 );
 
     m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" );
     btngrp-> insert ( m_tabstyle_top );
     gridLayout-> addWidget( m_tabstyle_top, 1, 1 );
     
     m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" );
     btngrp-> insert ( m_tabstyle_bottom );
     gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 );
 
     m_tabstyle_top-> setChecked ( tabtop );
     m_tabstyle_bottom-> setChecked ( !tabtop );
 
 	m_original_tabstyle = style;
 	m_original_tabpos = tabtop;
 
 	return tab;
 }
 
 
 Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
     : QDialog ( parent, name, true )
 {
     setCaption( tr( "Appearance" ) );
 
     Config config( "qpe" );
     config.setGroup( "Appearance" );
 
     QVBoxLayout *top = new QVBoxLayout ( this, 4, 4 );
 
 	m_sample = new SampleWindow ( this );
 	m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
 	
     OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
 	QWidget *styletab;
 	
  	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/styletabicon.png", tr( "Windows" ) );
     tw-> addTab ( createGuiTab ( tw ), "appearance/backgroundtabicon.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 (( 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 )
 {
 	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 );
 	
 	if ( m_sample && sli && sli-> style ( ))
 		m_sample-> setStyle2 ( sli-> style ( ));
 		
 	m_style_changed |= ( index != m_original_style );
 }
 
 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_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 );
 		
 		if ( col. isValid ( )) {
 			labels [cnt] = item-> label ( role );
 			colors [cnt] = col;
 		
 			cnt++;
 		}
 	}