4 files changed, 252 insertions, 239 deletions

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
@@ -18,83 +18,89 @@
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <iostream>
-using namespace std;
+#include "categoryfilterimpl.h"
+
+/* 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
     {
         end = categories.find( "#", start );
         item = categories.mid( start, end - start );
         if ( item != "" )
         {
             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 )
     {
         if ( lstCategories->isSelected( i ) )
         {
             ret.append( lstCategories->text( i ) );
             ret.append( "#" );
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
@@ -18,99 +18,101 @@
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#include "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 );
-//    if ( flags & VERBOSE_WGET )
-        //    verboseWget->setChecked( true );
-//    if ( flags & MAKE_LINKS )
-        //    makeLinks->setChecked( true );
+        forceOverwrite->setChecked( true );
+    //    if ( flags & VERBOSE_WGET )
+            //    verboseWget->setChecked( true );
+    //    if ( flags & MAKE_LINKS )
+            //    makeLinks->setChecked( true );
 
-          showMaximized();
+    QPEApplication::showDialog( this );
 
 }
 
 InstallOptionsDlgImpl::~InstallOptionsDlgImpl()
-{
-}
+{}
 
 
 int InstallOptionsDlgImpl :: getFlags()
 {
     int flags = 0;
 
     if ( forceDepends->isChecked() )
         flags |= FORCE_DEPENDS;
     if ( forceReinstall->isChecked() )
         flags |= FORCE_REINSTALL;
     if ( forceRemove->isChecked() )
         flags |= FORCE_REMOVE;
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,15 +1,15 @@
 /*
                              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,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
@@ -18,65 +18,68 @@
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <linux/limits.h>
-#include <unistd.h>
+#include "categoryfilterimpl.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"
-#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"
+/* STD */
+#include <linux/limits.h>
+#include <unistd.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" ) );
 
     // Create UI widgets
     initMainWidget();
     initProgressWidget();
@@ -230,25 +233,25 @@ MainWindow :: MainWindow( QWidget* parent, const char* name, WFlags fl )
     stack = new QWidgetStack( this );
     stack->addWidget( progressWindow, 2 );
     stack->addWidget( networkPkgWindow, 1 );
     setCentralWidget( stack );
     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 );
 
     QLabel *l = new QLabel( tr( "Servers:" ), networkPkgWindow );
 
     serversList = new QComboBox( networkPkgWindow );
@@ -287,25 +290,25 @@ void MainWindow :: initProgressWidget()
 
     m_progress = new QProgressBar( progressWindow );
     layout->addWidget( m_progress );
 }
 
 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 & ) ),
              this, SLOT( setProgressMessage( const QString & ) ) );
     connect( mgr, SIGNAL( progressUpdate( int ) ), this, SLOT( updateProgress( int ) ) );
     mgr->loadServers();
 
@@ -328,42 +331,42 @@ void MainWindow :: setDocument( const QString &doc )
     for ( int i = 0 ; i < serversList->count() ; ++i )
     {
         if ( serversList->text( i ) == LOCAL_IPKGS )
         {
             serversList->setCurrentItem( i );
             break;
         }
     }
     serverSelected( 0 );
 
     // Now set the check box of the selected package
     for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
-          item != 0 ;
-          item = (QCheckListItem *)item->nextSibling() )
+            item != 0 ;
+            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
     QWidget *widget = stack->visibleWidget();
 
     if ( widget != networkPkgWindow && widget != progressWindow )
     {
@@ -573,30 +576,30 @@ void MainWindow :: updateData()
         m_status->setText( tr( "Building server list:\n\t%1" ).arg( serverName ) );
         m_progress->setProgress( i );
         qApp->processEvents();
 
         if ( !server->isServerActive() )
         {
             i--;
             continue;
         }
 
         serversList->insertItem( serverName );
         if ( serverName == currentlySelectedServer )
-                activeItem = i;
-        }
+            activeItem = i;
+    }
 
-        // set selected server to be active server
-        if ( activeItem != -1 )
-                serversList->setCurrentItem( activeItem );
+    // set selected server to be active server
+    if ( activeItem != -1 )
+        serversList->setCurrentItem( activeItem );
     serverSelected( 0, FALSE );
 }
 
 void MainWindow :: serverSelected( int index )
 {
     serverSelected( index, TRUE );
 }
 
 void MainWindow :: serverSelected( int, bool raiseProgress )
 {
     QPixmap nullIcon( installedIcon.size() );
     nullIcon.fill( colorGroup().base() );
@@ -616,28 +619,28 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
     {
         if ( raiseProgress )
         {
             stack->raiseWidget( progressWindow );
         }
         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
-        Config cfg( "aqpkg" );
-        cfg.setGroup( "settings" );
-        cfg.writeEntry( "selectedServer", currentlySelectedServer );
+    // read download directory from config file
+    Config cfg( "aqpkg" );
+    cfg.setGroup( "settings" );
+    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++;
         if ( ( i % 100 ) == 0 )
         {
             if ( doProgress )
             {
@@ -669,25 +672,25 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
         if ( categoryFilterEnabled && categoryFilter != "" )
         {
             if ( package->getSection() == "" || categoryFilter.find( package->getSection().lower() ) == -1 )
                 continue;
         }
 
         // 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())
             {
 
                 item->setPixmap( 0, updatedIcon );
             }
             else
             {
@@ -729,25 +732,25 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
 
 void MainWindow :: searchForPackage( const QString &text )
 {
     if ( !text.isEmpty() )
     {
         // 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;
             }
         }
     }
 }
 
 void MainWindow :: updateServer()
@@ -757,114 +760,114 @@ void MainWindow :: updateServer()
     // Update the current server
     // Display dialog
 
     // Disable buttons to stop silly people clicking lots on them :)
 
     // 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::No | QMessageBox::Escape | QMessageBox::Default ,
-                        0, this );
+                      QMessageBox::Yes,
+                      QMessageBox::No | QMessageBox::Escape | QMessageBox::Default ,
+                      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 = (QCheckListItem *)item->nextSibling() )
+                    item != 0 && !found;
+                    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
         // and whether to install it
         if ( found )
             downloadSelectedPackages();
         else
             downloadRemotePackage();
 
     }
     else
     {
         doUpdate = false;
         for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
-              item != 0 ;
-              item = (QCheckListItem *)item->nextSibling() )
+                item != 0 ;
+                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
                 pos = name.find( "(installed)" );
                 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();
                 }
             }
         }
     }
 
     if ( doUpdate )
     {
         reloadData( 0x0 );
@@ -899,103 +902,103 @@ void MainWindow :: downloadSelectedPackages()
 
     // Get starting directory
     char initDir[PATH_MAX];
     getcwd( initDir, PATH_MAX );
 
     // 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 = (QCheckListItem *)item->nextSibling() )
+            item != 0 ;
+            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 );
-//    if ( dlg.exec() == QDialog::Rejected )
-//        return;
+    //    DownloadRemoteDlgImpl dlg( this, "Install", true );
+    //    if ( dlg.exec() == QDialog::Rejected )
+    //        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 = "";
 
     // First, write out ipkg_conf file so that ipkg can use it
     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 = (QCheckListItem *)item->nextSibling() )
+            item != 0 ;
+            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
 //    If installed and version up to date - remove
 InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
 {
     QString name = item->text();
@@ -1015,25 +1018,25 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
         InstallData *newitem = new InstallData();
         newitem->option = "I";
         newitem->packageName = name;
         return newitem;
     }
     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();
         }
         else
         {
             newitem->destination = p->getLocalPackage()->getInstalledTo();
@@ -1081,80 +1084,80 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
                 secondOption = "U"; // Internal action code, do not translate
             }
 
             // Sticky option not implemented yet, but will eventually allow
             // 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
-                        delete newitem;
-                        return 0x0;
-                        break;
-                    case 1: // Remove
-                        newitem->option = "D";
-                        // If local file, remove using package name, not filename
-                        if ( p->isPackageStoredLocally() )
-                            name = item->text();
-                        break;
-                    case 2: // Reinstall or Upgrade
-                        newitem->option = secondOption;
-                        break;
+                case 0: // Cancel
+                    delete newitem;
+                    return 0x0;
+                    break;
+                case 1: // Remove
+                    newitem->option = "D";
+                    // If local file, remove using package name, not filename
+                    if ( p->isPackageStoredLocally() )
+                        name = item->text();
+                    break;
+                case 2: // Reinstall or Upgrade
+                    newitem->option = secondOption;
+                    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 )
 {
     stack->raiseWidget( progressWindow );
 
     if ( dlg )
     {
         dlg->close();
         delete dlg;
     }
 
     mgr->reloadServerData();
     serverSelected( -1, FALSE );
 
 #ifdef QWS
     if ( reloadDocuments )
-        {
-                m_status->setText( tr( "Updating Launcher..." ) );
-
-                // Finally let the main system update itself
-                QCopEnvelope e("QPE/System", "linkChanged(QString)");
-                QString lf = QString::null;
-                e << lf;
-        }
+    {
+        m_status->setText( tr( "Updating Launcher..." ) );
+
+        // Finally let the main system update itself
+        QCopEnvelope e("QPE/System", "linkChanged(QString)");
+        QString lf = QString::null;
+        e << lf;
+    }
 #endif
 
     stack->raiseWidget( networkPkgWindow );
 }
 
 void MainWindow :: letterPushed( QString t )
 {
     QCheckListItem *top = (QCheckListItem *)packagesList->firstChild();
     QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
     if ( packagesList->firstChild() == 0 )
         return;
 
@@ -1172,36 +1175,37 @@ void MainWindow :: letterPushed( QString t )
     do
     {
         if ( item->text().lower().startsWith( t.lower() ) )
         {
             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 );
     layout->addMultiCellWidget( l, 0, 0, 0, 1 );
 
     btn1 = new QPushButton( tr( "Remove" ), this );
     connect( btn1, SIGNAL(clicked()), this, SLOT(slotButtonPressed()) );
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
@@ -15,90 +15,89 @@
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
+ 
 */
 
-#include <fstream>
-#include <algorithm>
-using namespace std;
+#include "settingsimpl.h"
+#include "global.h"
 
+/* 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>
-
-#ifdef QWS
-#include <qpe/config.h>
-#include <qpe/resource.h>
-#endif
-
-#include "settingsimpl.h"
-
-#include "global.h"
+/* STD */
+#include <fstream>
+#include <algorithm>
+using namespace std;
 
 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();
-        exec();
-
-        if ( changed )
-                dataMgr->writeOutIpkgConf();
+    QPEApplication::execDialog( this );
+    if ( changed )
+        dataMgr->writeOutIpkgConf();
 
-        return changed;
+    return changed;
 }
 
 QWidget *SettingsImpl :: initServerTab()
 {
     QWidget *control = new QWidget( this );
 
     QVBoxLayout *vb = new QVBoxLayout( control );
 
     QScrollView *sv = new QScrollView( control );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
@@ -109,53 +108,53 @@ QWidget *SettingsImpl :: initServerTab()
     QGridLayout *layout = new QGridLayout( container );
     layout->setSpacing( 2 );
     layout->setMargin( 4 );
 
     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 );
 
     QScrollView *sv = new QScrollView( control );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
@@ -167,53 +166,53 @@ QWidget *SettingsImpl :: initDestinationTab()
     QGridLayout *layout = new QGridLayout( container );
     layout->setSpacing( 2 );
     layout->setMargin( 4 );
 
     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 );
 
     QScrollView *sv = new QScrollView( control );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
@@ -226,72 +225,72 @@ QWidget *SettingsImpl :: initProxyTab()
     layout->setSpacing( 2 );
     layout->setMargin( 4 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "HTTP Proxy" ), container );
     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() );
 }
 
 //------------------ Servers tab ----------------------
 
 void SettingsImpl :: editServer( int sel )
@@ -327,71 +326,71 @@ void SettingsImpl :: removeServer()
 {
     changed = true;
     Server *s = dataMgr->getServer( servers->currentText() );
     if ( s )
     {
         dataMgr->getServerList().removeRef( s );
         servers->removeItem( currentSelectedServer );
     }
 }
 
 void SettingsImpl :: changeServerDetails()
 {
-        changed = true;
-
-        QString newName = servername->text();
-        
-        // Convert any spaces to underscores
-        char *tmpStr = new char[newName.length() + 1];
-        for ( unsigned int i = 0 ; i < newName.length() ; ++i )
-        {
-                if ( newName[i] == ' ' )
-                        tmpStr[i] = '_';
-                else
-                        tmpStr[i] = newName[i].latin1();
-        }
-        tmpStr[newName.length()] = '\0';
-        
-        newName = tmpStr;
-        delete tmpStr;
-        
-        if ( !newserver )
-        {
-                Server *s = dataMgr->getServer( servers->currentText() );
-                if ( s )
-                {
-                        // Update url
-                        s->setServerUrl( serverurl->text() );
-                        s->setActive( active->isChecked() );
-
-                        // Check if server name has changed, if it has then we need to replace the key in the map
-                        if ( serverName != newName )
-                        {
-                                // Update server name
-                                s->setServerName( newName );
-                        }
-                
-                        // Update list box
-                        servers->changeItem( newName, currentSelectedServer );
-                }
-        }
-        else
-        {
+    changed = true;
+
+    QString newName = servername->text();
+
+    // Convert any spaces to underscores
+    char *tmpStr = new char[newName.length() + 1];
+    for ( unsigned int i = 0 ; i < newName.length() ; ++i )
+    {
+        if ( newName[i] == ' ' )
+            tmpStr[i] = '_';
+        else
+            tmpStr[i] = newName[i].latin1();
+    }
+    tmpStr[newName.length()] = '\0';
+
+    newName = tmpStr;
+    delete tmpStr;
+
+    if ( !newserver )
+    {
+        Server *s = dataMgr->getServer( servers->currentText() );
+        if ( s )
+        {
+            // Update url
+            s->setServerUrl( serverurl->text() );
+            s->setActive( active->isChecked() );
+
+            // Check if server name has changed, if it has then we need to replace the key in the map
+            if ( serverName != newName )
+            {
+                // Update server name
+                s->setServerName( newName );
+            }
+
+            // Update list box
+            servers->changeItem( newName, currentSelectedServer );
+        }
+    }
+    else
+    {
         Server s( newName, serverurl->text() );
         dataMgr->getServerList().append( new Server( newName, serverurl->text() ) );
         dataMgr->getServerList().last()->setActive( active->isChecked() );
-                servers->insertItem( newName );
-                servers->setCurrentItem( servers->count() );
-                newserver = false;
-        }
+        servers->insertItem( newName );
+        servers->setCurrentItem( servers->count() );
+        newserver = false;
+    }
 }
 
 //------------------ Destinations tab ----------------------
 
 void SettingsImpl :: editDestination( int sel )
 {
     currentSelectedDestination = sel;
     Destination *d = dataMgr->getDestination( destinations->currentText() );
     if ( d )
     {
         destinationName = d->getDestinationName();
         destinationname->setText( d->getDestinationName() );
@@ -400,92 +399,94 @@ void SettingsImpl :: editDestination( int sel )
     }
     else
     {
         destinationName = "";
         destinationname->setText( "" );
         destinationurl->setText( "" );
         linkToRoot->setChecked( false );
     }
 }
 
 void SettingsImpl :: newDestination()
 {
-        newdestination = true;
-        destinationname->setText( "" );
-        destinationurl->setText( "" );
-        destinationname->setFocus();
+    newdestination = true;
+    destinationname->setText( "" );
+    destinationurl->setText( "" );
+    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 )
-        {
-                Destination *d = dataMgr->getDestination( destinations->currentText() );
-                if ( d )
-                {
-                        // Update url
-                        d->setDestinationPath( destinationurl->text() );
-                d->linkToRoot( linkToRoot->isChecked() );
-
-                        // Check if server name has changed, if it has then we need to replace the key in the map
-                        if ( destinationName != newName )
-                        {
-                                // Update server name
-                                d->setDestinationName( newName );
-
-                                // Update list box
-                                destinations->changeItem( newName, currentSelectedDestination );
-                        }
+    if ( !newdestination )
+    {
+        Destination *d = dataMgr->getDestination( destinations->currentText() );
+        if ( d )
+        {
+            // Update url
+            d->setDestinationPath( destinationurl->text() );
+            d->linkToRoot( linkToRoot->isChecked() );
+
+            // Check if server name has changed, if it has then we need to replace the key in the map
+            if ( destinationName != newName )
+            {
+                // Update server name
+                d->setDestinationName( newName );
+
+                // Update list box
+                destinations->changeItem( newName, currentSelectedDestination );
+            }
 
 #ifdef QWS
-                        QString key = newName;
-                        key += "_linkToRoot";
-                        int val = d->linkToRoot();
-                        cfg.writeEntry( key, val );
-#endif      
-                }  
-        }
-        else
-        {
-                dataMgr->getDestinationList().append( new Destination( newName, destinationurl->text() ) );
-                destinations->insertItem( newName );
-                destinations->setCurrentItem( destinations->count() );
-                newdestination = false;
+            QString key = newName;
+            key += "_linkToRoot";
+            int val = d->linkToRoot();
+            cfg.writeEntry( key, val );
+#endif
+
+        }
+    }
+    else
+    {
+        dataMgr->getDestinationList().append( new Destination( newName, destinationurl->text() ) );
+        destinations->insertItem( newName );
+        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() );
     dataMgr->setProxyUsername( txtUsername->text() );
     dataMgr->setProxyPassword( txtPassword->text() );
 
     dataMgr->setHttpProxyEnabled( chkHttpProxyEnabled->isChecked() );