-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index dee834e..ccce401 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -359,12 +359,13 @@ void NetworkPackageManager :: upgradePackages() | |||
359 | } | 359 | } |
360 | } | 360 | } |
361 | 361 | ||
362 | 362 | ||
363 | void NetworkPackageManager :: downloadPackage() | 363 | void NetworkPackageManager :: downloadPackage() |
364 | { | 364 | { |
365 | bool doUpdate = true; | ||
365 | if ( download->text() == "Download" ) | 366 | if ( download->text() == "Download" ) |
366 | { | 367 | { |
367 | // First, write out ipkg_conf file so that ipkg can use it | 368 | // First, write out ipkg_conf file so that ipkg can use it |
368 | dataMgr->writeOutIpkgConf(); | 369 | dataMgr->writeOutIpkgConf(); |
369 | 370 | ||
370 | // Display dialog to user asking where to download the files to | 371 | // Display dialog to user asking where to download the files to |
@@ -417,12 +418,13 @@ void NetworkPackageManager :: downloadPackage() | |||
417 | ipkg.runIpkg( ); | 418 | ipkg.runIpkg( ); |
418 | } | 419 | } |
419 | } | 420 | } |
420 | } | 421 | } |
421 | else if ( download->text() == "Remove" ) | 422 | else if ( download->text() == "Remove" ) |
422 | { | 423 | { |
424 | doUpdate = false; | ||
423 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); | 425 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); |
424 | item != 0 ; | 426 | item != 0 ; |
425 | item = (QCheckListItem *)item->nextSibling() ) | 427 | item = (QCheckListItem *)item->nextSibling() ) |
426 | { | 428 | { |
427 | if ( item->isOn() ) | 429 | if ( item->isOn() ) |
428 | { | 430 | { |
@@ -433,21 +435,32 @@ void NetworkPackageManager :: downloadPackage() | |||
433 | // if (there is a (installed), remove it | 435 | // if (there is a (installed), remove it |
434 | pos = name.find( "(installed)" ); | 436 | pos = name.find( "(installed)" ); |
435 | if ( pos > 0 ) | 437 | if ( pos > 0 ) |
436 | name.truncate( pos - 1 ); | 438 | name.truncate( pos - 1 ); |
437 | 439 | ||
438 | Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name ); | 440 | Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name ); |
441 | |||
442 | QString msgtext; | ||
443 | msgtext.sprintf( "Are you sure you wish to delete\n%s?", (const char *)p->getPackageName() ); | ||
444 | if ( QMessageBox::information( this, "Are you sure?", | ||
445 | msgtext, "No", "Yes" ) == 1 ) | ||
446 | { | ||
447 | doUpdate = true; | ||
439 | QFile f( p->getFilename() ); | 448 | QFile f( p->getFilename() ); |
440 | f.remove(); | 449 | f.remove(); |
441 | } | 450 | } |
442 | } | 451 | } |
443 | } | 452 | } |
453 | } | ||
444 | 454 | ||
455 | if ( doUpdate ) | ||
456 | { | ||
445 | dataMgr->reloadServerData(); | 457 | dataMgr->reloadServerData(); |
446 | serverSelected( -1 ); | 458 | serverSelected( -1 ); |
447 | } | 459 | } |
460 | } | ||
448 | 461 | ||
449 | 462 | ||
450 | void NetworkPackageManager :: applyChanges() | 463 | void NetworkPackageManager :: applyChanges() |
451 | { | 464 | { |
452 | stickyOption = ""; | 465 | stickyOption = ""; |
453 | 466 | ||