1 files changed, 26 insertions, 29 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index db9a259..485fe3d 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -14,12 +14,13 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifdef QWS
 #include <qpe/config.h>
+#include <qpe/qpeapplication.h>
 #endif
 
 #include <qmultilineedit.h>
 #include <qdialog.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
@@ -88,21 +89,21 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
                 {
                         removeList.push_back( item );
                         remove += "   " + item.packageName + "\n";
                 }
                 else if ( item.option == "U" || item.option == "R" )
                 {
-                        updateList.push_back( item );
+            updateList.push_back( item );
             QString type = " (Upgrade)";
             if ( item.option == "R" )
                 type = " (ReInstall)";
-                        upgrade += "   " + item.packageName + type + "\n";
-                }
-        }
+            upgrade += "   " + item.packageName + type + "\n";
+    }
+    }
 
-        output->setText( remove + install + upgrade );
+    output->setText( remove + install + upgrade );
 }
 
 InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, QWidget *parent, const char *name, bool modal, WFlags fl )
     : InstallDlg( parent, name, modal, fl )
 {
     pIpkg = ipkg;
@@ -113,50 +114,45 @@ InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, QWidget *parent
 InstallDlgImpl::~InstallDlgImpl()
 {
 }
 
 bool InstallDlgImpl :: showDlg()
 {
-        showMaximized();
-        bool ret = exec();
+    showMaximized();
+    bool ret = exec();
 
-        return ret;
+    return ret;
 }
 
 void InstallDlgImpl :: optionsSelected()
 {
-        InstallOptionsDlgImpl opt( flags, this, "Option", true );
-        opt.exec();
-
-        // set options selected from dialog
-    flags = 0;
-    if ( opt.forceDepends->isChecked() )
-        flags |= FORCE_DEPENDS;
-    if ( opt.forceReinstall->isChecked() )
-        flags |= FORCE_REINSTALL;
-    if ( opt.forceRemove->isChecked() )
-        flags |= FORCE_REMOVE;
-    if ( opt.forceOverwrite->isChecked() )
-        flags |= FORCE_OVERWRITE;
+    InstallOptionsDlgImpl opt( flags, this, "Option", true );
+    opt.exec();
+
+    // set options selected from dialog
+    flags = opt.getFlags();
 
 #ifdef QWS
     Config cfg( "aqpkg" );
     cfg.setGroup( "settings" );
     cfg.writeEntry( "installFlags", flags );
 #endif
 }
 
 void InstallDlgImpl :: installSelected()
 {
-        if ( btnInstall->text() == "Close" )
-        {
-                done( 1 );
-                return;
-        }
+    
+    if ( btnInstall->text() == "Close" )
+    {
+        done( 1 );
+        return;
+    }
 
-        btnInstall->setEnabled( false );
+    // Disable buttons
+    btnOptions->setEnabled( false );
+    btnInstall->setEnabled( false );
 
     if ( pIpkg )
     {
         output->setText( "" );
         
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
@@ -180,13 +176,13 @@ void InstallDlgImpl :: installSelected()
 #endif
 
         pIpkg = new Ipkg;
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
         
         // First run through the remove list, then the install list then the upgrade list
-            vector<InstallData>::iterator it;
+        vector<InstallData>::iterator it;
         pIpkg->setOption( "remove" );
         for ( it = removeList.begin() ; it != removeList.end() ; ++it )
         {
             pIpkg->setDestination( it->destination->getDestinationName() );
             pIpkg->setDestinationDir( it->destination->getDestinationPath() );
             pIpkg->setPackage( it->packageName );
@@ -227,13 +223,14 @@ void InstallDlgImpl :: installSelected()
             pIpkg->runIpkg();
         }
 
         delete pIpkg;
     }
 
-        btnInstall->setEnabled( true );
+    btnOptions->setEnabled( true );
+    btnInstall->setEnabled( true );
     btnInstall->setText( tr( "Close" ) );
 }
 
 void InstallDlgImpl :: displayText(const QString &text )
 {
     QString t = output->text() + "\n" + text;