summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/euroconv/calcdisplay.cpp50
-rw-r--r--noncore/tools/euroconv/calcdisplay.h38
-rw-r--r--noncore/tools/euroconv/calckeypad.cpp48
-rw-r--r--noncore/tools/euroconv/calckeypad.h2
-rw-r--r--noncore/tools/euroconv/currency.h4
5 files changed, 109 insertions, 33 deletions
diff --git a/noncore/tools/euroconv/calcdisplay.cpp b/noncore/tools/euroconv/calcdisplay.cpp
index 06e5158..1659858 100644
--- a/noncore/tools/euroconv/calcdisplay.cpp
+++ b/noncore/tools/euroconv/calcdisplay.cpp
@@ -16,4 +16,5 @@
#include <stdio.h>
#include <qvbox.h>
+#include <qpixmap.h>
#include "currency.h"
@@ -25,22 +26,39 @@ LCDDisplay::LCDDisplay( QWidget *parent, const char *name )
+
+this->setMargin(5);
+this->setSpacing(5);
+
// Create display
QVBox *vbxlayout = new QVBox (this);
-grpbxTop = new QVGroupBox(vbxlayout, "grpbxTop");
+/*************** Top LCD ***********************/
+grpbxTop = new QHGroupBox(vbxlayout, "grpbxTop");
+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->setSegmentStyle(QLCDNumber::Flat);
-cbbxTop->insertStrList(aCurrency);
-grpbxBottom = new QVGroupBox(vbxlayout, "grpbxBottom");
+/************** 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->setSegmentStyle(QLCDNumber::Flat);
-cbbxBottom->insertStrList(aCurrency);
// set combo box signals
@@ -48,7 +66,8 @@ connect(cbbxTop, SIGNAL(activated(int)), this, SLOT(cbbxChange()));
connect(cbbxBottom, SIGNAL(activated(int)), this, SLOT(cbbxChange()));
-btnSwap = new QPushButton("S",this, "swap");
-btnSwap->setMaximumSize(20,50);
-btnSwap->setMinimumSize(20,50);
+btnSwap = new QPushButton(this, "swap");
+QPixmap imgSwap((const char**) swap_xpm);
+btnSwap->setPixmap(imgSwap);
+btnSwap->setFixedSize(20,40);
// set signal
connect(btnSwap, SIGNAL(clicked()), this, SLOT(swapLCD()));
@@ -57,6 +76,4 @@ connect(btnSwap, SIGNAL(clicked()), this, SLOT(swapLCD()));
iCurrentLCD = 0;
-//setValue(123.456);
-
}
@@ -114,9 +131,15 @@ double dCurrentValue;
// get current value
if(!iCurrentLCD){
+ // iCurrentLCD = 0, lcdTop has current focus and is going to loose
+ // it
dCurrentValue = lcdTop->value();
iCurrentLCD = 1;
+ grpbxTop->setFrameStyle(0);
+ grpbxBottom->setFrameStyle(grpbxStyle);
}else{
dCurrentValue = lcdBottom->value();
iCurrentLCD = 0;
+ grpbxTop->setFrameStyle(grpbxStyle);
+ grpbxBottom->setFrameStyle(0);
}
@@ -131,6 +154,4 @@ void LCDDisplay::cbbxChange(void){
double dCurrentValue;
-printf("combo changes...\n");
-
// get current value
if(!iCurrentLCD){
@@ -162,4 +183,7 @@ switch (iIndex){
return(dValue*DM);
break;
+
+ default:
+ return 0;
}//switch (iIndex)
}// fct Eur2x
@@ -186,3 +210,7 @@ switch (iIndex){
break;
}//switch (iIndex)
+
+// we shouldn't come here
+return 0;
+
}// fct x2Euro
diff --git a/noncore/tools/euroconv/calcdisplay.h b/noncore/tools/euroconv/calcdisplay.h
index 17ce8f4..d1902cf 100644
--- a/noncore/tools/euroconv/calcdisplay.h
+++ b/noncore/tools/euroconv/calcdisplay.h
@@ -19,8 +19,38 @@
#include <qhbox.h>
#include <qlcdnumber.h>
-#include <qvgroupbox.h>
+#include <qhgroupbox.h>
#include <qpushbutton.h>
#include <qcombobox.h>
+
+/* XPM */
+static char *swap_xpm[] = {
+/* width height num_colors chars_per_pixel */
+" 13 18 2 1",
+/* colors */
+". c None",
+"# c #000000",
+/* pixels */
+"..#######....",
+"..#####......",
+"..######.....",
+"..#...###....",
+"........##...",
+".........##..",
+"..........##.",
+"...........##",
+"...........##",
+"...........##",
+"...........##",
+"..........##.",
+".........##..",
+"........##...",
+"..#...###....",
+"..######.....",
+"..#####......",
+"..#######....",
+};
+
+
class LCDDisplay : public QHBox{
@@ -37,9 +67,11 @@ public slots:
// void valueChanged( int );
private:
- QVGroupBox *grpbxTop;
+ int grpbxStyle;
+
+ QHGroupBox *grpbxTop;
QComboBox *cbbxTop;
QLCDNumber *lcdTop;
- QVGroupBox *grpbxBottom;
+ QHGroupBox *grpbxBottom;
QComboBox *cbbxBottom;
QLCDNumber *lcdBottom;
diff --git a/noncore/tools/euroconv/calckeypad.cpp b/noncore/tools/euroconv/calckeypad.cpp
index 4156570..f1d61c0 100644
--- a/noncore/tools/euroconv/calckeypad.cpp
+++ b/noncore/tools/euroconv/calckeypad.cpp
@@ -22,4 +22,6 @@ KeyPad::KeyPad(LCDDisplay *lcd, QWidget *parent, const char *name )
: QGrid(5, parent, name){
+int i;
+QButton *btnButton;
// save lcd at init
@@ -71,4 +73,10 @@ 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");
@@ -78,4 +86,15 @@ 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);
@@ -136,20 +155,13 @@ if(iPreviousOperator){
display->setValue(dCurrent);
}
-if(i == 5){
- // key '=' pressed
- dPreviousValue = 0;
- iPreviousOperator = 0;
- // We don't want to add digits
- iLenCurrent = 100;
-}else{
- dPreviousValue = dCurrent;
- iPreviousOperator = i;
- // reset LCD for next digit
- dCurrent = 0;
- iLenCurrent = 1;
- bIsDec = false;
- dDecCurrent = 0;
-}
+dPreviousValue = dCurrent;
+iPreviousOperator = i;
+
+// reset LCD for next digit
+dCurrent = 0;
+iLenCurrent = 1;
+bIsDec = false;
+dDecCurrent = 0;
}
/***********************************************************************
@@ -188,4 +200,8 @@ QMessageBox::about( this, "About Euroconv",
"Under GPL license\n\n"
"Written by Eric Santonacci for Opie\n"
- "http://opie.handhelds.org\n" );
+ "http://opie.handhelds.org\n\n"
+ "Version 0.2\n\n"
+ "Any comment or feedback to:\n"
+ "Eric.Santonacci@talc.fr\n");
+
}
diff --git a/noncore/tools/euroconv/calckeypad.h b/noncore/tools/euroconv/calckeypad.h
index 42e7eb3..aac3f41 100644
--- a/noncore/tools/euroconv/calckeypad.h
+++ b/noncore/tools/euroconv/calckeypad.h
@@ -72,5 +72,5 @@ private:
QButtonGroup *grpbtnOperators;
-
+ void setAppearance(void);
};
diff --git a/noncore/tools/euroconv/currency.h b/noncore/tools/euroconv/currency.h
index 90f5b57..d9ee75c 100644
--- a/noncore/tools/euroconv/currency.h
+++ b/noncore/tools/euroconv/currency.h
@@ -16,5 +16,5 @@
#define EURO 1 // Euro
#define FF 6.55957 // French Francs
-#define DM 1.96 // Deutch Mark
+#define DM 1.9594 // Deutch Mark
-static const char* aCurrency[] = { "Euro", "French Frs", "DM", 0 };
+static const char* aCurrency[] = { "Euro", "FF", "DM", 0 };