font icon from inline

2 files changed, 2 insertions, 2 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 9a3588c..db863d6 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -285,33 +285,33 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
     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" ), "", 24 );
-	m_except-> addColumn ( Resource::loadIconSet ( "appearance/font" ), "", 24 );
+	m_except-> addColumn ( Resource::loadIconSet ( "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 )));
 
@@ -411,33 +411,33 @@ Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
 
     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", tr( "Style" ));
-    tw-> addTab ( createFontTab ( tw, config ), "appearance/font", tr( "Font" ));
+    tw-> addTab ( createFontTab ( tw, config ), "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()
 {
 }
diff --git a/pics/appearance/font.png b/pics/appearance/font.png
deleted file mode 100644
index 2e51cad..0000000
--- a/pics/appearance/font.png
+++ b/dev/null