1 files changed, 39 insertions, 11 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
@@ -17,2 +17,3 @@
 #include <qvbox.h>
+#include <qpixmap.h>
 
@@ -26,2 +27,6 @@ LCDDisplay::LCDDisplay( QWidget *parent, const char *name )
 
+
+this->setMargin(5);
+this->setSpacing(5);
+
 // Create display
@@ -29,4 +34,11 @@ 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");
@@ -35,6 +47,13 @@ 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");
@@ -43,3 +62,2 @@ lcdBottom->setSmallDecimalPoint(true);
 lcdBottom->setSegmentStyle(QLCDNumber::Flat);
-cbbxBottom->insertStrList(aCurrency);
 
@@ -49,5 +67,6 @@ 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
@@ -58,4 +77,2 @@ iCurrentLCD = 0;
 
-//setValue(123.456);
-
 }
@@ -115,4 +132,8 @@ double dCurrentValue;
 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{
@@ -120,2 +141,4 @@ if(!iCurrentLCD){
     iCurrentLCD = 0;
+    grpbxTop->setFrameStyle(grpbxStyle);
+    grpbxBottom->setFrameStyle(0);
 }
@@ -132,4 +155,2 @@ double dCurrentValue;
 
-printf("combo changes...\n");
-
 // get current value
@@ -163,2 +184,5 @@ switch (iIndex){
         break;
+
+    default:
+        return 0;
 }//switch (iIndex)
@@ -187,2 +211,6 @@ switch (iIndex){
 }//switch (iIndex)
+
+// we shouldn't come here
+return 0;
+
 }// fct x2Euro