4 files changed, 33 insertions, 8 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index 1f0bb5f..2bb8b4d 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -180,13 +180,13 @@ void InstallDlgImpl :: init( bool displayextrainfo )
     layout->addMultiCellWidget( GroupBox2, 2, 2, 0, 1 );
 
     btnInstall = new QPushButton( Resource::loadPixmap( "aqpkg/apply" ), tr( "Start" ), this );
     layout->addWidget( btnInstall, 3, 0 );
     connect( btnInstall, SIGNAL( clicked() ), this, SLOT( installSelected() ) );
     
-    btnOptions = new QPushButton( Resource::loadPixmap( "aqpkg/config" ), tr( "Options" ), this );
+    btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this );
     layout->addWidget( btnOptions, 3, 1 );
     connect( btnOptions, SIGNAL( clicked() ), this, SLOT( optionsSelected() ) );
 }
 
 void InstallDlgImpl :: optionsSelected()
 {
@@ -227,12 +227,13 @@ void InstallDlgImpl :: installSelected()
     // Disable buttons
     btnOptions->setEnabled( false );
 //    btnInstall->setEnabled( false );
 
     btnInstall->setText( tr( "Abort" ) );
     btnInstall->setIconSet( Resource::loadPixmap( "close" ) );
+
     if ( pIpkg )
     {
         output->setText( "" );
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
         pIpkg->runIpkg();
     }
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index d7509bb..c30963e 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -52,15 +52,15 @@ public:
 	bool upgradeServer( QString &server );
 
 protected:
 
 private:
     DataManager *dataMgr;
-	QList<InstallData> installList;
-	QList<InstallData> removeList;
-	QList<InstallData> updateList;
+    QList<InstallData> installList;
+    QList<InstallData> removeList;
+    QList<InstallData> updateList;
     int flags;
     Ipkg *pIpkg;
     bool upgradePackages;
     
     QComboBox      *destination;
     QPushButton    *btnInstall;
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index dfe6d9c..7fa311d 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -337,12 +337,29 @@ void MainWindow :: displaySettings()
         stack->raiseWidget( progressWindow );
     	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 )
+    {
+        if ( widget ) delete widget;
+        stack->raiseWidget( networkPkgWindow );
+        e->ignore();
+    }
+    else
+    {
+        e->accept();
+    }
+}
     
 void MainWindow :: displayFindBar()
 {
     findBar->show();
     findEdit->setFocus();
 }
@@ -776,13 +793,14 @@ void MainWindow :: updateServer()
     Ipkg *ipkg = new Ipkg;
     ipkg->setOption( "update" );
 
     InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Refreshing server package lists" ),
                                               tr( "Update lists" ) );
     connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-    dlg->showMaximized();
+    stack->addWidget( dlg, 3 );
+    stack->raiseWidget( dlg );
     
 //  delete progDlg;
 }
 
 void MainWindow :: upgradePackages()
 {
@@ -805,13 +823,14 @@ void MainWindow :: upgradePackages()
         Ipkg *ipkg = new Ipkg;
         ipkg->setOption( "upgrade" );
 
         InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Upgrading installed packages" ),
                                                   tr ( "Upgrade" ) );
         connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-        dlg->showMaximized();
+        stack->addWidget( dlg, 3 );
+        stack->raiseWidget( dlg );
     }
 }
 
 void MainWindow :: downloadPackage()
 {
     bool doUpdate = true;
@@ -946,13 +965,14 @@ void MainWindow :: downloadRemotePackage()
     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 * ) ) );
-    dlg->showMaximized();
+    stack->addWidget( dlg, 3 );
+    stack->raiseWidget( dlg );
 }
 
 
 void MainWindow :: applyChanges()
 {
     stickyOption = "";
@@ -984,13 +1004,14 @@ void MainWindow :: applyChanges()
         return;
     }
     
     // do the stuff
     InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Apply changes" ) );
     connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-    dlg->showMaximized();
+    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
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index d75e5d2..b2de871 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -40,12 +40,15 @@ class MainWindow :public  QMainWindow
 	Q_OBJECT
 public:
 
 	MainWindow();
 	~MainWindow();
 
+protected:
+    void closeEvent( QCloseEvent* e );
+
 private:
     DataManager *mgr;
 
     QWidgetStack *stack;
     
     QPEToolBar *findBar;