author | eric <eric> | 2003-04-15 07:42:19 (UTC) |
---|---|---|
committer | eric <eric> | 2003-04-15 07:42:19 (UTC) |
commit | e263613e83b64fa93b5f3c1b904715daf076cc78 (patch) (unidiff) | |
tree | 2c41969e72ec324cb60e0c34516b945832f89c10 /noncore | |
parent | 99b059a9d6f16f1e30b0088d35deacf8b9384f28 (diff) | |
download | opie-e263613e83b64fa93b5f3c1b904715daf076cc78.zip opie-e263613e83b64fa93b5f3c1b904715daf076cc78.tar.gz opie-e263613e83b64fa93b5f3c1b904715daf076cc78.tar.bz2 |
- Fix a bug with numbers between 0 and 1.
-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 | |||
@@ -34,40 +34,40 @@ QVBox *vbxlayout = new QVBox (this); | |||
34 | 34 | ||
35 | /*************** Top LCD ***********************/ | 35 | /*************** Top LCD ***********************/ |
36 | grpbxTop = new QHGroupBox(vbxlayout, "grpbxTop"); | 36 | grpbxTop = new QHGroupBox(vbxlayout, "grpbxTop"); |
37 | grpbxStyle = grpbxTop->frameStyle(); | 37 | grpbxStyle = grpbxTop->frameStyle(); |
38 | grpbxTop->setMaximumHeight(48); | 38 | grpbxTop->setMaximumHeight(48); |
39 | 39 | ||
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); |
53 | grpbxBottom->setFrameShadow(QFrame::MShadow); | 53 | grpbxBottom->setFrameShadow(QFrame::MShadow); |
54 | 54 | ||
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 | ||
68 | btnSwap = new QPushButton(this, "swap"); | 68 | btnSwap = new QPushButton(this, "swap"); |
69 | QPixmap imgSwap((const char**) swap_xpm); | 69 | QPixmap imgSwap((const char**) swap_xpm); |
70 | btnSwap->setPixmap(imgSwap); | 70 | btnSwap->setPixmap(imgSwap); |
71 | btnSwap->setFixedSize(20,40); | 71 | btnSwap->setFixedSize(20,40); |
72 | // set signal | 72 | // set signal |
73 | connect(btnSwap, SIGNAL(clicked()), this, SLOT(swapLCD())); | 73 | connect(btnSwap, SIGNAL(clicked()), this, SLOT(swapLCD())); |
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 | |||
@@ -104,25 +104,30 @@ connect(grpbtnOperators, SIGNAL(clicked(int)), this, SLOT(operatorPressed(int))) | |||
104 | connect(btnClear, SIGNAL(clicked()), this, SLOT(clearLCD())); | 104 | connect(btnClear, SIGNAL(clicked()), this, SLOT(clearLCD())); |
105 | connect(btnAbout, SIGNAL(clicked()), this, SLOT(aboutDialog())); | 105 | connect(btnAbout, SIGNAL(clicked()), this, SLOT(aboutDialog())); |
106 | connect(btnDot, SIGNAL(clicked()), this, SLOT(gotoDec())); | 106 | connect(btnDot, SIGNAL(clicked()), this, SLOT(gotoDec())); |
107 | } | 107 | } |
108 | 108 | ||
109 | 109 | ||
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++; |
123 | }else{ | 128 | }else{ |
124 | dCurrent += i*dDecCurrent; | 129 | dCurrent += i*dDecCurrent; |
125 | dDecCurrent /= 10; | 130 | dDecCurrent /= 10; |
126 | } | 131 | } |
127 | 132 | ||
128 | display->setValue(dCurrent); | 133 | display->setValue(dCurrent); |
@@ -181,34 +186,34 @@ iLenCurrent = 1; | |||
181 | bIsDec = false; | 186 | bIsDec = false; |
182 | dDecCurrent = 0; | 187 | dDecCurrent = 0; |
183 | iPreviousOperator = 0; | 188 | iPreviousOperator = 0; |
184 | dPreviousValue = 0; | 189 | dPreviousValue = 0; |
185 | display->setValue(0); | 190 | display->setValue(0); |
186 | } | 191 | } |
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... |
201 | **********************************************************************/ | 206 | **********************************************************************/ |
202 | void KeyPad::aboutDialog(void){ | 207 | void KeyPad::aboutDialog(void){ |
203 | 208 | ||
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 | } |