summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/calcdlg.ui29
-rw-r--r--noncore/apps/oxygen/calcdlgui.cpp2
-rw-r--r--noncore/apps/oxygen/dataTable.cpp15
-rw-r--r--noncore/apps/oxygen/datawidgetui.cpp2
-rw-r--r--noncore/apps/oxygen/oxygen.cpp5
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 @@
13 <y>0</y> 13 <y>0</y>
14 <width>245</width> 14 <width>241</width>
15 <height>318</height> 15 <height>318</height>
@@ -44,3 +44,3 @@
44 <name>title</name> 44 <name>title</name>
45 <string>Tab 1</string> 45 <string>Molecular Weight</string>
46 </attribute> 46 </attribute>
@@ -78,3 +78,3 @@
78 <name>text</name> 78 <name>text</name>
79 <string>TextLabel2</string> 79 <string>chemical Formula</string>
80 </property> 80 </property>
@@ -111,3 +111,3 @@
111 <name>text</name> 111 <name>text</name>
112 <string>PushButton3</string> 112 <string>Calculate</string>
113 </property> 113 </property>
@@ -122,3 +122,3 @@
122 <name>text</name> 122 <name>text</name>
123 <string>PushButton4</string> 123 <string>Clear</string>
124 </property> 124 </property>
@@ -135,3 +135,3 @@
135 <name>text</name> 135 <name>text</name>
136 <string>TextLabel3</string> 136 <string>Molecular Weight (u):</string>
137 </property> 137 </property>
@@ -153,3 +153,3 @@
153 <name>text</name> 153 <name>text</name>
154 <string>TextLabel1</string> 154 <string>Elemental Composition (%):</string>
155 </property> 155 </property>
@@ -162,2 +162,6 @@
162 </property> 162 </property>
163 <property stdset="1">
164 <name>readOnly</name>
165 <bool>true</bool>
166 </property>
163 </widget> 167 </widget>
@@ -166,13 +170,2 @@
166 </widget> 170 </widget>
167 <widget>
168 <class>QWidget</class>
169 <property stdset="1">
170 <name>name</name>
171 <cstring>tab</cstring>
172 </property>
173 <attribute>
174 <name>title</name>
175 <string>Tab 2</string>
176 </attribute>
177 </widget>
178 </widget> 171 </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()
47 mw = "???"; 47 mw = "???";
48 ea = tr( "ERROR: \n" ) + errors + "\n"; 48 ea = tr( "ERROR: \n" ).arg( errors )+ "\n";
49 } 49 }
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)
45 DataTable = new OxydataTable( 9,2, this ); 45 DataTable = new OxydataTable( 9,2, this );
46 DataTable->setColumnWidth ( 1 , ( parent->width()) ); 46 //DataTable->setColumnWidth ( 1 , ( parent->width())-10 );
47 DataTable->setColumnWidth ( 0 , ( parent->width()) );
48 setTable(); 47 setTable();
@@ -64,11 +63,11 @@ void OxydataWidget::setElement( int el )
64 63
65 DataTable->setText( 0,1,( configobj.readEntry( "Weight" ) )+" u" ); 64 DataTable->setText( 0,1,tr( "%1 u" ).arg( configobj.readEntry( "Weight" ) ) );
66 DataTable->setText( 1,1,configobj.readEntry( "Block" ) ); 65 DataTable->setText( 1,1,configobj.readEntry( "Block" ) );
67 DataTable->setText( 2,1,configobj.readEntry( "Group" ) ); 66 DataTable->setText( 2,1,configobj.readEntry( "Group" ) );
68 DataTable->setText( 3,1,( configobj.readEntry( "EN" ) )+" J" ); 67 DataTable->setText( 3,1,tr( "%1 J").arg( configobj.readEntry( "EN" ) ) );
69 DataTable->setText( 4,1,configobj.readEntry( "AR" )+" nm" ) ; 68 DataTable->setText( 4,1,tr( "%1 nm" ).arg( configobj.readEntry( "AR" ) ) ) ;
70 DataTable->setText( 5,1,configobj.readEntry( "IE" )+" J" ); 69 DataTable->setText( 5,1,tr( "%1 J" ).arg( configobj.readEntry( "IE" ) ) );
71 DataTable->setText( 6,1,configobj.readEntry( "Density" ) ); 70 DataTable->setText( 6,1,configobj.readEntry( "Density" ) );
72 DataTable->setText( 7,1,configobj.readEntry( "BP" )+" K" ); 71 DataTable->setText( 7,1,tr( "%1 K" ).arg( configobj.readEntry( "BP" ) ) );
73 DataTable->setText( 8,1,configobj.readEntry( "MP" )+" K" ); 72 DataTable->setText( 8,1,tr( "%1 K" ).arg( configobj.readEntry( "MP" ) ) );
74} 73}
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()
41 QString foo = configobj.readEntry( "Name" ); 41 QString foo = configobj.readEntry( "Name" );
42 dataCombo->insertItem( foo ); 42 dataCombo->insertItem( QString::number( i )+" - "+foo );
43 } 43 }
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 @@
18 18
19#include <qlabel.h>
20#include <qapplication.h> 19#include <qapplication.h>
21#include <qpushbutton.h>
22#include <qvbox.h>
23#include <qtabwidget.h> 20#include <qtabwidget.h>
@@ -40,3 +37,3 @@ Oxygen::Oxygen() : QMainWindow()
40 tabw->addTab( CalcDlgUI, tr( "Calculations" ) ); 37 tabw->addTab( CalcDlgUI, tr( "Calculations" ) );
41 setCentralWidget( tabw ); 38 setCentralWidget( tabw );
42} 39}