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
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>245</width>
+            <width>241</width>
             <height>318</height>
@@ -44,3 +44,3 @@
                 <name>title</name>
-                <string>Tab 1</string>
+                <string>Molecular Weight</string>
             </attribute>
@@ -78,3 +78,3 @@
                             <name>text</name>
-                            <string>TextLabel2</string>
+                            <string>chemical Formula</string>
                         </property>
@@ -111,3 +111,3 @@
                                     <name>text</name>
-                                    <string>PushButton3</string>
+                                    <string>Calculate</string>
                                 </property>
@@ -122,3 +122,3 @@
                                     <name>text</name>
-                                    <string>PushButton4</string>
+                                    <string>Clear</string>
                                 </property>
@@ -135,3 +135,3 @@
                             <name>text</name>
-                            <string>TextLabel3</string>
+                            <string>Molecular Weight (u):</string>
                         </property>
@@ -153,3 +153,3 @@
                             <name>text</name>
-                            <string>TextLabel1</string>
+                            <string>Elemental Composition (%):</string>
                         </property>
@@ -162,2 +162,6 @@
                         </property>
+                        <property stdset="1">
+                            <name>readOnly</name>
+                            <bool>true</bool>
+                        </property>
                     </widget>
@@ -166,13 +170,2 @@
         </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>
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
@@ -47,3 +47,3 @@ void calcDlgUI::calc()
         mw = "???";
-        ea = tr( "ERROR: \n" ) + errors + "\n";
+        ea = tr( "ERROR: \n" ).arg( errors )+ "\n";
     }
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
@@ -45,4 +45,3 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
     DataTable = new OxydataTable( 9,2, this );
-    DataTable->setColumnWidth ( 1 , ( parent->width()) );
-    DataTable->setColumnWidth ( 0 , ( parent->width()) );
+    //DataTable->setColumnWidth ( 1 , ( parent->width())-10 );
     setTable();
@@ -64,11 +63,11 @@ void OxydataWidget::setElement( int el )
 
-    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" ) ) );
 }
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
@@ -41,3 +41,3 @@ dataWidgetUI::dataWidgetUI() : QWidget()
         QString foo = configobj.readEntry( "Name" );
-        dataCombo->insertItem( foo );
+        dataCombo->insertItem( QString::number( i )+" - "+foo );
     }
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
@@ -18,6 +18,3 @@
 
-#include <qlabel.h>
 #include <qapplication.h>
-#include <qpushbutton.h>
-#include <qvbox.h>
 #include <qtabwidget.h>
@@ -40,3 +37,3 @@ Oxygen::Oxygen() : QMainWindow()
     tabw->addTab( CalcDlgUI, tr( "Calculations" ) );
-     setCentralWidget( tabw );
+    setCentralWidget( tabw );
 }