-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 94 | ||||
-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, 98 insertions, 35 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 | |||
@@ -49,7 +49,7 @@ enum { | |||
49 | MAXLINES = 100, | 49 | MAXLINES = 100, |
50 | }; | 50 | }; |
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 ) |
54 | { | 54 | { |
55 | setCaption( title ); | 55 | setCaption( title ); |
@@ -106,20 +106,18 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da | |||
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 | packages.append( newitem ); | ||
109 | 110 | ||
110 | if ( item->option == "I" ) | 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 ) ); |
114 | } | 114 | } |
115 | else if ( item->option == "D" ) | 115 | else if ( item->option == "D" ) |
116 | { | 116 | { |
117 | removeList.append( newitem ); | ||
118 | remove.append( QString( " %1\n" ).arg( item->packageName ) ); | 117 | remove.append( QString( " %1\n" ).arg( item->packageName ) ); |
119 | } | 118 | } |
120 | else if ( item->option == "U" || item->option == "R" ) | 119 | else if ( item->option == "U" || item->option == "R" ) |
121 | { | 120 | { |
122 | updateList.append( newitem ); | ||
123 | QString type; | 121 | QString type; |
124 | if ( item->option == "R" ) | 122 | if ( item->option == "R" ) |
125 | type = tr( "(ReInstall)" ); | 123 | type = tr( "(ReInstall)" ); |
@@ -128,6 +126,7 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da | |||
128 | upgrade.append( QString( " %1 %2\n" ).arg( item->packageName ).arg( type ) ); | 126 | upgrade.append( QString( " %1 %2\n" ).arg( item->packageName ).arg( type ) ); |
129 | } | 127 | } |
130 | } | 128 | } |
129 | |||
131 | output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) ); | 130 | output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) ); |
132 | 131 | ||
133 | displayAvailableSpace( destination->currentText() ); | 132 | displayAvailableSpace( destination->currentText() ); |
@@ -268,6 +267,7 @@ void InstallDlgImpl :: installSelected() | |||
268 | { | 267 | { |
269 | output->setText( "" ); | 268 | output->setText( "" ); |
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(); |
272 | } | 272 | } |
273 | else | 273 | else |
@@ -289,8 +289,13 @@ void InstallDlgImpl :: installSelected() | |||
289 | 289 | ||
290 | pIpkg = new Ipkg; | 290 | pIpkg = new Ipkg; |
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 |
298 | /* | ||
294 | pIpkg->setOption( "remove" ); | 299 | pIpkg->setOption( "remove" ); |
295 | QListIterator<InstallData> it( removeList ); | 300 | QListIterator<InstallData> it( removeList ); |
296 | InstallData *idata; | 301 | InstallData *idata; |
@@ -342,18 +347,8 @@ void InstallDlgImpl :: installSelected() | |||
342 | 347 | ||
343 | delete pIpkg; | 348 | delete pIpkg; |
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 | } |
358 | 353 | ||
359 | 354 | ||
@@ -400,3 +395,72 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text ) | |||
400 | txtAvailableSpace->setText( space ); | 395 | txtAvailableSpace->setText( space ); |
401 | } | 396 | } |
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 | |||
@@ -45,7 +45,7 @@ class InstallDlgImpl : public QWidget | |||
45 | { | 45 | { |
46 | Q_OBJECT | 46 | Q_OBJECT |
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 ); |
50 | ~InstallDlgImpl(); | 50 | ~InstallDlgImpl(); |
51 | 51 | ||
@@ -55,9 +55,8 @@ protected: | |||
55 | 55 | ||
56 | private: | 56 | 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; |
62 | int infoLevel; | 61 | int infoLevel; |
63 | Ipkg *pIpkg; | 62 | Ipkg *pIpkg; |
@@ -81,6 +80,7 @@ public slots: | |||
81 | void installSelected(); | 80 | void installSelected(); |
82 | void displayText(const QString &text ); | 81 | void displayText(const QString &text ); |
83 | void displayAvailableSpace( const QString &text); | 82 | void displayAvailableSpace( const QString &text); |
83 | void ipkgFinished(); | ||
84 | }; | 84 | }; |
85 | 85 | ||
86 | #endif | 86 | #endif |
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 | |||
@@ -55,10 +55,9 @@ Ipkg :: ~Ipkg() | |||
55 | // destDir is the dir that the destination alias points to (used to link to root) | 55 | // destDir is the dir that the destination alias points to (used to link to root) |
56 | // flags is the ipkg options flags | 56 | // flags is the ipkg options flags |
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; |
63 | 62 | ||
64 | QDir::setCurrent( "/tmp" ); | 63 | QDir::setCurrent( "/tmp" ); |
@@ -137,11 +136,12 @@ bool Ipkg :: runIpkg( ) | |||
137 | dependantPackages = new QList<QString>; | 136 | dependantPackages = new QList<QString>; |
138 | dependantPackages->setAutoDelete( true ); | 137 | dependantPackages->setAutoDelete( true ); |
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" ) |
146 | { | 146 | { |
147 | // If we are not removing packages and make links option is selected | 147 | // If we are not removing packages and make links option is selected |
@@ -171,7 +171,6 @@ bool Ipkg :: runIpkg( ) | |||
171 | 171 | ||
172 | emit outputText( "Finished" ); | 172 | emit outputText( "Finished" ); |
173 | emit outputText( "" ); | 173 | emit outputText( "" ); |
174 | return ret; | ||
175 | } | 174 | } |
176 | 175 | ||
177 | void Ipkg :: removeStatusEntry() | 176 | void Ipkg :: removeStatusEntry() |
@@ -295,10 +294,6 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) | |||
295 | { | 294 | { |
296 | emit outputText( QString( "Couldn't start ipkg process" ) ); | 295 | emit outputText( QString( "Couldn't start ipkg process" ) ); |
297 | } | 296 | } |
298 | |||
299 | // Now wait for it to finish | ||
300 | while ( !finished ) | ||
301 | qApp->processEvents(); | ||
302 | } | 297 | } |
303 | 298 | ||
304 | void Ipkg::commandStdout(OProcess*, char *buffer, int buflen) | 299 | void Ipkg::commandStdout(OProcess*, char *buffer, int buflen) |
@@ -354,6 +349,8 @@ void Ipkg::processFinished() | |||
354 | delete proc; | 349 | delete proc; |
355 | proc = 0; | 350 | proc = 0; |
356 | finished = true; | 351 | finished = true; |
352 | |||
353 | emit ipkgFinished(); | ||
357 | } | 354 | } |
358 | 355 | ||
359 | 356 | ||
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 | |||
@@ -43,7 +43,8 @@ class Ipkg : public QObject | |||
43 | public: | 43 | public: |
44 | Ipkg(); | 44 | Ipkg(); |
45 | ~Ipkg(); | 45 | ~Ipkg(); |
46 | bool runIpkg( ); | 46 | void runIpkg(); |
47 | void createSymLinks(); | ||
47 | 48 | ||
48 | void setOption( const char *opt ) { option = opt; } | 49 | void setOption( const char *opt ) { option = opt; } |
49 | void setPackage( const char *pkg ) { package = pkg; } | 50 | void setPackage( const char *pkg ) { package = pkg; } |
@@ -54,6 +55,7 @@ public: | |||
54 | 55 | ||
55 | signals: | 56 | signals: |
56 | void outputText( const QString &text ); | 57 | void outputText( const QString &text ); |
58 | void ipkgFinished(); | ||
57 | 59 | ||
58 | public slots: | 60 | public slots: |
59 | void commandStdout(OProcess*, char *buffer, int buflen); | 61 | void commandStdout(OProcess*, char *buffer, int buflen); |
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 | |||
@@ -297,7 +297,7 @@ void MainWindow :: init() | |||
297 | 297 | ||
298 | stack->raiseWidget( networkPkgWindow ); | 298 | stack->raiseWidget( networkPkgWindow ); |
299 | } | 299 | } |
300 | /* | 300 | |
301 | void MainWindow :: setDocument( const QString &doc ) | 301 | void MainWindow :: setDocument( const QString &doc ) |
302 | { | 302 | { |
303 | // Remove path from package | 303 | // Remove path from package |
@@ -327,7 +327,7 @@ void MainWindow :: setDocument( const QString &doc ) | |||
327 | } | 327 | } |
328 | } | 328 | } |
329 | } | 329 | } |
330 | */ | 330 | |
331 | void MainWindow :: displaySettings() | 331 | void MainWindow :: displaySettings() |
332 | { | 332 | { |
333 | SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); | 333 | SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); |
@@ -992,14 +992,14 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
992 | QString dest = "root"; | 992 | QString dest = "root"; |
993 | if ( !p->isInstalled() ) | 993 | if ( !p->isInstalled() ) |
994 | { | 994 | { |
995 | InstallData *newitem = new InstallData();; | 995 | InstallData *newitem = new InstallData(); |
996 | newitem->option = "I"; | 996 | newitem->option = "I"; |
997 | newitem->packageName = name; | 997 | newitem->packageName = name; |
998 | return newitem; | 998 | return newitem; |
999 | } | 999 | } |
1000 | else | 1000 | else |
1001 | { | 1001 | { |
1002 | InstallData *newitem = new InstallData();; | 1002 | InstallData *newitem = new InstallData(); |
1003 | newitem->option = "D"; | 1003 | newitem->option = "D"; |
1004 | if ( !p->isPackageStoredLocally() ) | 1004 | if ( !p->isPackageStoredLocally() ) |
1005 | newitem->packageName = p->getInstalledPackageName(); | 1005 | newitem->packageName = p->getInstalledPackageName(); |
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 | |||
@@ -106,7 +106,7 @@ private: | |||
106 | void initProgressWidget(); | 106 | void initProgressWidget(); |
107 | 107 | ||
108 | public slots: | 108 | public slots: |
109 | // void setDocument( const QString &doc ); | 109 | void setDocument( const QString &doc ); |
110 | void displayFindBar(); | 110 | void displayFindBar(); |
111 | void displayJumpBar(); | 111 | void displayJumpBar(); |
112 | void repeatFind(); | 112 | void repeatFind(); |