-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 58 | ||||
-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.h | 4 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 23 |
4 files changed, 44 insertions, 42 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index e122064..a924daf 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp | |||
@@ -99,12 +99,9 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d | |||
99 | output->setText( remove + install + upgrade ); | 99 | output->setText( remove + install + upgrade ); |
100 | |||
101 | connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); | ||
102 | } | 100 | } |
103 | 101 | ||
104 | InstallDlgImpl::InstallDlgImpl( QWidget *parent, const char *name, bool modal, WFlags fl ) | 102 | InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, QWidget *parent, const char *name, bool modal, WFlags fl ) |
105 | : InstallDlg( parent, name, modal, fl ) | 103 | : InstallDlg( parent, name, modal, fl ) |
106 | { | 104 | { |
107 | upgradePackages = true; | 105 | pIpkg = ipkg; |
108 | output->setText( "Upgrading installed packages" ); | 106 | output->setText( initialText ); |
109 | connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); | ||
110 | } | 107 | } |
@@ -157,3 +154,3 @@ void InstallDlgImpl :: installSelected() | |||
157 | 154 | ||
158 | if ( upgradePackages ) | 155 | if ( pIpkg ) |
159 | { | 156 | { |
@@ -161,6 +158,4 @@ void InstallDlgImpl :: installSelected() | |||
161 | 158 | ||
162 | Ipkg ipkg; | 159 | connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); |
163 | connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); | 160 | pIpkg->runIpkg(); |
164 | ipkg.setOption( "upgrade" ); | ||
165 | ipkg.runIpkg(); | ||
166 | } | 161 | } |
@@ -183,10 +178,13 @@ void InstallDlgImpl :: installSelected() | |||
183 | 178 | ||
179 | pIpkg = new Ipkg; | ||
180 | connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); | ||
181 | |||
184 | // First run through the remove list, then the install list then the upgrade list | 182 | // First run through the remove list, then the install list then the upgrade list |
185 | vector<InstallData>::iterator it; | 183 | vector<InstallData>::iterator it; |
186 | ipkg.setOption( "remove" ); | 184 | pIpkg->setOption( "remove" ); |
187 | for ( it = removeList.begin() ; it != removeList.end() ; ++it ) | 185 | for ( it = removeList.begin() ; it != removeList.end() ; ++it ) |
188 | { | 186 | { |
189 | ipkg.setDestination( it->destination->getDestinationName() ); | 187 | pIpkg->setDestination( it->destination->getDestinationName() ); |
190 | ipkg.setDestinationDir( it->destination->getDestinationPath() ); | 188 | pIpkg->setDestinationDir( it->destination->getDestinationPath() ); |
191 | ipkg.setPackage( it->packageName ); | 189 | pIpkg->setPackage( it->packageName ); |
192 | 190 | ||
@@ -196,14 +194,14 @@ void InstallDlgImpl :: installSelected() | |||
196 | 194 | ||
197 | ipkg.setFlags( tmpFlags ); | 195 | pIpkg->setFlags( tmpFlags ); |
198 | ipkg.runIpkg(); | 196 | pIpkg->runIpkg(); |
199 | } | 197 | } |
200 | 198 | ||
201 | ipkg.setOption( "install" ); | 199 | pIpkg->setOption( "install" ); |
202 | ipkg.setDestination( dest ); | 200 | pIpkg->setDestination( dest ); |
203 | ipkg.setDestinationDir( destDir ); | 201 | pIpkg->setDestinationDir( destDir ); |
204 | ipkg.setFlags( instFlags ); | 202 | pIpkg->setFlags( instFlags ); |
205 | for ( it = installList.begin() ; it != installList.end() ; ++it ) | 203 | for ( it = installList.begin() ; it != installList.end() ; ++it ) |
206 | { | 204 | { |
207 | ipkg.setPackage( it->packageName ); | 205 | pIpkg->setPackage( it->packageName ); |
208 | ipkg.runIpkg(); | 206 | pIpkg->runIpkg(); |
209 | } | 207 | } |
@@ -211,8 +209,8 @@ void InstallDlgImpl :: installSelected() | |||
211 | flags |= FORCE_REINSTALL; | 209 | flags |= FORCE_REINSTALL; |
212 | ipkg.setOption( "reinstall" ); | 210 | pIpkg->setOption( "reinstall" ); |
213 | for ( it = updateList.begin() ; it != updateList.end() ; ++it ) | 211 | for ( it = updateList.begin() ; it != updateList.end() ; ++it ) |
214 | { | 212 | { |
215 | ipkg.setDestination( it->destination->getDestinationName() ); | 213 | pIpkg->setDestination( it->destination->getDestinationName() ); |
216 | ipkg.setDestinationDir( it->destination->getDestinationPath() ); | 214 | pIpkg->setDestinationDir( it->destination->getDestinationPath() ); |
217 | ipkg.setPackage( it->packageName ); | 215 | pIpkg->setPackage( it->packageName ); |
218 | 216 | ||
@@ -221,5 +219,7 @@ void InstallDlgImpl :: installSelected() | |||
221 | tmpFlags |= MAKE_LINKS; | 219 | tmpFlags |= MAKE_LINKS; |
222 | ipkg.setFlags( tmpFlags ); | 220 | pIpkg->setFlags( tmpFlags ); |
223 | ipkg.runIpkg(); | 221 | pIpkg->runIpkg(); |
224 | } | 222 | } |
223 | |||
224 | delete pIpkg; | ||
225 | } | 225 | } |
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h index 3a5d8b8..6716ced 100644 --- a/noncore/settings/aqpkg/installdlgimpl.h +++ b/noncore/settings/aqpkg/installdlgimpl.h | |||
@@ -40,3 +40,3 @@ public: | |||
40 | InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); | 40 | InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); |
41 | InstallDlgImpl( QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); | 41 | InstallDlgImpl( Ipkg *ipkg, QString initialText, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); |
42 | ~InstallDlgImpl(); | 42 | ~InstallDlgImpl(); |
@@ -54,3 +54,3 @@ private: | |||
54 | int flags; | 54 | int flags; |
55 | Ipkg ipkg; | 55 | Ipkg *pIpkg; |
56 | bool upgradePackages; | 56 | bool upgradePackages; |
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 02d4258..eacef76 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp | |||
@@ -108,2 +108,3 @@ bool Ipkg :: runIpkg( ) | |||
108 | 108 | ||
109 | if ( package != "" ) | ||
109 | emit outputText( QString( "Dealing with package " ) + package ); | 110 | emit outputText( QString( "Dealing with package " ) + package ); |
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() | |||
270 | // Display dialog | 270 | // Display dialog |
271 | ProgressDlg *dlg = new ProgressDlg( this ); | 271 | // ProgressDlg *progDlg = new ProgressDlg( this ); |
272 | QString status = "Updating package lists..."; | 272 | // QString status = "Updating package lists..."; |
273 | dlg->show(); | 273 | // progDlg->show(); |
274 | dlg->setText( status ); | 274 | // progDlg->setText( status ); |
275 | 275 | ||
@@ -280,9 +280,7 @@ void NetworkPackageManager :: updateServer() | |||
280 | 280 | ||
281 | QString option = "update"; | ||
282 | QString dummy = ""; | ||
283 | Ipkg ipkg; | 281 | Ipkg ipkg; |
284 | connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); | 282 | ipkg.setOption( "update" ); |
285 | ipkg.setOption( option ); | ||
286 | 283 | ||
287 | ipkg.runIpkg( ); | 284 | InstallDlgImpl dlg( &ipkg, "Refreshing server package lists", this, "Upgrade", true ); |
285 | dlg.showDlg(); | ||
288 | 286 | ||
@@ -291,3 +289,3 @@ void NetworkPackageManager :: updateServer() | |||
291 | serverSelected(-1); | 289 | serverSelected(-1); |
292 | delete dlg; | 290 | // delete progDlg; |
293 | } | 291 | } |
@@ -311,3 +309,6 @@ void NetworkPackageManager :: upgradePackages() | |||
311 | // Now run upgrade | 309 | // Now run upgrade |
312 | InstallDlgImpl dlg( this, "Upgrade", true ); | 310 | Ipkg ipkg; |
311 | ipkg.setOption( "upgrade" ); | ||
312 | |||
313 | InstallDlgImpl dlg( &ipkg, "Upgrading installed packages", this, "Upgrade", true ); | ||
313 | dlg.showDlg(); | 314 | dlg.showDlg(); |