summaryrefslogtreecommitdiff
authoreric <eric>2003-02-21 14:07:05 (UTC)
committer eric <eric>2003-02-21 14:07:05 (UTC)
commitf16eeeaf5ce1f0d0bfad033e2526c0012c9ef868 (patch) (unidiff)
tree8d6bf9403d2d6d33ba47ea3955e70427ecbcba9c
parent6917879c47d406b6f4ee234f84b89e17265dd0a5 (diff)
downloadopie-f16eeeaf5ce1f0d0bfad033e2526c0012c9ef868.zip
opie-f16eeeaf5ce1f0d0bfad033e2526c0012c9ef868.tar.gz
opie-f16eeeaf5ce1f0d0bfad033e2526c0012c9ef868.tar.bz2
- really fix the "=" bug as a power fail made the changes lost last
time.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/euroconv/calckeypad.cpp29
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
@@ -114,9 +114,9 @@ void KeyPad::enterDigits(int i){
114 114
115if(!dCurrent) 115if(!dCurrent)
116 dCurrent = i; 116 dCurrent = i;
117else if(!bIsDec){ 117else if(iLenCurrent > 9)
118 if(iLenCurrent > 9)
119 return; 118 return;
119else if(!bIsDec){
120 dCurrent *= 10; 120 dCurrent *= 10;
121 dCurrent += i; 121 dCurrent += i;
122 iLenCurrent++; 122 iLenCurrent++;
@@ -155,14 +155,21 @@ if(iPreviousOperator){
155 display->setValue(dCurrent); 155 display->setValue(dCurrent);
156} 156}
157 157
158dPreviousValue = dCurrent; 158if(i==5){
159iPreviousOperator = i; 159 // ensure we won't be able to enter more digits
160 160 iLenCurrent = 100;
161// reset LCD for next digit 161 iPreviousOperator = 0;
162dCurrent = 0; 162 dPreviousValue = 0;
163iLenCurrent = 1; 163}else{
164bIsDec = false; 164 dPreviousValue = dCurrent;
165dDecCurrent = 0; 165 iPreviousOperator = i;
166
167 // reset LCD for next digit
168 dCurrent = 0;
169 iLenCurrent = 1;
170 bIsDec = false;
171 dDecCurrent = 0;
172}
166} 173}
167/*********************************************************************** 174/***********************************************************************
168 * SLOT: clearLCD CE/C has been pressed 175 * SLOT: clearLCD CE/C has been pressed
@@ -200,7 +207,7 @@ QMessageBox::about( this, "About Euroconv",
200 "Under GPL license\n\n" 207 "Under GPL license\n\n"
201 "Written by Eric Santonacci for Opie\n" 208 "Written by Eric Santonacci for Opie\n"
202 "http://opie.handhelds.org\n\n" 209 "http://opie.handhelds.org\n\n"
203 "Version 0.2\n\n" 210 "Version 0.3\n\n"
204 "Any comment or feedback to:\n" 211 "Any comment or feedback to:\n"
205 "Eric.Santonacci@talc.fr\n"); 212 "Eric.Santonacci@talc.fr\n");
206 213