author | andyq <andyq> | 2002-12-17 22:30:59 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-12-17 22:30:59 (UTC) |
commit | 01640bfdce16d2fd23722a59004a6efd4600c0cf (patch) (unidiff) | |
tree | 399d5da7706ab89b41b7da0eb5fec025d0d3db05 /noncore/settings/aqpkg | |
parent | f18839182d493a49e9411e3dbc070952da7dead9 (diff) | |
download | opie-01640bfdce16d2fd23722a59004a6efd4600c0cf.zip opie-01640bfdce16d2fd23722a59004a6efd4600c0cf.tar.gz opie-01640bfdce16d2fd23722a59004a6efd4600c0cf.tar.bz2 |
When ipkg process is run - start/close button changes to abort
-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 | |||
@@ -145,8 +145,19 @@ void InstallDlgImpl :: optionsSelected() | |||
145 | 145 | ||
146 | void InstallDlgImpl :: installSelected() | 146 | void 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; |
@@ -154,7 +165,9 @@ void InstallDlgImpl :: installSelected() | |||
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 | { |
@@ -232,10 +245,11 @@ void InstallDlgImpl :: installSelected() | |||
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 | |||
239 | void InstallDlgImpl :: displayText(const QString &text ) | 253 | void InstallDlgImpl :: displayText(const QString &text ) |
240 | { | 254 | { |
241 | QString t = output->text() + "\n" + text; | 255 | QString t = output->text() + "\n" + text; |