From 26c4a68e5e7e68e6fba70b4abe1290d23c2d7410 Mon Sep 17 00:00:00 2001
From: cniehaus <cniehaus>
Date: Mon, 23 Sep 2002 11:16:29 +0000
Subject: i18n-stuff + removed some headers

---
(limited to 'noncore/apps/oxygen')

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
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>245</width>
+            <width>241</width>
             <height>318</height>
         </rect>
     </property>
@@ -42,7 +42,7 @@
             </property>
             <attribute>
                 <name>title</name>
-                <string>Tab 1</string>
+                <string>Molecular Weight</string>
             </attribute>
             <widget>
                 <class>QLayoutWidget</class>
@@ -76,7 +76,7 @@
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>TextLabel2</string>
+                            <string>chemical Formula</string>
                         </property>
                     </widget>
                     <widget>
@@ -109,7 +109,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>PushButton3</string>
+                                    <string>Calculate</string>
                                 </property>
                             </widget>
                             <widget>
@@ -120,7 +120,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>PushButton4</string>
+                                    <string>Clear</string>
                                 </property>
                             </widget>
                         </hbox>
@@ -133,7 +133,7 @@
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>TextLabel3</string>
+                            <string>Molecular Weight (u):</string>
                         </property>
                     </widget>
                     <widget>
@@ -151,7 +151,7 @@
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>TextLabel1</string>
+                            <string>Elemental Composition (%):</string>
                         </property>
                     </widget>
                     <widget>
@@ -160,21 +160,14 @@
                             <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
@@ -45,7 +45,7 @@ void calcDlgUI::calc()
         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
@@ -43,8 +43,7 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
     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 );
@@ -62,15 +61,15 @@ void OxydataWidget::setElement( int el )
     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
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
@@ -39,7 +39,7 @@ dataWidgetUI::dataWidgetUI() : QWidget()
     {
         configobj.setGroup( QString::number( i ) );
         QString foo = configobj.readEntry( "Name" );
-        dataCombo->insertItem( foo );
+        dataCombo->insertItem( QString::number( i )+" - "+foo );
     }
     
     OxydataWidget *oxyDW = new OxydataWidget(this);
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
@@ -16,10 +16,7 @@
  **************************************************************************/
 #include "oxygen.h"
 
-#include <qlabel.h>
 #include <qapplication.h>
-#include <qpushbutton.h>
-#include <qvbox.h>
 #include <qtabwidget.h>
 #include "calcdlg.h"
 #include "calcdlgui.h"
@@ -38,5 +35,5 @@ Oxygen::Oxygen() : QMainWindow()
     tabw->addTab( pse, tr( "PSE" ));
     tabw->addTab( DataWidgetUI , tr( "Data" ) );
     tabw->addTab( CalcDlgUI, tr( "Calculations" ) );
-     setCentralWidget( tabw );
+    setCentralWidget( tabw );
 }
--
cgit v0.9.0.2