Use inline pic for style tab

2 files changed, 4 insertions, 4 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 8dc70ee..9a3588c 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -276,51 +276,51 @@ QWidget *Appearance::createColorTab ( QWidget *parent, Config &cfg )
     gridLayout->addWidget( tempButton, 2, 1 );
 	QWhatsThis::add( tempButton, tr( "Click here to name and save the current color scheme." ) );
 
     return tab;
 }
 
 QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 {
     QWidget *tab = new QWidget ( parent );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
 
 	QGridLayout *lay = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
 
 	m_force = new QCheckBox ( tr( "Force styling for all applications." ), tab );
 	m_force-> setChecked ( cfg. readBoolEntry ( "ForceStyle" ));
 	lay-> addMultiCellWidget ( m_force, 0, 0, 0, 1 );
 	QWhatsThis::add( m_force, tr( "Click here to allow all applications to use global appearance settings." ) );
 
 	QLabel *l = new QLabel ( tab );
 	l-> setText ( QString ( "<p>%1</p>" ). arg ( tr( "Disable styling for these applications ( <b>*</b> can be used as a wildcard):" )));
 	lay-> addMultiCellWidget ( l, 1, 1, 0, 1 );
 	QWhatsThis::add( l, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
 
 	m_except = new QListView ( tab );
-	m_except-> addColumn ( Resource::loadIconSet ( "appearance/style.png" ), "", 24 );
-	m_except-> addColumn ( Resource::loadIconSet ( "appearance/font.png" ), "", 24 );
-	m_except-> addColumn ( Resource::loadIconSet ( "appearance/deco.png" ), "", 24 );
+	m_except-> addColumn ( Resource::loadIconSet ( "appearance" ), "", 24 );
+	m_except-> addColumn ( Resource::loadIconSet ( "appearance/font" ), "", 24 );
+	m_except-> addColumn ( Resource::loadIconSet ( "appearance/deco" ), "", 24 );
 	m_except-> addColumn ( tr( "Binary file(s)" ));
 	m_except-> setColumnAlignment ( 0, AlignCenter );
 	m_except-> setColumnAlignment ( 1, AlignCenter );
 	m_except-> setColumnAlignment ( 2, AlignCenter );
 	m_except-> setAllColumnsShowFocus ( true );
 	m_except-> setMinimumHeight ( 30 );
 	m_except-> header ( )-> setClickEnabled ( false );
 	m_except-> header ( )-> setResizeEnabled ( false );
 	m_except-> header ( )-> setMovingEnabled ( false );
 	m_except-> setSorting ( -1 );
 	lay-> addMultiCellWidget ( m_except, 2, 6, 0, 0 );
 	QWhatsThis::add( m_except, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
 
 	connect ( m_except, SIGNAL( clicked ( QListViewItem *, const QPoint &, int )), this, SLOT( clickedExcept ( QListViewItem *, const QPoint &, int )));
 
 	QToolButton *tb = new QToolButton ( tab );
 	tb-> setIconSet ( Resource::loadIconSet ( "appearance/add" ));
 	tb-> setFocusPolicy ( QWidget::StrongFocus );
 	lay-> addWidget ( tb, 2, 1 );
 	connect ( tb, SIGNAL( clicked ( )), this, SLOT( addExcept ( )));
 	QWhatsThis::add( tb, tr( "Click here to add an application to the list above." ) );
 
 	tb = new QToolButton ( tab );
 	tb-> setIconSet ( Resource::loadIconSet ( "editdelete" ));
@@ -402,49 +402,49 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 
 	return tab;
 }
 
 
 Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
     : QDialog ( parent, name, true, WStyle_ContextHelp )
 {
     setCaption( tr( "Appearance Settings" ) );
 
     Config config( "qpe" );
     config.setGroup( "Appearance" );
 
     QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 );
 
 	m_sample = new SampleWindow ( this );
 	m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
 	QWhatsThis::add( m_sample, tr( "This is a preview window.  Look here to see your new appearance as options are changed." ) );
 
     OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
 	QWidget *styletab;
 
 	m_color_list = 0;
 
- 	tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance/style", tr( "Style" ));
+ 	tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance", tr( "Style" ));
     tw-> addTab ( createFontTab ( tw, config ), "appearance/font", tr( "Font" ));
     tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) );
     tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) );
 	tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "SettingsIcon", tr( "Advanced" ) );
 
 	top-> addWidget ( tw, 10 );
 	top-> addWidget ( m_sample, 1 );
 
     tw-> setCurrentTab ( styletab );
 	connect ( tw, SIGNAL( currentChanged ( QWidget * )), this, SLOT( tabChanged ( QWidget * )));
 
     m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false;
 }
 
 Appearance::~Appearance()
 {
 }
 
 void Appearance::tabChanged ( QWidget *w )
 {
 	if ( w == m_advtab ) {
 		m_sample-> hide ( );
 		updateGeometry ( ); // shouldn't be necessary ...
 	}
diff --git a/pics/appearance/style.png b/pics/appearance/style.png
deleted file mode 100644
index 2a533ca..0000000
--- a/pics/appearance/style.png
+++ b/dev/null