Fix for bug #741

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
@@ -185,3 +185,3 @@ void InstallDlgImpl :: init( bool displayextrainfo )
     
-    btnOptions = new QPushButton( Resource::loadPixmap( "aqpkg/config" ), tr( "Options" ), this );
+    btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this );
     layout->addWidget( btnOptions, 3, 1 );
@@ -232,2 +232,3 @@ void InstallDlgImpl :: installSelected()
     btnInstall->setIconSet( Resource::loadPixmap( "close" ) );
+
     if ( pIpkg )
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
@@ -57,5 +57,5 @@ private:
     DataManager *dataMgr;
-	QList<InstallData> installList;
-	QList<InstallData> removeList;
-	QList<InstallData> updateList;
+    QList<InstallData> installList;
+    QList<InstallData> removeList;
+    QList<InstallData> updateList;
     int flags;
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
@@ -342,2 +342,19 @@ void MainWindow :: displaySettings()
 }
+
+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();
+    }
+}
     
@@ -781,3 +798,4 @@ void MainWindow :: updateServer()
     connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-    dlg->showMaximized();
+    stack->addWidget( dlg, 3 );
+    stack->raiseWidget( dlg );
     
@@ -810,3 +828,4 @@ void MainWindow :: upgradePackages()
         connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-        dlg->showMaximized();
+        stack->addWidget( dlg, 3 );
+        stack->raiseWidget( dlg );
     }
@@ -951,3 +970,4 @@ void MainWindow :: downloadRemotePackage()
     connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-    dlg->showMaximized();
+    stack->addWidget( dlg, 3 );
+    stack->raiseWidget( dlg );
 }
@@ -989,3 +1009,4 @@ void MainWindow :: applyChanges()
     connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
-    dlg->showMaximized();
+    stack->addWidget( dlg, 3 );
+    stack->raiseWidget( dlg );
 }
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
@@ -45,2 +45,5 @@ public:
 
+protected:
+    void closeEvent( QCloseEvent* e );
+
 private: