summaryrefslogtreecommitdiff
path: root/noncore/settings/aqpkg/networkpkgmgr.cpp
Side-by-side diff
Diffstat (limited to 'noncore/settings/aqpkg/networkpkgmgr.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.cpp23
1 files changed, 12 insertions, 11 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 52d95a8..6874ded 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -270,6 +270,6 @@ void NetworkPackageManager :: updateServer()
// Display dialog
- ProgressDlg *dlg = new ProgressDlg( this );
- QString status = "Updating package lists...";
- dlg->show();
- dlg->setText( status );
+// ProgressDlg *progDlg = new ProgressDlg( this );
+// QString status = "Updating package lists...";
+// progDlg->show();
+// progDlg->setText( status );
@@ -280,9 +280,7 @@ void NetworkPackageManager :: updateServer()
- QString option = "update";
- QString dummy = "";
Ipkg ipkg;
- connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
- ipkg.setOption( option );
+ ipkg.setOption( "update" );
- ipkg.runIpkg( );
+ InstallDlgImpl dlg( &ipkg, "Refreshing server package lists", this, "Upgrade", true );
+ dlg.showDlg();
@@ -291,3 +289,3 @@ void NetworkPackageManager :: updateServer()
serverSelected(-1);
- delete dlg;
+// delete progDlg;
}
@@ -311,3 +309,6 @@ void NetworkPackageManager :: upgradePackages()
// Now run upgrade
- InstallDlgImpl dlg( this, "Upgrade", true );
+ Ipkg ipkg;
+ ipkg.setOption( "upgrade" );
+
+ InstallDlgImpl dlg( &ipkg, "Upgrading installed packages", this, "Upgrade", true );
dlg.showDlg();