author | eric <eric> | 2003-02-21 14:07:05 (UTC) |
---|---|---|
committer | eric <eric> | 2003-02-21 14:07:05 (UTC) |
commit | f16eeeaf5ce1f0d0bfad033e2526c0012c9ef868 (patch) (side-by-side diff) | |
tree | 8d6bf9403d2d6d33ba47ea3955e70427ecbcba9c | |
parent | 6917879c47d406b6f4ee234f84b89e17265dd0a5 (diff) | |
download | opie-f16eeeaf5ce1f0d0bfad033e2526c0012c9ef868.zip opie-f16eeeaf5ce1f0d0bfad033e2526c0012c9ef868.tar.gz opie-f16eeeaf5ce1f0d0bfad033e2526c0012c9ef868.tar.bz2 |
- really fix the "=" bug as a power fail made the changes lost last
time.
-rw-r--r-- | noncore/tools/euroconv/calckeypad.cpp | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/noncore/tools/euroconv/calckeypad.cpp b/noncore/tools/euroconv/calckeypad.cpp index f1d61c0..4d0c37f 100644 --- a/noncore/tools/euroconv/calckeypad.cpp +++ b/noncore/tools/euroconv/calckeypad.cpp @@ -116,5 +116,5 @@ if(!dCurrent) dCurrent = i; -else if(!bIsDec){ - if(iLenCurrent > 9) +else if(iLenCurrent > 9) return; +else if(!bIsDec){ dCurrent *= 10; @@ -157,10 +157,17 @@ if(iPreviousOperator){ -dPreviousValue = dCurrent; -iPreviousOperator = i; - -// reset LCD for next digit -dCurrent = 0; -iLenCurrent = 1; -bIsDec = false; -dDecCurrent = 0; +if(i==5){ + // ensure we won't be able to enter more digits + iLenCurrent = 100; + iPreviousOperator = 0; + dPreviousValue = 0; +}else{ + dPreviousValue = dCurrent; + iPreviousOperator = i; + + // reset LCD for next digit + dCurrent = 0; + iLenCurrent = 1; + bIsDec = false; + dDecCurrent = 0; +} } @@ -202,3 +209,3 @@ QMessageBox::about( this, "About Euroconv", "http://opie.handhelds.org\n\n" - "Version 0.2\n\n" + "Version 0.3\n\n" "Any comment or feedback to:\n" |