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
@@ -183,7 +183,7 @@ void InstallDlgImpl :: init( bool displayextrainfo )
     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() ) );
 }
@@ -230,6 +230,7 @@ void InstallDlgImpl :: installSelected()
 
     btnInstall->setText( tr( "Abort" ) );
     btnInstall->setIconSet( Resource::loadPixmap( "close" ) );
+
     if ( pIpkg )
     {
         output->setText( "" );
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
@@ -55,9 +55,9 @@ 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;
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
@@ -340,6 +340,23 @@ void MainWindow :: displaySettings()
     }
     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()
 {
@@ -779,7 +796,8 @@ void MainWindow :: updateServer()
     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;
 }
@@ -808,7 +826,8 @@ void MainWindow :: upgradePackages()
         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 );
     }
 }
 
@@ -949,7 +968,8 @@ void MainWindow :: downloadRemotePackage()
 
     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 );
 }
 
 
@@ -987,7 +1007,8 @@ void MainWindow :: applyChanges()
     // 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
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
@@ -43,6 +43,9 @@ public:
         MainWindow();
         ~MainWindow();
 
+protected:
+    void closeEvent( QCloseEvent* e );
+
 private:
     DataManager *mgr;