2 files changed, 36 insertions, 36 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 2b35119..8dc70ee 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -415,24 +415,24 @@ Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
     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 ( 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 ), "appearance/advanced", tr( "Advanced" ) );
+        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;
@@ -525,23 +525,23 @@ void Appearance::done ( int 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 ( )) {
                 int ci = m_color_list ? m_color_list-> currentItem ( ) : -1;
-        
-                        m_sample-> setStyle2 ( sli-> style ( ), ci < 0 ? palette ( ) : ((ColorListItem *) m_color_list-> item ( ci ))-> palette ( ));
+
+                m_sample-> setStyle2 ( sli-> style ( ), ci < 0 ? palette ( ) : ((ColorListItem *) m_color_list-> item ( ci ))-> palette ( ));
         }
-                
+
         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 ( )) {
@@ -563,30 +563,30 @@ void Appearance::styleSettingsClicked ( )
                 }
                 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 ( ));        
+                        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_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 )
@@ -598,44 +598,44 @@ void Appearance::colorClicked ( int index )
 
 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++;
                 }
         }
 
     EditScheme* editdlg = new EditScheme( cnt, labels, colors, this, "editScheme", true );
     editdlg-> showMaximized ( );
     if ( editdlg-> exec ( ) == QDialog::Accepted ) {
             ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 );
                 cnt = 0;
-                    
+
                 for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) {
                         if ( item-> color ( role ). isValid ( )) {
                         citem-> setColor ( role, colors [cnt] );
                         cnt++;
                 }
         }
-        
+
         m_color_list-> setCurrentItem ( 0 );
         colorClicked ( 0 );
-        
+
         m_color_changed = true;
     }
     delete editdlg;
 }
 
 
 void Appearance::saveSchemeClicked()
 {
@@ -653,26 +653,26 @@ void Appearance::saveSchemeClicked()
     if ( d-> exec ( ) == QDialog::Accepted ) {
         QString schemename = ed-> text ( );
                 QString filestr = QPEApplication::qpeDir();
                 filestr.append( "/etc/colors/" );
                 filestr.append( schemename );
                 filestr.append( ".scheme" );
         QFile file ( filestr );
         if ( !file. exists ( ))
-        { 
+        {
                 QPalette p = item-> palette ( );
-        
+
             Config config ( file.name(), Config::File );
             config. setGroup( "Colors" );
 
                         item-> save ( config );
-                                        
+
             config. write ( ); // need to flush the config info first
-            
+
             m_color_list-> insertItem ( new ColorListItem ( schemename, config ));
         }
         else
         {
                 QMessageBox::information ( this, tr( "Save scheme" ), tr( "Scheme does already exist." ));
         }
     }
     delete d;
@@ -717,76 +717,76 @@ void Appearance::delExcept ( )
                 m_except-> setFocus ( );
                 delete m_except-> selectedItem ( );
         }
 }
 
 void Appearance::upExcept ( )
 {
         ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
-        
+
         if ( it && it-> itemAbove ( ))
                 it-> itemAbove ( )-> moveItem ( it );
 }
 
 void Appearance::downExcept ( )
 {
         ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
-        
+
         if ( it && it-> itemBelow ( ))
                 it-> moveItem ( it-> itemBelow ( ));
 }
 
 class ExEdit : public QLineEdit {
 public:
-        ExEdit ( ExceptListItem *item ) 
+        ExEdit ( ExceptListItem *item )
                 : QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item )
-        { 
+        {
                 setFrame ( false );
-                
+
                 QRect r = it-> listView ( )-> itemRect ( it );
-                
+
                 int x = it-> listView ( )-> header ( )-> cellPos ( 3 ) - 1;
                 int y = r. y ( );
                 int w = it-> listView ( )-> viewport ( )-> width ( ) - x;
                 int h = r. height ( ); // + 2;
-                
-                        setText ( it-> pattern ( ));    
+
+                setText ( it-> pattern ( ));
                 setGeometry ( x, y, w, h );
-                
-                        qDebug ( "ExEdit: [%s] at %d,%d %d,%d", it->text(2).latin1(),x,y,w,h);
-                
+
+                qDebug ( "ExEdit: [%s] at %d,%d %d,%d", it->text(2).latin1(),x,y,w,h);
+
                 m_out = true;
-                
+
                 show ( );
                 setFocus ( );
                 selectAll ( );
                 end ( true );
         }
-        
-        virtual void focusOutEvent ( QFocusEvent * ) 
+
+        virtual void focusOutEvent ( QFocusEvent * )
         {
                 hide ( );
                 if ( m_out )
                         it-> setPattern ( text ( ));
                 delete this;
         }
-        
+
         virtual void keyPressEvent ( QKeyEvent *e )
         {
                 if ( e-> key ( ) == Key_Return )
                         it-> listView ( )-> setFocus ( );
                 else if ( e-> key ( ) == Key_Escape ) {
                         m_out = false;
                         it-> listView ( )-> setFocus ( );
                 }
                 else
                         QLineEdit::keyPressEvent ( e );
         }
-        
+
 private:
         ExceptListItem *it;
         bool m_out;
 };
 
 void Appearance::clickedExcept ( QListViewItem *item, const QPoint &, int c )
 {
         if ( !item || c < 0 || c > 3 )
diff --git a/pics/appearance/advanced.png b/pics/appearance/advanced.png
deleted file mode 100644
index 184fb3a..0000000
--- a/pics/appearance/advanced.png
+++ b/dev/null