5 files changed, 21 insertions, 32 deletions

diff --git a/noncore/apps/oxygen/calcdlg.ui b/noncore/apps/oxygen/calcdlg.ui
index 2d30164..a8ed170 100644
--- a/noncore/apps/oxygen/calcdlg.ui
+++ b/noncore/apps/oxygen/calcdlg.ui
@@ -8,13 +8,13 @@
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>245</width>
+            <width>241</width>
             <height>318</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Form1</string>
@@ -39,13 +39,13 @@
             <property stdset="1">
                 <name>name</name>
                 <cstring>tab</cstring>
             </property>
             <attribute>
                 <name>title</name>
-                <string>Tab 1</string>
+                <string>Molecular Weight</string>
             </attribute>
             <widget>
                 <class>QLayoutWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Layout6</cstring>
@@ -73,13 +73,13 @@
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel2</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>TextLabel2</string>
+                            <string>chemical Formula</string>
                         </property>
                     </widget>
                     <widget>
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
@@ -106,37 +106,37 @@
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>calculate</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>PushButton3</string>
+                                    <string>Calculate</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>clear_fields</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>PushButton4</string>
+                                    <string>Clear</string>
                                 </property>
                             </widget>
                         </hbox>
                     </widget>
                     <widget>
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel3</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>TextLabel3</string>
+                            <string>Molecular Weight (u):</string>
                         </property>
                     </widget>
                     <widget>
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
@@ -148,33 +148,26 @@
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel1</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>TextLabel1</string>
+                            <string>Elemental Composition (%):</string>
                         </property>
                     </widget>
                     <widget>
                         <class>QMultiLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>anal_display</cstring>
                         </property>
+                        <property stdset="1">
+                            <name>readOnly</name>
+                            <bool>true</bool>
+                        </property>
                     </widget>
                 </vbox>
             </widget>
         </widget>
-        <widget>
-            <class>QWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>tab</cstring>
-            </property>
-            <attribute>
-                <name>title</name>
-                <string>Tab 2</string>
-            </attribute>
-        </widget>
     </widget>
 </widget>
 </UI>
diff --git a/noncore/apps/oxygen/calcdlgui.cpp b/noncore/apps/oxygen/calcdlgui.cpp
index ca3a9f2..f8dfde5 100644
--- a/noncore/apps/oxygen/calcdlgui.cpp
+++ b/noncore/apps/oxygen/calcdlgui.cpp
@@ -42,13 +42,13 @@ void calcDlgUI::calc()
     double weight = kmolcalc->getWeight();
     if ( errors == "OK" ) {
         mw.setNum( weight );
         ea = kmolcalc->getEmpFormula() + " :\n" + kmolcalc->getEA();
     } else {
         mw = "???";
-        ea = tr( "ERROR: \n" ) + errors + "\n";
+        ea = tr( "ERROR: \n" ).arg( errors )+ "\n";
     }
     result->setText( mw );
     anal_display->setText( ea );
 }
 
 /**
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 20c2985..98d3bd8 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -40,14 +40,13 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
     QFont bf;
     bf.setBold( true );
     bf.setPointSize( bf.pointSize()+2 );
     middle->setFont( bf );
 
     DataTable = new OxydataTable( 9,2, this );
-    DataTable->setColumnWidth ( 1 , ( parent->width()) );
-    DataTable->setColumnWidth ( 0 , ( parent->width()) );
+    //DataTable->setColumnWidth ( 1 , ( parent->width())-10 );
     setTable();
 
     qgrid->addWidget( hbox,0,0 );
     qgrid->addWidget( DataTable,1,0 );
 }
 
@@ -59,21 +58,21 @@ void OxydataWidget::setElement( int el )
 
     left->setText( configobj.readEntry( "Symbol" ) );
     middle->setText( configobj.readEntry( "Name" ) );
     right->setText( QString::number( el+1 ) );
 
 
-    DataTable->setText( 0,1,( configobj.readEntry( "Weight" ) )+" u" );
+    DataTable->setText( 0,1,tr( "%1 u" ).arg( configobj.readEntry( "Weight" ) ) );
     DataTable->setText( 1,1,configobj.readEntry( "Block" ) );
     DataTable->setText( 2,1,configobj.readEntry( "Group" ) );
-    DataTable->setText( 3,1,( configobj.readEntry( "EN" ) )+" J" );
-    DataTable->setText( 4,1,configobj.readEntry( "AR" )+" nm" ) ;
-    DataTable->setText( 5,1,configobj.readEntry( "IE" )+" J" );
+    DataTable->setText( 3,1,tr( "%1 J").arg( configobj.readEntry( "EN" ) ) );
+    DataTable->setText( 4,1,tr( "%1 nm" ).arg( configobj.readEntry( "AR" ) ) ) ;
+    DataTable->setText( 5,1,tr( "%1 J" ).arg( configobj.readEntry( "IE" ) ) );
     DataTable->setText( 6,1,configobj.readEntry( "Density" ) );
-    DataTable->setText( 7,1,configobj.readEntry( "BP" )+" K" );
-    DataTable->setText( 8,1,configobj.readEntry( "MP" )+" K" );
+    DataTable->setText( 7,1,tr( "%1 K" ).arg( configobj.readEntry( "BP" ) ) );
+    DataTable->setText( 8,1,tr( "%1 K" ).arg( configobj.readEntry( "MP" ) ) );
 }
 
 void OxydataWidget::setTable() const
 {
     DataTable->setText( 0,0, tr( "Weight:" ) );
     DataTable->setText( 1,0, tr( "Block" )) ;
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index 44cc43d..c7afa32 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -36,13 +36,13 @@ dataWidgetUI::dataWidgetUI() : QWidget()
     //read in all names of the 118 elements
     Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File );
     for ( int i = 1 ; i < 119 ; i++ )
     {
         configobj.setGroup( QString::number( i ) );
         QString foo = configobj.readEntry( "Name" );
-        dataCombo->insertItem( foo );
+        dataCombo->insertItem( QString::number( i )+" - "+foo );
     }
     
     OxydataWidget *oxyDW = new OxydataWidget(this);
     connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) );
     oxyDW->setElement( 0 );
 
diff --git a/noncore/apps/oxygen/oxygen.cpp b/noncore/apps/oxygen/oxygen.cpp
index bc99d89..a16bc77 100644
--- a/noncore/apps/oxygen/oxygen.cpp
+++ b/noncore/apps/oxygen/oxygen.cpp
@@ -13,16 +13,13 @@
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 #include "oxygen.h"
 
-#include <qlabel.h>
 #include <qapplication.h>
-#include <qpushbutton.h>
-#include <qvbox.h>
 #include <qtabwidget.h>
 #include "calcdlg.h"
 #include "calcdlgui.h"
 #include "datawidgetui.h"
 #include "psewidget.h"
 
@@ -35,8 +32,8 @@ Oxygen::Oxygen() : QMainWindow()
     this->setCaption( tr( "Oxygen" ) );
     
     QTabWidget *tabw = new QTabWidget( this , "qtab" );
     tabw->addTab( pse, tr( "PSE" ));
     tabw->addTab( DataWidgetUI , tr( "Data" ) );
     tabw->addTab( CalcDlgUI, tr( "Calculations" ) );
-     setCentralWidget( tabw );
+    setCentralWidget( tabw );
 }