summaryrefslogtreecommitdiff
authorandyq <andyq>2002-12-17 22:30:59 (UTC)
committer andyq <andyq>2002-12-17 22:30:59 (UTC)
commit01640bfdce16d2fd23722a59004a6efd4600c0cf (patch) (unidiff)
tree399d5da7706ab89b41b7da0eb5fec025d0d3db05
parentf18839182d493a49e9411e3dbc070952da7dead9 (diff)
downloadopie-01640bfdce16d2fd23722a59004a6efd4600c0cf.zip
opie-01640bfdce16d2fd23722a59004a6efd4600c0cf.tar.gz
opie-01640bfdce16d2fd23722a59004a6efd4600c0cf.tar.bz2
When ipkg process is run - start/close button changes to abort
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.cpp22
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
@@ -144,18 +144,31 @@ void InstallDlgImpl :: optionsSelected()
144} 144}
145 145
146void InstallDlgImpl :: installSelected() 146void InstallDlgImpl :: installSelected()
147{ 147{
148 148 if ( btnInstall->text() == "Abort" )
149 if ( btnInstall->text() == "Close" ) 149 {
150 if ( pIpkg )
151 {
152 displayText( "\n**** User Clicked ABORT ***" );
153 pIpkg->abort();
154 displayText( "**** Process Aborted ****" );
155 }
156
157 btnInstall->setText( tr( "Close" ) );
158 return;
159 }
160 else if ( btnInstall->text() == "Close" )
150 { 161 {
151 done( 1 ); 162 done( 1 );
152 return; 163 return;
153 } 164 }
154 165
155 // Disable buttons 166 // Disable buttons
156 btnOptions->setEnabled( false ); 167 btnOptions->setEnabled( false );
157 btnInstall->setEnabled( false ); 168// btnInstall->setEnabled( false );
169
170 btnInstall->setText( "Abort" );
158 171
159 if ( pIpkg ) 172 if ( pIpkg )
160 { 173 {
161 output->setText( "" ); 174 output->setText( "" );
@@ -231,12 +244,13 @@ void InstallDlgImpl :: installSelected()
231 delete pIpkg; 244 delete pIpkg;
232 } 245 }
233 246
234 btnOptions->setEnabled( true ); 247 btnOptions->setEnabled( true );
235 btnInstall->setEnabled( true ); 248// btnInstall->setEnabled( true );
236 btnInstall->setText( tr( "Close" ) ); 249 btnInstall->setText( tr( "Close" ) );
237} 250}
238 251
252
239void InstallDlgImpl :: displayText(const QString &text ) 253void InstallDlgImpl :: displayText(const QString &text )
240{ 254{
241 QString t = output->text() + "\n" + text; 255 QString t = output->text() + "\n" + text;
242 output->setText( t ); 256 output->setText( t );