author | andyq <andyq> | 2002-10-22 18:00:55 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-22 18:00:55 (UTC) |
commit | d7cca919f20d602bd755b7690c25e31f6e9520b1 (patch) (unidiff) | |
tree | b5ffe24d905ace7563c21be0eea06b39402430aa /noncore/settings | |
parent | 6843a1bd8f8e679c220431f8377abcd2ffd2019b (diff) | |
download | opie-d7cca919f20d602bd755b7690c25e31f6e9520b1.zip opie-d7cca919f20d602bd755b7690c25e31f6e9520b1.tar.gz opie-d7cca919f20d602bd755b7690c25e31f6e9520b1.tar.bz2 |
Changed so that refreshing server packages shows status dialog
-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 | 5 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 23 |
4 files changed, 46 insertions, 44 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 | |||
@@ -88,34 +88,31 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d | |||
88 | { | 88 | { |
89 | removeList.push_back( item ); | 89 | removeList.push_back( item ); |
90 | remove += " " + item.packageName + "\n"; | 90 | remove += " " + item.packageName + "\n"; |
91 | } | 91 | } |
92 | else if ( item.option == "U" ) | 92 | else if ( item.option == "U" ) |
93 | { | 93 | { |
94 | updateList.push_back( item ); | 94 | updateList.push_back( item ); |
95 | upgrade += " " + item.packageName + "\n"; | 95 | upgrade += " " + item.packageName + "\n"; |
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | ||
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 | } |
111 | 108 | ||
112 | 109 | ||
113 | InstallDlgImpl::~InstallDlgImpl() | 110 | InstallDlgImpl::~InstallDlgImpl() |
114 | { | 111 | { |
115 | } | 112 | } |
116 | 113 | ||
117 | bool InstallDlgImpl :: showDlg() | 114 | bool InstallDlgImpl :: showDlg() |
118 | { | 115 | { |
119 | showMaximized(); | 116 | showMaximized(); |
120 | bool ret = exec(); | 117 | bool ret = exec(); |
121 | 118 | ||
@@ -146,91 +143,94 @@ void InstallDlgImpl :: optionsSelected() | |||
146 | } | 143 | } |
147 | 144 | ||
148 | void InstallDlgImpl :: installSelected() | 145 | void InstallDlgImpl :: installSelected() |
149 | { | 146 | { |
150 | if ( btnInstall->text() == "Close" ) | 147 | if ( btnInstall->text() == "Close" ) |
151 | { | 148 | { |
152 | done( 1 ); | 149 | done( 1 ); |
153 | return; | 150 | return; |
154 | } | 151 | } |
155 | 152 | ||
156 | btnInstall->setEnabled( false ); | 153 | btnInstall->setEnabled( false ); |
157 | 154 | ||
158 | if ( upgradePackages ) | 155 | if ( pIpkg ) |
159 | { | 156 | { |
160 | output->setText( "" ); | 157 | output->setText( "" ); |
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 | } |
167 | else | 162 | else |
168 | { | 163 | { |
169 | output->setText( "" ); | 164 | output->setText( "" ); |
170 | Destination *d = dataMgr->getDestination( destination->currentText() ); | 165 | Destination *d = dataMgr->getDestination( destination->currentText() ); |
171 | QString dest = d->getDestinationName(); | 166 | QString dest = d->getDestinationName(); |
172 | QString destDir = d->getDestinationPath(); | 167 | QString destDir = d->getDestinationPath(); |
173 | int instFlags = flags; | 168 | int instFlags = flags; |
174 | if ( d->linkToRoot() ) | 169 | if ( d->linkToRoot() ) |
175 | instFlags |= MAKE_LINKS; | 170 | instFlags |= MAKE_LINKS; |
176 | 171 | ||
177 | #ifdef QWS | 172 | #ifdef QWS |
178 | // Save settings | 173 | // Save settings |
179 | Config cfg( "aqpkg" ); | 174 | Config cfg( "aqpkg" ); |
180 | cfg.setGroup( "settings" ); | 175 | cfg.setGroup( "settings" ); |
181 | cfg.writeEntry( "dest", dest ); | 176 | cfg.writeEntry( "dest", dest ); |
182 | #endif | 177 | #endif |
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 | ||
193 | int tmpFlags = flags; | 191 | int tmpFlags = flags; |
194 | if ( it->destination->linkToRoot() ) | 192 | if ( it->destination->linkToRoot() ) |
195 | tmpFlags |= MAKE_LINKS; | 193 | tmpFlags |= MAKE_LINKS; |
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 | } |
210 | 208 | ||
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 | ||
219 | int tmpFlags = flags; | 217 | int tmpFlags = flags; |
220 | if ( it->destination->linkToRoot() && it->recreateLinks ) | 218 | if ( it->destination->linkToRoot() && it->recreateLinks ) |
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 | } |
226 | 226 | ||
227 | btnInstall->setEnabled( true ); | 227 | btnInstall->setEnabled( true ); |
228 | btnInstall->setText( tr( "Close" ) ); | 228 | btnInstall->setText( tr( "Close" ) ); |
229 | } | 229 | } |
230 | 230 | ||
231 | void InstallDlgImpl :: displayText(const QString &text ) | 231 | void InstallDlgImpl :: displayText(const QString &text ) |
232 | { | 232 | { |
233 | QString t = output->text() + "\n" + text; | 233 | QString t = output->text() + "\n" + text; |
234 | output->setText( t ); | 234 | output->setText( t ); |
235 | output->setCursorPosition( output->numLines(), 0 ); | 235 | output->setCursorPosition( output->numLines(), 0 ); |
236 | } | 236 | } |
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 | |||
@@ -29,37 +29,37 @@ class InstallData | |||
29 | { | 29 | { |
30 | public: | 30 | public: |
31 | QString option; // I - install, D - delete, U - upgrade | 31 | QString option; // I - install, D - delete, U - upgrade |
32 | QString packageName; | 32 | QString packageName; |
33 | Destination *destination; | 33 | Destination *destination; |
34 | bool recreateLinks; | 34 | bool recreateLinks; |
35 | }; | 35 | }; |
36 | 36 | ||
37 | class InstallDlgImpl : public InstallDlg | 37 | class InstallDlgImpl : public InstallDlg |
38 | { | 38 | { |
39 | public: | 39 | 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(); |
43 | 43 | ||
44 | bool showDlg(); | 44 | bool showDlg(); |
45 | bool upgradeServer( QString &server ); | 45 | bool upgradeServer( QString &server ); |
46 | 46 | ||
47 | protected: | 47 | protected: |
48 | 48 | ||
49 | private: | 49 | private: |
50 | DataManager *dataMgr; | 50 | DataManager *dataMgr; |
51 | vector<InstallData> installList; | 51 | vector<InstallData> installList; |
52 | vector<InstallData> removeList; | 52 | vector<InstallData> removeList; |
53 | vector<InstallData> updateList; | 53 | vector<InstallData> updateList; |
54 | int flags; | 54 | int flags; |
55 | Ipkg ipkg; | 55 | Ipkg *pIpkg; |
56 | bool upgradePackages; | 56 | bool upgradePackages; |
57 | 57 | ||
58 | bool runIpkg( QString &option, const QString& package, const QString& dest, int flags ); | 58 | bool runIpkg( QString &option, const QString& package, const QString& dest, int flags ); |
59 | 59 | ||
60 | void optionsSelected(); | 60 | void optionsSelected(); |
61 | void installSelected(); | 61 | void installSelected(); |
62 | void displayText(const QString &text ); | 62 | void displayText(const QString &text ); |
63 | }; | 63 | }; |
64 | 64 | ||
65 | #endif | 65 | #endif |
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 | |||
@@ -96,26 +96,27 @@ bool Ipkg :: runIpkg( ) | |||
96 | cmd += IPKG_CONF; | 96 | cmd += IPKG_CONF; |
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | 99 | ||
100 | if ( option == "reinstall" ) | 100 | if ( option == "reinstall" ) |
101 | cmd += " install"; | 101 | cmd += " install"; |
102 | else | 102 | else |
103 | cmd += " " + option; | 103 | cmd += " " + option; |
104 | if ( option != "upgrade" ) | 104 | if ( option != "upgrade" ) |
105 | cmd += " " + package; | 105 | cmd += " " + package; |
106 | cmd += " 2>&1"; | 106 | cmd += " 2>&1"; |
107 | 107 | ||
108 | 108 | ||
109 | emit outputText( QString( "Dealing with package " ) + package ); | 109 | if ( package != "" ) |
110 | emit outputText( QString( "Dealing with package " ) + package ); | ||
110 | 111 | ||
111 | qApp->processEvents(); | 112 | qApp->processEvents(); |
112 | 113 | ||
113 | // If we are removing packages and make links option is selected | 114 | // If we are removing packages and make links option is selected |
114 | // create the links | 115 | // create the links |
115 | if ( option == "remove" || option == "reinstall" ) | 116 | if ( option == "remove" || option == "reinstall" ) |
116 | { | 117 | { |
117 | createLinks = false; | 118 | createLinks = false; |
118 | if ( flags & MAKE_LINKS ) | 119 | if ( flags & MAKE_LINKS ) |
119 | { | 120 | { |
120 | emit outputText( QString( "Removing symbolic links...\n" ) ); | 121 | emit outputText( QString( "Removing symbolic links...\n" ) ); |
121 | linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); | 122 | linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); |
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 | |||
@@ -259,66 +259,67 @@ void NetworkPackageManager :: serverSelected( int ) | |||
259 | upgrade->setEnabled( true ); | 259 | upgrade->setEnabled( true ); |
260 | download->setEnabled( true ); | 260 | download->setEnabled( true ); |
261 | download->setText( "Download" ); | 261 | download->setText( "Download" ); |
262 | } | 262 | } |
263 | } | 263 | } |
264 | 264 | ||
265 | void NetworkPackageManager :: updateServer() | 265 | void NetworkPackageManager :: updateServer() |
266 | { | 266 | { |
267 | QString serverName = serversList->currentText(); | 267 | QString serverName = serversList->currentText(); |
268 | 268 | ||
269 | // Update the current server | 269 | // Update the current server |
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 | ||
276 | // Disable buttons to stop silly people clicking lots on them :) | 276 | // Disable buttons to stop silly people clicking lots on them :) |
277 | 277 | ||
278 | // First, write out ipkg_conf file so that ipkg can use it | 278 | // First, write out ipkg_conf file so that ipkg can use it |
279 | dataMgr->writeOutIpkgConf(); | 279 | dataMgr->writeOutIpkgConf(); |
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 | ||
289 | // Reload data | 287 | // Reload data |
290 | dataMgr->reloadServerData( serversList->currentText() ); | 288 | dataMgr->reloadServerData( serversList->currentText() ); |
291 | serverSelected(-1); | 289 | serverSelected(-1); |
292 | delete dlg; | 290 | // delete progDlg; |
293 | } | 291 | } |
294 | 292 | ||
295 | void NetworkPackageManager :: upgradePackages() | 293 | void NetworkPackageManager :: upgradePackages() |
296 | { | 294 | { |
297 | // We're gonna do an upgrade of all packages | 295 | // We're gonna do an upgrade of all packages |
298 | // First warn user that this isn't recommended | 296 | // First warn user that this isn't recommended |
299 | QString text = "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n"; | 297 | QString text = "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n"; |
300 | QMessageBox warn("Warning", text, QMessageBox::Warning, | 298 | QMessageBox warn("Warning", text, QMessageBox::Warning, |
301 | QMessageBox::Yes, | 299 | QMessageBox::Yes, |
302 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default , | 300 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default , |
303 | 0, this ); | 301 | 0, this ); |
304 | warn.adjustSize(); | 302 | warn.adjustSize(); |
305 | 303 | ||
306 | if ( warn.exec() == QMessageBox::Yes ) | 304 | if ( warn.exec() == QMessageBox::Yes ) |
307 | { | 305 | { |
308 | // First, write out ipkg_conf file so that ipkg can use it | 306 | // First, write out ipkg_conf file so that ipkg can use it |
309 | dataMgr->writeOutIpkgConf(); | 307 | dataMgr->writeOutIpkgConf(); |
310 | 308 | ||
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(); |
314 | 315 | ||
315 | // Reload data | 316 | // Reload data |
316 | dataMgr->reloadServerData( LOCAL_SERVER ); | 317 | dataMgr->reloadServerData( LOCAL_SERVER ); |
317 | 318 | ||
318 | dataMgr->reloadServerData( serversList->currentText() ); | 319 | dataMgr->reloadServerData( serversList->currentText() ); |
319 | serverSelected(-1); | 320 | serverSelected(-1); |
320 | } | 321 | } |
321 | } | 322 | } |
322 | 323 | ||
323 | 324 | ||
324 | void NetworkPackageManager :: downloadPackage() | 325 | void NetworkPackageManager :: downloadPackage() |