summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/dataTable.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index e027c16..20c2985 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -30,61 +30,60 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
QGridLayout *qgrid = new QGridLayout( this, 2,1 );
QHBox *hbox = new QHBox( this );
left = new QLabel( hbox );
middle = new QLabel( hbox );
right = new QLabel( hbox );
right->setAlignment( AlignRight );
middle->setAlignment( AlignHCenter );
QFont bf;
bf.setBold( true );
bf.setPointSize( bf.pointSize()+2 );
middle->setFont( bf );
DataTable = new OxydataTable( 9,2, this );
-// DataTable->setColumnWidth ( 1 , 118 );
-// DataTable->setColumnWidth ( 0 , 118 );
+ DataTable->setColumnWidth ( 1 , ( parent->width()) );
+ DataTable->setColumnWidth ( 0 , ( parent->width()) );
setTable();
qgrid->addWidget( hbox,0,0 );
qgrid->addWidget( DataTable,1,0 );
}
void OxydataWidget::setElement( int el )
{
Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File );
configobj.setGroup( QString::number( el+1 ));
left->setText( configobj.readEntry( "Symbol" ) );
middle->setText( configobj.readEntry( "Name" ) );
right->setText( QString::number( el+1 ) );
- DataTable->setText( 0,1,configobj.readEntry( "Weight" ) );
+ DataTable->setText( 0,1,( configobj.readEntry( "Weight" ) )+" u" );
DataTable->setText( 1,1,configobj.readEntry( "Block" ) );
DataTable->setText( 2,1,configobj.readEntry( "Group" ) );
- DataTable->setText( 3,1,configobj.readEntry( "EN" ) );
- DataTable->setText( 4,1,configobj.readEntry( "AR" ) ) ;
- DataTable->setText( 5,1,configobj.readEntry( "IE" ) );
+ 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( 6,1,configobj.readEntry( "Density" ) );
- DataTable->setText( 7,1,configobj.readEntry( "BP" ) );
- DataTable->setText( 8,1,configobj.readEntry( "MP" ) );
-
+ DataTable->setText( 7,1,configobj.readEntry( "BP" )+" K" );
+ DataTable->setText( 8,1,configobj.readEntry( "MP" )+" K" );
}
void OxydataWidget::setTable() const
{
DataTable->setText( 0,0, tr( "Weight:" ) );
DataTable->setText( 1,0, tr( "Block" )) ;
DataTable->setText( 2,0, tr( "Group" )) ;
DataTable->setText( 3,0, tr( "Electronegativity" )) ;
DataTable->setText( 4,0, tr( "Atomic radius" )) ;
DataTable->setText( 5,0, tr( "Ionizationenergie" )) ;
DataTable->setText( 6,0, tr( "Density" )) ;
DataTable->setText( 7,0, tr( "Boilingpoint" ) );
DataTable->setText( 8,0, tr( "Meltingpoint" ) );
}