use the wrench from inline

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
@@ -327,482 +327,482 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 	tb-> setFocusPolicy ( QWidget::StrongFocus );
 	lay-> addWidget ( tb, 3, 1 );
 	connect ( tb, SIGNAL( clicked ( )), this, SLOT( delExcept ( )));
 	QWhatsThis::add( tb, tr( "Click here to delete the currently selected application." ) );
 
 	tb = new QToolButton ( tab );
 	tb-> setIconSet ( Resource::loadIconSet ( "up" ));
 	tb-> setFocusPolicy ( QWidget::StrongFocus );
 	lay-> addWidget ( tb, 4, 1 );
 	connect ( tb, SIGNAL( clicked ( )), this, SLOT( upExcept ( )));
 	QWhatsThis::add( tb, tr( "Click here to move the currently selected application up in the list." ) );
 
 	tb = new QToolButton ( tab );
 	tb-> setIconSet ( Resource::loadIconSet ( "down" ));
 	tb-> setFocusPolicy ( QWidget::StrongFocus );
 	lay-> addWidget ( tb, 5, 1 );
 	connect ( tb, SIGNAL( clicked ( )), this, SLOT( downExcept ( )));
 	QWhatsThis::add( tb, tr( "Click here to move the currently selected application down in the list." ) );
 
 	lay-> setRowStretch ( 6, 10 );
 	lay-> setColStretch ( 0, 10 );
 
 	QStringList sl = cfg. readListEntry ( "NoStyle", ';' );
 	QListViewItem *lvit = 0;
 	for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
 		int fl = ( *it ). left ( 1 ). toInt ( 0, 32 );
 
 		lvit = new ExceptListItem ( m_except, lvit, ( *it ). mid ( 1 ), fl & 0x01, fl & 0x02, fl & 0x04 );
 	}
 
 
 	vertLayout-> addSpacing ( 3 );
 	QFrame *f = new QFrame ( tab );
 	f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
 	vertLayout-> addWidget ( f );
 	vertLayout-> addSpacing ( 3 );
 
 
     QGridLayout* gridLayout = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
 
 	int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1;
 	bool tabtop = ( cfg. readEntry ( "TabPosition", "Top" ) == "Top" );
 
     QLabel* label = new QLabel( tr( "Tab style:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
 	QWhatsThis::add( label, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
 
     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 );
 	QWhatsThis::add( m_tabstyle_list, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
 
     m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" );
     btngrp-> insert ( m_tabstyle_top );
     gridLayout-> addWidget( m_tabstyle_top, 1, 1 );
 	QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) );
 
     m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" );
     btngrp-> insert ( m_tabstyle_bottom );
     gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 );
 	QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) );
 
     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, 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 ( 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;
 }
 
 Appearance::~Appearance()
 {
 }
 
 void Appearance::tabChanged ( QWidget *w )
 {
 	if ( w == m_advtab ) {
 		m_sample-> hide ( );
 		updateGeometry ( ); // shouldn't be necessary ...
 	}
 	else
 		m_sample-> show ( );
 }
 
 void Appearance::accept ( )
 {
 	bool newtabpos = m_tabstyle_top-> isChecked ( );
 	int newtabstyle = m_tabstyle_list-> currentItem ( );
 
     Config config ( "qpe" );
     config. setGroup ( "Appearance" );
 
     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 );
     }
 
 
 	m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated
 
 	QStringList sl;
 	QString exceptstr;
 	for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( )) {
 		int fl = 0;
 		fl |= ( it-> noStyle ( ) ? 0x01 : 0 );
 		fl |= ( it-> noFont ( ) ? 0x02 : 0 );
 		fl |= ( it-> noDeco ( ) ? 0x04 : 0 );
 		exceptstr = QString::number ( fl, 32 );
 		exceptstr.append( it-> pattern ( ));
 		sl << exceptstr;
 	}
 	config. writeEntry ( "NoStyle", sl, ';' );
 	config. writeEntry ( "ForceStyle", m_force-> isChecked ( ));
 
 	config. write ( ); // need to flush the config info first
 	Global::applyStyle ( );
 
 	if ( QMessageBox::warning ( this, tr( "Restart" ), tr( "Do you want to restart %1 now?" ). arg ( ODevice::inst ( )-> system ( ) == System_Zaurus ? "Qtopia" : "Opie" ),  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 ( )) {
 		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 ( )) {
 		QDialog *d = new QDialog ( this, "SETTINGS-DLG", true );
 		QVBoxLayout *vbox = new QVBoxLayout ( d, 3, 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 ( ));		
+			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 )
 		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++;
 		}
 	}
 
     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()
 {
 	ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
 	if ( !item )
 		return;
 
 	QDialog *d = new QDialog ( this, 0, true );
 	d-> setCaption ( tr( "Save Scheme" ));
 	QLineEdit *ed = new QLineEdit ( d );
 	( new QVBoxLayout ( d, 3, 3 ))-> addWidget ( ed );
 	ed-> setFocus ( );
 
     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;
 }
 
 void Appearance::deleteSchemeClicked()
 {
 	ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
 	if ( !item )
 		return;
 
     if ( m_color_list-> currentItem ( ) > 0 )
     {
 		if ( QPEMessageBox::confirmDelete ( this, tr( "Delete scheme" ), item-> text ( ) ) )
 		{
 			QString filestr = QPEApplication::qpeDir ( );
 			filestr.append( "/etc/colors/" );
 			filestr.append( item-> text ( ) );
 			filestr.append( ".scheme" );
 			QFile::remove ( filestr );
 			delete item;
         }
     }
     else
     {
         QMessageBox::information( this, tr( "Delete scheme" ), tr( "Unable to delete current scheme." ));
     }
 }
 
 
 void Appearance::addExcept ( )
 {
 	ExceptListItem *it = new ExceptListItem ( m_except, 0, tr( "<new>" ), true, true, true );
 	m_except-> ensureItemVisible ( it );
 	m_except-> setSelected ( it, true );
 }
 
 void Appearance::delExcept ( )
 {
 	if ( m_except-> selectedItem ( )) {
 		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 )
 		return;
 
 	ExceptListItem *it = (ExceptListItem *) item;
 
 	if ( c == 0 )
 		it-> setNoStyle ( !it-> noStyle ( ));
 	else if ( c == 1 )
 		it-> setNoFont ( !it-> noFont ( ));
 	else if ( c == 2 )
 		it-> setNoDeco ( !it-> noDeco ( ));
 	else if ( c == 3 ) {
 		m_except-> ensureItemVisible ( it );
 		new ExEdit ( it );
 	}
 }
 
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