summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -69,139 +69,146 @@ grpbtnDigits->insert(btn4, 4);
grpbtnDigits->insert(btn5, 5);
grpbtnDigits->insert(btn6, 6);
grpbtnDigits->insert(btn7, 7);
grpbtnDigits->insert(btn8, 8);
grpbtnDigits->insert(btn9, 9);
// set appearance of buttons
for(i=0; i<10; i++){
btnButton = grpbtnDigits->find(i);
btnButton->setFixedSize(30,30);
}
// Operator key
grpbtnOperators = new QButtonGroup(0, "operator");
grpbtnOperators->insert(btnPlus, 1);
grpbtnOperators->insert(btnMinus,2);
grpbtnOperators->insert(btnMultiply,3);
grpbtnOperators->insert(btnDivide,4);
grpbtnOperators->insert(btnEqual,5);
// set appearance of buttons
for(i=1; i<6; i++){
btnButton = grpbtnOperators->find(i);
btnButton->setFixedSize(30,30);
}
btnClear->setFixedSize(30,30);
btnClear->setPalette(QPalette( QColor(255, 99, 71) ) );
btnDot->setFixedSize(30,30);
btnPercent->setFixedSize(30,30);
btnF1->setFixedSize(30,30);
btnAbout->setFixedSize(30,30);
// SIGNALS AND SLOTS
connect(grpbtnDigits, SIGNAL(clicked(int) ), this, SLOT(enterDigits(int)));
connect(grpbtnOperators, SIGNAL(clicked(int)), this, SLOT(operatorPressed(int)));
connect(btnClear, SIGNAL(clicked()), this, SLOT(clearLCD()));
connect(btnAbout, SIGNAL(clicked()), this, SLOT(aboutDialog()));
connect(btnDot, SIGNAL(clicked()), this, SLOT(gotoDec()));
}
/***********************************************************************
* SLOT: enterDigits calculates the value to display and display it.
**********************************************************************/
void KeyPad::enterDigits(int i){
if(!dCurrent)
dCurrent = i;
-else if(!bIsDec){
- if(iLenCurrent > 9)
+else if(iLenCurrent > 9)
return;
+else if(!bIsDec){
dCurrent *= 10;
dCurrent += i;
iLenCurrent++;
}else{
dCurrent += i*dDecCurrent;
dDecCurrent /= 10;
}
display->setValue(dCurrent);
}
/***********************************************************************
* SLOT: Operator has been pressed
**********************************************************************/
void KeyPad::operatorPressed(int i){
if(iPreviousOperator){
switch(iPreviousOperator){
case 1: // Plus +
dCurrent += dPreviousValue;
break;
case 2: // Minus -
dCurrent = dPreviousValue - dCurrent;
break;
case 3: // Multiply *
dCurrent *= dPreviousValue;
break;
case 4: // Divide /
dCurrent = dPreviousValue / dCurrent;
break;
}
display->setValue(dCurrent);
}
-dPreviousValue = dCurrent;
-iPreviousOperator = i;
-
-// reset LCD for next digit
-dCurrent = 0;
-iLenCurrent = 1;
-bIsDec = false;
-dDecCurrent = 0;
+if(i==5){
+ // ensure we won't be able to enter more digits
+ iLenCurrent = 100;
+ iPreviousOperator = 0;
+ dPreviousValue = 0;
+}else{
+ dPreviousValue = dCurrent;
+ iPreviousOperator = i;
+
+ // reset LCD for next digit
+ dCurrent = 0;
+ iLenCurrent = 1;
+ bIsDec = false;
+ dDecCurrent = 0;
+}
}
/***********************************************************************
* SLOT: clearLCD CE/C has been pressed
**********************************************************************/
void KeyPad::clearLCD(void){
dCurrent = 0;
iLenCurrent = 1;
bIsDec = false;
dDecCurrent = 0;
iPreviousOperator = 0;
dPreviousValue = 0;
display->setValue(0);
}
/***********************************************************************
* SLOT: gotoDec Dot has been pressed
**********************************************************************/
void KeyPad::gotoDec(void){
bIsDec = true;
dDecCurrent = 0.1;
}
/***********************************************************************
* SLOT: Display About Dialog...
**********************************************************************/
void KeyPad::aboutDialog(void){
QMessageBox::about( this, "About Euroconv",
"Euroconv is an Euro converter\n\n"
"Copyright 2003 TALC Informatique.\n"
"Under GPL license\n\n"
"Written by Eric Santonacci for Opie\n"
"http://opie.handhelds.org\n\n"
- "Version 0.2\n\n"
+ "Version 0.3\n\n"
"Any comment or feedback to:\n"
"Eric.Santonacci@talc.fr\n");
}