1 files changed, 44 insertions, 7 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index b00931e..5e03f11 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -16,16 +16,18 @@
  ***************************************************************************/
 
 #include <iostream>
 using namespace std;
 
 #include <qmenubar.h>
-#include <qpopupmenu.h>
 #include <qmessagebox.h>
+#include <qpopupmenu.h>
+#include <qtimer.h>
 
 #include "mainwin.h"
+#include "progresswidget.h"
 #include "datamgr.h"
 #include "networkpkgmgr.h"
 #include "settingsimpl.h"
 #include "helpwindow.h"
 #include "utils.h"
 #include "global.h"
@@ -63,27 +65,52 @@ MainWindow :: MainWindow( QWidget *p, char *name )
         menu = menuBar();  //new QMenuBar( this );
         menu->insertItem( tr( "&Settings" ), settings );
         menu->insertItem( tr( "&Edit" ), edit );
         menu->insertItem( tr( "&Filter" ), filter );
         menu->insertItem( tr( "&Help" ), help );
 
-    mgr = new DataManager();
-    mgr->loadServers();
-
+        // Create UI widgets
         stack = new QWidgetStack( this );
 
-        networkPkgWindow = new NetworkPackageManager( mgr, stack );
+        progressWindow = new ProgressWidget( stack );
+        stack->addWidget( progressWindow, 2 );
+
+        networkPkgWindow = new NetworkPackageManager( stack );
+        connect( networkPkgWindow, SIGNAL( appRaiseMainWidget() ), this, SLOT( raiseMainWidget() ) );
+        connect( networkPkgWindow, SIGNAL( appRaiseProgressWidget() ), this, SLOT( raiseProgressWidget() ) );
+        connect( networkPkgWindow, SIGNAL( progressSetSteps( int ) ), progressWindow, SLOT( setSteps( int ) ) );
+        connect( networkPkgWindow, SIGNAL( progressSetMessage( const QString & ) ),
+             progressWindow, SLOT( setMessage( const QString & ) ) );
+        connect( networkPkgWindow, SIGNAL( progressUpdate( int ) ), progressWindow, SLOT( update( int ) ) );
         stack->addWidget( networkPkgWindow, 1 );
 
         setCentralWidget( stack );
-        stack->raiseWidget( networkPkgWindow );
+        stack->raiseWidget( progressWindow );
+
+        // Delayed call to finish initialization
+        QTimer::singleShot( 100, this, SLOT( init() ) );
+
 }
 
 MainWindow :: ~MainWindow()
 {
-        delete networkPkgWindow;
+        delete mgr;
+}
+
+void MainWindow :: init()
+{
+    stack->raiseWidget( progressWindow );
+    mgr = new DataManager();
+        connect( mgr, SIGNAL( progressSetSteps( int ) ), progressWindow, SLOT( setSteps( int ) ) );
+        connect( mgr, SIGNAL( progressSetMessage( const QString & ) ),
+             progressWindow, SLOT( setMessage( const QString & ) ) );
+        connect( mgr, SIGNAL( progressUpdate( int ) ), progressWindow, SLOT( update( int ) ) );
+    mgr->loadServers();
+    networkPkgWindow->setDataManager( mgr );
+    networkPkgWindow->updateData();
+    stack->raiseWidget( networkPkgWindow );
 }
 
 void MainWindow :: setDocument( const QString &doc )
 {
     // Remove path from package
     QString package = Utils::getPackageNameFromIpkFilename( doc );
@@ -205,6 +232,16 @@ void MainWindow :: filterCategory()
     else
     {
         if ( networkPkgWindow->filterByCategory( true ) )
             filter->setItemChecked( mnuFilterByCategory, true );
     }
 }
+
+void MainWindow :: raiseMainWidget()
+{
+    stack->raiseWidget( networkPkgWindow );
+}
+
+void MainWindow :: raiseProgressWidget()
+{
+    stack->raiseWidget( progressWindow );
+}