| -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 @@ -38,32 +38,32 @@ grpbxStyle = grpbxTop->frameStyle(); grpbxTop->setMaximumHeight(48); cbbxTop = new QComboBox(grpbxTop, "cbbxTop"); cbbxTop->setMaximumWidth(50); cbbxTop->insertStrList(aCurrency); lcdTop = new QLCDNumber(10, grpbxTop, "lcdTop"); lcdTop->setMode( QLCDNumber::DEC ); -lcdTop->setSmallDecimalPoint(true); +lcdTop->setSmallDecimalPoint(false); lcdTop->setSegmentStyle(QLCDNumber::Flat); /************** Bottom LCD ************************/ grpbxBottom = new QHGroupBox(vbxlayout, "grpbxBottom"); grpbxBottom->setMaximumHeight(46); grpbxBottom->setFrameStyle(0); grpbxBottom->setFrameShadow(QFrame::MShadow); cbbxBottom = new QComboBox(grpbxBottom, "cbbxBottom"); cbbxBottom->setMaximumWidth(50); cbbxBottom->insertStrList(aCurrency); lcdBottom = new QLCDNumber(10, grpbxBottom, "lcdBottom"); lcdBottom->setMode( QLCDNumber::DEC ); -lcdBottom->setSmallDecimalPoint(true); +lcdBottom->setSmallDecimalPoint(false); lcdBottom->setSegmentStyle(QLCDNumber::Flat); // set combo box signals connect(cbbxTop, SIGNAL(activated(int)), this, SLOT(cbbxChange())); connect(cbbxBottom, SIGNAL(activated(int)), this, SLOT(cbbxChange())); btnSwap = new QPushButton(this, "swap"); QPixmap imgSwap((const char**) swap_xpm); 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 @@ -108,17 +108,22 @@ 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; + if(bIsDec) { + dCurrent = i*dDecCurrent; + dDecCurrent /= 10; + } + else + dCurrent = i; else if(iLenCurrent > 9) return; else if(!bIsDec){ dCurrent *= 10; dCurrent += i; iLenCurrent++; }else{ dCurrent += i*dDecCurrent; @@ -185,30 +190,30 @@ dPreviousValue = 0; display->setValue(0); } /*********************************************************************** * SLOT: gotoDec Dot has been pressed **********************************************************************/ void KeyPad::gotoDec(void){ -bIsDec = true; -dDecCurrent = 0.1; + 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.4\n\n" + "Version 0.5\n\n" "Any comment or feedback to:\n" "Eric.Santonacci@talc.fr\n"); } |