12 files changed, 2197 insertions, 2006 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
@@ -22,16 +22,40 @@
  -.   .:....=;==+<;          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>
@@ -44,813 +68,823 @@
 #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";
+    {
+        return "Default";
    }
-QPixmap icon() const {
+    QPixmap icon() const
-        return QPixmap();
+    {
+        return QPixmap();
    }
-    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
+    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-        *iface = 0;
+    {
-        if ( uuid == IID_QUnknown )
+        *iface = 0;
-            *iface = this;
+        if ( uuid == IID_QUnknown )
-        else if ( uuid == IID_WindowDecoration )
+            *iface = this;
-            *iface = this;
+        else if ( uuid == IID_WindowDecoration )
+            *iface = this;
-        if ( *iface )
-            (*iface)->addRef();
+        if ( *iface )
-        return QS_OK;
+            (*iface)->addRef();
+        return QS_OK;
    }
    Q_REFCOUNT
 private:
-        ulong ref;
+    ulong ref;
 };
 QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg )
 {
    QWidget* tab = new QWidget( parent, "StyleTab" );
    QVBoxLayout* vertLayout = new QVBoxLayout( tab, 3, 3 );
    m_style_list = new QListBox( tab, "m_style_list" );
    vertLayout->addWidget( m_style_list );
-        QWhatsThis::add( m_style_list, tr( "Styles control the way items such as buttons and scroll bars appear in all applications.\n\nClick here to select an available style." ) );
+    QWhatsThis::add( m_style_list, tr( "Styles control the way items such as buttons and scroll bars appear in all applications.\n\nClick here to select an available style." ) );
    m_style_settings = new QPushButton ( tr( "Settings..." ), tab );
    connect ( m_style_settings, SIGNAL( clicked ( )), this, SLOT( styleSettingsClicked ( )));
    vertLayout-> addWidget ( m_style_settings );
-        QWhatsThis::add( m_style_settings, tr( "Click here to configure the currently selected style.\n\nNote:  This option is not available for all styles." ) );
+    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/" );
+        QString path = QPEApplication::qpeDir ( );
-                QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
+        path.append( "/plugins/styles/" );
+        QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
-                for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
-                        QString libstr = path;
+        for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
-                        libstr.append( "/" );
+        {
-                        libstr.append( *it );
+            QString libstr = path;
-                        QLibrary *lib = new QLibrary ( libstr );
+            libstr.append( "/" );
-                        StyleInterface *iface;
+            libstr.append( *it );
+            QLibrary *lib = new QLibrary ( libstr );
-                        if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface ) {
+            StyleInterface *iface;
-                                StyleListItem *slit = new StyleListItem ( lib, iface );
-                                m_style_list-> insertItem ( slit );
+            if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface )
+            {
-                                if ( slit-> key ( ) == s )
+                StyleListItem *slit = new StyleListItem ( lib, iface );
-                                        m_style_list-> setCurrentItem ( slit );
+                m_style_list-> insertItem ( slit );
-                        }
-                        else
+                if ( slit-> key ( ) == s )
-                                delete lib;
+                    m_style_list-> setCurrentItem ( slit );
-                }
+            }
-        }
+            else
+                delete lib;
+        }
+    }
    m_original_style = m_style_list-> currentItem ( );
    styleClicked ( m_original_style );
    connect( m_style_list, SIGNAL( highlighted( int ) ), this, SLOT( styleClicked( int ) ) );
-        return tab;
+    return tab;
 }
 QWidget *Appearance::createDecoTab ( QWidget *parent, Config &cfg )
 {
    QWidget* tab = new QWidget( parent, "DecoTab" );
    QVBoxLayout* vertLayout = new QVBoxLayout( tab, 3, 3 );
    m_deco_list = new QListBox( tab, "m_deco_list" );
    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." ) );
+    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();
+        QString path = QPEApplication::qpeDir();
-                path.append( "/plugins/decorations/" );
+        path.append( "/plugins/decorations/" );
-                QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
+        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( "/" );
+            QString libstr = path;
-                        libstr.append( *it );
+            libstr.append( "/" );
-                        QLibrary *lib = new QLibrary ( libstr );
+            libstr.append( *it );
-                        WindowDecorationInterface *iface;
+            QLibrary *lib = new QLibrary ( libstr );
+            WindowDecorationInterface *iface;
-                        if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK ) {
-                                DecoListItem *dlit = new DecoListItem ( lib, iface );
+            if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK )
-                                m_deco_list-> insertItem ( dlit );
+            {
+                DecoListItem *dlit = new DecoListItem ( lib, iface );
-                                if ( dlit-> key ( ) == s )
+                m_deco_list-> insertItem ( dlit );
-                                        m_deco_list-> setCurrentItem ( dlit );
-                        }
+                if ( dlit-> key ( ) == s )
-                        else
+                    m_deco_list-> setCurrentItem ( dlit );
-                                delete lib;
+            }
-                }
+            else
-        }
+                delete lib;
+        }
+    }
    m_original_deco = m_deco_list-> currentItem ( );
    if ( m_deco_list-> currentItem  ( ) < 0 )
-            m_deco_list-> setCurrentItem ( 0 );
+        m_deco_list-> setCurrentItem ( 0 );
    decoClicked ( m_original_deco );
    connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) );
-        return tab;
+    return tab;
 }
 QWidget *Appearance::createFontTab ( QWidget *parent, Config &cfg )
 {
    QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" );
    QString styleStr = cfg. readEntry ( "FontStyle", "Regular" );
    int size = cfg. readNumEntry ( "FontSize", 10 );
    m_fontselect = new OFontSelector ( false, parent, "FontTab" );
    m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
-        QWhatsThis::add( m_fontselect, tr( "Select the desired name, style and size of the default font applications will use." ) );
+    QWhatsThis::add( m_fontselect, tr( "Select the desired name, style and size of the default font applications will use." ) );
    connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
             this, SLOT( fontClicked ( const QFont & )));
    return m_fontselect;
 }
 QWidget *Appearance::createColorTab ( QWidget *parent, Config &cfg )
 {
    QWidget *tab = new QWidget( parent, "ColorTab" );
    QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 3, 3 );
    gridLayout->setRowStretch ( 3, 10 );
    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." ) );
+    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 ));
+    m_color_list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), cfg ));
-        QString path = QPEApplication::qpeDir ( );
+    QString path = QPEApplication::qpeDir ( );
-        path.append( "/etc/colors/" );
+    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;
+        QString name = (*it). left ((*it). find ( ".scheme" ));
-                pathstr.append( *it );
+        QString pathstr = path;
-                Config config ( pathstr, Config::File );
+        pathstr.append( *it );
-                config. setGroup ( "Colors" );
+        Config config ( pathstr, Config::File );
+        config. setGroup ( "Colors" );
-                m_color_list-> insertItem ( new ColorListItem ( name, config ));
+        m_color_list-> insertItem ( new ColorListItem ( name, config ));
-        }
+    }
    m_color_list-> setCurrentItem ( 0 );
    QPushButton* tempButton = new QPushButton( tab, "editSchemeButton" );
    tempButton->setText( tr( "Edit..." ) );
    connect( tempButton, SIGNAL( clicked() ), this, SLOT( editSchemeClicked() ) );
    gridLayout->addWidget( tempButton, 0, 1 );
-        QWhatsThis::add( tempButton, tr( "Click here to change the colors in the current color scheme." ) );
+    QWhatsThis::add( tempButton, tr( "Click here to change the colors in the current color scheme." ) );
    tempButton = new QPushButton( tab, "deleteSchemeButton" );
    tempButton->setText( tr( "Delete" ) );
    connect( tempButton, SIGNAL( clicked() ), this, SLOT( deleteSchemeClicked() ) );
    gridLayout->addWidget( tempButton, 1, 1 );
-        QWhatsThis::add( tempButton, tr( "Click here to delete the color scheme selected in the list to the left." ) );
+    QWhatsThis::add( tempButton, tr( "Click here to delete the color scheme selected in the list to the left." ) );
    tempButton = new QPushButton( tab, "saveSchemeButton" );
    tempButton->setText( tr( "Save" ) );
    connect( tempButton, SIGNAL( clicked() ), this, SLOT( saveSchemeClicked() ) );
    gridLayout->addWidget( tempButton, 2, 1 );
-        QWhatsThis::add( tempButton, tr( "Click here to name and save the current color scheme." ) );
+    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 );
+    QGridLayout *lay = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
-        m_force = new QCheckBox ( tr( "Force styling for all applications." ), tab );
+    m_force = new QCheckBox ( tr( "Force styling for all applications." ), tab );
-        m_force-> setChecked ( cfg. readBoolEntry ( "ForceStyle" ));
+    m_force-> setChecked ( cfg. readBoolEntry ( "ForceStyle" ));
-        lay-> addMultiCellWidget ( m_force, 0, 0, 0, 1 );
+    lay-> addMultiCellWidget ( m_force, 0, 0, 0, 1 );
-        QWhatsThis::add( m_force, tr( "Click here to allow all applications to use global appearance settings." ) );
+    QWhatsThis::add( m_force, tr( "Click here to allow all applications to use global appearance settings." ) );
-        QLabel *l = new QLabel ( tab );
+    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):" )));
+    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 );
+    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." ) );
+    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 = new QListView ( tab );
-        m_except-> addColumn ( Resource::loadIconSet ( "appearance" ), "", 24 );
+    m_except-> addColumn ( Resource::loadIconSet ( "appearance" ), "", 24 );
-        m_except-> addColumn ( Resource::loadIconSet ( "font" ), "", 24 );
+    m_except-> addColumn ( Resource::loadIconSet ( "font" ), "", 24 );
-        m_except-> addColumn ( Resource::loadIconSet ( "appearance/deco" ), "", 24 );
+    m_except-> addColumn ( Resource::loadIconSet ( "appearance/deco" ), "", 24 );
-        m_except-> addColumn ( tr( "Binary file(s)" ));
+    m_except-> addColumn ( tr( "Binary file(s)" ));
-        m_except-> setColumnAlignment ( 0, AlignCenter );
+    m_except-> setColumnAlignment ( 0, AlignCenter );
-        m_except-> setColumnAlignment ( 1, AlignCenter );
+    m_except-> setColumnAlignment ( 1, AlignCenter );
-        m_except-> setColumnAlignment ( 2, AlignCenter );
+    m_except-> setColumnAlignment ( 2, AlignCenter );
-        m_except-> setAllColumnsShowFocus ( true );
+    m_except-> setAllColumnsShowFocus ( true );
-        m_except-> setMinimumHeight ( 30 );
+    m_except-> setMinimumHeight ( 30 );
-        m_except-> header ( )-> setClickEnabled ( false );
+    m_except-> header ( )-> setClickEnabled ( false );
-        m_except-> header ( )-> setResizeEnabled ( false );
+    m_except-> header ( )-> setResizeEnabled ( false );
-        m_except-> header ( )-> setMovingEnabled ( false );
+    m_except-> header ( )-> setMovingEnabled ( false );
-        m_except-> setSorting ( -1 );
+    m_except-> setSorting ( -1 );
-        lay-> addMultiCellWidget ( m_except, 2, 6, 0, 0 );
+    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." ) );
+    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 )));
+    connect ( m_except, SIGNAL( clicked ( QListViewItem *, const QPoint &, int )), this, SLOT( clickedExcept ( QListViewItem *, const QPoint &, int )));
-        QToolButton *tb = new QToolButton ( tab );
+    QToolButton *tb = new QToolButton ( tab );
-        tb-> setIconSet ( Resource::loadIconSet ( "appearance/add" ));
+    tb-> setIconSet ( Resource::loadIconSet ( "appearance/add" ));
-        tb-> setFocusPolicy ( QWidget::StrongFocus );
+    tb-> setFocusPolicy ( QWidget::StrongFocus );
-        lay-> addWidget ( tb, 2, 1 );
+    lay-> addWidget ( tb, 2, 1 );
-        connect ( tb, SIGNAL( clicked ( )), this, SLOT( addExcept ( )));
+    connect ( tb, SIGNAL( clicked ( )), this, SLOT( addExcept ( )));
-        QWhatsThis::add( tb, tr( "Click here to add an application to the list above." ) );
+    QWhatsThis::add( tb, tr( "Click here to add an application to the list above." ) );
-        tb = new QToolButton ( tab );
+    tb = new QToolButton ( tab );
-        tb-> setIconSet ( Resource::loadIconSet ( "editdelete" ));
+    tb-> setIconSet ( Resource::loadIconSet ( "editdelete" ));
-        tb-> setFocusPolicy ( QWidget::StrongFocus );
+    tb-> setFocusPolicy ( QWidget::StrongFocus );
-        lay-> addWidget ( tb, 3, 1 );
+    lay-> addWidget ( tb, 3, 1 );
-        connect ( tb, SIGNAL( clicked ( )), this, SLOT( delExcept ( )));
+    connect ( tb, SIGNAL( clicked ( )), this, SLOT( delExcept ( )));
-        QWhatsThis::add( tb, tr( "Click here to delete the currently selected application." ) );
+    QWhatsThis::add( tb, tr( "Click here to delete the currently selected application." ) );
-        tb = new QToolButton ( tab );
+    tb = new QToolButton ( tab );
-        tb-> setIconSet ( Resource::loadIconSet ( "up" ));
+    tb-> setIconSet ( Resource::loadIconSet ( "up" ));
-        tb-> setFocusPolicy ( QWidget::StrongFocus );
+    tb-> setFocusPolicy ( QWidget::StrongFocus );
-        lay-> addWidget ( tb, 4, 1 );
+    lay-> addWidget ( tb, 4, 1 );
-        connect ( tb, SIGNAL( clicked ( )), this, SLOT( upExcept ( )));
+    connect ( tb, SIGNAL( clicked ( )), this, SLOT( upExcept ( )));
-        QWhatsThis::add( tb, tr( "Click here to move the currently selected application up in the list." ) );
+    QWhatsThis::add( tb, tr( "Click here to move the currently selected application up in the list." ) );
-        tb = new QToolButton ( tab );
+    tb = new QToolButton ( tab );
-        tb-> setIconSet ( Resource::loadIconSet ( "down" ));
+    tb-> setIconSet ( Resource::loadIconSet ( "down" ));
-        tb-> setFocusPolicy ( QWidget::StrongFocus );
+    tb-> setFocusPolicy ( QWidget::StrongFocus );
-        lay-> addWidget ( tb, 5, 1 );
+    lay-> addWidget ( tb, 5, 1 );
-        connect ( tb, SIGNAL( clicked ( )), this, SLOT( downExcept ( )));
+    connect ( tb, SIGNAL( clicked ( )), this, SLOT( downExcept ( )));
-        QWhatsThis::add( tb, tr( "Click here to move the currently selected application down in the list." ) );
+    QWhatsThis::add( tb, tr( "Click here to move the currently selected application down in the list." ) );
-        lay-> setRowStretch ( 6, 10 );
+    lay-> setRowStretch ( 6, 10 );
-        lay-> setColStretch ( 0, 10 );
+    lay-> setColStretch ( 0, 10 );
-        QStringList sl = cfg. readListEntry ( "NoStyle", ';' );
+    QStringList sl = cfg. readListEntry ( "NoStyle", ';' );
-        QListViewItem *lvit = 0;
+    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 );
+    {
+        int fl = ( *it ). left ( 1 ). toInt ( 0, 32 );
-                lvit = new ExceptListItem ( m_except, lvit, ( *it ). mid ( 1 ), fl & 0x01, fl & 0x02, fl & 0x04 );
-        }
+        lvit = new ExceptListItem ( m_except, lvit, ( *it ). mid ( 1 ), fl & 0x01, fl & 0x02, fl & 0x04 );
+    }
-        vertLayout-> addSpacing ( 3 );
-        QFrame *f = new QFrame ( tab );
+    vertLayout-> addSpacing ( 3 );
-        f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
+    QFrame *f = new QFrame ( tab );
-        vertLayout-> addWidget ( f );
+    f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
-        vertLayout-> addSpacing ( 3 );
+    vertLayout-> addWidget ( f );
+    vertLayout-> addSpacing ( 3 );
    QGridLayout* gridLayout = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
-        int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1;
+    int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1;
-        bool tabtop = ( cfg. readEntry ( "TabPosition", "Top" ) == "Top" );
+    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" ) );
+    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" ) );
+    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." ) );
+    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." ) );
+    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_tabstyle = style;
-        m_original_tabpos = tabtop;
+    m_original_tabpos = tabtop;
-        vertLayout-> addSpacing ( 3 );
+    vertLayout-> addSpacing ( 3 );
-        QHBoxLayout *rotLay = new QHBoxLayout ( vertLayout, 3 );
+    QHBoxLayout *rotLay = new QHBoxLayout ( vertLayout, 3 );
-        QLabel* rotlabel = new QLabel( tr( "Rotation direction:" ), tab );
+    QLabel* rotlabel = new QLabel( tr( "Rotation direction:" ), tab );
-        m_rotdir_cw = new QRadioButton( tab, "rotdir_cw" );
+    m_rotdir_cw = new QRadioButton( tab, "rotdir_cw" );
-        QPixmap cw1 = Resource::loadIconSet("redo"). pixmap( );
+    QPixmap cw1 = Resource::loadIconSet("redo"). pixmap( );
-        m_rotdir_ccw = new QRadioButton( tab, "rotdir_ccw" );
+    m_rotdir_ccw = new QRadioButton( tab, "rotdir_ccw" );
-        QImage ccwImage = cw1. convertToImage( ). mirror( 1, 0 );
+    QImage ccwImage = cw1. convertToImage( ). mirror( 1, 0 );
-        QPixmap ccw1;
+    QPixmap ccw1;
-        m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
+    m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
-        QPixmap flip1 = Resource::loadIconSet("pass"). pixmap( );
+    QPixmap flip1 = Resource::loadIconSet("pass"). pixmap( );
-        QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
+    QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
-        rotbtngrp-> hide ( );
+    rotbtngrp-> hide ( );
-        rotbtngrp-> setExclusive ( true );
+    rotbtngrp-> setExclusive ( true );
-        rotbtngrp-> insert ( m_rotdir_cw );
+    rotbtngrp-> insert ( m_rotdir_cw );
-        rotbtngrp-> insert ( m_rotdir_ccw );
+    rotbtngrp-> insert ( m_rotdir_ccw );
-        rotbtngrp-> insert ( m_rotdir_flip );
+    rotbtngrp-> insert ( m_rotdir_flip );
-        ccw1. convertFromImage( ccwImage );
+    ccw1. convertFromImage( ccwImage );
-        m_rotdir_cw-> setPixmap( cw1 );
+    m_rotdir_cw-> setPixmap( cw1 );
-        m_rotdir_ccw-> setPixmap( ccw1 );
+    m_rotdir_ccw-> setPixmap( ccw1 );
-        m_rotdir_flip-> setPixmap( flip1 );
+    m_rotdir_flip-> setPixmap( flip1 );
-        rotLay-> addWidget ( rotlabel, 0 );
+    rotLay-> addWidget ( rotlabel, 0 );
-        rotLay-> addWidget ( m_rotdir_cw, 0 );
+    rotLay-> addWidget ( m_rotdir_cw, 0 );
-        rotLay-> addWidget ( m_rotdir_ccw, 0 );
+    rotLay-> addWidget ( m_rotdir_ccw, 0 );
-        rotLay-> addWidget ( m_rotdir_flip, 0 );
+    rotLay-> addWidget ( m_rotdir_flip, 0 );
-        int rotDirection = cfg.readNumEntry( "rotatedir" );
+    int rotDirection = cfg.readNumEntry( "rotatedir" );
-        ODirection rot = CW;
+    ODirection rot = CW;
-        if (rotDirection == -1) {
+    if (rotDirection == -1)
-                rot = ODevice::inst ( )-> direction ( );
+    {
-        } else {
+        rot = ODevice::inst ( )-> direction ( );
-                rot = (ODirection)rotDirection;
+    }
-        }
+    else
+    {
-        m_rotdir_cw-> setChecked ( rot == CW );
+        rot = (ODirection)rotDirection;
-        m_rotdir_ccw-> setChecked ( rot == CCW );
+    }
-        m_rotdir_flip-> setChecked ( rot == Flip );
+    m_rotdir_cw-> setChecked ( rot == CW );
-        return tab;
+    m_rotdir_ccw-> setChecked ( rot == CCW );
+    m_rotdir_flip-> setChecked ( rot == Flip );
+    return tab;
 }
 Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
-    : QDialog ( parent, name, true, WStyle_ContextHelp )
+        : 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 = new SampleWindow ( this );
-        m_sample-> setDecoration ( new DefaultWindowDecoration ( ) );
+    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." ) );
+    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;
+    QWidget *styletab;
-        m_color_list = 0;
+    m_color_list = 0;
-         tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance", tr( "Style" ));
+    tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance", tr( "Style" ));
    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" ) );
+    tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "SettingsIcon", tr( "Advanced" ) );
-        top-> addWidget ( tw, 10 );
+    top-> addWidget ( tw, 10 );
-        top-> addWidget ( m_sample, 1 );
+    top-> addWidget ( m_sample, 1 );
    tw-> setCurrentTab ( styletab );
-        connect ( tw, SIGNAL( currentChanged ( QWidget * )), this, SLOT( tabChanged ( QWidget * )));
+    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 ...
+        m_sample-> hide ( );
-        }
+        updateGeometry ( ); // shouldn't be necessary ...
-        else
+    }
-                m_sample-> show ( );
+    else
+        m_sample-> show ( );
 }
 void Appearance::accept ( )
 {
-        bool newtabpos = m_tabstyle_top-> isChecked ( );
+    bool newtabpos = m_tabstyle_top-> isChecked ( );
-        int newtabstyle = m_tabstyle_list-> currentItem ( );
+    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 )
+        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 )
+        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" );
+        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 ( ));
+        ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
-                if ( item )
+        if ( item )
-                        item-> save ( config );
+            item-> save ( config );
-    }
+    }
-        ODirection rot;
+    ODirection rot;
-        if (m_rotdir_ccw-> isChecked ( )) {
+    if (m_rotdir_ccw-> isChecked ( ))
-                rot = CCW;
+    {
-        } else if (m_rotdir_cw-> isChecked ( )) {
+        rot = CCW;
-                rot = CW;
+    }
-        } else {
+    else if (m_rotdir_cw-> isChecked ( ))
-                rot = Flip;
+    {
-        }
+        rot = CW;
-        config. writeEntry ( "rotatedir", (int)rot );
+    }
+    else
-        m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated
+    {
+        rot = Flip;
-        QStringList sl;
+    }
-        QString exceptstr;
+    config. writeEntry ( "rotatedir", (int)rot );
-        for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( )) {
-                int fl = 0;
+    m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated
-                fl |= ( it-> noStyle ( ) ? 0x01 : 0 );
-                fl |= ( it-> noFont ( ) ? 0x02 : 0 );
+    QStringList sl;
-                fl |= ( it-> noDeco ( ) ? 0x04 : 0 );
+    QString exceptstr;
-                exceptstr = QString::number ( fl, 32 );
+    for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( ))
-                exceptstr.append( it-> pattern ( ));
+    {
-                sl << exceptstr;
+        int fl = 0;
-        }
+        fl |= ( it-> noStyle ( ) ? 0x01 : 0 );
-        config. writeEntry ( "NoStyle", sl, ';' );
+        fl |= ( it-> noFont ( ) ? 0x02 : 0 );
-        config. writeEntry ( "ForceStyle", m_force-> isChecked ( ));
+        fl |= ( it-> noDeco ( ) ? 0x04 : 0 );
+        exceptstr = QString::number ( fl, 32 );
-        config. write ( ); // need to flush the config info first
+        exceptstr.append( it-> pattern ( ));
-        Global::applyStyle ( );
+        sl << exceptstr;
+    }
-        QDialog::accept ( );
+    config. writeEntry ( "NoStyle", sl, ';' );
+    config. writeEntry ( "ForceStyle", m_force-> isChecked ( ));
+    config. write ( ); // need to flush the config info first
+    Global::applyStyle ( );
+    QDialog::accept ( );
 }
 void Appearance::done ( int r )
 {
-        QDialog::done ( r );
+    QDialog::done ( r );
-        close ( );
+    close ( );
 }
 void Appearance::styleClicked ( int index )
 {
    StyleListItem *sli = (StyleListItem *) m_style_list-> item ( index );
-        m_style_settings-> setEnabled ( sli ? sli-> hasSettings ( ) : false );
+    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;
+    {
+        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 );
+    m_style_changed |= ( index != m_original_style );
 }
 void Appearance::styleSettingsClicked ( )
 {
-        StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
+    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 );
+        QDialog *d = new QDialog ( this, "SETTINGS-DLG", true );
+        QVBoxLayout *vbox = new QVBoxLayout ( d, 3, 0 );
-                QWidget *w = item-> settings ( d );
+        QWidget *w = item-> settings ( d );
-                if ( w ) {
+        if ( w )
-                        vbox-> addWidget ( w );
+        {
+            vbox-> addWidget ( w );
-                        d-> setCaption ( w-> caption ( ));
+            d-> setCaption ( w-> caption ( ));
-                           d-> showMaximized ( );
+            bool accepted = ( QPEApplication::execDialog ( d ) == QDialog::Accepted );
-                        bool accepted = ( d-> exec ( ) == QDialog::Accepted );
-                        if ( item-> setSettings ( accepted ))
+            if ( item-> setSettings ( accepted ))
-                                m_style_changed = true;
+                m_style_changed = true;
-                }
+        }
-                delete d;
+        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 ( ));
+        if ( dli && dli-> interface ( ))
-                else
+            m_sample-> setDecoration ( dli-> interface ( ));
-                        m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
+        else
-                m_sample-> repaint ( );
+            m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
-        }
+        m_sample-> repaint ( );
-        m_deco_changed |= ( index != m_original_deco );
+    }
+    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 );
+    m_sample-> setFont ( f );
 }
 void Appearance::colorClicked ( int index )
 {
-        ColorListItem *item = (ColorListItem *) m_color_list-> item ( index );
+    ColorListItem *item = (ColorListItem *) m_color_list-> item ( index );
-        if ( item )
+    if ( item )
-                m_sample-> setPalette ( item-> palette ( ));
+        m_sample-> setPalette ( item-> palette ( ));
-        m_color_changed |= ( item-> palette ( ) != qApp-> palette ( ));
+    m_color_changed |= ( item-> palette ( ) != qApp-> palette ( ));
 }
 void Appearance::editSchemeClicked ( )
 {
-        ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
+    ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
-        int cnt = 0;
+    int cnt = 0;
-        QString labels [QColorGroup::NColorRoles];
+    QString labels [QColorGroup::NColorRoles];
-        QColor colors [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 );
+    {
+        QColor col = item-> color ( role );
-                if ( col. isValid ( )) {
+        if ( col. isValid ( ))
-                        labels [cnt] = item-> label ( role );
+        {
-                        colors [cnt] = col;
+            labels [cnt] = item-> label ( role );
+            colors [cnt] = col;
-                        cnt++;
+            cnt++;
-                }
+        }
-        }
+    }
    EditScheme* editdlg = new EditScheme( cnt, labels, colors, this, "editScheme", true );
-    editdlg-> showMaximized ( );
+    if ( QPEApplication::execDialog( editdlg ) == QDialog::Accepted )
-    if ( editdlg-> exec ( ) == QDialog::Accepted ) {
+    {
-            ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 );
+        ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 );
-                cnt = 0;
+        cnt = 0;
-                for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) {
+        for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ )
-                        if ( item-> color ( role ). isValid ( )) {
+        {
-                        citem-> setColor ( role, colors [cnt] );
+            if ( item-> color ( role ). isValid ( ))
-                        cnt++;
+            {
-                }
+                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 ( ));
+    ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
-        if ( !item )
+    if ( !item )
-                return;
+        return;
-        QDialog *d = new QDialog ( this, 0, true );
+    QDialog *d = new QDialog ( this, 0, true );
-        d-> setCaption ( tr( "Save Scheme" ));
+    d-> setCaption ( tr( "Save Scheme" ));
-        QLineEdit *ed = new QLineEdit ( d );
+    QLineEdit *ed = new QLineEdit ( d );
-        ( new QVBoxLayout ( d, 3, 3 ))-> addWidget ( ed );
+    ( new QVBoxLayout ( d, 3, 3 ))-> addWidget ( ed );
-        ed-> setFocus ( );
+    ed-> setFocus ( );
-    if ( d-> exec ( ) == QDialog::Accepted ) {
+    if ( d-> exec ( ) == QDialog::Accepted )
+    {
        QString schemename = ed-> text ( );
-                QString filestr = QPEApplication::qpeDir();
+        QString filestr = QPEApplication::qpeDir();
-                filestr.append( "/etc/colors/" );
+        filestr.append( "/etc/colors/" );
-                filestr.append( schemename );
+        filestr.append( schemename );
-                filestr.append( ".scheme" );
+        filestr.append( ".scheme" );
        QFile file ( filestr );
        if ( !file. exists ( ))
        {
-                QPalette p = item-> palette ( );
+            QPalette p = item-> palette ( );
            Config config ( file.name(), Config::File );
            config. setGroup( "Colors" );
-                        item-> save ( config );
+            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." ));
+            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 ( ));
+    ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
-        if ( !item )
+    if ( !item )
-                return;
+        return;
    if ( m_color_list-> currentItem ( ) > 0 )
    {
-                if ( QPEMessageBox::confirmDelete ( this, tr( "Delete scheme" ), item-> text ( ) ) )
+        if ( QPEMessageBox::confirmDelete ( this, tr( "Delete scheme" ), item-> text ( ) ) )
-                {
+        {
-                        QString filestr = QPEApplication::qpeDir ( );
+            QString filestr = QPEApplication::qpeDir ( );
-                        filestr.append( "/etc/colors/" );
+            filestr.append( "/etc/colors/" );
-                        filestr.append( item-> text ( ) );
+            filestr.append( item-> text ( ) );
-                        filestr.append( ".scheme" );
+            filestr.append( ".scheme" );
-                        QFile::remove ( filestr );
+            QFile::remove ( filestr );
-                        delete item;
+            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 );
+    ExceptListItem *it = new ExceptListItem ( m_except, 0, tr( "<new>" ), true, true, true );
-        m_except-> ensureItemVisible ( it );
+    m_except-> ensureItemVisible ( it );
-        m_except-> setSelected ( it, true );
+    m_except-> setSelected ( it, true );
 }
 void Appearance::delExcept ( )
 {
-        if ( m_except-> selectedItem ( )) {
+    if ( m_except-> selectedItem ( ))
-                m_except-> setFocus ( );
+    {
-                delete m_except-> selectedItem ( );
+        m_except-> setFocus ( );
-        }
+        delete m_except-> selectedItem ( );
+    }
 }
 void Appearance::upExcept ( )
 {
-        ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
+    ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
-        if ( it && it-> itemAbove ( ))
+    if ( it && it-> itemAbove ( ))
-                it-> itemAbove ( )-> moveItem ( it );
+        it-> itemAbove ( )-> moveItem ( it );
 }
 void Appearance::downExcept ( )
 {
-        ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
+    ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
-        if ( it && it-> itemBelow ( ))
+    if ( it && it-> itemBelow ( ))
-                it-> moveItem ( it-> itemBelow ( ));
+        it-> moveItem ( it-> itemBelow ( ));
 }
-class ExEdit : public QLineEdit {
+class ExEdit : public QLineEdit
+{
 public:
-        ExEdit ( ExceptListItem *item )
+    ExEdit ( ExceptListItem *item )
-                : QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item )
+            : QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item )
-        {
+    {
-                setFrame ( false );
+        setFrame ( false );
-                QRect r = it-> listView ( )-> itemRect ( it );
+        QRect r = it-> listView ( )-> itemRect ( it );
-                int x = it-> listView ( )-> header ( )-> cellPos ( 3 ) - 1;
+        int x = it-> listView ( )-> header ( )-> cellPos ( 3 ) - 1;
-                int y = r. y ( );
+        int y = r. y ( );
-                int w = it-> listView ( )-> viewport ( )-> width ( ) - x;
+        int w = it-> listView ( )-> viewport ( )-> width ( ) - x;
-                int h = r. height ( ); // + 2;
+        int h = r. height ( ); // + 2;
-                setText ( it-> pattern ( ));
+        setText ( it-> pattern ( ));
-                setGeometry ( x, y, w, h );
+        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;
+        m_out = true;
-                show ( );
+        show ( );
-                setFocus ( );
+        setFocus ( );
-                selectAll ( );
+        selectAll ( );
-                end ( true );
+        end ( true );
-        }
+    }
-        virtual void focusOutEvent ( QFocusEvent * )
+    virtual void focusOutEvent ( QFocusEvent * )
-        {
+    {
-                hide ( );
+        hide ( );
-                if ( m_out )
+        if ( m_out )
-                        it-> setPattern ( text ( ));
+            it-> setPattern ( text ( ));
-                delete this;
+        delete this;
-        }
+    }
-        virtual void keyPressEvent ( QKeyEvent *e )
+    virtual void keyPressEvent ( QKeyEvent *e )
-        {
+    {
-                if ( e-> key ( ) == Key_Return )
+        if ( e-> key ( ) == Key_Return )
-                        it-> listView ( )-> setFocus ( );
+            it-> listView ( )-> setFocus ( );
-                else if ( e-> key ( ) == Key_Escape ) {
+        else if ( e-> key ( ) == Key_Escape )
-                        m_out = false;
+        {
-                        it-> listView ( )-> setFocus ( );
+            m_out = false;
-                }
+            it-> listView ( )-> setFocus ( );
-                else
+        }
-                        QLineEdit::keyPressEvent ( e );
+        else
-        }
+            QLineEdit::keyPressEvent ( e );
+    }
 private:
-        ExceptListItem *it;
+    ExceptListItem *it;
-        bool m_out;
+    bool m_out;
 };
 void Appearance::clickedExcept ( QListViewItem *item, const QPoint &, int c )
 {
-        if ( !item || c < 0 || c > 3 )
+    if ( !item || c < 0 || c > 3 )
-                return;
+        return;
-        ExceptListItem *it = (ExceptListItem *) item;
+    ExceptListItem *it = (ExceptListItem *) item;
-        if ( c == 0 )
+    if ( c == 0 )
-                it-> setNoStyle ( !it-> noStyle ( ));
+        it-> setNoStyle ( !it-> noStyle ( ));
-        else if ( c == 1 )
+    else if ( c == 1 )
-                it-> setNoFont ( !it-> noFont ( ));
+        it-> setNoFont ( !it-> noFont ( ));
-        else if ( c == 2 )
+    else if ( c == 2 )
-                it-> setNoDeco ( !it-> noDeco ( ));
+        it-> setNoDeco ( !it-> noDeco ( ));
-        else if ( c == 3 ) {
+    else if ( c == 3 )
-                m_except-> ensureItemVisible ( it );
+    {
-                new ExEdit ( it );
+        m_except-> ensureItemVisible ( it );
-        }
+        new ExEdit ( it );
+    }
 }
diff --git a/noncore/settings/appearance2/stylelistitem.h b/noncore/settings/appearance2/stylelistitem.h
index caefad8..b6c72c3 100644
--- a/noncore/settings/appearance2/stylelistitem.h
+++ b/noncore/settings/appearance2/stylelistitem.h
@@ -23,25 +23,31 @@
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef STYLELISTITEM_H
 #define STYLELISTITEM_H
-#include <qlistbox.h>
+/* OPIE */
 #include <qpe/styleinterface.h>
+#include <qpe/qlibrary.h>
+#include <qpe/resource.h>
+/* QT */
+#include <qlistbox.h>
+#include <qfileinfo.h>
 #include <stdio.h>
 class StyleListItem : public QListBoxText {
 public:
-        StyleListItem ( const QString &t, QStyle *sty ) : QListBoxText ( t ) 
+        StyleListItem ( const QString &t, QStyle *sty ) : QListBoxText ( t )
-        { 
+        {
                m_lib = 0;
                m_style_if = 0;
                m_settings_if = 0;
                m_style = sty;
        }
        StyleListItem ( QLibrary *lib, StyleInterface *iface ) : QListBoxText ( iface-> name ( ))
        {
diff --git a/noncore/settings/aqpkg/categoryfilterimpl.cpp b/noncore/settings/aqpkg/categoryfilterimpl.cpp
index 61e1f93..217d2c9 100644
--- a/noncore/settings/aqpkg/categoryfilterimpl.cpp
+++ b/noncore/settings/aqpkg/categoryfilterimpl.cpp
@@ -22,46 +22,52 @@
  -.   .:....=;==+<;          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 <iostream>
+#include "categoryfilterimpl.h"
-using namespace std;
+/* OPIE */
+#include <qpe/qpeapplication.h>
+/* QT */
 #include <qgroupbox.h>
-#include <qlayout.h> 
+#include <qlayout.h>
 #include <qlistbox.h>
 #include <qstring.h>
-#include "categoryfilterimpl.h"
+/* STD */
+#include <iostream>
+using namespace std;
 CategoryFilterImpl :: CategoryFilterImpl(const QString &categories, const QString &selectedCategories, QWidget *parent, const char *name )
-    : QDialog( parent, name, true )
+        : QDialog( parent, name, true )
 {
    setCaption( tr( "Category Filter" ) );
    QVBoxLayout *layout = new QVBoxLayout( this );
    layout->setMargin( 2 );
    layout->setSpacing( 4 );
    QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Select one or more groups" ), this );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addWidget( grpbox );
    QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
-    
    lstCategories = new QListBox( grpbox );
    lstCategories->setSelectionMode( QListBox::Multi );
    grplayout->addWidget( lstCategories );
-    
    // Split up categories and add them to the listbox
    int start = 1;
    QString item;
    int end;
    QString finditem;
    do
    {
@@ -71,26 +77,26 @@ CategoryFilterImpl :: CategoryFilterImpl(const QString &categories, const QStrin
        {
            lstCategories->insertItem( item );
            finditem = QString( "#%1#" ).arg( item );
            if ( selectedCategories.find( finditem ) != -1 )
                lstCategories->setSelected( lstCategories->count()-1, true );
        }
        start = end + 1;
-    } while ( start < (int)categories.length() );
+    }
+    while ( start < (int)categories.length() );
    lstCategories->sort( true );
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 CategoryFilterImpl :: ~CategoryFilterImpl()
-{
+{}
-}
 QString CategoryFilterImpl :: getSelectedFilter()
 {
    // Grab cetegories from listbox
    QString ret = "#";
    for ( int i = 0 ; i < (int)lstCategories->count() ; ++i )
    {
diff --git a/noncore/settings/aqpkg/instoptionsimpl.cpp b/noncore/settings/aqpkg/instoptionsimpl.cpp
index 9d52013..126e3b9 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.cpp
+++ b/noncore/settings/aqpkg/instoptionsimpl.cpp
@@ -22,91 +22,93 @@
  -.   .:....=;==+<;          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 "global.h"
+#include "instoptionsimpl.h"
+#include "ipkg.h"
+/* OPIE */
 #ifdef QWS
 #include <qpe/config.h>
 #endif
+#include <qpe/qpeapplication.h>
+/* QT */
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include "global.h"
-#include "instoptionsimpl.h"
-#include "ipkg.h"
 InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, int verb, QWidget * parent, const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl )
+        : QDialog( parent, name, modal, fl )
 {
    setCaption( tr( "Options" ) );
-    
    QVBoxLayout *layout = new QVBoxLayout( this );
    layout->setMargin( 2 );
    layout->setSpacing( 4 );
    QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Options" ), this );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addWidget( grpbox );
    QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
-    
    forceDepends = new QCheckBox( tr( "Force Depends" ), grpbox );
    grplayout->addWidget( forceDepends );
    forceReinstall = new QCheckBox( tr( "Force Reinstall" ), grpbox );
    grplayout->addWidget( forceReinstall );
    forceRemove = new QCheckBox( tr( "Force Remove" ), grpbox );
    grplayout->addWidget( forceRemove );
    forceOverwrite = new QCheckBox( tr( "Force Overwrite" ), grpbox );
    grplayout->addWidget( forceOverwrite );
    QLabel *l = new QLabel( tr( "Information Level" ), grpbox );
    grplayout->addWidget( l );
-    
    verboseIpkg = new QComboBox( grpbox );
    verboseIpkg->insertItem( tr( "Errors only" ) );
    verboseIpkg->insertItem( tr( "Normal messages" ) );
    verboseIpkg->insertItem( tr( "Informative messages" ) );
    verboseIpkg->insertItem( tr( "Troubleshooting output" ) );
    verboseIpkg->setCurrentItem( verb );
    grplayout->addWidget( verboseIpkg );
-    
    grplayout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
-    
    if ( flags & FORCE_DEPENDS )
-            forceDepends->setChecked( true );
+        forceDepends->setChecked( true );
    if ( flags & FORCE_REINSTALL )
-            forceReinstall->setChecked( true );
+        forceReinstall->setChecked( true );
    if ( flags & FORCE_REMOVE )
-            forceRemove->setChecked( true );
+        forceRemove->setChecked( true );
    if ( flags & FORCE_OVERWRITE )
-            forceOverwrite->setChecked( true );
+        forceOverwrite->setChecked( true );
-//    if ( flags & VERBOSE_WGET )
+    //    if ( flags & VERBOSE_WGET )
-        //    verboseWget->setChecked( true );
+            //    verboseWget->setChecked( true );
-//    if ( flags & MAKE_LINKS )
+    //    if ( flags & MAKE_LINKS )
-        //    makeLinks->setChecked( true );
+            //    makeLinks->setChecked( true );
-          showMaximized();
+    QPEApplication::showDialog( this );
 }
 InstallOptionsDlgImpl::~InstallOptionsDlgImpl()
-{
+{}
-}
 int InstallOptionsDlgImpl :: getFlags()
 {
    int flags = 0;
    if ( forceDepends->isChecked() )
        flags |= FORCE_DEPENDS;
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index dbe694e..6f5c712 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -1,11 +1,11 @@
 /*
                              This file is part of the OPIE Project
+ 
               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
@@ -22,57 +22,60 @@
  -.   .:....=;==+<;          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 <linux/limits.h>
+#include "categoryfilterimpl.h"
-#include <unistd.h>
+#include "datamgr.h"
+#include "global.h"
+#include "inputdlg.h"
+#include "ipkg.h"
+#include "installdlgimpl.h"
+#include "letterpushbutton.h"
+#include "mainwin.h"
+#include "packagewin.h"
+#include "settingsimpl.h"
+#include "utils.h"
+/* OPIE */
 #include <qpe/qcopenvelope_qws.h>
-#include <qmenubar.h>
 #include <qpe/qpeapplication.h>
-#include <qtoolbar.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
+/* QT */
+#include <qmenubar.h>
+#include <qtoolbar.h>
 #include <qaction.h>
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qprogressbar.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 #include <qwidgetstack.h>
-#include "categoryfilterimpl.h"
+/* STD */
-#include "datamgr.h"
+#include <linux/limits.h>
-#include "global.h"
+#include <unistd.h>
-#include "inputdlg.h"
-#include "ipkg.h"
-#include "installdlgimpl.h"
-#include "letterpushbutton.h"
-#include "mainwin.h"
-#include "packagewin.h"
-#include "settingsimpl.h"
-#include "utils.h"
 extern int compareVersions( const char *v1, const char *v2 );
 MainWindow :: MainWindow( QWidget* parent, const char* name, WFlags fl )
-                :QMainWindow( parent, name, fl || WStyle_ContextHelp )
+                :QMainWindow( parent, name, fl || WStyle_ContextHelp )
 {
    // Disable suspend mode
    QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
    LOCAL_SERVER = QObject::tr( "Installed packages" );
    LOCAL_IPKGS = QObject::tr( "Local packages" );
    setCaption( tr( "AQPkg - Package Manager" ) );
@@ -234,17 +237,17 @@ MainWindow :: MainWindow( QWidget* parent, const char* name, WFlags fl )
    stack->raiseWidget( progressWindow );
    // Delayed call to finish initialization
    QTimer::singleShot( 100, this, SLOT( init() ) );
 }
 MainWindow :: ~MainWindow()
 {
-        delete mgr;
+    delete mgr;
    // Reenable suspend mode
    QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
 }
 void MainWindow :: initMainWidget()
 {
    networkPkgWindow = new QWidget( this );
@@ -291,17 +294,17 @@ void MainWindow :: initProgressWidget()
 void MainWindow :: init()
 {
 #ifdef QWS
    // read download directory from config file
    Config cfg( "aqpkg" );
    cfg.setGroup( "settings" );
    currentlySelectedServer = cfg.readEntry( "selectedServer", "local" );
-//    showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
+    //    showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
 #endif
    stack->raiseWidget( progressWindow );
    mgr = new DataManager();
    connect( mgr, SIGNAL( progressSetSteps( int ) ), this, SLOT( setProgressSteps( int ) ) );
    connect( mgr, SIGNAL( progressSetMessage( const QString & ) ),
@@ -332,34 +335,34 @@ void MainWindow :: setDocument( const QString &doc )
            serversList->setCurrentItem( i );
            break;
        }
    }
    serverSelected( 0 );
    // Now set the check box of the selected package
    for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
-          item != 0 ;
+            item != 0 ;
-          item = (QCheckListItem *)item->nextSibling() )
+            item = (QCheckListItem *)item->nextSibling() )
    {
        if ( item->text().startsWith( package ) )
        {
            item->setOn( true );
            break;
        }
    }
 }
 void MainWindow :: displaySettings()
 {
    SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );
    if ( dlg->showDlg() )
    {
        stack->raiseWidget( progressWindow );
-            updateData();
+        updateData();
        stack->raiseWidget( networkPkgWindow );
    }
    delete dlg;
 }
 void MainWindow :: closeEvent( QCloseEvent *e )
 {
    // If install dialog is visible, return to main view, otherwise close app
@@ -577,22 +580,22 @@ void MainWindow :: updateData()
        if ( !server->isServerActive() )
        {
            i--;
            continue;
        }
        serversList->insertItem( serverName );
        if ( serverName == currentlySelectedServer )
-                activeItem = i;
+            activeItem = i;
-        }
+    }
-        // set selected server to be active server
+    // set selected server to be active server
-        if ( activeItem != -1 )
+    if ( activeItem != -1 )
-                serversList->setCurrentItem( activeItem );
+        serversList->setCurrentItem( activeItem );
    serverSelected( 0, FALSE );
 }
 void MainWindow :: serverSelected( int index )
 {
    serverSelected( index, TRUE );
 }
@@ -620,20 +623,20 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
        }
        m_progress->setTotalSteps( list.count() );
        m_status->setText( tr( "Building package list for:\n\t%1" ).arg( serverName ) );
    }
    packagesList->clear();
 #ifdef QWS
-        // read download directory from config file
+    // read download directory from config file
-        Config cfg( "aqpkg" );
+    Config cfg( "aqpkg" );
-        cfg.setGroup( "settings" );
+    cfg.setGroup( "settings" );
-        cfg.writeEntry( "selectedServer", currentlySelectedServer );
+    cfg.writeEntry( "selectedServer", currentlySelectedServer );
 #endif
    int i = 0;
    Package *package;
    for ( ; it.current(); ++it )
    {
        // Update progress after every 100th package (arbitrary value, seems to give good balance)
        i++;
@@ -673,17 +676,17 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
        }
        // If the local server, only display installed packages
        if ( serverName == LOCAL_SERVER && !package->isInstalled() )
            continue;
        QCheckListItem *item = new QCheckListItem( packagesList, package->getPackageName(),
-                                                   QCheckListItem::CheckBox );
+                               QCheckListItem::CheckBox );
        if ( package->isInstalled() )
        {
            // If a different version of package is available, show update available icon
            // Otherwise, show installed icon
            if ( package->getNewVersionAvailable())
            {
@@ -733,17 +736,17 @@ void MainWindow :: searchForPackage( const QString &text )
    {
        // look through package list for text startng at current position
        QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
        if ( start == 0 )
            start = (QCheckListItem *)packagesList->firstChild();
        for ( QCheckListItem *item = start; item != 0 ;
-              item = (QCheckListItem *)item->nextSibling() )
+                item = (QCheckListItem *)item->nextSibling() )
        {
            if ( item->text().lower().find( text ) != -1 )
            {
                packagesList->ensureItemVisible( item );
                packagesList->setCurrentItem( item );
                break;
            }
        }
@@ -761,67 +764,67 @@ void MainWindow :: updateServer()
    // First, write out ipkg_conf file so that ipkg can use it
    mgr->writeOutIpkgConf();
    Ipkg *ipkg = new Ipkg;
    ipkg->setOption( "update" );
    InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Refreshing server package lists" ),
-                                              tr( "Update lists" ) );
+                          tr( "Update lists" ) );
    connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-        reloadDocuments = FALSE;
+    reloadDocuments = FALSE;
    stack->addWidget( dlg, 3 );
    stack->raiseWidget( dlg );
-//  delete progDlg;
+    //  delete progDlg;
 }
 void MainWindow :: upgradePackages()
 {
    // We're gonna do an upgrade of all packages
    // First warn user that this isn't recommended
    // TODO - ODevice????
    QString text = tr( "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n" );
    QMessageBox warn( tr( "Warning" ), text, QMessageBox::Warning,
-                        QMessageBox::Yes,
+                      QMessageBox::Yes,
-                        QMessageBox::No | QMessageBox::Escape | QMessageBox::Default ,
+                      QMessageBox::No | QMessageBox::Escape | QMessageBox::Default ,
-                        0, this );
+                      0, this );
    warn.adjustSize();
    if ( warn.exec() == QMessageBox::Yes )
    {
        // First, write out ipkg_conf file so that ipkg can use it
        mgr->writeOutIpkgConf();
        // Now run upgrade
        Ipkg *ipkg = new Ipkg;
        ipkg->setOption( "upgrade" );
        InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Upgrading installed packages" ),
-                                                  tr ( "Upgrade" ) );
+                              tr ( "Upgrade" ) );
        connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-                reloadDocuments = TRUE;
+        reloadDocuments = TRUE;
        stack->addWidget( dlg, 3 );
        stack->raiseWidget( dlg );
    }
 }
 void MainWindow :: downloadPackage()
 {
    bool doUpdate = true;
    if ( downloadEnabled )
    {
        // See if any packages are selected
        bool found = false;
        if ( serversList->currentText() != LOCAL_SERVER )
        {
            for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
-                  item != 0 && !found;
+                    item != 0 && !found;
-                  item = (QCheckListItem *)item->nextSibling() )
+                    item = (QCheckListItem *)item->nextSibling() )
            {
                if ( item->isOn() )
                    found = true;
            }
        }
        // If user selected some packages then download the and store the locally
        // otherwise, display dialog asking user what package to download from an http server
@@ -831,18 +834,18 @@ void MainWindow :: downloadPackage()
        else
            downloadRemotePackage();
    }
    else
    {
        doUpdate = false;
        for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
-              item != 0 ;
+                item != 0 ;
-              item = (QCheckListItem *)item->nextSibling() )
+                item = (QCheckListItem *)item->nextSibling() )
        {
            if ( item->isOn() )
            {
                QString name = item->text();
                int pos = name.find( "*" );
                name.truncate( pos );
                // if (there is a (installed), remove it
@@ -850,17 +853,17 @@ void MainWindow :: downloadPackage()
                if ( pos > 0 )
                    name.truncate( pos - 1 );
                Package *p = mgr->getServer( serversList->currentText() )->getPackage( name );
                QString msgtext;
                msgtext = tr( "Are you sure you wish to delete\n%1?" ).arg( (const char *)p->getPackageName() );
                if ( QMessageBox::information( this, tr( "Are you sure?" ),
-                                    msgtext, tr( "No" ), tr( "Yes" ) ) == 1 )
+                                               msgtext, tr( "No" ), tr( "Yes" ) ) == 1 )
                {
                    doUpdate = true;
                    QFile f( p->getFilename() );
                    f.remove();
                }
            }
        }
    }
@@ -903,51 +906,51 @@ void MainWindow :: downloadSelectedPackages()
    // Download each package
    Ipkg ipkg;
    connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
    ipkg.setOption( "download" );
    ipkg.setRuntimeDirectory( dir );
    for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
-          item != 0 ;
+            item != 0 ;
-          item = (QCheckListItem *)item->nextSibling() )
+            item = (QCheckListItem *)item->nextSibling() )
    {
        if ( item->isOn() )
        {
            ipkg.setPackage( item->text() );
            ipkg.runIpkg( );
        }
    }
 }
 void MainWindow :: downloadRemotePackage()
 {
    // Display dialog
    bool ok;
    QString package = InputDialog::getText( tr( "Install Remote Package" ), tr( "Enter package location" ), "http://", &ok, this );
    if ( !ok || package.isEmpty() )
        return;
-//    DownloadRemoteDlgImpl dlg( this, "Install", true );
+    //    DownloadRemoteDlgImpl dlg( this, "Install", true );
-//    if ( dlg.exec() == QDialog::Rejected )
+    //    if ( dlg.exec() == QDialog::Rejected )
-//        return;
+    //        return;
    // grab details from dialog
-//    QString package = dlg.getPackageLocation();
+    //    QString package = dlg.getPackageLocation();
    InstallData *item = new InstallData();
    item->option = "I";
    item->packageName = package;
    QList<InstallData> workingPackages;
    workingPackages.setAutoDelete( TRUE );
    workingPackages.append( item );
    InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Download" ) );
    connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-        reloadDocuments = TRUE;
+    reloadDocuments = TRUE;
    stack->addWidget( dlg, 3 );
    stack->raiseWidget( dlg );
 }
 void MainWindow :: applyChanges()
 {
    stickyOption = "";
@@ -956,42 +959,42 @@ void MainWindow :: applyChanges()
    mgr->writeOutIpkgConf();
    // Now for each selected item
    // deal with it
    QList<InstallData> workingPackages;
    workingPackages.setAutoDelete( TRUE );
    for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
-          item != 0 ;
+            item != 0 ;
-          item = (QCheckListItem *)item->nextSibling() )
+            item = (QCheckListItem *)item->nextSibling() )
    {
        if ( item->isOn() )
        {
            InstallData *instdata = dealWithItem( item );
            if ( instdata )
                workingPackages.append( instdata );
            else
                return;
-                }
+        }
    }
    if ( workingPackages.count() == 0 )
    {
        // Nothing to do
        QMessageBox::information( this, tr( "Nothing to do" ),
-                             tr( "No packages selected" ), tr( "OK" ) );
+                                  tr( "No packages selected" ), tr( "OK" ) );
        return;
    }
    // do the stuff
    InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Apply changes" ) );
    connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-        reloadDocuments = TRUE;
+    reloadDocuments = TRUE;
    stack->addWidget( dlg, 3 );
    stack->raiseWidget( dlg );
 }
 // decide what to do - either remove, upgrade or install
 // Current rules:
 //    If not installed - install
 //    If installed and different version available - upgrade
@@ -1019,17 +1022,17 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
    }
    else
    {
        InstallData *newitem = new InstallData();
        newitem->option = "D";
        // If local file, remove using package name, not filename
        if ( p->isPackageStoredLocally() )
            name = item->text();
-        
        if ( !p->isPackageStoredLocally() )
            newitem->packageName = p->getInstalledPackageName();
        else
            newitem->packageName = name;
        if ( p->getInstalledTo() )
        {
            newitem->destination = p->getInstalledTo();
@@ -1085,43 +1088,43 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
            // the user to say something like 'remove all'
            if ( stickyOption == "" )
            {
                QString msgtext;
                msgtext = caption.arg( ( const char * )name );
                QuestionDlg dlg( text, msgtext, secondButton );
                switch( dlg.exec() )
                {
-                    case 0: // Cancel
+                case 0: // Cancel
-                        delete newitem;
+                    delete newitem;
-                        return 0x0;
+                    return 0x0;
-                        break;
+                    break;
-                    case 1: // Remove
+                case 1: // Remove
-                        newitem->option = "D";
+                    newitem->option = "D";
-                        // If local file, remove using package name, not filename
+                    // If local file, remove using package name, not filename
-                        if ( p->isPackageStoredLocally() )
+                    if ( p->isPackageStoredLocally() )
-                            name = item->text();
+                        name = item->text();
-                        break;
+                    break;
-                    case 2: // Reinstall or Upgrade
+                case 2: // Reinstall or Upgrade
-                        newitem->option = secondOption;
+                    newitem->option = secondOption;
-                        break;
+                    break;
                }
            }
            else
            {
-//                newitem->option = stickyOption;
+                //                newitem->option = stickyOption;
            }
        }
        // Check if we are reinstalling the same version
        if ( newitem->option != "R" )
-           newitem->recreateLinks = true;
+            newitem->recreateLinks = true;
        else
-           newitem->recreateLinks = false;
+            newitem->recreateLinks = false;
        // User hit cancel (on dlg - assume remove)
        return newitem;
    }
 }
 void MainWindow :: reloadData( InstallDlgImpl *dlg )
 {
@@ -1133,24 +1136,24 @@ void MainWindow :: reloadData( InstallDlgImpl *dlg )
        delete dlg;
    }
    mgr->reloadServerData();
    serverSelected( -1, FALSE );
 #ifdef QWS
    if ( reloadDocuments )
-        {
+    {
-                m_status->setText( tr( "Updating Launcher..." ) );
+        m_status->setText( tr( "Updating Launcher..." ) );
-                // Finally let the main system update itself
+        // Finally let the main system update itself
-                QCopEnvelope e("QPE/System", "linkChanged(QString)");
+        QCopEnvelope e("QPE/System", "linkChanged(QString)");
-                QString lf = QString::null;
+        QString lf = QString::null;
-                e << lf;
+        e << lf;
-        }
+    }
 #endif
    stack->raiseWidget( networkPkgWindow );
 }
 void MainWindow :: letterPushed( QString t )
 {
    QCheckListItem *top = (QCheckListItem *)packagesList->firstChild();
@@ -1176,28 +1179,29 @@ void MainWindow :: letterPushed( QString t )
            packagesList->setSelected( item, true );
            packagesList->ensureItemVisible( item );
            break;
        }
        item = (QCheckListItem *)item->nextSibling();
        if ( !item )
            item = (QCheckListItem *)packagesList->firstChild();
-    } while ( item != start);
+    }
+    while ( item != start);
 }
 void MainWindow :: slotDisplayPackage( QListViewItem *item )
 {
    QString itemstr( ((QCheckListItem*)item)->text() );
    PackageWindow *p = new PackageWindow( mgr->getServer( serversList->currentText() )->getPackage( itemstr ) );
-    p->showMaximized();
+    QPEApplication::showWidget( p );
 }
 QuestionDlg::QuestionDlg( const QString &caption, const QString &text, const QString &secondbtn )
-    : QWidget( 0x0, 0x0, WType_Modal | WType_TopLevel | WStyle_Dialog )
+        : QWidget( 0x0, 0x0, WType_Modal | WType_TopLevel | WStyle_Dialog )
 {
    setCaption( caption );
    resize( 175, 100 );
    QGridLayout *layout = new QGridLayout( this );
    QLabel *l = new QLabel( text, this );
    l->setAlignment( AlignCenter | WordBreak );
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 4887ceb..9fdf31e 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -19,82 +19,81 @@
 ..}^=.=       =       ;      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 <fstream>
+#include "settingsimpl.h"
-#include <algorithm>
+#include "global.h"
-using namespace std;
+/* OPIE */
+#include <opie/otabwidget.h>
+#ifdef QWS
+#include <qpe/config.h>
+#include <qpe/resource.h>
+#endif
+#include <qpe/qpeapplication.h>
+/* QT */
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
-#include <opie/otabwidget.h>
+/* STD */
+#include <fstream>
-#ifdef QWS
+#include <algorithm>
-#include <qpe/config.h>
+using namespace std;
-#include <qpe/resource.h>
-#endif
-#include "settingsimpl.h"
-#include "global.h"
 SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl )
+        : QDialog( parent, name, modal, fl )
 {
    setCaption( tr( "Configuration" ) );
-    
    // Setup layout to make everything pretty
    QVBoxLayout *layout = new QVBoxLayout( this );
    layout->setMargin( 2 );
    layout->setSpacing( 4 );
    // Setup tabs for all info
    OTabWidget *tabwidget = new OTabWidget( this );
    layout->addWidget( tabwidget );
    tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) );
    tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) );
    tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) );
    tabwidget->setCurrentTab( tr( "Servers" ) );
-    
    dataMgr = dataManager;
    setupData();
    changed = false;
    newserver = false;
    newdestination = false;
 }
 SettingsImpl :: ~SettingsImpl()
 {
 }
 bool SettingsImpl :: showDlg()
 {
-        showMaximized();
+    QPEApplication::execDialog( this );
-        exec();
+    if ( changed )
+        dataMgr->writeOutIpkgConf();
-        if ( changed )
-                dataMgr->writeOutIpkgConf();
-        return changed;
+    return changed;
 }
 QWidget *SettingsImpl :: initServerTab()
 {
    QWidget *control = new QWidget( this );
    QVBoxLayout *vb = new QVBoxLayout( control );
@@ -113,45 +112,45 @@ QWidget *SettingsImpl :: initServerTab()
    servers = new QListBox( container );
    servers->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
    connect( servers, SIGNAL( highlighted( int ) ), this, SLOT( editServer( int ) ) );
    layout->addMultiCellWidget( servers, 0, 0, 0, 1 );
    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( newServer() ) );
    layout->addWidget( btn, 1, 0 );
-    
    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( removeServer() ) );
    layout->addWidget( btn, 1, 1 );
-    
    QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Server" ), container );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
    QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
-    
    QLabel *label = new QLabel( tr( "Name:" ), grpbox );
    grplayout->addWidget( label, 0, 0 );
    servername = new QLineEdit( grpbox );
    grplayout->addWidget( servername, 0, 1 );
    label = new QLabel( tr( "Address:" ), grpbox );
    grplayout->addWidget( label, 1, 0 );
    serverurl = new QLineEdit( grpbox );
    grplayout->addWidget( serverurl, 1, 1 );
    active = new QCheckBox( tr( "Active Server" ), grpbox );
    grplayout->addMultiCellWidget( active, 2, 2, 0, 1 );
-    
    btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
    connect( btn, SIGNAL( clicked() ), this, SLOT( changeServerDetails() ) );
    grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
-    
    return control;
 }
 QWidget *SettingsImpl :: initDestinationTab()
 {
    QWidget *control = new QWidget( this );
    QVBoxLayout *vb = new QVBoxLayout( control );
@@ -171,45 +170,45 @@ QWidget *SettingsImpl :: initDestinationTab()
    destinations = new QListBox( container );
    destinations->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
    connect( destinations, SIGNAL( highlighted( int ) ), this, SLOT( editDestination( int ) ) );
    layout->addMultiCellWidget( destinations, 0, 0, 0, 1 );
    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( newDestination() ) );
    layout->addWidget( btn, 1, 0 );
-    
    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( removeDestination() ) );
    layout->addWidget( btn, 1, 1 );
-    
    QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Destination" ), container );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
    QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
-    
    QLabel *label = new QLabel( tr( "Name:" ), grpbox );
    grplayout->addWidget( label, 0, 0 );
    destinationname = new QLineEdit( grpbox );
    grplayout->addWidget( destinationname, 0, 1 );
    label = new QLabel( tr( "Location:" ), grpbox );
    grplayout->addWidget( label, 1, 0 );
    destinationurl = new QLineEdit( grpbox );
    grplayout->addWidget( destinationurl, 1, 1 );
    linkToRoot = new QCheckBox( tr( "Link to root" ), grpbox );
    grplayout->addMultiCellWidget( linkToRoot, 2, 2, 0, 1 );
-    
    btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
    connect( btn, SIGNAL( clicked() ), this, SLOT( changeDestinationDetails() ) );
    grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
-    
    return control;
 }
 QWidget *SettingsImpl :: initProxyTab()
 {
    QWidget *control = new QWidget( this );
    QVBoxLayout *vb = new QVBoxLayout( control );
@@ -230,64 +229,64 @@ QWidget *SettingsImpl :: initProxyTab()
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 0, 0, 0, 1 );
    QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
    txtHttpProxy = new QLineEdit( grpbox );
    grplayout->addWidget( txtHttpProxy );
    chkHttpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox );
    grplayout->addWidget( chkHttpProxyEnabled );
-    
    grpbox = new QGroupBox( 0, Qt::Vertical, tr( "FTP Proxy" ), container );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 1, 1, 0, 1 );
    grplayout = new QVBoxLayout( grpbox->layout() );
    txtFtpProxy = new QLineEdit( grpbox );
    grplayout->addWidget( txtFtpProxy );
    chkFtpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox );
    grplayout->addWidget( chkFtpProxyEnabled );
-    
    QLabel *label = new QLabel( tr( "Username:" ), container );
    layout->addWidget( label, 2, 0 );
    txtUsername = new QLineEdit( container );
    layout->addWidget( txtUsername, 2, 1 );
    label = new QLabel( tr( "Password:" ), container );
    layout->addWidget( label, 3, 0 );
    txtPassword = new QLineEdit( container );
    layout->addWidget( txtPassword, 3, 1 );
    QPushButton *btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( proxyApplyChanges() ) );
    layout->addMultiCellWidget( btn, 4, 4, 0, 1 );
-    
    return control;
 }
 void SettingsImpl :: setupData()
 {
    // add servers
    QString serverName;
    QListIterator<Server> it( dataMgr->getServerList() );
    for ( ; it.current(); ++it )
-        {
+    {
        serverName = it.current()->getServerName();
        if ( serverName == LOCAL_SERVER || serverName == LOCAL_IPKGS )
            continue;
        servers->insertItem( serverName );
-        }
+    }
    // add destinations
    QListIterator<Destination> it2( dataMgr->getDestinationList() );
    for ( ; it2.current(); ++it2 )
        destinations->insertItem( it2.current()->getDestinationName() );
-    
    // setup proxy tab
    txtHttpProxy->setText( dataMgr->getHttpProxy() );
    txtFtpProxy->setText( dataMgr->getFtpProxy() );
    txtUsername->setText( dataMgr->getProxyUsername() );
    txtPassword->setText( dataMgr->getProxyPassword() );
    chkHttpProxyEnabled->setChecked( dataMgr->getHttpProxyEnabled() );
    chkFtpProxyEnabled->setChecked( dataMgr->getFtpProxyEnabled() );
 }
@@ -331,63 +330,63 @@ void SettingsImpl :: removeServer()
    {
        dataMgr->getServerList().removeRef( s );
        servers->removeItem( currentSelectedServer );
    }
 }
 void SettingsImpl :: changeServerDetails()
 {
-        changed = true;
+    changed = true;
-        QString newName = servername->text();
+    QString newName = servername->text();
-        
-        // Convert any spaces to underscores
+    // Convert any spaces to underscores
-        char *tmpStr = new char[newName.length() + 1];
+    char *tmpStr = new char[newName.length() + 1];
-        for ( unsigned int i = 0 ; i < newName.length() ; ++i )
+    for ( unsigned int i = 0 ; i < newName.length() ; ++i )
-        {
+    {
-                if ( newName[i] == ' ' )
+        if ( newName[i] == ' ' )
-                        tmpStr[i] = '_';
+            tmpStr[i] = '_';
-                else
+        else
-                        tmpStr[i] = newName[i].latin1();
+            tmpStr[i] = newName[i].latin1();
-        }
+    }
-        tmpStr[newName.length()] = '\0';
+    tmpStr[newName.length()] = '\0';
-        
-        newName = tmpStr;
+    newName = tmpStr;
-        delete tmpStr;
+    delete tmpStr;
-        
-        if ( !newserver )
+    if ( !newserver )
-        {
+    {
-                Server *s = dataMgr->getServer( servers->currentText() );
+        Server *s = dataMgr->getServer( servers->currentText() );
-                if ( s )
+        if ( s )
-                {
+        {
-                        // Update url
+            // Update url
-                        s->setServerUrl( serverurl->text() );
+            s->setServerUrl( serverurl->text() );
-                        s->setActive( active->isChecked() );
+            s->setActive( active->isChecked() );
-                        // Check if server name has changed, if it has then we need to replace the key in the map
+            // Check if server name has changed, if it has then we need to replace the key in the map
-                        if ( serverName != newName )
+            if ( serverName != newName )
-                        {
+            {
-                                // Update server name
+                // Update server name
-                                s->setServerName( newName );
+                s->setServerName( newName );
-                        }
+            }
-                
-                        // Update list box
+            // Update list box
-                        servers->changeItem( newName, currentSelectedServer );
+            servers->changeItem( newName, currentSelectedServer );
-                }
+        }
-        }
+    }
-        else
+    else
-        {
+    {
        Server s( newName, serverurl->text() );
        dataMgr->getServerList().append( new Server( newName, serverurl->text() ) );
        dataMgr->getServerList().last()->setActive( active->isChecked() );
-                servers->insertItem( newName );
+        servers->insertItem( newName );
-                servers->setCurrentItem( servers->count() );
+        servers->setCurrentItem( servers->count() );
-                newserver = false;
+        newserver = false;
-        }
+    }
 }
 //------------------ Destinations tab ----------------------
 void SettingsImpl :: editDestination( int sel )
 {
    currentSelectedDestination = sel;
    Destination *d = dataMgr->getDestination( destinations->currentText() );
@@ -404,84 +403,86 @@ void SettingsImpl :: editDestination( int sel )
        destinationname->setText( "" );
        destinationurl->setText( "" );
        linkToRoot->setChecked( false );
    }
 }
 void SettingsImpl :: newDestination()
 {
-        newdestination = true;
+    newdestination = true;
-        destinationname->setText( "" );
+    destinationname->setText( "" );
-        destinationurl->setText( "" );
+    destinationurl->setText( "" );
-        destinationname->setFocus();
+    destinationname->setFocus();
    linkToRoot->setChecked( true );
 }
 void SettingsImpl :: removeDestination()
 {
    changed = true;
    Destination *d = dataMgr->getDestination( destinations->currentText() );
    if ( d )
    {
        dataMgr->getDestinationList().removeRef( d );
        destinations->removeItem( currentSelectedDestination );
    }
 }
 void SettingsImpl :: changeDestinationDetails()
 {
-        changed = true;
+    changed = true;
 #ifdef QWS
    Config cfg( "aqpkg" );
    cfg.setGroup( "destinations" );
 #endif
    QString newName = destinationname->text();
-        if ( !newdestination )
+    if ( !newdestination )
-        {
+    {
-                Destination *d = dataMgr->getDestination( destinations->currentText() );
+        Destination *d = dataMgr->getDestination( destinations->currentText() );
-                if ( d )
+        if ( d )
-                {
+        {
-                        // Update url
+            // Update url
-                        d->setDestinationPath( destinationurl->text() );
+            d->setDestinationPath( destinationurl->text() );
-                d->linkToRoot( linkToRoot->isChecked() );
+            d->linkToRoot( linkToRoot->isChecked() );
-                        // Check if server name has changed, if it has then we need to replace the key in the map
+            // Check if server name has changed, if it has then we need to replace the key in the map
-                        if ( destinationName != newName )
+            if ( destinationName != newName )
-                        {
+            {
-                                // Update server name
+                // Update server name
-                                d->setDestinationName( newName );
+                d->setDestinationName( newName );
-                                // Update list box
+                // Update list box
-                                destinations->changeItem( newName, currentSelectedDestination );
+                destinations->changeItem( newName, currentSelectedDestination );
-                        }
+            }
 #ifdef QWS
-                        QString key = newName;
+            QString key = newName;
-                        key += "_linkToRoot";
+            key += "_linkToRoot";
-                        int val = d->linkToRoot();
+            int val = d->linkToRoot();
-                        cfg.writeEntry( key, val );
+            cfg.writeEntry( key, val );
-#endif      
+#endif
-                }  
-        }
+        }
-        else
+    }
-        {
+    else
-                dataMgr->getDestinationList().append( new Destination( newName, destinationurl->text() ) );
+    {
-                destinations->insertItem( newName );
+        dataMgr->getDestinationList().append( new Destination( newName, destinationurl->text() ) );
-                destinations->setCurrentItem( destinations->count() );
+        destinations->insertItem( newName );
-                newdestination = false;
+        destinations->setCurrentItem( destinations->count() );
+        newdestination = false;
 #ifdef QWS
        QString key = newName;
        key += "_linkToRoot";
        cfg.writeEntry( key, true );
 #endif
-        }
+    }
 }
 //------------------ Proxy tab ----------------------
 void SettingsImpl :: proxyApplyChanges()
 {
    changed = true;
    dataMgr->setHttpProxy( txtHttpProxy->text() );
    dataMgr->setFtpProxy( txtFtpProxy->text() );
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index a00193d..977c283 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,33 +1,36 @@
 #include "backuprestore.h"
-//#include "output.h"
 #include "errordialog.h"
+/* OPIE */
+#include <opie2/ostorageinfo.h>
+#include <qpe/qpeapplication.h>
+/* QT */
 #include <qapplication.h>
 #include <qmultilineedit.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qheader.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qlist.h>
 #include <stdlib.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 #include <qtextview.h>
-#include <opie2/ostorageinfo.h>
+/* STD */
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #define HEADER_NAME 0
 #define HEADER_BACKUP 1
@@ -36,17 +39,16 @@
 #define EXTENSION ".bck"
 const QString tempFileName = "/tmp/backup.err";
 BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags fl)
        : BackupAndRestoreBase(parent, name,  fl)
 {
-    this->showMaximized();
    backupList->header()->hide();
    restoreList->header()->hide();
    connect(backupButton, SIGNAL(clicked()),
            this, SLOT(backup()));
    connect(restoreButton, SIGNAL(clicked()),
            this, SLOT(restore()));
    connect(backupList, SIGNAL(clicked( QListViewItem * )),
            this, SLOT(selectItem(QListViewItem*)));
@@ -125,16 +127,17 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags f
        {
            if(*dontBackupList.at(i2) == text)
            {
                selectItem(list.at(i));
                break;
            }
        }
    }
+    QPEApplication::showWidget( this );
 }
 BackupAndRestore::~BackupAndRestore()
 {
    QList<QListViewItem> list;
    getAllItems(backupList->firstChild(), list);
    Config config("BackupAndRestore");
@@ -282,18 +285,17 @@ void BackupAndRestore::backup()
                errorFile.close();
                pErrDialog->m_textarea->setText( s );
            }
            else
            {
                pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" );
            }
-            pErrDialog->showMaximized();
+            QPEApplication::execDialog( pErrDialog );
-            pErrDialog->exec();
            delete pErrDialog;
            break;
        }
        setCaption(tr("Backup and Restore.. Failed !!"));
        return;
    }
    else
    {
@@ -447,18 +449,17 @@ void BackupAndRestore::restore()
                errorFile.close();
                pErrDialog->m_textarea->setText( s );
            }
            else
            {
                pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) );
            }
-            pErrDialog->showMaximized();
+            QPEApplication::execDialog( pErrDialog );
-            pErrDialog->exec();
            delete pErrDialog;
            setCaption(tr("Backup and Restore.. Failed !!"));
            return;
            break;
        }
diff --git a/noncore/settings/networksettings/ppp/devices.cpp b/noncore/settings/networksettings/ppp/devices.cpp
index e94904b..9da090d 100644
--- a/noncore/settings/networksettings/ppp/devices.cpp
+++ b/noncore/settings/networksettings/ppp/devices.cpp
@@ -19,35 +19,41 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Library General Public
 * License along with this program; if not, write to the Free
 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#include "interfaceppp.h"
+#include "devices.h"
+#include "authwidget.h"
+#include "pppdata.h"
+#include "edit.h"
+#include "general.h"
+/* OPIE */
+#include <qpe/qpeapplication.h>
+/* QT */
 #include <qdir.h>
-#include <stdlib.h>
 #include <qlayout.h>
 #include <qtabwidget.h>
 #include <qtabdialog.h>
 #include <qwhatsthis.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qbuttongroup.h>
 #include <qmessagebox.h>
 #include <qvgroupbox.h>
-#include "interfaceppp.h"
+/* STD */
-#include "devices.h"
+#include <stdlib.h>
-#include "authwidget.h"
-#include "pppdata.h"
-#include "edit.h"
-#include "general.h"
 void parseargs(char* buf, char** args);
 DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *name, WFlags f )
    : ChooserWidget(ip->data(), parent, name, f)
 {
  _ifaceppp = ip;
  QWhatsThis::add(edit_b, tr("Allows you to modify the selected device"));
@@ -186,18 +192,17 @@ int DevicesWidget::doTab(){
   tabWindow->addTab( modem1, tr("&Device") );
   modem2 = new ModemWidget2( _pppdata, _ifaceppp, tabWindow, "modem2" );
   tabWindow->addTab( modem2, tr("&Modem") );
    int result = 0;
    bool ok = false;
    while (!ok){
-        dlg->showMaximized();
+        result = QPEApplication::execDialog( dlg );
-        result = dlg->exec();
        ok = true;
        if(result == QDialog::Accepted) {
            if (!modem1->save()){
                QMessageBox::critical(this, "error", tr( "You must enter a unique device name"));
                ok = false;
            }else{
                 modem2->save();
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index ceac90c..7d21605 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -18,1117 +18,1194 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Library General Public
 * License along with this program; if not, write to the Free
 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <string.h>
+#include "edit.h"
-#include <termios.h>
+#include "pppdata.h"
+#include "iplined.h"
+#include "auth.h"
+/* OPIE */
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+/* QT */
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qwhatsthis.h>
 #include <qregexp.h>
 #include <qapplication.h>
 #include <qbuttongroup.h>
 #include <qvgroupbox.h>
 #include <qhbox.h>
 #include <qdialog.h>
-#include <qpe/resource.h>
-#include "edit.h"
+/* STD */
-#include "pppdata.h"
-#include "iplined.h"
+#include <string.h>
-#include "auth.h"
+#include <termios.h>
 DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
                        , const char *name )
-    : QWidget(parent, name), _pppdata(pd)
+        : QWidget(parent, name), _pppdata(pd)
 {
-  const int GRIDROWS = 6;
+    const int GRIDROWS = 6;
-  QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );
+    QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );
-  connect_label = new QLabel(tr("Connection name:"), this);
+    connect_label = new QLabel(tr("Connection name:"), this);
-  tl->addWidget(connect_label, 0, 0);
+    tl->addWidget(connect_label, 0, 0);
-  connectname_l = new QLineEdit(this);
+    connectname_l = new QLineEdit(this);
-//  connectname_l->setMaxLength(ACCNAME_SIZE);
+    //  connectname_l->setMaxLength(ACCNAME_SIZE);
-  tl->addWidget(connectname_l, 0, 1);
+    tl->addWidget(connectname_l, 0, 1);
-  QString tmp = tr("Type in a unique name for this connection");
+    QString tmp = tr("Type in a unique name for this connection");
-  QWhatsThis::add(connect_label,tmp);
+    QWhatsThis::add(connect_label,tmp);
-  QWhatsThis::add(connectname_l,tmp);
+    QWhatsThis::add(connectname_l,tmp);
-  number_label = new QLabel(tr("Phone number:"), this);
+    number_label = new QLabel(tr("Phone number:"), this);
-  number_label->setAlignment(AlignTop|AlignLeft);
+    number_label->setAlignment(AlignTop|AlignLeft);
-  tl->addWidget(number_label, 1, 0);
+    tl->addWidget(number_label, 1, 0);
-  QHBoxLayout *lpn = new QHBoxLayout(5);
+    QHBoxLayout *lpn = new QHBoxLayout(5);
-  tl->addLayout(lpn, 1, 1);
+    tl->addLayout(lpn, 1, 1);
-  numbers = new QListBox(this);
+    numbers = new QListBox(this);
-//  numbers->setMinimumSize(120, 70);
+    //  numbers->setMinimumSize(120, 70);
-  lpn->addWidget(numbers);
+    lpn->addWidget(numbers);
-  QVBoxLayout *lpn1 = new QVBoxLayout;
+    QVBoxLayout *lpn1 = new QVBoxLayout;
-  lpn->addLayout(lpn1);
+    lpn->addLayout(lpn1);
-  add = new QPushButton(tr("&Add..."), this);
+    add = new QPushButton(tr("&Add..."), this);
-  del = new QPushButton(tr("&Remove"), this);
+    del = new QPushButton(tr("&Remove"), this);
-  up = new QPushButton(this);
+    up = new QPushButton(this);
-  up->setPixmap( Resource::loadPixmap("up") );
+    up->setPixmap( Resource::loadPixmap("up") );
-  down = new QPushButton(this);
+    down = new QPushButton(this);
-  down->setPixmap( Resource::loadPixmap("down") );
+    down->setPixmap( Resource::loadPixmap("down") );
-  lpn1->addWidget(add);
+    lpn1->addWidget(add);
-  lpn1->addWidget(del);
+    lpn1->addWidget(del);
-  lpn1->addStretch(1);
+    lpn1->addStretch(1);
-  lpn1->addWidget(up);
+    lpn1->addWidget(up);
-  lpn1->addWidget(down);
+    lpn1->addWidget(down);
-  connect(add, SIGNAL(clicked()),
+    connect(add, SIGNAL(clicked()),
-          this, SLOT(addNumber()));
+            this, SLOT(addNumber()));
-  connect(del, SIGNAL(clicked()),
+    connect(del, SIGNAL(clicked()),
-          this, SLOT(delNumber()));
+            this, SLOT(delNumber()));
-  connect(up, SIGNAL(clicked()),
+    connect(up, SIGNAL(clicked()),
-          this, SLOT(upNumber()));
+            this, SLOT(upNumber()));
-  connect(down, SIGNAL(clicked()),
+    connect(down, SIGNAL(clicked()),
-          this, SLOT(downNumber()));
+            this, SLOT(downNumber()));
-  connect(numbers, SIGNAL(highlighted(int)),
+    connect(numbers, SIGNAL(highlighted(int)),
-          this, SLOT(selectionChanged(int)));
+            this, SLOT(selectionChanged(int)));
-  numbersChanged();
+    numbersChanged();
-  tmp = tr("<p>Specifies the phone numbers to dial. You\n"
+    tmp = tr("<p>Specifies the phone numbers to dial. You\n"
-             "can supply multiple numbers here, simply\n"
+             "can supply multiple numbers here, simply\n"
-             "click on \"Add\". You can arrange the\n"
+             "click on \"Add\". You can arrange the\n"
-             "order the numbers are tried by using the\n"
+             "order the numbers are tried by using the\n"
-             "arrow buttons.\n\n"
+             "arrow buttons.\n\n"
-             "When a number is busy or fails, <i>kppp</i> will \n"
+             "When a number is busy or fails, <i>kppp</i> will \n"
-             "try the next number and so on");
+             "try the next number and so on");
-  QWhatsThis::add(number_label,tmp);
-  QWhatsThis::add(numbers,tmp);
-  pppdargs = new QPushButton(tr("Customize pppd Arguments..."), this);
-  connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
-  tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter);
-  // Set defaults if editing an existing connection
-  if(!isnewaccount) {
-    connectname_l->setText(_pppdata->accname());
-    // insert the phone numbers into the listbox
-    QString n = _pppdata->phonenumber();
-    QString tmp = "";
-    uint idx = 0;
-    while(idx != n.length()) {
-      if(n[idx] == ':') {
-        if(tmp.length() > 0)
-          numbers->insertItem(tmp);
-        tmp = "";
-      } else
-        tmp += n[idx];
-      idx++;
-    }
-    if(tmp.length() > 0)
-      numbers->insertItem(tmp);
-  }
+    QWhatsThis::add(number_label,tmp);
+    QWhatsThis::add(numbers,tmp);
+    pppdargs = new QPushButton(tr("Customize pppd Arguments..."), this);
+    connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
+    tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter);
+    // Set defaults if editing an existing connection
+    if(!isnewaccount)
+    {
+        connectname_l->setText(_pppdata->accname());
+        // insert the phone numbers into the listbox
+        QString n = _pppdata->phonenumber();
+        QString tmp = "";
+        uint idx = 0;
+        while(idx != n.length())
+        {
+            if(n[idx] == ':')
+            {
+                if(tmp.length() > 0)
+                    numbers->insertItem(tmp);
+                tmp = "";
+            }
+            else
+                tmp += n[idx];
+            idx++;
+        }
+        if(tmp.length() > 0)
+            numbers->insertItem(tmp);
-  numbersChanged();
+    }
-  tl->activate();
+    numbersChanged();
+    tl->activate();
 }
-bool DialWidget::save() {
+bool DialWidget::save()
-  //first check to make sure that the account name is unique!
+{
-  if(connectname_l->text().isEmpty() ||
+    //first check to make sure that the account name is unique!
-     !_pppdata->isUniqueAccname(connectname_l->text())) {
+    if(connectname_l->text().isEmpty() ||
-    return false;
+            !_pppdata->isUniqueAccname(connectname_l->text()))
-  } else {
+    {
-    _pppdata->setAccname(connectname_l->text());
+        return false;
-    QString number = "";
-    for(uint i = 0; i < numbers->count(); i++) {
-      if(i != 0)
-        number += ":";
-      number += numbers->text(i);
    }
+    else
+    {
+        _pppdata->setAccname(connectname_l->text());
+        QString number = "";
+        for(uint i = 0; i < numbers->count(); i++)
+        {
+            if(i != 0)
+                number += ":";
+            number += numbers->text(i);
+        }
-    _pppdata->setPhonenumber(number);
+        _pppdata->setPhonenumber(number);
-    return true;
+        return true;
-  }
+    }
 }
-void DialWidget::numbersChanged() {
+void DialWidget::numbersChanged()
-  int sel = numbers->currentItem();
+{
+    int sel = numbers->currentItem();
-  del->setEnabled(sel != -1);
+    del->setEnabled(sel != -1);
-  up->setEnabled(sel != -1 && sel != 0);
+    up->setEnabled(sel != -1 && sel != 0);
-  down->setEnabled(sel != -1 && sel != (int)numbers->count()-1);
+    down->setEnabled(sel != -1 && sel != (int)numbers->count()-1);
 }
-void DialWidget::selectionChanged(int) {
+void DialWidget::selectionChanged(int)
-  numbersChanged();
+{
+    numbersChanged();
 }
-void DialWidget::addNumber() {
+void DialWidget::addNumber()
+{
    PhoneNumberDialog dlg(this);
-   if(dlg.exec()) {
+    if(dlg.exec())
-     numbers->insertItem(dlg.phoneNumber());
+    {
-     numbersChanged();
+        numbers->insertItem(dlg.phoneNumber());
-   }
+        numbersChanged();
+    }
 }
-void DialWidget::delNumber() {
+void DialWidget::delNumber()
-  if(numbers->currentItem() != -1) {
+{
-    numbers->removeItem(numbers->currentItem());
+    if(numbers->currentItem() != -1)
-    numbersChanged();
+    {
-  }
+        numbers->removeItem(numbers->currentItem());
+        numbersChanged();
+    }
 }
-void DialWidget::upNumber() {
+void DialWidget::upNumber()
-  int idx = numbers->currentItem();
+{
-  if(idx != -1) {
+    int idx = numbers->currentItem();
-    QString item = numbers->text(idx);
+    if(idx != -1)
-    numbers->removeItem(idx);
+    {
-    numbers->insertItem(item, idx-1);
+        QString item = numbers->text(idx);
-    numbers->setCurrentItem(idx-1);
+        numbers->removeItem(idx);
-    numbersChanged();
+        numbers->insertItem(item, idx-1);
-  }
+        numbers->setCurrentItem(idx-1);
+        numbersChanged();
+    }
 }
-void DialWidget::downNumber() {
+void DialWidget::downNumber()
-  int idx = numbers->currentItem();
+{
-  if(idx != -1) {
+    int idx = numbers->currentItem();
-    QString item = numbers->text(idx);
+    if(idx != -1)
-    numbers->removeItem(idx);
+    {
-    numbers->insertItem(item, idx+1);
+        QString item = numbers->text(idx);
-    numbers->setCurrentItem(idx+1);
+        numbers->removeItem(idx);
-    numbersChanged();
+        numbers->insertItem(item, idx+1);
-  }
+        numbers->setCurrentItem(idx+1);
+        numbersChanged();
+    }
 }
-void DialWidget::pppdargsbutton() {
+void DialWidget::pppdargsbutton()
+{
    PPPdArguments pa(_pppdata, this);
-    pa.showMaximized();
+    QPEApplication::execDialog( &pa );
-    pa.exec();
 }
 /////////////////////////////////////////////////////////////////////////////
 // ExecWidget
 /////////////////////////////////////////////////////////////////////////////
 ExecWidget::ExecWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const char *name) :
-    QWidget(parent, name), _pppdata(pd)
+        QWidget(parent, name), _pppdata(pd)
 {
    QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
-  QLabel *l = new QLabel( tr("Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).<br><br>Be sure to supply the whole path to the program otherwise we might be unable to find it."), this);
+    QLabel *l = new QLabel( tr("Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).<br><br>Be sure to supply the whole path to the program otherwise we might be unable to find it."), this);
-  tl->addWidget(l);
+    tl->addWidget(l);
-  tl->addStretch(1);
+    tl->addStretch(1);
-  QGridLayout *l1 = new QGridLayout(4, 2, 10);
+    QGridLayout *l1 = new QGridLayout(4, 2, 10);
-  tl->addLayout(l1);
+    tl->addLayout(l1);
-  l1->setColStretch(0, 0);
+    l1->setColStretch(0, 0);
-  l1->setColStretch(1, 1);
+    l1->setColStretch(1, 1);
-  before_connect_l = new QLabel(tr("Before connect:"), this);
+    before_connect_l = new QLabel(tr("Before connect:"), this);
-  before_connect_l->setAlignment(AlignVCenter);
+    before_connect_l->setAlignment(AlignVCenter);
-  l1->addWidget(before_connect_l, 0, 0);
+    l1->addWidget(before_connect_l, 0, 0);
-  before_connect = new QLineEdit(this);
+    before_connect = new QLineEdit(this);
-//  before_connect->setMaxLength(COMMAND_SIZE);
+    //  before_connect->setMaxLength(COMMAND_SIZE);
-  l1->addWidget(before_connect, 0, 1);
+    l1->addWidget(before_connect, 0, 1);
-  QString tmp = tr("Allows you to run a program <b>before</b> a connection\n"
+    QString tmp = tr("Allows you to run a program <b>before</b> a connection\n"
-             "is established. It is called immediately before\n"
+                     "is established. It is called immediately before\n"
-             "dialing has begun.\n\n"
+                     "dialing has begun.\n\n"
-             "This might be useful, e.g. to stop HylaFAX blocking the\n"
+                     "This might be useful, e.g. to stop HylaFAX blocking the\n"
-             "modem.");
+                     "modem.");
-  QWhatsThis::add(before_connect_l,tmp);
+    QWhatsThis::add(before_connect_l,tmp);
-  QWhatsThis::add(before_connect,tmp);
+    QWhatsThis::add(before_connect,tmp);
-  command_label = new QLabel(tr("Upon connect:"), this);
+    command_label = new QLabel(tr("Upon connect:"), this);
-  command_label->setAlignment(AlignVCenter);
+    command_label->setAlignment(AlignVCenter);
-  l1->addWidget(command_label, 1, 0);
+    l1->addWidget(command_label, 1, 0);
-  command = new QLineEdit(this);
+    command = new QLineEdit(this);
-//  command->setMaxLength(COMMAND_SIZE);
+    //  command->setMaxLength(COMMAND_SIZE);
-  l1->addWidget(command, 1, 1);
+    l1->addWidget(command, 1, 1);
-  tmp = tr("Allows you to run a program <b>after</b> a connection\n"
+    tmp = tr("Allows you to run a program <b>after</b> a connection\n"
-             "is established. When your program is called, all\n"
+             "is established. When your program is called, all\n"
-             "preparations for an Internet connection are finished.\n"
+             "preparations for an Internet connection are finished.\n"
-             "\n"
+             "\n"
-             "Very useful for fetching mail and news");
+             "Very useful for fetching mail and news");
-  QWhatsThis::add(command_label,tmp);
+    QWhatsThis::add(command_label,tmp);
-  QWhatsThis::add(command,tmp);
+    QWhatsThis::add(command,tmp);
-  predisconnect_label = new QLabel(tr("Before disconnect:"),
+    predisconnect_label = new QLabel(tr("Before disconnect:"),
-                                 this);
+                                     this);
-  predisconnect_label->setAlignment(AlignVCenter);
+    predisconnect_label->setAlignment(AlignVCenter);
-  l1->addWidget(predisconnect_label, 2, 0);
+    l1->addWidget(predisconnect_label, 2, 0);
-  predisconnect = new QLineEdit(this);
+    predisconnect = new QLineEdit(this);
-//  predisconnect->setMaxLength(COMMAND_SIZE);
+    //  predisconnect->setMaxLength(COMMAND_SIZE);
-  l1->addWidget(predisconnect, 2, 1);
+    l1->addWidget(predisconnect, 2, 1);
-  tmp = tr("Allows you to run a program <b>before</b> a connection\n"
+    tmp = tr("Allows you to run a program <b>before</b> a connection\n"
-             "is closed. The connection will stay open until\n"
+             "is closed. The connection will stay open until\n"
-             "the program exits.");
+             "the program exits.");
-  QWhatsThis::add(predisconnect_label,tmp);
+    QWhatsThis::add(predisconnect_label,tmp);
-  QWhatsThis::add(predisconnect,tmp);
+    QWhatsThis::add(predisconnect,tmp);
-  discommand_label = new QLabel(tr("Upon disconnect:"),
+    discommand_label = new QLabel(tr("Upon disconnect:"),
-                              this);
+                                  this);
-  discommand_label->setAlignment(AlignVCenter);
+    discommand_label->setAlignment(AlignVCenter);
-  l1->addWidget(discommand_label, 3, 0);
+    l1->addWidget(discommand_label, 3, 0);
-  discommand = new QLineEdit(this);
+    discommand = new QLineEdit(this);
-//  discommand->setMaxLength(COMMAND_SIZE);
+    //  discommand->setMaxLength(COMMAND_SIZE);
-  l1->addWidget(discommand, 3, 1);
+    l1->addWidget(discommand, 3, 1);
-  tmp = tr("Allows you to run a program <b>after</b> a connection\n"
+    tmp = tr("Allows you to run a program <b>after</b> a connection\n"
-             "has been closed.");
+             "has been closed.");
-  QWhatsThis::add(discommand_label,tmp);
+    QWhatsThis::add(discommand_label,tmp);
-  QWhatsThis::add(discommand,tmp);
+    QWhatsThis::add(discommand,tmp);
-  // extra space between entries
+    // extra space between entries
-  l1->addRowSpacing(1, 5);
+    l1->addRowSpacing(1, 5);
-  l1->addRowSpacing(3, 5);
+    l1->addRowSpacing(3, 5);
-  tl->addStretch(1);
+    tl->addStretch(1);
-  tl->activate();
+    tl->activate();
-  // Set defaults if editing an existing connection
+    // Set defaults if editing an existing connection
-  if(!isnewaccount) {
+    if(!isnewaccount)
-    before_connect->setText(_pppdata->command_before_connect());
+    {
-    command->setText(_pppdata->command_on_connect());
+        before_connect->setText(_pppdata->command_before_connect());
-    discommand->setText(_pppdata->command_on_disconnect());
+        command->setText(_pppdata->command_on_connect());
-    predisconnect->setText(_pppdata->command_before_disconnect());
+        discommand->setText(_pppdata->command_on_disconnect());
-  }
+        predisconnect->setText(_pppdata->command_before_disconnect());
+    }
 }
-bool ExecWidget::save() {
+bool ExecWidget::save()
-  _pppdata->setCommand_before_connect(before_connect->text());
+{
-  _pppdata->setCommand_on_connect(command->text());
+    _pppdata->setCommand_before_connect(before_connect->text());
-  _pppdata->setCommand_before_disconnect(predisconnect->text());
+    _pppdata->setCommand_on_connect(command->text());
-  _pppdata->setCommand_on_disconnect(discommand->text());
+    _pppdata->setCommand_before_disconnect(predisconnect->text());
-  return true;
+    _pppdata->setCommand_on_disconnect(discommand->text());
+    return true;
 }
 /////////////////////////////////////////////////////////////////////////////
 //
 // IPWidget
 //
 /////////////////////////////////////////////////////////////////////////////
 IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
-    : QWidget(parent, name), _pppdata(pd)
+        : QWidget(parent, name), _pppdata(pd)
 {
-  QVBoxLayout *topLayout = new QVBoxLayout(this);
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
-  topLayout->setSpacing( 3 );//KDialog::spacingHint());
+    topLayout->setSpacing( 3 );//KDialog::spacingHint());
-  box = new QVGroupBox(tr("Configuration"), this);
+    box = new QVGroupBox(tr("Configuration"), this);
-//  box->setInsideSpacing( 1 );//KDialog::spacingHint());
+    //  box->setInsideSpacing( 1 );//KDialog::spacingHint());
-  rb = new QButtonGroup(this);
+    rb = new QButtonGroup(this);
-  rb->hide();
+    rb->hide();
-  connect(rb, SIGNAL(clicked(int)),
+    connect(rb, SIGNAL(clicked(int)),
-          SLOT(hitIPSelect(int)));
+            SLOT(hitIPSelect(int)));
-  dynamicadd_rb = new QRadioButton(box);
+    dynamicadd_rb = new QRadioButton(box);
-  dynamicadd_rb->setText(tr("Dynamic IP address"));
+    dynamicadd_rb->setText(tr("Dynamic IP address"));
-  QWhatsThis::add(dynamicadd_rb,
+    QWhatsThis::add(dynamicadd_rb,
-                  tr("Select this option when your computer gets an\n"
+                        tr("Select this option when your computer gets an\n"
-                       "internet address (IP) every time a\n"
+                           "internet address (IP) every time a\n"
-                       "connection is made.\n"
+                           "connection is made.\n"
-                       "\n"
+                           "\n"
-                       "Almost every Internet Service Provider uses\n"
+                           "Almost every Internet Service Provider uses\n"
-                       "this method, so this should be turned on."));
+                           "this method, so this should be turned on."));
-  staticadd_rb = new QRadioButton(box);
+    staticadd_rb = new QRadioButton(box);
-  staticadd_rb->setText(tr("Static IP address"));
+    staticadd_rb->setText(tr("Static IP address"));
-  rb->insert(dynamicadd_rb, 0);
+    rb->insert(dynamicadd_rb, 0);
-  rb->insert(staticadd_rb, 1);
+    rb->insert(staticadd_rb, 1);
-  QWhatsThis::add(staticadd_rb,
+    QWhatsThis::add(staticadd_rb,
-                  tr("Select this option when your computer has a\n"
+                        tr("Select this option when your computer has a\n"
-                       "fixed internet address (IP). Most computers\n"
+                           "fixed internet address (IP). Most computers\n"
-                       "don't have this, so you should probably select\n"
+                           "don't have this, so you should probably select\n"
-                       "dynamic IP addressing unless you know what you\n"
+                           "dynamic IP addressing unless you know what you\n"
-                       "are doing."));
+                           "are doing."));
-  QWidget *ipWidget = new QWidget(box);
+    QWidget *ipWidget = new QWidget(box);
-  QGridLayout *ipLayout = new QGridLayout(ipWidget, 2, 2);
+    QGridLayout *ipLayout = new QGridLayout(ipWidget, 2, 2);
-  ipLayout->setSpacing( 2 );//KDialog::spacingHint());
+    ipLayout->setSpacing( 2 );//KDialog::spacingHint());
-  ipaddress_label = new QLabel(tr("IP address:"), ipWidget);
+    ipaddress_label = new QLabel(tr("IP address:"), ipWidget);
-  QString tmp = tr("If your computer has a permanent internet\n"
+    QString tmp = tr("If your computer has a permanent internet\n"
-             "address, you must supply your IP address here.");
+                     "address, you must supply your IP address here.");
-  ipLayout->addWidget(ipaddress_label, 0, 0);
+    ipLayout->addWidget(ipaddress_label, 0, 0);
-  ipaddress_l = new IPLineEdit(ipWidget);
+    ipaddress_l = new IPLineEdit(ipWidget);
-  ipLayout->addWidget(ipaddress_l, 0, 1);
+    ipLayout->addWidget(ipaddress_l, 0, 1);
-  QWhatsThis::add(ipaddress_label,tmp);
+    QWhatsThis::add(ipaddress_label,tmp);
-  QWhatsThis::add(ipaddress_l,tmp);
+    QWhatsThis::add(ipaddress_l,tmp);
-  sub_label = new QLabel(tr("Subnet mask:"), ipWidget);
+    sub_label = new QLabel(tr("Subnet mask:"), ipWidget);
-  tmp = tr("<p>If your computer has a static Internet address,\n"
+    tmp = tr("<p>If your computer has a static Internet address,\n"
-             "you must supply a network mask here. In almost\n"
+             "you must supply a network mask here. In almost\n"
-             "all cases this netmask will be <b>255.255.255.0</b>,\n"
+             "all cases this netmask will be <b>255.255.255.0</b>,\n"
-             "but your mileage may vary.\n"
+             "but your mileage may vary.\n"
-             "\n"
+             "\n"
-             "If unsure, contact your Internet Service Provider");
+             "If unsure, contact your Internet Service Provider");
-  ipLayout->addWidget(sub_label, 1, 0);
+    ipLayout->addWidget(sub_label, 1, 0);
-  subnetmask_l = new IPLineEdit(ipWidget);
+    subnetmask_l = new IPLineEdit(ipWidget);
-  ipLayout->addWidget(subnetmask_l, 1, 1);
+    ipLayout->addWidget(subnetmask_l, 1, 1);
-  QWhatsThis::add(sub_label,tmp);
+    QWhatsThis::add(sub_label,tmp);
-  QWhatsThis::add(subnetmask_l,tmp);
+    QWhatsThis::add(subnetmask_l,tmp);
-  autoname = new QCheckBox(tr("Auto-configure hostname from this IP"), this);
+    autoname = new QCheckBox(tr("Auto-configure hostname from this IP"), this);
-  autoname->setChecked(_pppdata->autoname());
+    autoname->setChecked(_pppdata->autoname());
-  connect(autoname,SIGNAL(toggled(bool)),
+    connect(autoname,SIGNAL(toggled(bool)),
-          this,SLOT(autoname_t(bool)));
+            this,SLOT(autoname_t(bool)));
-  QWhatsThis::add(autoname,
+    QWhatsThis::add(autoname,
-                  tr("<p>Whenever you connect, this reconfigures\n"
+                        tr("<p>Whenever you connect, this reconfigures\n"
-                       "your hostname to match the IP address you\n"
+                           "your hostname to match the IP address you\n"
-                       "got from the PPP server. This may be useful\n"
+                           "got from the PPP server. This may be useful\n"
-                       "if you need to use a protocol which depends\n"
+                           "if you need to use a protocol which depends\n"
-                       "on this information, but it can also cause several\n"
+                           "on this information, but it can also cause several\n"
-                       "<a href=\"kppp-7.html#autohostname\">problems</a>.\n"
+                           "<a href=\"kppp-7.html#autohostname\">problems</a>.\n"
-                       "\n"
+                           "\n"
-                       "Don't enable this unless you really need it."));
+                           "Don't enable this unless you really need it."));
-  topLayout->addWidget(box);
+    topLayout->addWidget(box);
-  topLayout->addWidget(autoname);
+    topLayout->addWidget(autoname);
-  topLayout->addStretch();
+    topLayout->addStretch();
-  //load info from gpppdata
+    //load info from gpppdata
-  if(!isnewaccount) {
+    if(!isnewaccount)
-    if(_pppdata->ipaddr() == "0.0.0.0" &&
+    {
-       _pppdata->subnetmask() == "0.0.0.0") {
+        if(_pppdata->ipaddr() == "0.0.0.0" &&
-      dynamicadd_rb->setChecked(true);
+                _pppdata->subnetmask() == "0.0.0.0")
-      hitIPSelect(0);
+        {
-      autoname->setChecked(_pppdata->autoname());
+            dynamicadd_rb->setChecked(true);
+            hitIPSelect(0);
+            autoname->setChecked(_pppdata->autoname());
+        }
+        else
+        {
+            ipaddress_l->setText(_pppdata->ipaddr());
+            subnetmask_l->setText(_pppdata->subnetmask());
+            staticadd_rb->setChecked(true);
+            autoname->setChecked(false);
+        }
    }
-    else {
+    else
-      ipaddress_l->setText(_pppdata->ipaddr());
+    {
-      subnetmask_l->setText(_pppdata->subnetmask());
+        dynamicadd_rb->setChecked(true);
-      staticadd_rb->setChecked(true);
+        hitIPSelect(0);
-      autoname->setChecked(false);
    }
-  }
-  else {
-    dynamicadd_rb->setChecked(true);
-    hitIPSelect(0);
-  }
 }
-void IPWidget::autoname_t(bool on) {
+void IPWidget::autoname_t(bool on)
-  static bool was_warned = false;
+{
+    static bool was_warned = false;
-  // big-fat warning when selecting the auto configure hostname option
-  if(on && !was_warned) {
+    // big-fat warning when selecting the auto configure hostname option
-    QMessageBox::information(this,
+    if(on && !was_warned)
-                         tr("Selecting this option might cause some weird "
+    {
-                              "problems with the X-server and applications "
+        QMessageBox::information(this,
-                              "while kppp is connected. Don't use it until "
+                                 tr("Selecting this option might cause some weird "
-                              "you know what you are doing!\n"
+                                    "problems with the X-server and applications "
-                              "For more information take a look at the "
+                                    "while kppp is connected. Don't use it until "
-                              "handbook (or help) in the section \"Frequently "
+                                    "you know what you are doing!\n"
-                              "asked questions\"."),
+                                    "For more information take a look at the "
-                         tr("Warning"));
+                                    "handbook (or help) in the section \"Frequently "
-    was_warned = true;
+                                    "asked questions\"."),
-  }
+                                 tr("Warning"));
+        was_warned = true;
+    }
 }
-void IPWidget::save() {
+void IPWidget::save()
-  if(dynamicadd_rb->isChecked()) {
+{
-    _pppdata->setIpaddr("0.0.0.0");
+    if(dynamicadd_rb->isChecked())
-    _pppdata->setSubnetmask("0.0.0.0");
+    {
-  } else {
+        _pppdata->setIpaddr("0.0.0.0");
-    _pppdata->setIpaddr(ipaddress_l->text());
+        _pppdata->setSubnetmask("0.0.0.0");
-    _pppdata->setSubnetmask(subnetmask_l->text());
+    }
-  }
+    else
-  _pppdata->setAutoname(autoname->isChecked());
+    {
+        _pppdata->setIpaddr(ipaddress_l->text());
+        _pppdata->setSubnetmask(subnetmask_l->text());
+    }
+    _pppdata->setAutoname(autoname->isChecked());
 }
-void IPWidget::hitIPSelect( int i ) {
+void IPWidget::hitIPSelect( int i )
-  if(i == 0) {
+{
-    ipaddress_label->setEnabled(false);
+    if(i == 0)
-    sub_label->setEnabled(false);
+    {
-    ipaddress_l->setEnabled(false);
+        ipaddress_label->setEnabled(false);
-    subnetmask_l->setEnabled(false);
+        sub_label->setEnabled(false);
-  }
+        ipaddress_l->setEnabled(false);
-  else {
+        subnetmask_l->setEnabled(false);
-    ipaddress_label->setEnabled(true);
+    }
-    sub_label->setEnabled(true);
+    else
-    ipaddress_l->setEnabled(true);
+    {
-    subnetmask_l->setEnabled(true);
+        ipaddress_label->setEnabled(true);
-  }
+        sub_label->setEnabled(true);
+        ipaddress_l->setEnabled(true);
+        subnetmask_l->setEnabled(true);
+    }
 }
 DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
-    : QWidget(parent, name), _pppdata(pd)
+        : QWidget(parent, name), _pppdata(pd)
 {
    QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );
-  dnsdomain_label = new QLabel(tr("Domain name:"), this);
+    dnsdomain_label = new QLabel(tr("Domain name:"), this);
-  tl->addWidget(dnsdomain_label, 0, 0);
+    tl->addWidget(dnsdomain_label, 0, 0);
-  dnsdomain = new QLineEdit(this);
+    dnsdomain = new QLineEdit(this);
-  tl->addWidget(dnsdomain, 0, 1);
+    tl->addWidget(dnsdomain, 0, 1);
-  QString tmp = tr("If you enter a domain name here, this domain\n"
+    QString tmp = tr("If you enter a domain name here, this domain\n"
-                     "name is used for your computer while you are\n"
+                     "name is used for your computer while you are\n"
-                     "connected. When the connection is closed, the\n"
+                     "connected. When the connection is closed, the\n"
-                     "original domain name of your computer is\n"
+                     "original domain name of your computer is\n"
-                     "restored.\n"
+                     "restored.\n"
-                     "\n"
+                     "\n"
-                     "If you leave this field blank, no changes are\n"
+                     "If you leave this field blank, no changes are\n"
-                     "made to the domain name.");
+                     "made to the domain name.");
-  QWhatsThis::add(dnsdomain_label,tmp);
+    QWhatsThis::add(dnsdomain_label,tmp);
-  QWhatsThis::add(dnsdomain,tmp);
+    QWhatsThis::add(dnsdomain,tmp);
-  conf_label = new QLabel(tr("Configuration:"), this);
+    conf_label = new QLabel(tr("Configuration:"), this);
-  tl->addWidget(conf_label, 1, 0);
+    tl->addWidget(conf_label, 1, 0);
-  bg = new QButtonGroup("Group", this);
+    bg = new QButtonGroup("Group", this);
-  connect(bg, SIGNAL(clicked(int)), SLOT(DNS_Mode_Selected(int)));
+    connect(bg, SIGNAL(clicked(int)), SLOT(DNS_Mode_Selected(int)));
-  bg->hide();
+    bg->hide();
-  autodns = new QRadioButton(tr("Automatic"), this);
+    autodns = new QRadioButton(tr("Automatic"), this);
-  bg->insert(autodns, 0);
+    bg->insert(autodns, 0);
-  tl->addWidget(autodns, 1, 1);
+    tl->addWidget(autodns, 1, 1);
-  if(!_pppdata->pppdVersionMin(2, 3, 7))
+    if(!_pppdata->pppdVersionMin(2, 3, 7))
-    autodns->setEnabled(false);
+        autodns->setEnabled(false);
-  mandns = new QRadioButton(tr("Manual"), this);
+    mandns = new QRadioButton(tr("Manual"), this);
-  bg->insert(mandns, 1);
+    bg->insert(mandns, 1);
-  tl->addWidget(mandns, 2, 1);
+    tl->addWidget(mandns, 2, 1);
-  dns_label = new QLabel(tr("DNS IP address:"), this);
+    dns_label = new QLabel(tr("DNS IP address:"), this);
-  tl->addWidget(dns_label, 3, 0);
+    tl->addWidget(dns_label, 3, 0);
-  QHBoxLayout *l2 = new QHBoxLayout;
+    QHBoxLayout *l2 = new QHBoxLayout;
-  tl->addLayout(l2, 3, 1);
+    tl->addLayout(l2, 3, 1);
-  dnsipaddr = new IPLineEdit(this);
+    dnsipaddr = new IPLineEdit(this);
-  connect(dnsipaddr, SIGNAL(returnPressed()),
+    connect(dnsipaddr, SIGNAL(returnPressed()),
-          SLOT(adddns()));
+            SLOT(adddns()));
-  connect(dnsipaddr, SIGNAL(textChanged(const QString &)),
+    connect(dnsipaddr, SIGNAL(textChanged(const QString &)),
-          SLOT(DNS_Edit_Changed(const QString &)));
+            SLOT(DNS_Edit_Changed(const QString &)));
-  l2->addWidget(dnsipaddr, 1);
+    l2->addWidget(dnsipaddr, 1);
-  l2->addStretch(1);
+    l2->addStretch(1);
-  tmp = tr("<p>Allows you to specify a new DNS server to be\n"
+    tmp = tr("<p>Allows you to specify a new DNS server to be\n"
-             "used while you are connected. When the\n"
+             "used while you are connected. When the\n"
-             "connection is closed, this DNS entry will be\n"
+             "connection is closed, this DNS entry will be\n"
-             "removed again.\n"
+             "removed again.\n"
-             "\n"
+             "\n"
-             "To add a DNS server, type in the IP address of\n"
+             "To add a DNS server, type in the IP address of\n"
-             "the DNS server here and click on <b>Add</b>");
+             "the DNS server here and click on <b>Add</b>");
-  QWhatsThis::add(dns_label, tmp);
+    QWhatsThis::add(dns_label, tmp);
-  QWhatsThis::add(dnsipaddr, tmp);
+    QWhatsThis::add(dnsipaddr, tmp);
-  QHBoxLayout *l1 = new QHBoxLayout;
+    QHBoxLayout *l1 = new QHBoxLayout;
-  tl->addLayout(l1, 4, 1);
+    tl->addLayout(l1, 4, 1);
-  add = new QPushButton(tr("Add"), this);
+    add = new QPushButton(tr("Add"), this);
-  connect(add, SIGNAL(clicked()), SLOT(adddns()));
+    connect(add, SIGNAL(clicked()), SLOT(adddns()));
-  l1->addWidget(add);
+    l1->addWidget(add);
-//  l1->addStretch(1);
+    //  l1->addStretch(1);
-  QWhatsThis::add(add,
+    QWhatsThis::add(add,
-                  tr("Click this button to add the DNS server\n"
+                        tr("Click this button to add the DNS server\n"
-                       "specified in the field above. The entry\n"
+                           "specified in the field above. The entry\n"
-                       "will then be added to the list below"));
+                           "will then be added to the list below"));
-  remove = new QPushButton(tr("Remove"), this);
+    remove = new QPushButton(tr("Remove"), this);
-  connect(remove, SIGNAL(clicked()), SLOT(removedns()));
+    connect(remove, SIGNAL(clicked()), SLOT(removedns()));
-  l1->addWidget(remove);
+    l1->addWidget(remove);
-  QWhatsThis::add(remove,
+    QWhatsThis::add(remove,
-                  tr("Click this button to remove the selected DNS\n"
+                        tr("Click this button to remove the selected DNS\n"
-                       "server entry from the list below"));
+                           "server entry from the list below"));
-  servers_label = new QLabel(tr("DNS address list:"), this);
+    servers_label = new QLabel(tr("DNS address list:"), this);
-  servers_label->setAlignment(AlignTop|AlignLeft);
+    servers_label->setAlignment(AlignTop|AlignLeft);
-  tl->addWidget(servers_label, 5, 0);
+    tl->addWidget(servers_label, 5, 0);
-  dnsservers = new QListBox(this);
+    dnsservers = new QListBox(this);
-  dnsservers->setMinimumSize(150, 80);
+    dnsservers->setMinimumSize(150, 80);
-  connect(dnsservers, SIGNAL(highlighted(int)),
+    connect(dnsservers, SIGNAL(highlighted(int)),
-          SLOT(DNS_Entry_Selected(int)));
+            SLOT(DNS_Entry_Selected(int)));
-  tl->addWidget(dnsservers, 5, 1);
+    tl->addWidget(dnsservers, 5, 1);
-  tmp = tr("<p>This shows all defined DNS servers to use\n"
+    tmp = tr("<p>This shows all defined DNS servers to use\n"
-             "while you are connected. Use the <b>Add</b> and\n"
+             "while you are connected. Use the <b>Add</b> and\n"
-             "<b>Remove</b> buttons to modify the list");
+             "<b>Remove</b> buttons to modify the list");
-  QWhatsThis::add(servers_label,tmp);
+    QWhatsThis::add(servers_label,tmp);
-  QWhatsThis::add(dnsservers,tmp);
+    QWhatsThis::add(dnsservers,tmp);
-  exdnsdisabled_toggle = new QCheckBox(tr("Disable DNS servers during connection"), this);
+    exdnsdisabled_toggle = new QCheckBox(tr("Disable DNS servers during connection"), this);
-  // exdnsdisabled_toggle = new QCheckBox(tr("Disable existing DNS servers during connection"), this);
+    // exdnsdisabled_toggle = new QCheckBox(tr("Disable existing DNS servers during connection"), this);
-  exdnsdisabled_toggle->setChecked(_pppdata->exDNSDisabled());
+    exdnsdisabled_toggle->setChecked(_pppdata->exDNSDisabled());
-  tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter);
+    tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter);
-  QWhatsThis::add(exdnsdisabled_toggle,
+    QWhatsThis::add(exdnsdisabled_toggle,
-                  tr("<p>When this option is selected, all DNS\n"
+                        tr("<p>When this option is selected, all DNS\n"
-                       "servers specified in <tt>/etc/resolv.conf</tt> are\n"
+                           "servers specified in <tt>/etc/resolv.conf</tt> are\n"
-                       "temporary disabled while the dialup connection\n"
+                           "temporary disabled while the dialup connection\n"
-                       "is established. After the connection is\n"
+                           "is established. After the connection is\n"
-                       "closed, the servers will be re-enabled\n"
+                           "closed, the servers will be re-enabled\n"
-                       "\n"
+                           "\n"
-                       "Typically, there is no reason to use this\n"
+                           "Typically, there is no reason to use this\n"
-                       "option, but it may become useful under \n"
+                           "option, but it may become useful under \n"
-                       "some circumstances."));
+                           "some circumstances."));
-  // restore data if editing
+    // restore data if editing
-  if(!isnewaccount) {
+    if(!isnewaccount)
-    dnsservers->insertStringList(_pppdata->dns());
+    {
-    dnsdomain->setText(_pppdata->domain());
+        dnsservers->insertStringList(_pppdata->dns());
-  }
+        dnsdomain->setText(_pppdata->domain());
+    }
-  int mode = _pppdata->autoDNS() ? 0 : 1;
-  bg->setButton(mode);
+    int mode = _pppdata->autoDNS() ? 0 : 1;
-  DNS_Mode_Selected(mode);
+    bg->setButton(mode);
+    DNS_Mode_Selected(mode);
-  tl->activate();
+    tl->activate();
 }
-void DNSWidget::DNS_Edit_Changed(const QString &text) {
+void DNSWidget::DNS_Edit_Changed(const QString &text)
-  QRegExp r("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+");
+{
-  add->setEnabled(text.find(r) != -1);
+    QRegExp r("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+");
+    add->setEnabled(text.find(r) != -1);
 }
-void DNSWidget::DNS_Entry_Selected(int) {
+void DNSWidget::DNS_Entry_Selected(int)
-  remove->setEnabled(true);
+{
+    remove->setEnabled(true);
 }
-void DNSWidget::DNS_Mode_Selected(int mode) {
+void DNSWidget::DNS_Mode_Selected(int mode)
-  bool on = (mode == 1);
+{
-  dns_label->setEnabled(on);
+    bool on = (mode == 1);
-  servers_label->setEnabled(on);
+    dns_label->setEnabled(on);
-  dnsipaddr->setText("");
+    servers_label->setEnabled(on);
-  dnsipaddr->setEnabled(on);
+    dnsipaddr->setText("");
-  add->setEnabled(false);
+    dnsipaddr->setEnabled(on);
-  remove->setEnabled(dnsservers->count()>0 && on);
+    add->setEnabled(false);
-  dnsservers->clearSelection();
+    remove->setEnabled(dnsservers->count()>0 && on);
-  dnsservers->setEnabled(on);
+    dnsservers->clearSelection();
-  dnsservers->triggerUpdate(false);
+    dnsservers->setEnabled(on);
+    dnsservers->triggerUpdate(false);
 }
-void DNSWidget::save() {
+void DNSWidget::save()
-  _pppdata->setAutoDNS(bg->id(bg->selected()) == 0);
+{
-  QStringList serverlist;
+    _pppdata->setAutoDNS(bg->id(bg->selected()) == 0);
-  for(uint i=0; i < dnsservers->count(); i++)
+    QStringList serverlist;
-    serverlist.append(dnsservers->text(i));
+    for(uint i=0; i < dnsservers->count(); i++)
-  _pppdata->setDns(serverlist);
+        serverlist.append(dnsservers->text(i));
+    _pppdata->setDns(serverlist);
-  // strip leading dot
-  QString s(dnsdomain->text());
+    // strip leading dot
-  if(s.left(1) == ".")
+    QString s(dnsdomain->text());
-    _pppdata->setDomain(s.mid(1));
+    if(s.left(1) == ".")
-  else
+        _pppdata->setDomain(s.mid(1));
-    _pppdata->setDomain(dnsdomain->text());
+    else
+        _pppdata->setDomain(dnsdomain->text());
-  _pppdata->setExDNSDisabled(exdnsdisabled_toggle->isChecked());
+    _pppdata->setExDNSDisabled(exdnsdisabled_toggle->isChecked());
 }
-void DNSWidget::adddns() {
+void DNSWidget::adddns()
-  if(dnsservers->count() < MAX_DNS_ENTRIES) {
+{
-    dnsservers->insertItem(dnsipaddr->text());
+    if(dnsservers->count() < MAX_DNS_ENTRIES)
-    dnsipaddr->setText("");
+    {
-  }
+        dnsservers->insertItem(dnsipaddr->text());
+        dnsipaddr->setText("");
+    }
 }
-void DNSWidget::removedns() {
+void DNSWidget::removedns()
-  int i;
+{
-  i = dnsservers->currentItem();
+    int i;
-  if(i != -1)
+    i = dnsservers->currentItem();
-    dnsservers->removeItem(i);
+    if(i != -1)
-  remove->setEnabled(dnsservers->count()>0);
+        dnsservers->removeItem(i);
+    remove->setEnabled(dnsservers->count()>0);
 }
 //
 // GatewayWidget
 //
 GatewayWidget::GatewayWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
-    : QWidget(parent, name), _pppdata(pd)
+        : QWidget(parent, name), _pppdata(pd)
 {
-  QVBoxLayout *topLayout = new QVBoxLayout(this);
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
-  topLayout->setSpacing( 2 );
+    topLayout->setSpacing( 2 );
-  topLayout->setMargin( 0 );
+    topLayout->setMargin( 0 );
-  box = new QVGroupBox(tr("Configuration"), this);
+    box = new QVGroupBox(tr("Configuration"), this);
-  rb = new QButtonGroup(this);
+    rb = new QButtonGroup(this);
-  rb->hide();
+    rb->hide();
-  connect(rb, SIGNAL(clicked(int)), SLOT(hitGatewaySelect(int)));
+    connect(rb, SIGNAL(clicked(int)), SLOT(hitGatewaySelect(int)));
-  defaultgateway = new QRadioButton(box);
+    defaultgateway = new QRadioButton(box);
-  defaultgateway->setText(tr("Default gateway"));
+    defaultgateway->setText(tr("Default gateway"));
-  rb->insert(defaultgateway, 0);
+    rb->insert(defaultgateway, 0);
-  QWhatsThis::add(defaultgateway,
+    QWhatsThis::add(defaultgateway,
-                  tr("This makes the PPP peer computer (the computer\n"
+                        tr("This makes the PPP peer computer (the computer\n"
-                       "you are connected to with your modem) to act as\n"
+                           "you are connected to with your modem) to act as\n"
-                       "a gateway. Your computer will send all packets not\n"
+                           "a gateway. Your computer will send all packets not\n"
-                       "going to a computer inside your local net to this\n"
+                           "going to a computer inside your local net to this\n"
-                       "computer, which will route these packets.\n"
+                           "computer, which will route these packets.\n"
-                       "\n"
+                           "\n"
-                       "This is the default for most ISPs, so you should\n"
+                           "This is the default for most ISPs, so you should\n"
-                       "probably leave this option on."));
+                           "probably leave this option on."));
-  staticgateway = new QRadioButton(box);
+    staticgateway = new QRadioButton(box);
-  staticgateway->setText(tr("Static gateway"));
+    staticgateway->setText(tr("Static gateway"));
-  rb->insert(staticgateway, 1);
+    rb->insert(staticgateway, 1);
-  QWhatsThis::add(staticgateway,
+    QWhatsThis::add(staticgateway,
-                  tr("<p>Allows you to specify which computer you want\n"
+                        tr("<p>Allows you to specify which computer you want\n"
-                       "to use as gateway (see <i>Default Gateway</i> above)"));
+                           "to use as gateway (see <i>Default Gateway</i> above)"));
-  QHBox *gateBox = new QHBox(box);
+    QHBox *gateBox = new QHBox(box);
-  gate_label = new QLabel(tr("Gateway IP address:"), gateBox);
+    gate_label = new QLabel(tr("Gateway IP address:"), gateBox);
-  gatewayaddr = new IPLineEdit(gateBox);
+    gatewayaddr = new IPLineEdit(gateBox);
-  defaultroute = new QCheckBox(tr("Assign the default route to this gateway"),
+    defaultroute = new QCheckBox(tr("Assign the default route to this gateway"),
-                             this);
+                                 this);
-  QWhatsThis::add(defaultroute,
+    QWhatsThis::add(defaultroute,
-                  tr("If this option is enabled, all packets not\n"
+                        tr("If this option is enabled, all packets not\n"
-                       "going to the local net are routed through\n"
+                           "going to the local net are routed through\n"
-                       "the PPP connection.\n"
+                           "the PPP connection.\n"
-                       "\n"
+                           "\n"
-                       "Normally, you should turn this on"));
+                           "Normally, you should turn this on"));
-  topLayout->addWidget(box);
+    topLayout->addWidget(box);
-  topLayout->addWidget(defaultroute);
+    topLayout->addWidget(defaultroute);
-  topLayout->addStretch();
+    topLayout->addStretch();
-  //load info from gpppdata
+    //load info from gpppdata
-  if(!isnewaccount) {
+    if(!isnewaccount)
-    if(_pppdata->gateway() == "0.0.0.0") {
+    {
-      defaultgateway->setChecked(true);
+        if(_pppdata->gateway() == "0.0.0.0")
-      hitGatewaySelect(0);
+        {
+            defaultgateway->setChecked(true);
+            hitGatewaySelect(0);
+        }
+        else
+        {
+            gatewayaddr->setText(_pppdata->gateway());
+            staticgateway->setChecked(true);
+        }
+        defaultroute->setChecked(_pppdata->defaultroute());
    }
-    else {
+    else
-      gatewayaddr->setText(_pppdata->gateway());
+    {
-      staticgateway->setChecked(true);
+        defaultgateway->setChecked(true);
+        hitGatewaySelect(0);
+        defaultroute->setChecked(true);
    }
-    defaultroute->setChecked(_pppdata->defaultroute());
-  }
-  else {
-    defaultgateway->setChecked(true);
-    hitGatewaySelect(0);
-    defaultroute->setChecked(true);
-  }
 }
-void GatewayWidget::save() {
+void GatewayWidget::save()
-  _pppdata->setGateway(gatewayaddr->text());
+{
-  _pppdata->setDefaultroute(defaultroute->isChecked());
+    _pppdata->setGateway(gatewayaddr->text());
+    _pppdata->setDefaultroute(defaultroute->isChecked());
 }
-void GatewayWidget::hitGatewaySelect( int i ) {
+void GatewayWidget::hitGatewaySelect( int i )
-  if(i == 0) {
+{
-    gatewayaddr->setText("0.0.0.0");
+    if(i == 0)
-    gatewayaddr->setEnabled(false);
+    {
-    gate_label->setEnabled(false);
+        gatewayaddr->setText("0.0.0.0");
-  }
+        gatewayaddr->setEnabled(false);
-  else {
+        gate_label->setEnabled(false);
-    gatewayaddr->setEnabled(true);
+    }
-    gatewayaddr->setText("");
+    else
-    gate_label->setEnabled(true);
+    {
-  }
+        gatewayaddr->setEnabled(true);
+        gatewayaddr->setText("");
+        gate_label->setEnabled(true);
+    }
 }
 ScriptWidget::ScriptWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
-    : QWidget(parent, name),_pppdata(pd)
+        : QWidget(parent, name),_pppdata(pd)
 {
-  QVBoxLayout *tl = new QVBoxLayout(this, 0 );
+    QVBoxLayout *tl = new QVBoxLayout(this, 0 );
-  se = new ScriptEdit(this);
+    se = new ScriptEdit(this);
-  connect(se, SIGNAL(returnPressed()), SLOT(addButton()));
+    connect(se, SIGNAL(returnPressed()), SLOT(addButton()));
-  tl->addWidget(se);
+    tl->addWidget(se);
-  // insert equal-sized buttons
+    // insert equal-sized buttons
-  QHBoxLayout *hl = new QHBoxLayout( this );
+    QHBoxLayout *hl = new QHBoxLayout( this );
-  tl->addLayout( hl );
+    tl->addLayout( hl );
-  add = new QPushButton( tr("Add"), this );
+    add = new QPushButton( tr("Add"), this );
-  hl->addWidget( add );
+    hl->addWidget( add );
-  connect(add, SIGNAL(clicked()), SLOT(addButton()));
+    connect(add, SIGNAL(clicked()), SLOT(addButton()));
-  insert = new QPushButton( tr("Insert"), this );
+    insert = new QPushButton( tr("Insert"), this );
-  hl->addWidget( insert );
+    hl->addWidget( insert );
-  connect(insert, SIGNAL(clicked()), SLOT(insertButton()));
+    connect(insert, SIGNAL(clicked()), SLOT(insertButton()));
-  remove = new QPushButton( tr("Remove"), this );
+    remove = new QPushButton( tr("Remove"), this );
-  hl->addWidget( remove );
+    hl->addWidget( remove );
-  connect(remove, SIGNAL(clicked()), SLOT(removeButton()));
+    connect(remove, SIGNAL(clicked()), SLOT(removeButton()));
-  QHBoxLayout *l12 = new QHBoxLayout(0);
+    QHBoxLayout *l12 = new QHBoxLayout(0);
-  tl->addLayout(l12);
+    tl->addLayout(l12);
-  stl = new QListBox(this);
+    stl = new QListBox(this);
-//  stl->setVScrollBarMode( QScrollView::AlwaysOff );
+    //  stl->setVScrollBarMode( QScrollView::AlwaysOff );
-  connect(stl, SIGNAL(highlighted(int)), SLOT(stlhighlighted(int)));
+    connect(stl, SIGNAL(highlighted(int)), SLOT(stlhighlighted(int)));
-//  stl->setMinimumSize(QSize(70, 140));
+    //  stl->setMinimumSize(QSize(70, 140));
-  sl = new QListBox(this);
+    sl = new QListBox(this);
-//  sl->setVScrollBarMode( QScrollView::AlwaysOff );
+    //  sl->setVScrollBarMode( QScrollView::AlwaysOff );
-  connect(sl, SIGNAL(highlighted(int)), SLOT(slhighlighted(int)));
+    connect(sl, SIGNAL(highlighted(int)), SLOT(slhighlighted(int)));
-//  sl->setMinimumSize(QSize(150, 140));
+    //  sl->setMinimumSize(QSize(150, 140));
-  slb = new QScrollBar(this);
+    slb = new QScrollBar(this);
-//  slb->setFixedWidth(slb->sizeHint().width());
+    //  slb->setFixedWidth(slb->sizeHint().width());
-  connect(slb, SIGNAL(valueChanged(int)), SLOT(scrolling(int)));
+    connect(slb, SIGNAL(valueChanged(int)), SLOT(scrolling(int)));
-  l12->addWidget(stl, 1);
+    l12->addWidget(stl, 1);
-  l12->addWidget(sl, 3);
+    l12->addWidget(sl, 3);
-  l12->addWidget(slb, 0);
+    l12->addWidget(slb, 0);
-  //load data from gpppdata
+    //load data from gpppdata
-  if(!isnewaccount) {
+    if(!isnewaccount)
-    QStringList &comlist = _pppdata->scriptType();
-    QStringList &arglist = _pppdata->script();
-    QStringList::Iterator itcom = comlist.begin();
-    QStringList::Iterator itarg = arglist.begin();
-    for ( ;
-          itcom != comlist.end() && itarg != arglist.end();
-          ++itcom, ++itarg )
    {
-      stl->insertItem(*itcom);
+        QStringList &comlist = _pppdata->scriptType();
-      sl->insertItem(*itarg);
+        QStringList &arglist = _pppdata->script();
+        QStringList::Iterator itcom = comlist.begin();
+        QStringList::Iterator itarg = arglist.begin();
+        for ( ;
+                itcom != comlist.end() && itarg != arglist.end();
+                ++itcom, ++itarg )
+        {
+            stl->insertItem(*itcom);
+            sl->insertItem(*itarg);
+        }
    }
-  }
-  insert->setEnabled(false);
+    insert->setEnabled(false);
-  remove->setEnabled(false);
+    remove->setEnabled(false);
-  adjustScrollBar();
+    adjustScrollBar();
-  tl->activate();
+    tl->activate();
 }
-bool ScriptWidget::check() {
+bool ScriptWidget::check()
-  uint lstart = 0;
+{
-  uint lend  = 0;
+    uint lstart = 0;
-  uint errcnt = 0;
+    uint lend  = 0;
+    uint errcnt = 0;
-  if(sl->count() > 0)   {
+    if(sl->count() > 0)
-    for( uint i=0; i <= sl->count()-1; i++) {
+    {
-        if(stl->text(i) == "LoopStart") {
+        for( uint i=0; i <= sl->count()-1; i++)
-                lstart++;
+        {
-        }
+            if(stl->text(i) == "LoopStart")
-        if (stl->text(i) == "LoopEnd") {
+            {
-                lend++;
+                lstart++;
+            }
+            if (stl->text(i) == "LoopEnd")
+            {
+                lend++;
+            }
+            if ( lend > lstart ) errcnt++;
        }
-        if ( lend > lstart ) errcnt++;
+        return ( (errcnt == 0 ) && (lstart == lend) );
    }
-    return ( (errcnt == 0 ) && (lstart == lend) );
+    return true;
-  }
-  return true;
 }
-void ScriptWidget::save() {
+void ScriptWidget::save()
-  QStringList typelist, arglist;
+{
-  for(uint i=0; i < sl->count(); i++) {
+    QStringList typelist, arglist;
-    typelist.append(stl->text(i));
+    for(uint i=0; i < sl->count(); i++)
-    arglist.append(sl->text(i));
+    {
-  }
+        typelist.append(stl->text(i));
-  _pppdata->setScriptType(typelist);
+        arglist.append(sl->text(i));
-  _pppdata->setScript(arglist);
+    }
+    _pppdata->setScriptType(typelist);
+    _pppdata->setScript(arglist);
 }
-void ScriptWidget::adjustScrollBar() {
+void ScriptWidget::adjustScrollBar()
-  if((int)sl->count() <= sl->numItemsVisible())
+{
-    slb->setRange(0, 0);
+    if((int)sl->count() <= sl->numItemsVisible())
-  else
+        slb->setRange(0, 0);
-    slb->setRange(0, (sl->count() - sl->numItemsVisible())+1);
+    else
+        slb->setRange(0, (sl->count() - sl->numItemsVisible())+1);
 }
-void ScriptWidget::scrolling(int i) {
+void ScriptWidget::scrolling(int i)
-  sl->setTopItem(i);
+{
-  stl->setTopItem(i);
+    sl->setTopItem(i);
+    stl->setTopItem(i);
 }
-void ScriptWidget::slhighlighted(int i) {
+void ScriptWidget::slhighlighted(int i)
-  insert->setEnabled(true);
+{
-  remove->setEnabled(true);
+    insert->setEnabled(true);
-  stl->setCurrentItem(i);
+    remove->setEnabled(true);
+    stl->setCurrentItem(i);
 }
-void ScriptWidget::stlhighlighted(int i) {
+void ScriptWidget::stlhighlighted(int i)
-  insert->setEnabled(true);
+{
-  remove->setEnabled(true);
+    insert->setEnabled(true);
-  sl->setCurrentItem(i);
+    remove->setEnabled(true);
+    sl->setCurrentItem(i);
 }
-void ScriptWidget::addButton() {
+void ScriptWidget::addButton()
-  //don't allow more than the maximum script entries
+{
-  if(sl->count() == MAX_SCRIPT_ENTRIES-1)
+    //don't allow more than the maximum script entries
-    return;
+    if(sl->count() == MAX_SCRIPT_ENTRIES-1)
+        return;
-  switch(se->type()) {
+    switch(se->type())
+    {
    case ScriptEdit::Expect:
-      stl->insertItem("Expect");
+        stl->insertItem("Expect");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::Send:
-      stl->insertItem("Send");
+        stl->insertItem("Send");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::SendNoEcho:
-      stl->insertItem("SendNoEcho");
+        stl->insertItem("SendNoEcho");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::Pause:
-      stl->insertItem("Pause");
+        stl->insertItem("Pause");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::Hangup:
-      stl->insertItem("Hangup");
+        stl->insertItem("Hangup");
-      sl->insertItem("");
+        sl->insertItem("");
-      break;
+        break;
    case ScriptEdit::Answer:
-      stl->insertItem("Answer");
+        stl->insertItem("Answer");
-      sl->insertItem("");
+        sl->insertItem("");
-      break;
+        break;
    case ScriptEdit::Timeout:
-      stl->insertItem("Timeout");
+        stl->insertItem("Timeout");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::Password:
-      stl->insertItem("Password");
+        stl->insertItem("Password");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::ID:
-      stl->insertItem("ID");
+        stl->insertItem("ID");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::Prompt:
-      stl->insertItem("Prompt");
+        stl->insertItem("Prompt");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::PWPrompt:
-      stl->insertItem("PWPrompt");
+        stl->insertItem("PWPrompt");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::LoopStart:
-      stl->insertItem("LoopStart");
+        stl->insertItem("LoopStart");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::LoopEnd:
-      stl->insertItem("LoopEnd");
+        stl->insertItem("LoopEnd");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::Scan:
-      stl->insertItem("Scan");
+        stl->insertItem("Scan");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    case ScriptEdit::Save:
-      stl->insertItem("Save");
+        stl->insertItem("Save");
-      sl->insertItem(se->text());
+        sl->insertItem(se->text());
-      break;
+        break;
    default:
-      break;
+        break;
-  }
+    }
-  //get the scrollbar adjusted, and scroll the list so we can see what
+    //get the scrollbar adjusted, and scroll the list so we can see what
-  //we're adding to
+    //we're adding to
-  adjustScrollBar();
+    adjustScrollBar();
-  slb->setValue(slb->maxValue());
+    slb->setValue(slb->maxValue());
-  //clear the text in the entry box
+    //clear the text in the entry box
-  se->setText("");
+    se->setText("");
 }
-void ScriptWidget::insertButton() {
+void ScriptWidget::insertButton()
-  //exit if there is no highlighted item, or we've reached the
+{
-  //maximum entries in the script list
+    //exit if there is no highlighted item, or we've reached the
-  if(sl->currentItem() < 0 || (sl->count() == MAX_SCRIPT_ENTRIES-1))
+    //maximum entries in the script list
-    return;
+    if(sl->currentItem() < 0 || (sl->count() == MAX_SCRIPT_ENTRIES-1))
+        return;
-  switch(se->type()) {
+    switch(se->type())
+    {
    case ScriptEdit::Expect:
-      stl->insertItem("Expect", stl->currentItem());
+        stl->insertItem("Expect", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::Send:
-      stl->insertItem("Send", stl->currentItem());
+        stl->insertItem("Send", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::SendNoEcho:
-      stl->insertItem("SendNoEcho", stl->currentItem());
+        stl->insertItem("SendNoEcho", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::Pause:
-      stl->insertItem("Pause", stl->currentItem());
+        stl->insertItem("Pause", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::Hangup:
-      stl->insertItem("Hangup", stl->currentItem());
+        stl->insertItem("Hangup", stl->currentItem());
-      sl->insertItem("", sl->currentItem());
+        sl->insertItem("", sl->currentItem());
-      break;
+        break;
    case ScriptEdit::Answer:
-      stl->insertItem("Answer", stl->currentItem());
+        stl->insertItem("Answer", stl->currentItem());
-      sl->insertItem("", sl->currentItem());
+        sl->insertItem("", sl->currentItem());
-      break;
+        break;
    case ScriptEdit::Timeout:
-      stl->insertItem("Timeout", stl->currentItem());
+        stl->insertItem("Timeout", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::Password:
-      stl->insertItem("Password", stl->currentItem());
+        stl->insertItem("Password", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::ID:
-      stl->insertItem("ID", stl->currentItem());
+        stl->insertItem("ID", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::Prompt:
-      stl->insertItem("Prompt", stl->currentItem());
+        stl->insertItem("Prompt", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::PWPrompt:
-      stl->insertItem("PWPrompt", stl->currentItem());
+        stl->insertItem("PWPrompt", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::LoopStart:
-      stl->insertItem("LoopStart", stl->currentItem());
+        stl->insertItem("LoopStart", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::LoopEnd:
-      stl->insertItem("LoopEnd", stl->currentItem());
+        stl->insertItem("LoopEnd", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::Scan:
-      stl->insertItem("Scan", stl->currentItem());
+        stl->insertItem("Scan", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    case ScriptEdit::Save:
-      stl->insertItem("Save", stl->currentItem());
+        stl->insertItem("Save", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
-      break;
+        break;
    default:
-      break;
+        break;
-  }
+    }
-  adjustScrollBar();
+    adjustScrollBar();
-  se->setText("");
+    se->setText("");
 }
-void ScriptWidget::removeButton() {
+void ScriptWidget::removeButton()
- if(sl->currentItem() >= 0) {
+{
-   int stlc = stl->currentItem();
+    if(sl->currentItem() >= 0)
-   sl->removeItem(sl->currentItem());
+    {
-   stl->removeItem(stlc);
+        int stlc = stl->currentItem();
-   adjustScrollBar();
+        sl->removeItem(sl->currentItem());
-   insert->setEnabled(sl->currentItem() != -1);
+        stl->removeItem(stlc);
-   remove->setEnabled(sl->currentItem() != -1);
+        adjustScrollBar();
- }
+        insert->setEnabled(sl->currentItem() != -1);
+        remove->setEnabled(sl->currentItem() != -1);
+    }
 }
 /////////////////////////////////////////////////////////////////////////////
 //
 // Used to specify a new phone number
 //
 /////////////////////////////////////////////////////////////////////////////
 PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
-    : QDialog(parent,"PhoneNumberDialog",true)
+        : QDialog(parent,"PhoneNumberDialog",true)
 {
    setCaption( tr("Add Phone Number") );
-  QVBoxLayout *layout = new QVBoxLayout( this );
+    QVBoxLayout *layout = new QVBoxLayout( this );
-  layout->setSpacing( 3 );
+    layout->setSpacing( 3 );
-  layout->setMargin( 3 );
+    layout->setMargin( 3 );
-//    QHBox *hbox = new QHBox(this);
+    //    QHBox *hbox = new QHBox(this);
-//  setMainWidget(hbox);
+    //  setMainWidget(hbox);
-//  hbox->setSpacing( 2 );//KDialog::spacingHint());
+    //  hbox->setSpacing( 2 );//KDialog::spacingHint());
-  QLabel *label = new QLabel(this, tr("Enter a phone number:"));
+    QLabel *label = new QLabel(this, tr("Enter a phone number:"));
-  layout->addWidget( label );
+    layout->addWidget( label );
-  le = new QLineEdit(this, "lineEdit");
+    le = new QLineEdit(this, "lineEdit");
-  layout->addWidget( le );
+    layout->addWidget( le );
-  connect(le, SIGNAL(textChanged(const QString &)),
+    connect(le, SIGNAL(textChanged(const QString &)),
-          this, SLOT(textChanged(const QString &)));
+            this, SLOT(textChanged(const QString &)));
-  le->setFocus();
+    le->setFocus();
-  textChanged("");
+    textChanged("");
 }
-QString PhoneNumberDialog::phoneNumber() {
+QString PhoneNumberDialog::phoneNumber()
-  QString s = le->text();
+{
+    QString s = le->text();
-  return s;
+    return s;
 }
-void PhoneNumberDialog::textChanged(const QString &s) {
+void PhoneNumberDialog::textChanged(const QString &s)
-//  enableButtonOK(s.length() > 0);
+{
+    //  enableButtonOK(s.length() > 0);
 }
 //#include "edit.moc"
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index 566b179..9cb8ad2 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -14,52 +14,54 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
+#include "modulesinfo.h"
+#include "detail.h"
+/* OPIE */
 #include <qpe/qpeapplication.h>
+/* QT */
 #include <qfile.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
-#include "modulesinfo.h"
-#include "detail.h"
 ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
+        : QWidget( parent, name, fl )
 {
    QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 4 );
    layout->setMargin( 4 );
    ModulesView = new QListView( this );
    int colnum = ModulesView->addColumn( tr( "Module" ) );
    colnum = ModulesView->addColumn( tr( "Size" ) );
    ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
    colnum = ModulesView->addColumn( tr( "Use#" ) );
    ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
    colnum = ModulesView->addColumn( tr( "Used by" ) );
    ModulesView->setAllColumnsShowFocus( TRUE );
    layout->addMultiCellWidget( ModulesView, 0, 0, 0, 1 );
    QWhatsThis::add( ModulesView, tr( "This is a list of all the kernel modules currently loaded on this handheld device.\n\nClick and hold on a module to see additional information about the module, or to unload it." ) );
-        
-        // Test if we have /sbin/modinfo, and if so, allow module detail window
+    // Test if we have /sbin/modinfo, and if so, allow module detail window
-        if ( QFile::exists( "/sbin/modinfo" ) )
+    if ( QFile::exists( "/sbin/modinfo" ) )
-        {
+    {
-                QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
+        QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
-            connect( ModulesView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
+        connect( ModulesView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
-                                 this, SLOT( viewModules( QListViewItem * ) ) );
+                 this, SLOT( viewModules( QListViewItem * ) ) );
-        }
+    }
    CommandCB = new QComboBox( FALSE, this );
    CommandCB->insertItem( "modprobe -r" );
    CommandCB->insertItem( "rmmod" );
    // I can't think of other useful commands yet. Anyone?
    layout->addWidget( CommandCB, 1, 0 );
    QWhatsThis::add( CommandCB, tr( "Select a command here and then click the Send button to the right to send the command to module selected above." ) );
@@ -69,49 +71,49 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
    btn->setText( tr( "Send" ) );
    connect( btn, SIGNAL( clicked() ), this, SLOT( slotSendClicked() ) );
    layout->addWidget( btn, 1, 1 );
    QWhatsThis::add( btn, tr( "Click here to send the selected command to the module selected above." ) );
    QTimer *t = new QTimer( this );
    connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) );
    t->start( 5000 );
-        
    updateData();
-        
-        ModulesDtl = new Detail();
+    ModulesDtl = new Detail();
    QWhatsThis::add( ModulesDtl->detailView, tr( "This area shows detailed information about this module." ) );
 }
 ModulesInfo::~ModulesInfo()
-{
+{}
-}
 void ModulesInfo::updateData()
 {
    char modname[64];
    char usage[200];
    int modsize, usecount;
    QString selectedmod;
    QListViewItem *curritem = ModulesView->currentItem();
    if ( curritem )
    {
        selectedmod = curritem->text( 0 );
    }
-    
    ModulesView->clear();
    FILE *procfile = fopen( ( QString ) ( "/proc/modules"), "r");
    if ( procfile )
    {
        QListViewItem *newitem;
        QListViewItem *selecteditem = 0x0;
-        while ( true ) {
+        while ( true )
+        {
            modname[0] = '\0';
            usage[0] = '\0';
            int success = fscanf( procfile, "%s%d%d%[^\n]", modname, &modsize, &usecount, usage );
            if ( success == EOF )
                break;
            QString qmodname = QString( modname );
@@ -128,61 +130,61 @@ void ModulesInfo::updateData()
        ModulesView->setCurrentItem( selecteditem );
        fclose( procfile );
    }
 }
 void ModulesInfo::slotSendClicked()
 {
-        if ( !ModulesView->currentItem() )
+    if ( !ModulesView->currentItem() )
-        {
+    {
-                return;
+        return;
-        }
+    }
-        
-        QString capstr = tr( "You really want to execute %1 for this module?" ).arg( CommandCB->currentText() );
+    QString capstr = tr( "You really want to execute %1 for this module?" ).arg( CommandCB->currentText() );
-        QString modname = ModulesView->currentItem()->text( 0 );
+    QString modname = ModulesView->currentItem()->text( 0 );
-        
    if ( QMessageBox::warning( this, modname, capstr,
-         QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
+                               QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
    {
-                QString command = "/sbin/";
+        QString command = "/sbin/";
-                command.append( CommandCB->currentText() );
+        command.append( CommandCB->currentText() );
-                command.append( " " );
+        command.append( " " );
-                command.append( modname );
+        command.append( modname );
        FILE* stream = popen( command, "r" );
        if ( stream )
            pclose( stream );
    }
 }
 void ModulesInfo::viewModules( QListViewItem *modules )
 {
-    QString modname = modules->text( 0 );   
+    QString modname = modules->text( 0 );
-        QString capstr = "Module: ";
+    QString capstr = "Module: ";
-        capstr.append( modname );
+    capstr.append( modname );
    ModulesDtl->setCaption( capstr );
    QString command = "/sbin/modinfo ";
-        command.append( modname );
+    command.append( modname );
    FILE* modinfo = popen( command, "r" );
-    
    if ( modinfo )
    {
        char line[200];
        ModulesDtl->detailView->setText( " Details:\n------------\n" );
-        
        while( true )
-        {        
+        {
            int success = fscanf( modinfo, "%[^\n]\n", line );
            if ( success == EOF )
-                break;         
+                break;
            ModulesDtl->detailView->append( line );
        }
-        
        pclose( modinfo );
    }
-    ModulesDtl->showMaximized();
+    QPEApplication::showWidget( ModulesDtl );
 }
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index af0fe26..2a90b0f 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -12,52 +12,55 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
+#include "processinfo.h"
+#include "detail.h"
+/* OPIE */
 #include <qpe/qpeapplication.h>
+/* QT */
 #include <qdir.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
+/* STD */
 #include <sys/types.h>
 #include <signal.h>
-#include "processinfo.h"
-#include "detail.h"
 ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
+        : QWidget( parent, name, fl )
 {
    QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 4 );
    layout->setMargin( 4 );
    ProcessView = new QListView( this, "ProcessView" );
    int colnum = ProcessView->addColumn( tr( "PID" ) );
    ProcessView->setColumnAlignment( colnum, Qt::AlignRight );
    colnum = ProcessView->addColumn( tr( "Command" ),96 );
    colnum = ProcessView->addColumn( tr( "Status" ) );
    colnum = ProcessView->addColumn( tr( "Time" ) );
    ProcessView->setColumnAlignment( colnum, Qt::AlignRight );
    ProcessView->setAllColumnsShowFocus( TRUE );
    QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold );
    connect( ProcessView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
-            this, SLOT( viewProcess( QListViewItem * ) ) );
+             this, SLOT( viewProcess( QListViewItem * ) ) );
    layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 );
    QWhatsThis::add( ProcessView, tr( "This is a list of all the processes on this handheld device.\n\nClick and hold on a process to see additional information about the process, or to send a signal to it." ) );
-    
    SignalCB = new QComboBox( FALSE, this, "SignalCB" );
    SignalCB->insertItem( " 1: SIGHUP" );
    SignalCB->insertItem( " 2: SIGINT" );
    SignalCB->insertItem( " 3: SIGQUIT" );
    SignalCB->insertItem( " 5: SIGTRAP" );
    SignalCB->insertItem( " 6: SIGABRT" );
    SignalCB->insertItem( " 9: SIGKILL" );
    SignalCB->insertItem( "14: SIGALRM" );
@@ -81,35 +84,34 @@ ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
    updateData();
    ProcessDtl = new Detail();
    QWhatsThis::add( ProcessDtl->detailView, tr( "This area shows detailed information about this process." ) );
 }
 ProcessInfo::~ProcessInfo()
-{
+{}
-}
 void ProcessInfo::updateData()
 {
    int pid, ppid, pgrp, session, tty, tpgid, utime, stime, cutime, cstime, counter, priority, starttime,
-       signal, blocked, sigignore, sigcatch;
+    signal, blocked, sigignore, sigcatch;
    uint flags, minflt, cminflt, majflt, cmajflt, timeout, itrealvalue, vsize, rss, rlim, startcode,
-         endcode, startstack, kstkesp, kstkeip, wchan;
+    endcode, startstack, kstkesp, kstkeip, wchan;
    char state;
    char comm[64];
    QString selectedpid;
    QListViewItem *curritem = ProcessView->currentItem();
    if ( curritem )
    {
        selectedpid = curritem->text( 0 );
    }
-    
    ProcessView->clear();
    QListViewItem *newitem;
    QListViewItem *selecteditem = 0x0;
    QDir *procdir = new QDir("/proc", 0, QDir::Name, QDir::Dirs);
    QFileInfoList *proclist = new QFileInfoList(*(procdir->entryInfoList()));
    if ( proclist )
    {
@@ -121,21 +123,21 @@ void ProcessInfo::updateData()
            QString processnum = f->fileName();
            if ( processnum >= "1" && processnum <= "99999" )
            {
                FILE *procfile = fopen( ( QString ) ( "/proc/" + processnum + "/stat"), "r");
                if ( procfile )
                {
                    fscanf( procfile,
-                           "%d %s %c %d %d %d %d %d %u %u %u %u %u %d %d %d %d %d %d %u %u %d %u %u %u %u %u %u %u %u %d %d %d %d %u",
+                            "%d %s %c %d %d %d %d %d %u %u %u %u %u %d %d %d %d %d %d %u %u %d %u %u %u %u %u %u %u %u %d %d %d %d %u",
-                           &pid, comm, &state, &ppid, &pgrp, &session,&tty, &tpgid, &flags, &minflt, &cminflt,
+                            &pid, comm, &state, &ppid, &pgrp, &session,&tty, &tpgid, &flags, &minflt, &cminflt,
-                           &majflt, &cmajflt, &utime, &stime, &cutime, &cstime, &counter, &priority, &timeout,
+                            &majflt, &cmajflt, &utime, &stime, &cutime, &cstime, &counter, &priority, &timeout,
-                           &itrealvalue, &starttime, &vsize, &rss, &rlim, &startcode, &endcode, &startstack,
+                            &itrealvalue, &starttime, &vsize, &rss, &rlim, &startcode, &endcode, &startstack,
-                           &kstkesp, &kstkeip, &signal, &blocked, &sigignore, &sigcatch, &wchan );
+                            &kstkesp, &kstkeip, &signal, &blocked, &sigignore, &sigcatch, &wchan );
                    processnum = processnum.rightJustify( 5, ' ' );
                    QString processcmd = QString( comm ).replace( QRegExp( "[()]" ), "" );
                    QString processstatus = QChar(state);
                    QString processtime = QString::number( ( utime + stime ) / 100 );
                    processtime = processtime.rightJustify( 9, ' ' );
                    fclose( procfile );
                    newitem = new QListViewItem( ProcessView, processnum, processcmd, processstatus, processtime );
@@ -150,36 +152,36 @@ void ProcessInfo::updateData()
    }
    delete proclist;
    delete procdir;
 }
 void ProcessInfo::slotSendClicked()
 {
-        QListViewItem *currprocess = ProcessView->currentItem();
+    QListViewItem *currprocess = ProcessView->currentItem();
-        if ( !currprocess )
+    if ( !currprocess )
-        {
+    {
-                return;
+        return;
-        }
+    }
-        
-        QString capstr = tr( "Really want to send %1\nto this process?" ).arg( SignalCB->currentText() );
+    QString capstr = tr( "Really want to send %1\nto this process?" ).arg( SignalCB->currentText() );
-        
-        if ( QMessageBox::warning( this, currprocess->text( 1 ), capstr,
+    if ( QMessageBox::warning( this, currprocess->text( 1 ), capstr,
-                 QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
+                               QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
-        {
+    {
-                currprocess = ProcessView->currentItem();
+        currprocess = ProcessView->currentItem();
-                if ( currprocess )
+        if ( currprocess )
-                {
+        {
-                        QString sigstr = SignalCB->currentText();
+            QString sigstr = SignalCB->currentText();
-                        sigstr.truncate(2);
+            sigstr.truncate(2);
-                        int sigid = sigstr.toUInt();
+            int sigid = sigstr.toUInt();
-                        kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid );
+            kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid );
-                }
+        }
    }
 }
 void ProcessInfo::viewProcess( QListViewItem *process )
 {
    QString pid= process->text( 0 ).stripWhiteSpace();
    QString command = process->text( 1 );
@@ -191,10 +193,10 @@ void ProcessInfo::viewProcess( QListViewItem *process )
        fgets( line, 81, statfile );
        ProcessDtl->detailView->setText( line );
        while ( fgets( line, 81, statfile ) )
        {
            ProcessDtl->detailView->append( line );
        }
        fclose( statfile );
    }
-    ProcessDtl->showMaximized();
+    QPEApplication::showWidget( ProcessDtl );
 }
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index d87a005..08de352 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -3,436 +3,487 @@
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include "userdialog.h"
+#include "passwd.h"
+/* OPIE */
+#include <opie/odevice.h>
+#include <qpe/qpeapplication.h>
+/* QT */
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qfile.h>
+/* STD */
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <signal.h>
-#include "passwd.h"
-#include <opie/odevice.h>
 using namespace Opie;
 /**
 * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups.
 *
 */
-UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) {
+UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl)
-        vm=viewmode;
+{
-        QVBoxLayout *layout = new QVBoxLayout(this);
+    vm=viewmode;
-        myTabWidget=new QTabWidget(this,"User Tab Widget");
+    QVBoxLayout *layout = new QVBoxLayout(this);
-        layout->addWidget(myTabWidget);
+    myTabWidget=new QTabWidget(this,"User Tab Widget");
-        setupTab1();
+    layout->addWidget(myTabWidget);
-        setupTab2();
+    setupTab1();
+    setupTab2();
-        accounts->groupStringList.sort();
-        // And also fill the listview & the combobox with all available groups.
+    accounts->groupStringList.sort();
-        for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) {
+    // And also fill the listview & the combobox with all available groups.
-                accounts->splitGroupEntry(*it);
+    for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it)
-                        if(accounts->gr_name.find(QRegExp("^#"),0)) {// Skip commented lines.
+    {
-                        new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox);
+        accounts->splitGroupEntry(*it);
-                        groupComboBox->insertItem(accounts->gr_name);
+        if(accounts->gr_name.find(QRegExp("^#"),0))
-                }
+                {// Skip commented lines.
-        }
+            new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox);
-        showMaximized();
+            groupComboBox->insertItem(accounts->gr_name);
+        }
+    }
+    QPEApplication::showDialog( this );
 }
 /**
 * Empty destructor.
 *
 */
-UserDialog::~UserDialog() {
+UserDialog::~UserDialog()
-}
+{}
 /**
 *  Creates the first tab, all userinfo is here.
 *
 */
-void UserDialog::setupTab1() {
+void UserDialog::setupTab1()
-        QPixmap mypixmap;
+{
-        QWidget *tabpage = new QWidget(myTabWidget,"page1");
+    QPixmap mypixmap;
-        QVBoxLayout *layout = new QVBoxLayout(tabpage);
+    QWidget *tabpage = new QWidget(myTabWidget,"page1");
-        layout->setMargin(5);
+    QVBoxLayout *layout = new QVBoxLayout(tabpage);
+    layout->setMargin(5);
-        // Picture
-        picturePushButton = new QPushButton(tabpage,"Label");
+    // Picture
-        picturePushButton->setMinimumSize(48,48);
+    picturePushButton = new QPushButton(tabpage,"Label");
-        picturePushButton->setMaximumSize(48,48);
+    picturePushButton->setMinimumSize(48,48);
-                picturePushButton->setPixmap(Resource::loadPixmap("usermanager/usericon"));// Load default usericon.
+    picturePushButton->setMaximumSize(48,48);
-                connect(picturePushButton,SIGNAL(clicked()),this,SLOT(clickedPicture()));// Clicking the picture should invoke pictureselector.
+            picturePushButton->setPixmap(Resource::loadPixmap("usermanager/usericon"));// Load default usericon.
+            connect(picturePushButton,SIGNAL(clicked()),this,SLOT(clickedPicture()));// Clicking the picture should invoke pictureselector.
-        // Login
-        QLabel *loginLabel=new QLabel(tabpage,"Login: ");
+    // Login
-        loginLabel->setText("Login: ");
+    QLabel *loginLabel=new QLabel(tabpage,"Login: ");
-        loginLineEdit=new QLineEdit(tabpage,"Login: ");
+    loginLabel->setText("Login: ");
+    loginLineEdit=new QLineEdit(tabpage,"Login: ");
-        // UID
-        QLabel *uidLabel=new QLabel(tabpage,"uid: ");
+    // UID
-        uidLabel->setText("UserID: ");
+    QLabel *uidLabel=new QLabel(tabpage,"uid: ");
-        uidLineEdit=new QLineEdit(tabpage,"uid: ");
+    uidLabel->setText("UserID: ");
-        uidLineEdit->setEnabled(false);
+    uidLineEdit=new QLineEdit(tabpage,"uid: ");
+    uidLineEdit->setEnabled(false);
-        // Username (gecos)
-        QLabel *gecosLabel=new QLabel(tabpage,"gecos");
+    // Username (gecos)
-        gecosLabel->setText("Username: ");
+    QLabel *gecosLabel=new QLabel(tabpage,"gecos");
-        gecosLineEdit=new QLineEdit(tabpage,"gecos");
+    gecosLabel->setText("Username: ");
+    gecosLineEdit=new QLineEdit(tabpage,"gecos");
-        // Password
-        QLabel *passwordLabel=new QLabel(tabpage,"password");
+    // Password
-        passwordLabel->setText("Password: ");
+    QLabel *passwordLabel=new QLabel(tabpage,"password");
-        passwordLineEdit=new QLineEdit(tabpage,"password");
+    passwordLabel->setText("Password: ");
-        passwordLineEdit->setEchoMode(QLineEdit::Password);
+    passwordLineEdit=new QLineEdit(tabpage,"password");
+    passwordLineEdit->setEchoMode(QLineEdit::Password);
-        // Shell
-        QLabel *shellLabel=new QLabel(tabpage,"shell");
+    // Shell
-        shellLabel->setText("Shell: ");
+    QLabel *shellLabel=new QLabel(tabpage,"shell");
-        shellComboBox=new QComboBox(tabpage,"shell");
+    shellLabel->setText("Shell: ");
-        shellComboBox->setEditable(true);
+    shellComboBox=new QComboBox(tabpage,"shell");
-        shellComboBox->insertItem("/bin/sh");
+    shellComboBox->setEditable(true);
-        shellComboBox->insertItem("/bin/ash");
+    shellComboBox->insertItem("/bin/sh");
-        shellComboBox->insertItem("/bin/false");
+    shellComboBox->insertItem("/bin/ash");
+    shellComboBox->insertItem("/bin/false");
-        // Primary Group
-        QLabel *groupLabel=new QLabel(tabpage,"group");
+    // Primary Group
-        groupLabel->setText("Primary group: ");
+    QLabel *groupLabel=new QLabel(tabpage,"group");
-        groupComboBox=new QComboBox(tabpage,"PrimaryGroup");
+    groupLabel->setText("Primary group: ");
+    groupComboBox=new QComboBox(tabpage,"PrimaryGroup");
-        if(vm==VIEWMODE_NEW) {
-                // Copy /etc/skel
+    if(vm==VIEWMODE_NEW)
-                skelLabel=new QLabel(tabpage,"skel");
+    {
-                skelLabel->setText("Copy /etc/skel: ");
+        // Copy /etc/skel
-                skelCheckBox=new QCheckBox(tabpage);
+        skelLabel=new QLabel(tabpage,"skel");
-                skelCheckBox->setChecked(true);
+        skelLabel->setText("Copy /etc/skel: ");
-        }
+        skelCheckBox=new QCheckBox(tabpage);
+        skelCheckBox->setChecked(true);
-        // Widget layout
+    }
-        QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout");
-        layout->addWidget(picturePushButton);
+    // Widget layout
-        layout->addSpacing(5);
+    QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout");
-        layout->addLayout(hlayout);
+    layout->addWidget(picturePushButton);
-        QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1");
+    layout->addSpacing(5);
-        QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2");
+    layout->addLayout(hlayout);
-                // First column, labels
+    QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1");
-                vlayout1->addWidget(loginLabel);
+    QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2");
-                vlayout1->addSpacing(5);
+    // First column, labels
-                vlayout1->addWidget(uidLabel);
+    vlayout1->addWidget(loginLabel);
-                vlayout1->addSpacing(5);
+    vlayout1->addSpacing(5);
-                vlayout1->addWidget(gecosLabel);
+    vlayout1->addWidget(uidLabel);
-                vlayout1->addSpacing(5);
+    vlayout1->addSpacing(5);
-                vlayout1->addWidget(passwordLabel);
+    vlayout1->addWidget(gecosLabel);
-                vlayout1->addSpacing(5);
+    vlayout1->addSpacing(5);
-                vlayout1->addWidget(shellLabel);
+    vlayout1->addWidget(passwordLabel);
-                vlayout1->addSpacing(5);
+    vlayout1->addSpacing(5);
-                vlayout1->addWidget(groupLabel);
+    vlayout1->addWidget(shellLabel);
-                if(vm==VIEWMODE_NEW) {
+    vlayout1->addSpacing(5);
-                        vlayout1->addSpacing(5);
+    vlayout1->addWidget(groupLabel);
-                        vlayout1->addWidget(skelLabel);
+    if(vm==VIEWMODE_NEW)
-                }
+    {
-                // Second column, data
+        vlayout1->addSpacing(5);
-                vlayout2->addWidget(loginLineEdit);
+        vlayout1->addWidget(skelLabel);
-                vlayout2->addSpacing(5);
+    }
-                vlayout2->addWidget(uidLineEdit);
+    // Second column, data
-                vlayout2->addSpacing(5);
+    vlayout2->addWidget(loginLineEdit);
-                vlayout2->addWidget(gecosLineEdit);
+    vlayout2->addSpacing(5);
-                vlayout2->addSpacing(5);
+    vlayout2->addWidget(uidLineEdit);
-                vlayout2->addWidget(passwordLineEdit);
+    vlayout2->addSpacing(5);
-                vlayout2->addSpacing(5);
+    vlayout2->addWidget(gecosLineEdit);
-                vlayout2->addWidget(shellComboBox);
+    vlayout2->addSpacing(5);
-                vlayout2->addSpacing(5);
+    vlayout2->addWidget(passwordLineEdit);
-                vlayout2->addWidget(groupComboBox);
+    vlayout2->addSpacing(5);
-                if(vm==VIEWMODE_NEW) {
+    vlayout2->addWidget(shellComboBox);
-                        vlayout2->addSpacing(5);
+    vlayout2->addSpacing(5);
-                        vlayout2->addWidget(skelCheckBox);
+    vlayout2->addWidget(groupComboBox);
-                }
+    if(vm==VIEWMODE_NEW)
-        hlayout->addLayout(vlayout1);
+    {
-        hlayout->addLayout(vlayout2);
+        vlayout2->addSpacing(5);
-        
+        vlayout2->addWidget(skelCheckBox);
-        myTabWidget->addTab(tabpage,"User Info");
+    }
+    hlayout->addLayout(vlayout1);
+    hlayout->addLayout(vlayout2);
+    myTabWidget->addTab(tabpage,"User Info");
 }
 /**
 *  Creates the second tab containing additional groups for the user.
 *
 */
-void UserDialog::setupTab2() {
+void UserDialog::setupTab2()
-        QWidget *tabpage = new QWidget(myTabWidget,"page2");
+{
-        QVBoxLayout *layout = new QVBoxLayout(tabpage);
+    QWidget *tabpage = new QWidget(myTabWidget,"page2");
-        layout->setMargin(5);
+    QVBoxLayout *layout = new QVBoxLayout(tabpage);
+    layout->setMargin(5);
-        // Additional groups
-        groupsListView=new QListView(tabpage,"groups");
+    // Additional groups
-        groupsListView->addColumn("Additional groups");
+    groupsListView=new QListView(tabpage,"groups");
-        groupsListView->setColumnWidthMode(0,QListView::Maximum);
+    groupsListView->addColumn("Additional groups");
-        groupsListView->setMultiSelection(false);
+    groupsListView->setColumnWidthMode(0,QListView::Maximum);
-        groupsListView->setAllColumnsShowFocus(false);
+    groupsListView->setMultiSelection(false);
-        
+    groupsListView->setAllColumnsShowFocus(false);
-        layout->addSpacing(5);
-                // Grouplist
+    layout->addSpacing(5);
-                layout->addWidget(groupsListView);
+    // Grouplist
-        
+    layout->addWidget(groupsListView);
-        myTabWidget->addTab(tabpage,"User Groups");
+    myTabWidget->addTab(tabpage,"User Groups");
 }
 /**
 * Static function that creates the userinfo dialog.
 * The user will be prompted to add a user. 
 *
 * @param uid This is a suggested available UID.
 * @param gid This is a suggested available GID.
 *
 * @return <code>true</code> if the user was successfully added, otherwise <code>false</code>.
 *
 */
-bool UserDialog::addUser(int uid, int gid) {
+bool UserDialog::addUser(int uid, int gid)
-        QCheckListItem *temp;
+{
-        QFile ozTest;
+    QCheckListItem *temp;
-        int oz=false;
+    QFile ozTest;
-        if(ODevice::inst()->system()==System_OpenZaurus) oz=true;
+    int oz=false;
-        // viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating adduserDialog's widgets here.
+    if(ODevice::inst()->system()==System_OpenZaurus) oz=true;
-        UserDialog *adduserDialog=new UserDialog(VIEWMODE_NEW);
+    // viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating adduserDialog's widgets here.
-        adduserDialog->setCaption(tr("Add User"));
+    UserDialog *adduserDialog=new UserDialog(VIEWMODE_NEW);
-                adduserDialog->userID=uid;// Set next available UID as default uid.
+    adduserDialog->setCaption(tr("Add User"));
-                adduserDialog->groupID=gid;// Set next available GID as default gid.
+            adduserDialog->userID=uid;// Set next available UID as default uid.
-        // Insert default group into groupComboBox
+            adduserDialog->groupID=gid;// Set next available GID as default gid.
-        adduserDialog->groupComboBox->insertItem("<create new group>",0);
+    // Insert default group into groupComboBox
-        adduserDialog->uidLineEdit->setText(QString::number(uid));
+    adduserDialog->groupComboBox->insertItem("<create new group>",0);
-        // If we're running on OZ, add new users to some default groups.
+    adduserDialog->uidLineEdit->setText(QString::number(uid));
-        if(oz) {
+    // If we're running on OZ, add new users to some default groups.
-                QListViewItemIterator iter( adduserDialog->groupsListView );
+    if(oz)
-                for ( ; iter.current(); ++iter ) {
+    {
-                        temp=(QCheckListItem*)iter.current();
+        QListViewItemIterator iter( adduserDialog->groupsListView );
-                        if (temp->text()=="video") temp->setOn(true);
+        for ( ; iter.current(); ++iter )
-                        if (temp->text()=="audio") temp->setOn(true);
+        {
-                        if (temp->text()=="time") temp->setOn(true);
+            temp=(QCheckListItem*)iter.current();
-                        if (temp->text()=="power") temp->setOn(true);
+            if (temp->text()=="video") temp->setOn(true);
-                        if (temp->text()=="input") temp->setOn(true);
+            if (temp->text()=="audio") temp->setOn(true);
-                        if (temp->text()=="sharp") temp->setOn(true);
+            if (temp->text()=="time") temp->setOn(true);
-                        if (temp->text()=="tty") temp->setOn(true);
+            if (temp->text()=="power") temp->setOn(true);
-                }
+            if (temp->text()=="input") temp->setOn(true);
-        }
+            if (temp->text()=="sharp") temp->setOn(true);
-        // Show the dialog! 
+            if (temp->text()=="tty") temp->setOn(true);
-        if(!(adduserDialog->exec())) return false;
+        }
-        if((adduserDialog->groupComboBox->currentItem()!=0)) {
+    }
-                accounts->findGroup(adduserDialog->groupComboBox->currentText());
+    // Show the dialog!
-                adduserDialog->groupID=accounts->gr_gid;
+    if(!(adduserDialog->exec())) return false;
-                qWarning(QString::number(accounts->gr_gid));
+    if((adduserDialog->groupComboBox->currentItem()!=0))
-        }
+    {
-        if(!(accounts->addUser(adduserDialog->loginLineEdit->text(), adduserDialog->passwordLineEdit->text(), 
+        accounts->findGroup(adduserDialog->groupComboBox->currentText());
-                                                        adduserDialog->uidLineEdit->text().toInt(), adduserDialog->groupID, adduserDialog->gecosLineEdit->text(), 
+        adduserDialog->groupID=accounts->gr_gid;
-                                                        QString("/home/")+adduserDialog->loginLineEdit->text() , adduserDialog->shellComboBox->currentText()))) {
+        qWarning(QString::number(accounts->gr_gid));
-                QMessageBox::information(0,"Ooops!","Something went wrong!\nUnable to add user.");
+    }
-                return false;
+    if(!(accounts->addUser(adduserDialog->loginLineEdit->text(), adduserDialog->passwordLineEdit->text(),
-        }
+                           adduserDialog->uidLineEdit->text().toInt(), adduserDialog->groupID, adduserDialog->gecosLineEdit->text(),
-    
+                           QString("/home/")+adduserDialog->loginLineEdit->text() , adduserDialog->shellComboBox->currentText())))
-        // Add User to additional groups.
+    {
-        QListViewItemIterator it( adduserDialog->groupsListView );
+        QMessageBox::information(0,"Ooops!","Something went wrong!\nUnable to add user.");
-        for ( ; it.current(); ++it ) {
+        return false;
-                temp=(QCheckListItem*)it.current();
+    }
-                if (temp->isOn() )
-                accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text());
+    // Add User to additional groups.
-        }
+    QListViewItemIterator it( adduserDialog->groupsListView );
-        // Copy image to pics/users/
+    for ( ; it.current(); ++it )
-        if(!(adduserDialog->userImage.isNull())) {
+    {
-                QDir d;
+        temp=(QCheckListItem*)it.current();
-                if(!(d.exists("/opt/QtPalmtop/pics/users"))) {
+        if (temp->isOn() )
-                        d.mkdir("/opt/QtPalmtop/pics/users");
+            accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text());
-                }
+    }
-                QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
+    // Copy image to pics/users/
-        //      adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48);
+    if(!(adduserDialog->userImage.isNull()))
-                adduserDialog->userImage.save(filename,"PNG");
+    {
-        }
+        QDir d;
-        
+        if(!(d.exists("/opt/QtPalmtop/pics/users")))
-        // Should we copy the skeleton homedirectory /etc/skel to the user's homedirectory?
+        {
-        accounts->findUser(adduserDialog->loginLineEdit->text());
+            d.mkdir("/opt/QtPalmtop/pics/users");
-        if(adduserDialog->skelCheckBox->isChecked()) {
+        }
-                QString command_cp;
+        QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
-                QString command_chown;
+                //      adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48);
-                command_cp.sprintf("cp -a /etc/skel/* %s/",accounts->pw_dir.latin1());
+        adduserDialog->userImage.save(filename,"PNG");
-                system(command_cp);
+    }
-                
-                        command_cp.sprintf("cp -a /etc/skel/.[!.]* %s/",accounts->pw_dir.latin1());// Bug in busybox, ".*" includes parent directory, does this work as a workaround?
+    // Should we copy the skeleton homedirectory /etc/skel to the user's homedirectory?
-                system(command_cp);
+    accounts->findUser(adduserDialog->loginLineEdit->text());
-                
+    if(adduserDialog->skelCheckBox->isChecked())
-                command_chown.sprintf("chown -R %d:%d %s",accounts->pw_uid,accounts->pw_gid,accounts->pw_dir.latin1());
+    {
-                system(command_chown);
+        QString command_cp;
-        }
+        QString command_chown;
-        
+        command_cp.sprintf("cp -a /etc/skel/* %s/",accounts->pw_dir.latin1());
-        return true;
+        system(command_cp);
+                command_cp.sprintf("cp -a /etc/skel/.[!.]* %s/",accounts->pw_dir.latin1());// Bug in busybox, ".*" includes parent directory, does this work as a workaround?
+        system(command_cp);
+        command_chown.sprintf("chown -R %d:%d %s",accounts->pw_uid,accounts->pw_gid,accounts->pw_dir.latin1());
+        system(command_chown);
+    }
+    return true;
 }
 /**
 * Deletes the user account.
 *
 * @param username User to be deleted.
 *
 * @return <code>true</code> if the user was successfully deleted, otherwise <code>false</code>.
 *
 */
-bool UserDialog::delUser(const char *username) {
+bool UserDialog::delUser(const char *username)
-                if((accounts->findUser(username))) {// Does that user exist?
+{
-                        if(!(accounts->delUser(username))) {// Delete the user.
+    if((accounts->findUser(username)))
-                        QMessageBox::information(0,"Ooops!","Something went wrong\nUnable to delete user: "+QString(username)+".");
+            {// Does that user exist?
-                }
+        if(!(accounts->delUser(username)))
-        } else {
+                {// Delete the user.
-                QMessageBox::information(0,"Invalid Username","That username ("+QString(username)+")does not exist.");
+            QMessageBox::information(0,"Ooops!","Something went wrong\nUnable to delete user: "+QString(username)+".");
-                return false;
+        }
-        }
+    }
-        return true;
+    else
+    {
+        QMessageBox::information(0,"Invalid Username","That username ("+QString(username)+")does not exist.");
+        return false;
+    }
+    return true;
 }
 /**
 * This displays a confirmation dialog wether a user should be deleted or not.
 *  (And also deletes the account)
 *
 * @param username User to be deleted.
 *
 * @return <code>true</code> if the user was successfully deleted, otherwise <code>false</code>.
 *
 */
-bool UserDialog::editUser(const char *username) {
+bool UserDialog::editUser(const char *username)
-        int invalid_group=0;
+{
-        // viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating edituserDialog's widgets here.
+    int invalid_group=0;
-                UserDialog *edituserDialog=new UserDialog(VIEWMODE_EDIT);// Create Dialog
+    // viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating edituserDialog's widgets here.
-        edituserDialog->setCaption(tr("Edit User"));
+            UserDialog *edituserDialog=new UserDialog(VIEWMODE_EDIT);// Create Dialog
-                accounts->findUser(username);// Locate user in database and fill variables in 'accounts' object.
+    edituserDialog->setCaption(tr("Edit User"));
-                if(!(accounts->findGroup(accounts->pw_gid))) {// Locate the user's primary group, and fill group variables in 'accounts' object.
+            accounts->findUser(username);// Locate user in database and fill variables in 'accounts' object.
-                invalid_group=1;
+    if(!(accounts->findGroup(accounts->pw_gid)))
-        }
+            {// Locate the user's primary group, and fill group variables in 'accounts' object.
-        // Fill widgets with userinfo.
+        invalid_group=1;
-        edituserDialog->loginLineEdit->setText(accounts->pw_name);
+    }
-        edituserDialog->uidLineEdit->setText(QString::number(accounts->pw_uid));
+    // Fill widgets with userinfo.
-        edituserDialog->gecosLineEdit->setText(accounts->pw_gecos);
+    edituserDialog->loginLineEdit->setText(accounts->pw_name);
-        // Set password to '........', we will later check if this still is the contents, if not, the password has been changed.
+    edituserDialog->uidLineEdit->setText(QString::number(accounts->pw_uid));
-        edituserDialog->passwordLineEdit->setText("........");
+    edituserDialog->gecosLineEdit->setText(accounts->pw_gecos);
-        // If this user is not using /bin/sh,/bin/ash or /bin/false as shell, add that entry to the shell-combobox.
+    // Set password to '........', we will later check if this still is the contents, if not, the password has been changed.
-        if(accounts->pw_shell!="/bin/sh" && accounts->pw_shell!="/bin/ash" && accounts->pw_shell!="/bin/false") {
+    edituserDialog->passwordLineEdit->setText("........");
-                edituserDialog->shellComboBox->insertItem(accounts->pw_shell,0);
+    // If this user is not using /bin/sh,/bin/ash or /bin/false as shell, add that entry to the shell-combobox.
-                edituserDialog->shellComboBox->setCurrentItem(0);
+    if(accounts->pw_shell!="/bin/sh" && accounts->pw_shell!="/bin/ash" && accounts->pw_shell!="/bin/false")
-        }
+    {
-        // Select the primary group for this user.
+        edituserDialog->shellComboBox->insertItem(accounts->pw_shell,0);
-        for(int i=0;i<edituserDialog->groupComboBox->count();++i) {
+        edituserDialog->shellComboBox->setCurrentItem(0);
-                if(accounts->gr_name==edituserDialog->groupComboBox->text(i)) {
+    }
-                        edituserDialog->groupComboBox->setCurrentItem(i);
+    // Select the primary group for this user.
-                        break;
+    for(int i=0;i<edituserDialog->groupComboBox->count();++i)
-                }
+    {
-        }
+        if(accounts->gr_name==edituserDialog->groupComboBox->text(i))
-        if(invalid_group) {
+        {
-                edituserDialog->groupComboBox->insertItem("<Undefined group>",0);
+            edituserDialog->groupComboBox->setCurrentItem(i);
-                edituserDialog->groupComboBox->setCurrentItem(0);
+            break;
-        }
+        }
+    }
-        // Select the groups in the listview, to which the user belongs.
+    if(invalid_group)
-        QCheckListItem *temp;
+    {
-        // BAH!!! QRegExp in qt2 sucks... or maybe I do... can't figure out how to check for EITHER end of input ($) OR a comma, so here we do two different QRegExps instead.
+        edituserDialog->groupComboBox->insertItem("<Undefined group>",0);
-                QRegExp userRegExp(QString("[:,]%1$").arg(username));// The end of line variant.
+        edituserDialog->groupComboBox->setCurrentItem(0);
-                QStringList tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of.
+    }
-                for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {// Iterate over all of them.
-                qWarning(*it);
+    // Select the groups in the listview, to which the user belongs.
-                        QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups.
+    QCheckListItem *temp;
-                for ( ; lvit.current(); ++lvit ) {
+    // BAH!!! QRegExp in qt2 sucks... or maybe I do... can't figure out how to check for EITHER end of input ($) OR a comma, so here we do two different QRegExps instead.
-                        if(lvit.current()->text(0)==(*it).left((*it).find(":"))) {
+            QRegExp userRegExp(QString("[:,]%1$").arg(username));// The end of line variant.
-                                temp=(QCheckListItem*)lvit.current();
+            QStringList tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of.
-                                        temp->setOn(true);// If we find a line with that groupname, select it.;
+    for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it)
-                        }
+            {// Iterate over all of them.
-                }
+        qWarning(*it);
-        }
+                QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups.
-                userRegExp=QRegExp(QString("[:,]%1,").arg(username));// And the other one. (not end of line.)
+        for ( ; lvit.current(); ++lvit )
-                tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of.
+        {
-                for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {// Iterate over all of them.
+            if(lvit.current()->text(0)==(*it).left((*it).find(":")))
-                qWarning(*it);
+            {
-                        QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups.
+                temp=(QCheckListItem*)lvit.current();
-                for ( ; lvit.current(); ++lvit ) {
+                        temp->setOn(true);// If we find a line with that groupname, select it.;
-                        if(lvit.current()->text(0)==(*it).left((*it).find(":"))) {
+            }
-                                temp=(QCheckListItem*)lvit.current();
+        }
-                                        temp->setOn(true);// If we find a line with that groupname, select it.;
+    }
-                        }
+            userRegExp=QRegExp(QString("[:,]%1,").arg(username));// And the other one. (not end of line.)
-                }
+            tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of.
-        }
+    for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it)
-        
+            {// Iterate over all of them.
-                if(!(edituserDialog->exec())) return false;// SHOW THE DIALOG!
+        qWarning(*it);
-        
+                QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups.
-                accounts->findUser(username);// Fill user variables in 'acccounts' object.
+        for ( ; lvit.current(); ++lvit )
-        accounts->pw_name=edituserDialog->loginLineEdit->text();
+        {
-        // Has the password been changed ? Make a new "crypt":ed password.
+            if(lvit.current()->text(0)==(*it).left((*it).find(":")))
-        if(edituserDialog->passwordLineEdit->text()!="........") accounts->pw_passwd=crypt(edituserDialog->passwordLineEdit->text(), accounts->crypt_make_salt());
+            {
-        
+                temp=(QCheckListItem*)lvit.current();
-        // Set all variables in accounts object, that will be used when calling 'updateUser()'
+                        temp->setOn(true);// If we find a line with that groupname, select it.;
-        accounts->pw_uid=edituserDialog->uidLineEdit->text().toInt();
+            }
-                if(accounts->findGroup(edituserDialog->groupComboBox->currentText())) {// Fill all group variables in 'accounts' object.
+        }
-                        accounts->pw_gid=accounts->gr_gid;// Only do this if the group is a valid group (ie. "<Undefined group>"), otherwise keep the old group.
+    }
-        }
-        accounts->pw_gecos=edituserDialog->gecosLineEdit->text();
+            if(!(edituserDialog->exec())) return false;// SHOW THE DIALOG!
-        accounts->pw_shell=edituserDialog->shellComboBox->currentText();
-        // Update userinfo, using the information stored in the user variables stored in the accounts object.
+            accounts->findUser(username);// Fill user variables in 'acccounts' object.
-        accounts->updateUser(username);
+    accounts->pw_name=edituserDialog->loginLineEdit->text();
-        
+    // Has the password been changed ? Make a new "crypt":ed password.
-        // Remove user from all groups he/she is a member of. (could be done in a better way I guess, this was simple though.)
+    if(edituserDialog->passwordLineEdit->text()!="........") accounts->pw_passwd=crypt(edituserDialog->passwordLineEdit->text(), accounts->crypt_make_salt());
-        for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {
-                accounts->delGroupMember((*it).left((*it).find(":")),username);
+    // Set all variables in accounts object, that will be used when calling 'updateUser()'
-        }
+    accounts->pw_uid=edituserDialog->uidLineEdit->text().toInt();
-        
+    if(accounts->findGroup(edituserDialog->groupComboBox->currentText()))
-        // Add User to additional groups that he/she is a member of.
+            {// Fill all group variables in 'accounts' object.
-        QListViewItemIterator it( edituserDialog->groupsListView );
+                accounts->pw_gid=accounts->gr_gid;// Only do this if the group is a valid group (ie. "<Undefined group>"), otherwise keep the old group.
-        for ( ; it.current(); ++it ) {
+    }
-        temp=(QCheckListItem*)it.current();
+    accounts->pw_gecos=edituserDialog->gecosLineEdit->text();
-        if ( temp->isOn() )
+    accounts->pw_shell=edituserDialog->shellComboBox->currentText();
-                accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text());
+    // Update userinfo, using the information stored in the user variables stored in the accounts object.
-        }
+    accounts->updateUser(username);
-        
-        // Copy image to pics/users/
+    // Remove user from all groups he/she is a member of. (could be done in a better way I guess, this was simple though.)
-        if(!(edituserDialog->userImage.isNull())) {
+    for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it)
-                QDir d;
+    {
-                if(!(d.exists("/opt/QtPalmtop/pics/users"))) {
+        accounts->delGroupMember((*it).left((*it).find(":")),username);
-                        d.mkdir("/opt/QtPalmtop/pics/users");
+    }
-                }
-                QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
+    // Add User to additional groups that he/she is a member of.
-        //      edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48);
+    QListViewItemIterator it( edituserDialog->groupsListView );
-                edituserDialog->userImage.save(filename,"PNG");
+    for ( ; it.current(); ++it )
-        }
+    {
-        return true;
+        temp=(QCheckListItem*)it.current();
+        if ( temp->isOn() )
+            accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text());
+    }
+    // Copy image to pics/users/
+    if(!(edituserDialog->userImage.isNull()))
+    {
+        QDir d;
+        if(!(d.exists("/opt/QtPalmtop/pics/users")))
+        {
+            d.mkdir("/opt/QtPalmtop/pics/users");
+        }
+        QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
+                //      edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48);
+        edituserDialog->userImage.save(filename,"PNG");
+    }
+    return true;
 }
 /**
 * "OK" has been clicked. Verify some information before closing the dialog.
 *
 */
-void UserDialog::accept() {
+void UserDialog::accept()
-        // Add checking... valid username? username taken? 
+{
-        if(loginLineEdit->text().isEmpty()) {
+    // Add checking... valid username? username taken?
-                QMessageBox::information(0,"Empty Login","Please enter a login.");
+    if(loginLineEdit->text().isEmpty())
-                return;
+    {
-        }
+        QMessageBox::information(0,"Empty Login","Please enter a login.");
-        QDialog::accept();
+        return;
+    }
+    QDialog::accept();
 }
 /**
 * This slot is called when the usericon is clicked, this loads (should) the iconselector.
 *
 */
-void UserDialog::clickedPicture() {
+void UserDialog::clickedPicture()
-        QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED, QString::null);
+{
-        if(!(filename.isEmpty())) {
+    QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED, QString::null);
-                userImage.reset();
+    if(!(filename.isEmpty()))
-                if(!(userImage.load(filename))) {
+    {
-                        QMessageBox::information(0,"Sorry!","That icon could not be loaded.\nLoading failed on: "+filename);
+        userImage.reset();
-                } else {
+        if(!(userImage.load(filename)))
-        //              userImage=userImage.smoothScale(48,48);
+        {
-                        QPixmap *picture;
+            QMessageBox::information(0,"Sorry!","That icon could not be loaded.\nLoading failed on: "+filename);
-                        picture=(QPixmap *)picturePushButton->pixmap();
+        }
-                        picture->convertFromImage(userImage,0);
+        else
-                        picturePushButton->update();
+        {
-                }
+                    //          userImage=userImage.smoothScale(48,48);
-        }
+            QPixmap *picture;
+            picture=(QPixmap *)picturePushButton->pixmap();
+            picture->convertFromImage(userImage,0);
+            picturePushButton->update();
+        }
+    }
 }