Minor fix for find function and more liberal use of progress widget to give feedback to user

2 files changed, 26 insertions, 21 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index c9963bc..8090646 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -298,3 +298,3 @@ void MainWindow :: init()
 }
-
+/*
 void MainWindow :: setDocument( const QString &doc )
@@ -328,3 +328,3 @@ void MainWindow :: setDocument( const QString &doc )
 }
-
+*/
 void MainWindow :: displaySettings()
@@ -333,3 +333,7 @@ void MainWindow :: displaySettings()
     if ( dlg->showDlg( 0 ) )
+    {
+        stack->raiseWidget( progressWindow );
     	updateData();
+        stack->raiseWidget( networkPkgWindow );
+    }
     delete dlg;
@@ -730,4 +734,4 @@ void MainWindow :: searchForPackage( const QString &text )
         QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
-        if ( start != 0 )
-            start = (QCheckListItem *)start->nextSibling();
+//        if ( start != 0 )
+//            start = (QCheckListItem *)start->nextSibling();
         
@@ -769,5 +773,4 @@ void MainWindow :: updateServer()
 
-    // Reload data
-    mgr->reloadServerData();
-    serverSelected(-1);
+    reloadData();
+    
 //  delete progDlg;
@@ -799,5 +802,3 @@ void MainWindow :: upgradePackages()
 
-        // Reload data
-        mgr->reloadServerData();
-        serverSelected(-1);
+        reloadData();
     }
@@ -866,4 +867,3 @@ void MainWindow :: upgradePackages()
     {
-        mgr->reloadServerData();
-        serverSelected( -1 );
+        reloadData();
     }
@@ -942,6 +942,4 @@ void MainWindow :: downloadRemotePackage()
 
-    // Reload data
-    mgr->reloadServerData();
-    serverSelected(-1);
-
+    reloadData();
+    
 #ifdef QWS
@@ -990,6 +988,4 @@ void MainWindow :: applyChanges()
 
-    // Reload data
-    mgr->reloadServerData();
-    serverSelected(-1);
-
+    reloadData();
+    
 #ifdef QWS
@@ -1123,2 +1119,10 @@ InstallData MainWindow :: dealWithItem( QCheckListItem *item )
 
+void MainWindow :: reloadData()
+{
+    stack->raiseWidget( progressWindow );
+    mgr->reloadServerData();
+    serverSelected( -1, FALSE );
+    stack->raiseWidget( networkPkgWindow );
+}
+
 void MainWindow :: letterPushed( QString t )
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 46b5fae..be30668 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -93,2 +93,3 @@ private:
     InstallData dealWithItem( QCheckListItem *item );
+    void reloadData();
     
@@ -102,3 +103,3 @@ private:
 public slots:
-    void setDocument( const QString &doc );
+//    void setDocument( const QString &doc );
     void displayHelp();