1 files changed, 98 insertions, 64 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 9e5eede..ba12e55 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -18,85 +18,87 @@
   _.=:.       :    :=>`:     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 "stylelistitem.h"
+#include "decolistitem.h"
+#include "colorlistitem.h"
+#include "exceptlistitem.h"
+#include "sample.h"
+
+/* OPIE */
+#include <opie/ofontselector.h>
+#include <opie/odevice.h>
+#include <opie/ofiledialog.h>
+#include <opie/otabwidget.h>
+
+#include <qpe/config.h>
+#include <qpe/global.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/qpemessagebox.h>
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpestyle.h>
+#include <qpe/lightstyle.h>
+#include <qpe/styleinterface.h>
+
+/* QT */
 #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 <qpushbutton.h>
 #include <qradiobutton.h>
 #if QT_VERSION >= 300
 #include <qstylefactory.h>
 #endif
 #include <qtoolbutton.h>
 #include <qwindowsstyle.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qvbox.h>
 #include <qwhatsthis.h>
 
-#include <qpe/config.h>
-#include <qpe/global.h>
-#include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/qpemessagebox.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpestyle.h>
-#include <qpe/lightstyle.h>
-#include <qpe/qlibrary.h>
-#include <qpe/styleinterface.h>
-
-#include <opie/ofontselector.h>
-#include <opie/odevice.h>
-#include <opie/ofiledialog.h>
-#include <opie/otabwidget.h>
-
-#include "appearance.h"
-#include "editScheme.h"
-#include "stylelistitem.h"
-#include "decolistitem.h"
-#include "colorlistitem.h"
-#include "exceptlistitem.h"
-#include "sample.h"
-
-
 using namespace Opie;
 
 
 class DefaultWindowDecoration : public WindowDecorationInterface
 {
 public:
     DefaultWindowDecoration() : ref(0) {}
-    QString name() const {
+    QString name() const
+    {
 	return "Default";
     }
-QPixmap icon() const {
+    QPixmap icon() const
+    {
 	return QPixmap();
     }
-    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
+    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
 
@@ -125,37 +127,40 @@ QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg )
 	QWhatsThis::add( m_style_settings, tr( "Click here to configure the currently selected style.\n\nNote:  This option is not available for all styles." ) );
 
     QString s = cfg. readEntry ( "Style", "Light" );
 
 
 #if QT_VERSION >= 300
     m_style_list->insertStringList(QStyleFactory::styles());
 #else
     m_style_list-> insertItem ( new StyleListItem ( "Windows", new QWindowsStyle ( )));
     m_style_list-> insertItem ( new StyleListItem ( "Light", new LightStyle ( )));
     m_style_list-> insertItem ( new StyleListItem ( "QPE", new QPEStyle ( )));
 #endif
+
 	{
 		QString path = QPEApplication::qpeDir ( );
 		path.append( "/plugins/styles/" );
 		QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
 
-		for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
+        for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
+        {
 			QString libstr = path;
 			libstr.append( "/" );
 			libstr.append( *it );
 			QLibrary *lib = new QLibrary ( libstr );
 			StyleInterface *iface;
 
-			if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface ) {
+            if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface )
+            {
 				StyleListItem *slit = new StyleListItem ( lib, iface );
 				m_style_list-> insertItem ( slit );
 
 				if ( slit-> key ( ) == s )
 					m_style_list-> setCurrentItem ( slit );
 			}
 			else
 				delete lib;
 		}
 	}
 
     m_original_style = m_style_list-> currentItem ( );
@@ -175,32 +180,34 @@ QWidget *Appearance::createDecoTab ( QWidget *parent, Config &cfg )
     vertLayout->addWidget( m_deco_list );
 	QWhatsThis::add( m_deco_list, tr( "Window decorations control the way the application title bar and its buttons appear.\n\nClick here to select an available decoration." ) );
 
     QString s = cfg. readEntry ( "Decoration", "libflat.so" );
 
     m_deco_list-> insertItem ( new DecoListItem ( "QPE" ));
 
 	{
 		QString path = QPEApplication::qpeDir();
 		path.append( "/plugins/decorations/" );
 		QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
 
-		for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
+        for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
+        {
 			QString libstr = path;
 			libstr.append( "/" );
 			libstr.append( *it );
 			QLibrary *lib = new QLibrary ( libstr );
 			WindowDecorationInterface *iface;
 
-			if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK ) {
+            if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK )
+            {
 				DecoListItem *dlit = new DecoListItem ( lib, iface );
 				m_deco_list-> insertItem ( dlit );
 
 				if ( dlit-> key ( ) == s )
 					m_deco_list-> setCurrentItem ( dlit );
 			}
 			else
 				delete lib;
 		}
 	}
 
     m_original_deco = m_deco_list-> currentItem ( );
@@ -237,25 +244,26 @@ QWidget *Appearance::createColorTab ( QWidget *parent, Config &cfg )
 
     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 ) ) );
 	QWhatsThis::add( m_color_list, tr( "Color schemes are a collection of colors which are used for various parts of the display.\n\nClick here to select an available scheme." ) );
 
 	m_color_list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), cfg ));
 
 	QString path = QPEApplication::qpeDir ( );
 	path.append( "/etc/colors/" );
     QStringList sl = QDir ( path ). entryList ( "*.scheme" );
 
-	for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
+    for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
+    {
 		QString name = (*it). left ((*it). find ( ".scheme" ));
 		QString pathstr = path;
 		pathstr.append( *it );
 		Config config ( pathstr, Config::File );
 		config. setGroup ( "Colors" );
 
 		m_color_list-> insertItem ( new ColorListItem ( name, config ));
 	}
 
     m_color_list-> setCurrentItem ( 0 );
 
     QPushButton* tempButton = new QPushButton( tab, "editSchemeButton" );
@@ -339,25 +347,26 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 	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 ) {
+    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 );
 
@@ -423,27 +432,30 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 	m_rotdir_cw-> setPixmap( cw1 );
 	m_rotdir_ccw-> setPixmap( ccw1 );
 	m_rotdir_flip-> setPixmap( flip1 );
 
 	rotLay-> addWidget ( rotlabel, 0 );
 	rotLay-> addWidget ( m_rotdir_cw, 0 );
 	rotLay-> addWidget ( m_rotdir_ccw, 0 );
 	rotLay-> addWidget ( m_rotdir_flip, 0 );
 
 	int rotDirection = cfg.readNumEntry( "rotatedir" );
 	ODirection rot = CW;
 
-	if (rotDirection == -1) {
+    if (rotDirection == -1)
+    {
 		rot = ODevice::inst ( )-> direction ( );
-	} else {
+    }
+    else
+    {
 		rot = (ODirection)rotDirection;
 	}
 
 	m_rotdir_cw-> setChecked ( rot == CW );
 	m_rotdir_ccw-> setChecked ( rot == CCW );
 	m_rotdir_flip-> setChecked ( rot == Flip );
 
 	return tab;
 }
 
 
 Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
@@ -473,92 +485,102 @@ Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
 	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 ) {
+    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 ) {
+    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 ) {
+    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 )) {
+    if (( newtabstyle != m_original_tabstyle ) || ( newtabpos != m_original_tabpos ))
+    {
 		config. writeEntry ( "TabStyle", newtabstyle + 1 );
 		config. writeEntry ( "TabPosition", newtabpos ? "Top" : "Bottom" );
 	}
 
-    if ( m_font_changed ) {
+    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 );
     }
 
 	ODirection rot;
-	if (m_rotdir_ccw-> isChecked ( )) {
+    if (m_rotdir_ccw-> isChecked ( ))
+    {
 		rot = CCW;
-	} else if (m_rotdir_cw-> isChecked ( )) {
+    }
+    else if (m_rotdir_cw-> isChecked ( ))
+    {
 		rot = CW;
-	} else {
+    }
+    else
+    {
 		rot = Flip;
 	}
 	config. writeEntry ( "rotatedir", (int)rot );
 
 	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 ( )) {
+    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
@@ -570,63 +592,66 @@ void Appearance::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 ( )) {
+    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_style_changed |= ( index != m_original_style );
 }
 
 void Appearance::styleSettingsClicked ( )
 {
 	StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
 
-	if ( item && item-> hasSettings ( )) {
+    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 ) {
+        if ( w )
+        {
 			vbox-> addWidget ( w );
 
 			d-> setCaption ( w-> caption ( ));
 
-		   	d-> showMaximized ( );
-			bool accepted = ( d-> exec ( ) == QDialog::Accepted );
+            bool accepted = ( QPEApplication::execDialog ( d ) == 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 ( m_sample )
+    {
 		if ( dli && 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 ( ));
@@ -643,43 +668,47 @@ void Appearance::colorClicked ( int index )
 	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 )++ ) {
+    for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ )
+    {
 		QColor col = item-> color ( role );
 
-		if ( col. isValid ( )) {
+        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 ) {
+    if ( QPEApplication::execDialog( editdlg ) == 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 ( )) {
+        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;
 }
@@ -689,25 +718,26 @@ 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 ) {
+    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" );
@@ -752,47 +782,49 @@ void Appearance::deleteSchemeClicked()
 }
 
 
 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 ( )) {
+    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 {
+class ExEdit : public QLineEdit
+{
 public:
 	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;
@@ -813,25 +845,26 @@ public:
 	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 ) {
+        else if ( e-> key ( ) == Key_Escape )
+        {
 			m_out = false;
 			it-> listView ( )-> setFocus ( );
 		}
 		else
 			QLineEdit::keyPressEvent ( e );
 	}
 
 private:
 	ExceptListItem *it;
 	bool m_out;
 };
 
@@ -839,18 +872,19 @@ 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 ) {
+    else if ( c == 3 )
+    {
 		m_except-> ensureItemVisible ( it );
 		new ExEdit ( it );
 	}
 }