author | drw <drw> | 2003-04-26 22:42:19 (UTC) |
---|---|---|
committer | drw <drw> | 2003-04-26 22:42:19 (UTC) |
commit | 98a9291263e167b8882ac916330e7215ebd884b4 (patch) (unidiff) | |
tree | 882a909e9381ab4cc97e77377fd61361d7f21eab /noncore/settings | |
parent | 64c48b637c1bd1bef679bff500f3e0ce5365358d (diff) | |
download | opie-98a9291263e167b8882ac916330e7215ebd884b4.zip opie-98a9291263e167b8882ac916330e7215ebd884b4.tar.gz opie-98a9291263e167b8882ac916330e7215ebd884b4.tar.bz2 |
1. Fix for bug #872 - reduce CPU useage while ipkg is doing its thing 2. Re-enable setDocument function for identifying local ipks
-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 130 | ||||
-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.h | 8 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 17 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.h | 4 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 8 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.h | 2 |
6 files changed, 116 insertions, 53 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index 76d0a80..896e370 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp | |||
@@ -51,3 +51,3 @@ enum { | |||
51 | 51 | ||
52 | InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *dataManager, const char *title ) | 52 | InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title ) |
53 | : QWidget( 0, 0, 0 ) | 53 | : QWidget( 0, 0, 0 ) |
@@ -103,11 +103,11 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da | |||
103 | InstallData *newitem = new InstallData(); | 103 | InstallData *newitem = new InstallData(); |
104 | 104 | ||
105 | newitem->option = item->option; | 105 | newitem->option = item->option; |
106 | newitem->packageName = item->packageName; | 106 | newitem->packageName = item->packageName; |
107 | newitem->destination = item->destination; | 107 | newitem->destination = item->destination; |
108 | newitem->recreateLinks = item->recreateLinks; | 108 | newitem->recreateLinks = item->recreateLinks; |
109 | 109 | packages.append( newitem ); | |
110 | if ( item->option == "I" ) | 110 | |
111 | if ( item->option == "I" ) | ||
111 | { | 112 | { |
112 | installList.append( newitem ); | ||
113 | install.append( QString( " %1\n" ).arg( item->packageName ) ); | 113 | install.append( QString( " %1\n" ).arg( item->packageName ) ); |
@@ -116,3 +116,2 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da | |||
116 | { | 116 | { |
117 | removeList.append( newitem ); | ||
118 | remove.append( QString( " %1\n" ).arg( item->packageName ) ); | 117 | remove.append( QString( " %1\n" ).arg( item->packageName ) ); |
@@ -121,14 +120,14 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da | |||
121 | { | 120 | { |
122 | updateList.append( newitem ); | 121 | QString type; |
123 | QString type; | 122 | if ( item->option == "R" ) |
124 | if ( item->option == "R" ) | 123 | type = tr( "(ReInstall)" ); |
125 | type = tr( "(ReInstall)" ); | 124 | else |
126 | else | 125 | type = tr( "(Upgrade)" ); |
127 | type = tr( "(Upgrade)" ); | 126 | upgrade.append( QString( " %1 %2\n" ).arg( item->packageName ).arg( type ) ); |
128 | upgrade.append( QString( " %1 %2\n" ).arg( item->packageName ).arg( type ) ); | 127 | } |
129 | } | 128 | } |
130 | } | ||
131 | output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) ); | ||
132 | 129 | ||
133 | displayAvailableSpace( destination->currentText() ); | 130 | output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) ); |
131 | |||
132 | displayAvailableSpace( destination->currentText() ); | ||
134 | } | 133 | } |
@@ -270,2 +269,3 @@ void InstallDlgImpl :: installSelected() | |||
270 | connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); | 269 | connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); |
270 | connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished())); | ||
271 | pIpkg->runIpkg(); | 271 | pIpkg->runIpkg(); |
@@ -291,5 +291,10 @@ void InstallDlgImpl :: installSelected() | |||
291 | connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); | 291 | connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); |
292 | connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished())); | ||
293 | |||
294 | firstPackage = TRUE; | ||
295 | ipkgFinished(); | ||
292 | 296 | ||
293 | // First run through the remove list, then the install list then the upgrade list | 297 | // First run through the remove list, then the install list then the upgrade list |
294 | pIpkg->setOption( "remove" ); | 298 | /* |
299 | pIpkg->setOption( "remove" ); | ||
295 | QListIterator<InstallData> it( removeList ); | 300 | QListIterator<InstallData> it( removeList ); |
@@ -344,14 +349,4 @@ void InstallDlgImpl :: installSelected() | |||
344 | pIpkg = 0; | 349 | pIpkg = 0; |
350 | */ | ||
345 | } | 351 | } |
346 | |||
347 | btnOptions->setEnabled( true ); | ||
348 | // btnInstall->setEnabled( true ); | ||
349 | btnInstall->setText( tr( "Close" ) ); | ||
350 | btnInstall->setIconSet( Resource::loadPixmap( "enter" ) ); | ||
351 | |||
352 | btnOptions->setText( tr( "Save output" ) ); | ||
353 | btnOptions->setIconSet( Resource::loadPixmap( "save" ) ); | ||
354 | |||
355 | if ( destination && destination->currentText() != 0 && destination->currentText() != "" ) | ||
356 | displayAvailableSpace( destination->currentText() ); | ||
357 | } | 352 | } |
@@ -402 +397,70 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text ) | |||
402 | 397 | ||
398 | void InstallDlgImpl :: ipkgFinished() | ||
399 | { | ||
400 | InstallData *item; | ||
401 | if ( firstPackage ) | ||
402 | item = packages.first(); | ||
403 | else | ||
404 | { | ||
405 | // Create symlinks if necessary before moving on to next package | ||
406 | pIpkg->createSymLinks(); | ||
407 | |||
408 | item = packages.next(); | ||
409 | } | ||
410 | |||
411 | firstPackage = FALSE; | ||
412 | if ( item ) | ||
413 | { | ||
414 | pIpkg->setPackage( item->packageName ); | ||
415 | int tmpFlags = flags; | ||
416 | |||
417 | if ( item->option == "I" ) | ||
418 | { | ||
419 | pIpkg->setOption( "install" ); | ||
420 | Destination *d = dataMgr->getDestination( destination->currentText() ); | ||
421 | pIpkg->setDestination( d->getDestinationName() ); | ||
422 | pIpkg->setDestinationDir( d->getDestinationPath() ); | ||
423 | |||
424 | if ( d->linkToRoot() ) | ||
425 | tmpFlags |= MAKE_LINKS; | ||
426 | } | ||
427 | else if ( item->option == "D" ) | ||
428 | { | ||
429 | pIpkg->setOption( "remove" ); | ||
430 | pIpkg->setDestination( item->destination->getDestinationName() ); | ||
431 | pIpkg->setDestinationDir( item->destination->getDestinationPath() ); | ||
432 | |||
433 | if ( item->destination->linkToRoot() ) | ||
434 | tmpFlags |= MAKE_LINKS; | ||
435 | } | ||
436 | else | ||
437 | { | ||
438 | if ( item->option == "R" ) | ||
439 | pIpkg->setOption( "reinstall" ); | ||
440 | else | ||
441 | pIpkg->setOption( "upgrade" ); | ||
442 | |||
443 | pIpkg->setDestination( item->destination->getDestinationName() ); | ||
444 | pIpkg->setDestinationDir( item->destination->getDestinationPath() ); | ||
445 | pIpkg->setPackage( item->packageName ); | ||
446 | |||
447 | tmpFlags |= FORCE_REINSTALL; | ||
448 | if ( item->destination->linkToRoot() && item->recreateLinks ) | ||
449 | tmpFlags |= MAKE_LINKS; | ||
450 | } | ||
451 | pIpkg->setFlags( tmpFlags, infoLevel ); | ||
452 | pIpkg->runIpkg(); | ||
453 | } | ||
454 | else | ||
455 | { | ||
456 | btnOptions->setEnabled( true ); | ||
457 | btnInstall->setText( tr( "Close" ) ); | ||
458 | btnInstall->setIconSet( Resource::loadPixmap( "enter" ) ); | ||
459 | |||
460 | btnOptions->setText( tr( "Save output" ) ); | ||
461 | btnOptions->setIconSet( Resource::loadPixmap( "save" ) ); | ||
462 | |||
463 | if ( destination && destination->currentText() != 0 && destination->currentText() != "" ) | ||
464 | displayAvailableSpace( destination->currentText() ); | ||
465 | } | ||
466 | } \ No newline at end of file | ||
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h index 15cf427..9a7dbff 100644 --- a/noncore/settings/aqpkg/installdlgimpl.h +++ b/noncore/settings/aqpkg/installdlgimpl.h | |||
@@ -47,3 +47,3 @@ class InstallDlgImpl : public QWidget | |||
47 | public: | 47 | public: |
48 | InstallDlgImpl( QList<InstallData> &packageList, DataManager *dataManager, const char *title = 0 ); | 48 | InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title = 0 ); |
49 | InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title = 0 ); | 49 | InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title = 0 ); |
@@ -57,5 +57,4 @@ private: | |||
57 | DataManager *dataMgr; | 57 | DataManager *dataMgr; |
58 | QList<InstallData> installList; | 58 | QList<InstallData> packages; |
59 | QList<InstallData> removeList; | 59 | bool firstPackage; |
60 | QList<InstallData> updateList; | ||
61 | int flags; | 60 | int flags; |
@@ -83,2 +82,3 @@ public slots: | |||
83 | void displayAvailableSpace( const QString &text); | 82 | void displayAvailableSpace( const QString &text); |
83 | void ipkgFinished(); | ||
84 | }; | 84 | }; |
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index e906653..34999ad 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp | |||
@@ -57,6 +57,5 @@ Ipkg :: ~Ipkg() | |||
57 | // dir is the directory to run ipkg in (defaults to "") | 57 | // dir is the directory to run ipkg in (defaults to "") |
58 | bool Ipkg :: runIpkg( ) | 58 | void Ipkg :: runIpkg() |
59 | { | 59 | { |
60 | error = false; | 60 | error = false; |
61 | bool ret = false; | ||
62 | QStringList commands; | 61 | QStringList commands; |
@@ -139,7 +138,8 @@ bool Ipkg :: runIpkg( ) | |||
139 | 138 | ||
140 | ret = executeIpkgCommand( commands, option ); | 139 | executeIpkgCommand( commands, option ); |
141 | 140 | ||
142 | if ( aborted ) | 141 | } |
143 | return false; | ||
144 | 142 | ||
143 | void Ipkg :: createSymLinks() | ||
144 | { | ||
145 | if ( option == "install" || option == "reinstall" || option == "upgrade" ) | 145 | if ( option == "install" || option == "reinstall" || option == "upgrade" ) |
@@ -173,3 +173,2 @@ bool Ipkg :: runIpkg( ) | |||
173 | emit outputText( "" ); | 173 | emit outputText( "" ); |
174 | return ret; | ||
175 | } | 174 | } |
@@ -297,6 +296,2 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) | |||
297 | } | 296 | } |
298 | |||
299 | // Now wait for it to finish | ||
300 | while ( !finished ) | ||
301 | qApp->processEvents(); | ||
302 | } | 297 | } |
@@ -356,2 +351,4 @@ void Ipkg::processFinished() | |||
356 | finished = true; | 351 | finished = true; |
352 | |||
353 | emit ipkgFinished(); | ||
357 | } | 354 | } |
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h index 531bfc0..a0d38e3 100644 --- a/noncore/settings/aqpkg/ipkg.h +++ b/noncore/settings/aqpkg/ipkg.h | |||
@@ -45,3 +45,4 @@ public: | |||
45 | ~Ipkg(); | 45 | ~Ipkg(); |
46 | bool runIpkg( ); | 46 | void runIpkg(); |
47 | void createSymLinks(); | ||
47 | 48 | ||
@@ -56,2 +57,3 @@ signals: | |||
56 | void outputText( const QString &text ); | 57 | void outputText( const QString &text ); |
58 | void ipkgFinished(); | ||
57 | 59 | ||
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 1aec6a8..58f6feb 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -299,3 +299,3 @@ void MainWindow :: init() | |||
299 | } | 299 | } |
300 | /* | 300 | |
301 | void MainWindow :: setDocument( const QString &doc ) | 301 | void MainWindow :: setDocument( const QString &doc ) |
@@ -329,3 +329,3 @@ void MainWindow :: setDocument( const QString &doc ) | |||
329 | } | 329 | } |
330 | */ | 330 | |
331 | void MainWindow :: displaySettings() | 331 | void MainWindow :: displaySettings() |
@@ -994,3 +994,3 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
994 | { | 994 | { |
995 | InstallData *newitem = new InstallData();; | 995 | InstallData *newitem = new InstallData(); |
996 | newitem->option = "I"; | 996 | newitem->option = "I"; |
@@ -1001,3 +1001,3 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1001 | { | 1001 | { |
1002 | InstallData *newitem = new InstallData();; | 1002 | InstallData *newitem = new InstallData(); |
1003 | newitem->option = "D"; | 1003 | newitem->option = "D"; |
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h index 0295519..c4548b1 100644 --- a/noncore/settings/aqpkg/mainwin.h +++ b/noncore/settings/aqpkg/mainwin.h | |||
@@ -108,3 +108,3 @@ private: | |||
108 | public slots: | 108 | public slots: |
109 | // void setDocument( const QString &doc ); | 109 | void setDocument( const QString &doc ); |
110 | void displayFindBar(); | 110 | void displayFindBar(); |