summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp44
-rw-r--r--noncore/settings/aqpkg/mainwin.h3
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
@@ -297,5 +297,5 @@ void MainWindow :: init()
stack->raiseWidget( networkPkgWindow );
}
-
+/*
void MainWindow :: setDocument( const QString &doc )
{
@@ -327,10 +327,14 @@ void MainWindow :: setDocument( const QString &doc )
}
}
-
+*/
void MainWindow :: displaySettings()
{
SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );
if ( dlg->showDlg( 0 ) )
+ {
+ stack->raiseWidget( progressWindow );
updateData();
+ stack->raiseWidget( networkPkgWindow );
+ }
delete dlg;
}
@@ -729,6 +733,6 @@ void MainWindow :: searchForPackage( const QString &text )
vector<InstallData> workingPackages;
QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
- if ( start != 0 )
- start = (QCheckListItem *)start->nextSibling();
+// if ( start != 0 )
+// start = (QCheckListItem *)start->nextSibling();
if ( start == 0 )
@@ -768,7 +772,6 @@ void MainWindow :: updateServer()
dlg.showDlg();
- // Reload data
- mgr->reloadServerData();
- serverSelected(-1);
+ reloadData();
+
// delete progDlg;
}
@@ -798,7 +801,5 @@ void MainWindow :: upgradePackages()
dlg.showDlg();
- // Reload data
- mgr->reloadServerData();
- serverSelected(-1);
+ reloadData();
}
}
@@ -865,6 +866,5 @@ void MainWindow :: upgradePackages()
if ( doUpdate )
{
- mgr->reloadServerData();
- serverSelected( -1 );
+ reloadData();
}
}
@@ -941,8 +941,6 @@ void MainWindow :: downloadRemotePackage()
dlg2.showDlg();
- // Reload data
- mgr->reloadServerData();
- serverSelected(-1);
-
+ reloadData();
+
#ifdef QWS
// Finally let the main system update itself
@@ -989,8 +987,6 @@ void MainWindow :: applyChanges()
dlg.showDlg();
- // Reload data
- mgr->reloadServerData();
- serverSelected(-1);
-
+ reloadData();
+
#ifdef QWS
// Finally let the main system update itself
@@ -1122,4 +1118,12 @@ 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
@@ -92,4 +92,5 @@ private:
void downloadRemotePackage();
InstallData dealWithItem( QCheckListItem *item );
+ void reloadData();
// Progress widget
@@ -101,5 +102,5 @@ private:
public slots:
- void setDocument( const QString &doc );
+// void setDocument( const QString &doc );
void displayHelp();
void displayFindBar();