-rw-r--r-- | noncore/tools/euroconv/calcdisplay.cpp | 4 | ||||
-rw-r--r-- | noncore/tools/euroconv/calckeypad.cpp | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/noncore/tools/euroconv/calcdisplay.cpp b/noncore/tools/euroconv/calcdisplay.cpp index 898de81..e5a49e6 100644 --- a/noncore/tools/euroconv/calcdisplay.cpp +++ b/noncore/tools/euroconv/calcdisplay.cpp | |||
@@ -40,13 +40,13 @@ grpbxTop->setMaximumHeight(48); | |||
40 | cbbxTop = new QComboBox(grpbxTop, "cbbxTop"); | 40 | cbbxTop = new QComboBox(grpbxTop, "cbbxTop"); |
41 | cbbxTop->setMaximumWidth(50); | 41 | cbbxTop->setMaximumWidth(50); |
42 | cbbxTop->insertStrList(aCurrency); | 42 | cbbxTop->insertStrList(aCurrency); |
43 | 43 | ||
44 | lcdTop = new QLCDNumber(10, grpbxTop, "lcdTop"); | 44 | lcdTop = new QLCDNumber(10, grpbxTop, "lcdTop"); |
45 | lcdTop->setMode( QLCDNumber::DEC ); | 45 | lcdTop->setMode( QLCDNumber::DEC ); |
46 | lcdTop->setSmallDecimalPoint(true); | 46 | lcdTop->setSmallDecimalPoint(false); |
47 | lcdTop->setSegmentStyle(QLCDNumber::Flat); | 47 | lcdTop->setSegmentStyle(QLCDNumber::Flat); |
48 | 48 | ||
49 | /************** Bottom LCD ************************/ | 49 | /************** Bottom LCD ************************/ |
50 | grpbxBottom = new QHGroupBox(vbxlayout, "grpbxBottom"); | 50 | grpbxBottom = new QHGroupBox(vbxlayout, "grpbxBottom"); |
51 | grpbxBottom->setMaximumHeight(46); | 51 | grpbxBottom->setMaximumHeight(46); |
52 | grpbxBottom->setFrameStyle(0); | 52 | grpbxBottom->setFrameStyle(0); |
@@ -55,13 +55,13 @@ grpbxBottom->setFrameShadow(QFrame::MShadow); | |||
55 | cbbxBottom = new QComboBox(grpbxBottom, "cbbxBottom"); | 55 | cbbxBottom = new QComboBox(grpbxBottom, "cbbxBottom"); |
56 | cbbxBottom->setMaximumWidth(50); | 56 | cbbxBottom->setMaximumWidth(50); |
57 | cbbxBottom->insertStrList(aCurrency); | 57 | cbbxBottom->insertStrList(aCurrency); |
58 | 58 | ||
59 | lcdBottom = new QLCDNumber(10, grpbxBottom, "lcdBottom"); | 59 | lcdBottom = new QLCDNumber(10, grpbxBottom, "lcdBottom"); |
60 | lcdBottom->setMode( QLCDNumber::DEC ); | 60 | lcdBottom->setMode( QLCDNumber::DEC ); |
61 | lcdBottom->setSmallDecimalPoint(true); | 61 | lcdBottom->setSmallDecimalPoint(false); |
62 | lcdBottom->setSegmentStyle(QLCDNumber::Flat); | 62 | lcdBottom->setSegmentStyle(QLCDNumber::Flat); |
63 | 63 | ||
64 | // set combo box signals | 64 | // set combo box signals |
65 | connect(cbbxTop, SIGNAL(activated(int)), this, SLOT(cbbxChange())); | 65 | connect(cbbxTop, SIGNAL(activated(int)), this, SLOT(cbbxChange())); |
66 | connect(cbbxBottom, SIGNAL(activated(int)), this, SLOT(cbbxChange())); | 66 | connect(cbbxBottom, SIGNAL(activated(int)), this, SLOT(cbbxChange())); |
67 | 67 | ||
diff --git a/noncore/tools/euroconv/calckeypad.cpp b/noncore/tools/euroconv/calckeypad.cpp index 1678095..e4898a3 100644 --- a/noncore/tools/euroconv/calckeypad.cpp +++ b/noncore/tools/euroconv/calckeypad.cpp | |||
@@ -110,13 +110,18 @@ connect(btnDot, SIGNAL(clicked()), this, SLOT(gotoDec())); | |||
110 | /*********************************************************************** | 110 | /*********************************************************************** |
111 | * SLOT: enterDigits calculates the value to display and display it. | 111 | * SLOT: enterDigits calculates the value to display and display it. |
112 | **********************************************************************/ | 112 | **********************************************************************/ |
113 | void KeyPad::enterDigits(int i){ | 113 | void KeyPad::enterDigits(int i){ |
114 | 114 | ||
115 | if(!dCurrent) | 115 | if(!dCurrent) |
116 | dCurrent = i; | 116 | if(bIsDec) { |
117 | dCurrent = i*dDecCurrent; | ||
118 | dDecCurrent /= 10; | ||
119 | } | ||
120 | else | ||
121 | dCurrent = i; | ||
117 | else if(iLenCurrent > 9) | 122 | else if(iLenCurrent > 9) |
118 | return; | 123 | return; |
119 | else if(!bIsDec){ | 124 | else if(!bIsDec){ |
120 | dCurrent *= 10; | 125 | dCurrent *= 10; |
121 | dCurrent += i; | 126 | dCurrent += i; |
122 | iLenCurrent++; | 127 | iLenCurrent++; |
@@ -187,14 +192,14 @@ display->setValue(0); | |||
187 | 192 | ||
188 | /*********************************************************************** | 193 | /*********************************************************************** |
189 | * SLOT: gotoDec Dot has been pressed | 194 | * SLOT: gotoDec Dot has been pressed |
190 | **********************************************************************/ | 195 | **********************************************************************/ |
191 | void KeyPad::gotoDec(void){ | 196 | void KeyPad::gotoDec(void){ |
192 | 197 | ||
193 | bIsDec = true; | 198 | bIsDec = true; |
194 | dDecCurrent = 0.1; | 199 | dDecCurrent = 0.1; |
195 | } | 200 | } |
196 | 201 | ||
197 | 202 | ||
198 | 203 | ||
199 | /*********************************************************************** | 204 | /*********************************************************************** |
200 | * SLOT: Display About Dialog... | 205 | * SLOT: Display About Dialog... |
@@ -204,11 +209,11 @@ void KeyPad::aboutDialog(void){ | |||
204 | QMessageBox::about( this, "About Euroconv", | 209 | QMessageBox::about( this, "About Euroconv", |
205 | "Euroconv is an Euro converter\n\n" | 210 | "Euroconv is an Euro converter\n\n" |
206 | "Copyright 2003 TALC Informatique.\n" | 211 | "Copyright 2003 TALC Informatique.\n" |
207 | "Under GPL license\n\n" | 212 | "Under GPL license\n\n" |
208 | "Written by Eric Santonacci for Opie\n" | 213 | "Written by Eric Santonacci for Opie\n" |
209 | "http://opie.handhelds.org\n\n" | 214 | "http://opie.handhelds.org\n\n" |
210 | "Version 0.4\n\n" | 215 | "Version 0.5\n\n" |
211 | "Any comment or feedback to:\n" | 216 | "Any comment or feedback to:\n" |
212 | "Eric.Santonacci@talc.fr\n"); | 217 | "Eric.Santonacci@talc.fr\n"); |
213 | 218 | ||
214 | } | 219 | } |