Diffstat (limited to 'noncore/tools/euroconv/calckeypad.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/tools/euroconv/calckeypad.cpp | 13 |
1 files changed, 10 insertions, 3 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 | ||
115 | if(!dCurrent) | 115 | if(!dCurrent) |
116 | dCurrent = i; | 116 | dCurrent = i; |
117 | else if(!bIsDec){ | 117 | else if(iLenCurrent > 9) |
118 | if(iLenCurrent > 9) | ||
119 | return; | 118 | return; |
119 | else if(!bIsDec){ | ||
120 | dCurrent *= 10; | 120 | dCurrent *= 10; |
121 | dCurrent += i; | 121 | dCurrent += i; |
122 | iLenCurrent++; | 122 | iLenCurrent++; |
@@ -155,6 +155,12 @@ if(iPreviousOperator){ | |||
155 | display->setValue(dCurrent); | 155 | display->setValue(dCurrent); |
156 | } | 156 | } |
157 | 157 | ||
158 | if(i==5){ | ||
159 | // ensure we won't be able to enter more digits | ||
160 | iLenCurrent = 100; | ||
161 | iPreviousOperator = 0; | ||
162 | dPreviousValue = 0; | ||
163 | }else{ | ||
158 | dPreviousValue = dCurrent; | 164 | dPreviousValue = dCurrent; |
159 | iPreviousOperator = i; | 165 | iPreviousOperator = i; |
160 | 166 | ||
@@ -164,6 +170,7 @@ iLenCurrent = 1; | |||
164 | bIsDec = false; | 170 | bIsDec = false; |
165 | dDecCurrent = 0; | 171 | dDecCurrent = 0; |
166 | } | 172 | } |
173 | } | ||
167 | /*********************************************************************** | 174 | /*********************************************************************** |
168 | * SLOT: clearLCD CE/C has been pressed | 175 | * SLOT: clearLCD CE/C has been pressed |
169 | **********************************************************************/ | 176 | **********************************************************************/ |
@@ -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 | ||