author | groucho <groucho> | 2003-03-19 11:36:34 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-03-19 11:36:34 (UTC) |
commit | 28be0fcc9bda71175c3ee17e79fce2ac24340ff2 (patch) (unidiff) | |
tree | f09c80460e4f0219eb308d612a2e67df57f2c254 /core/settings/button/buttonsettings.cpp | |
parent | 18c6c51705de3b1897f671e54b25929e74d11f23 (diff) | |
download | opie-28be0fcc9bda71175c3ee17e79fce2ac24340ff2.zip opie-28be0fcc9bda71175c3ee17e79fce2ac24340ff2.tar.gz opie-28be0fcc9bda71175c3ee17e79fce2ac24340ff2.tar.bz2 |
Fixed bug #744 where non mapped buttons in buttonsettings were not saved by introducing the "
ignore" statement.
Also removed unsed debug code
Diffstat (limited to 'core/settings/button/buttonsettings.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/button/buttonsettings.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp index eabb779..942d5e4 100644 --- a/core/settings/button/buttonsettings.cpp +++ b/core/settings/button/buttonsettings.cpp | |||
@@ -199,35 +199,34 @@ void ButtonSettings::keyReleaseEvent ( QKeyEvent *e ) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | void ButtonSettings::keyTimeout ( ) | 201 | void ButtonSettings::keyTimeout ( ) |
202 | { | 202 | { |
203 | if ( m_last_button ) { | 203 | if ( m_last_button ) { |
204 | edit ( m_last_button, true ); | 204 | edit ( m_last_button, true ); |
205 | m_last_button = false; | 205 | m_last_button = false; |
206 | } | 206 | } |
207 | } | 207 | } |
208 | 208 | ||
209 | void ButtonSettings::edit ( buttoninfo *bi, bool hold ) | 209 | void ButtonSettings::edit ( buttoninfo *bi, bool hold ) |
210 | { | 210 | { |
211 | qDebug ( "remap %s for %s", hold ? "hold" : "press", bi-> m_button-> userText ( ). latin1 ( )); | ||
212 | 211 | ||
213 | if ( m_lock ) | 212 | if ( m_lock ) |
214 | return; | 213 | return; |
215 | m_lock = true; | 214 | m_lock = true; |
216 | 215 | ||
217 | RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this ); | 216 | RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this ); |
218 | 217 | ||
219 | d-> showMaximized ( ); | 218 | d-> showMaximized ( ); |
220 | if ( d-> exec ( ) == QDialog::Accepted ) { | 219 | if ( d-> exec ( ) == QDialog::Accepted ) { |
221 | qDebug ( " -> %s %s", d-> message ( ). channel ( ). data ( ), d-> message ( ). message ( ). data ( )); | 220 | |
222 | 221 | ||
223 | if ( hold ) { | 222 | if ( hold ) { |
224 | bi-> m_hmsg = d-> message ( ); | 223 | bi-> m_hmsg = d-> message ( ); |
225 | bi-> m_hdirty = true; | 224 | bi-> m_hdirty = true; |
226 | } | 225 | } |
227 | else { | 226 | else { |
228 | bi-> m_pmsg = d-> message ( ); | 227 | bi-> m_pmsg = d-> message ( ); |
229 | bi-> m_pdirty = true; | 228 | bi-> m_pdirty = true; |
230 | } | 229 | } |
231 | 230 | ||
232 | updateLabels ( ); | 231 | updateLabels ( ); |
233 | } | 232 | } |