summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/euroconv/calcdisplay.cpp4
-rw-r--r--noncore/tools/euroconv/calckeypad.cpp13
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 ***********************/
36grpbxTop = new QHGroupBox(vbxlayout, "grpbxTop"); 36grpbxTop = new QHGroupBox(vbxlayout, "grpbxTop");
37grpbxStyle = grpbxTop->frameStyle(); 37grpbxStyle = grpbxTop->frameStyle();
38grpbxTop->setMaximumHeight(48); 38grpbxTop->setMaximumHeight(48);
39 39
40cbbxTop = new QComboBox(grpbxTop, "cbbxTop"); 40cbbxTop = new QComboBox(grpbxTop, "cbbxTop");
41cbbxTop->setMaximumWidth(50); 41cbbxTop->setMaximumWidth(50);
42cbbxTop->insertStrList(aCurrency); 42cbbxTop->insertStrList(aCurrency);
43 43
44lcdTop = new QLCDNumber(10, grpbxTop, "lcdTop"); 44lcdTop = new QLCDNumber(10, grpbxTop, "lcdTop");
45lcdTop->setMode( QLCDNumber::DEC ); 45lcdTop->setMode( QLCDNumber::DEC );
46lcdTop->setSmallDecimalPoint(true); 46lcdTop->setSmallDecimalPoint(false);
47lcdTop->setSegmentStyle(QLCDNumber::Flat); 47lcdTop->setSegmentStyle(QLCDNumber::Flat);
48 48
49/************** Bottom LCD ************************/ 49/************** Bottom LCD ************************/
50grpbxBottom = new QHGroupBox(vbxlayout, "grpbxBottom"); 50grpbxBottom = new QHGroupBox(vbxlayout, "grpbxBottom");
51grpbxBottom->setMaximumHeight(46); 51grpbxBottom->setMaximumHeight(46);
52grpbxBottom->setFrameStyle(0); 52grpbxBottom->setFrameStyle(0);
53grpbxBottom->setFrameShadow(QFrame::MShadow); 53grpbxBottom->setFrameShadow(QFrame::MShadow);
54 54
55cbbxBottom = new QComboBox(grpbxBottom, "cbbxBottom"); 55cbbxBottom = new QComboBox(grpbxBottom, "cbbxBottom");
56cbbxBottom->setMaximumWidth(50); 56cbbxBottom->setMaximumWidth(50);
57cbbxBottom->insertStrList(aCurrency); 57cbbxBottom->insertStrList(aCurrency);
58 58
59lcdBottom = new QLCDNumber(10, grpbxBottom, "lcdBottom"); 59lcdBottom = new QLCDNumber(10, grpbxBottom, "lcdBottom");
60lcdBottom->setMode( QLCDNumber::DEC ); 60lcdBottom->setMode( QLCDNumber::DEC );
61lcdBottom->setSmallDecimalPoint(true); 61lcdBottom->setSmallDecimalPoint(false);
62lcdBottom->setSegmentStyle(QLCDNumber::Flat); 62lcdBottom->setSegmentStyle(QLCDNumber::Flat);
63 63
64// set combo box signals 64// set combo box signals
65connect(cbbxTop, SIGNAL(activated(int)), this, SLOT(cbbxChange())); 65connect(cbbxTop, SIGNAL(activated(int)), this, SLOT(cbbxChange()));
66connect(cbbxBottom, SIGNAL(activated(int)), this, SLOT(cbbxChange())); 66connect(cbbxBottom, SIGNAL(activated(int)), this, SLOT(cbbxChange()));
67 67
68btnSwap = new QPushButton(this, "swap"); 68btnSwap = new QPushButton(this, "swap");
69QPixmap imgSwap((const char**) swap_xpm); 69QPixmap imgSwap((const char**) swap_xpm);
70btnSwap->setPixmap(imgSwap); 70btnSwap->setPixmap(imgSwap);
71btnSwap->setFixedSize(20,40); 71btnSwap->setFixedSize(20,40);
72// set signal 72// set signal
73connect(btnSwap, SIGNAL(clicked()), this, SLOT(swapLCD())); 73connect(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)))
104connect(btnClear, SIGNAL(clicked()), this, SLOT(clearLCD())); 104connect(btnClear, SIGNAL(clicked()), this, SLOT(clearLCD()));
105connect(btnAbout, SIGNAL(clicked()), this, SLOT(aboutDialog())); 105connect(btnAbout, SIGNAL(clicked()), this, SLOT(aboutDialog()));
106connect(btnDot, SIGNAL(clicked()), this, SLOT(gotoDec())); 106connect(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 **********************************************************************/
113void KeyPad::enterDigits(int i){ 113void KeyPad::enterDigits(int i){
114 114
115if(!dCurrent) 115if(!dCurrent)
116 dCurrent = i; 116 if(bIsDec) {
117 dCurrent = i*dDecCurrent;
118 dDecCurrent /= 10;
119 }
120 else
121 dCurrent = i;
117else if(iLenCurrent > 9) 122else if(iLenCurrent > 9)
118 return; 123 return;
119else if(!bIsDec){ 124else 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
128display->setValue(dCurrent); 133display->setValue(dCurrent);
@@ -181,34 +186,34 @@ iLenCurrent = 1;
181bIsDec = false; 186bIsDec = false;
182dDecCurrent = 0; 187dDecCurrent = 0;
183iPreviousOperator = 0; 188iPreviousOperator = 0;
184dPreviousValue = 0; 189dPreviousValue = 0;
185display->setValue(0); 190display->setValue(0);
186} 191}
187 192
188/*********************************************************************** 193/***********************************************************************
189 * SLOT: gotoDec Dot has been pressed 194 * SLOT: gotoDec Dot has been pressed
190 **********************************************************************/ 195 **********************************************************************/
191void KeyPad::gotoDec(void){ 196void KeyPad::gotoDec(void){
192 197
193bIsDec = true; 198 bIsDec = true;
194dDecCurrent = 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 **********************************************************************/
202void KeyPad::aboutDialog(void){ 207void KeyPad::aboutDialog(void){
203 208
204QMessageBox::about( this, "About Euroconv", 209QMessageBox::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}