1 files changed, 25 insertions, 2 deletions

diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index c8492e5..7256777 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -10,24 +10,34 @@
 
 #include <qpe/config.h>
 #include "datawidgetui.h"
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qlayout.h>
+#include <qtable.h>
+#include <qhbox.h>
+#include <qlabel.h>
 
 dataWidgetUI::dataWidgetUI() : QDialog()
 {
     this->setCaption("Chemical Data");
     
     QVBoxLayout *vbox = new QVBoxLayout( this );
     
     dataCombo = new QComboBox( this );
-    DataTable = new OxydataTable( 7,2, this );
+    DataTable = new OxydataTable( 8,2, this );
     DataTable->setShowGrid( false );
+    DataTable->setHScrollBarMode(QScrollView::AlwaysOff);
+
+    QHBox *hbox = new QHBox( this );
+    left = new QLabel( hbox );
+    middle = new QLabel( hbox );
+    right = new QLabel( hbox );
 
     vbox->addWidget( dataCombo );
+    vbox->addWidget( hbox );
     vbox->addWidget( DataTable );
     
     DataTable->show();
     dataCombo->show();
     
     connect ( dataCombo, SIGNAL( activated(int) ), this, SLOT( slotShowData(int) ) );
@@ -56,19 +66,30 @@ void dataWidgetUI::createTableLayout(){
     DataTable->setText( 1,0,"Block" );
     DataTable->setText( 2,0,"Group" );
     DataTable->setText( 3,0,"Electronegativity" );
     DataTable->setText( 4,0,"Atomic radius" );
     DataTable->setText( 5,0,"Ionizationenergie" );
     DataTable->setText( 6,0,"Density" );
-    DataTable->setText( 7,0,"Boilingpoint" );
+    DataTable->setText( 7,0, tr( "Boilingpoint" ) );
+    DataTable->setText( 8,0, tr( "Meltingpoint" ) );
 }
 
 
 void dataWidgetUI::slotShowData(int number){
     Config test( "/home/opie/Settings/oxygendata", Config::File );
     test.setGroup( QString::number( number+1 ));
+    
+    left->setText( test.readEntry( "Symbol" ) );
+    middle->setText( test.readEntry( "Name" ) );
+    right->setText( QString::number( number+1 ) );
+
+    QFont bf;
+    bf.setBold( true );
+    bf.setPointSize( bf.pointSize()+2 );
+    middle->setFont( bf );
+
     QString weight = test.readEntry( "Weight" );
     DataTable->setText( 0,1,weight ); 
     QString block = test.readEntry( "Block" );
     DataTable->setText( 1,1,block ); 
     QString grp = test.readEntry( "Group" );
     DataTable->setText( 2,1,grp ); 
@@ -79,7 +100,9 @@ void dataWidgetUI::slotShowData(int number){
     QString ion = test.readEntry( "IE" );
     DataTable->setText( 5,1,ion ); 
     QString dens = test.readEntry( "Density" );
     DataTable->setText( 6,1,dens ); 
     QString bp = test.readEntry( "BP" );
     DataTable->setText( 7,1,bp ); 
+    QString mp = test.readEntry( "MP" );
+    DataTable->setText( 7,1,mp ); 
 }