-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index bfb4f62..80c06ba 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp @@ -140,26 +140,39 @@ void InstallDlgImpl :: optionsSelected() Config cfg( "aqpkg" ); cfg.setGroup( "settings" ); cfg.writeEntry( "installFlags", flags ); #endif } void InstallDlgImpl :: installSelected() { - - if ( btnInstall->text() == "Close" ) + if ( btnInstall->text() == "Abort" ) + { + if ( pIpkg ) + { + displayText( "\n**** User Clicked ABORT ***" ); + pIpkg->abort(); + displayText( "**** Process Aborted ****" ); + } + + btnInstall->setText( tr( "Close" ) ); + return; + } + else if ( btnInstall->text() == "Close" ) { done( 1 ); return; } // Disable buttons btnOptions->setEnabled( false ); - btnInstall->setEnabled( false ); +// btnInstall->setEnabled( false ); + + btnInstall->setText( "Abort" ); if ( pIpkg ) { output->setText( "" ); connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); pIpkg->runIpkg(); } @@ -227,20 +240,21 @@ void InstallDlgImpl :: installSelected() pIpkg->setFlags( tmpFlags ); pIpkg->runIpkg(); } delete pIpkg; } btnOptions->setEnabled( true ); - btnInstall->setEnabled( true ); +// btnInstall->setEnabled( true ); btnInstall->setText( tr( "Close" ) ); } + void InstallDlgImpl :: displayText(const QString &text ) { QString t = output->text() + "\n" + text; output->setText( t ); output->setCursorPosition( output->numLines(), 0 ); } |