summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2002-12-27 11:41:02 (UTC)
committer cniehaus <cniehaus>2002-12-27 11:41:02 (UTC)
commit497a1cbad9b685ba7e08720d4337589dc6b9fbd2 (patch) (side-by-side diff)
tree4010d09dfce1c17d2902b8e2bb99d000e2db98b5
parent3e797c54cfe1573ae80c8f60ea981685333643e3 (diff)
downloadopie-497a1cbad9b685ba7e08720d4337589dc6b9fbd2.zip
opie-497a1cbad9b685ba7e08720d4337589dc6b9fbd2.tar.gz
opie-497a1cbad9b685ba7e08720d4337589dc6b9fbd2.tar.bz2
finally found that stupid bug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/dataTable.cpp8
-rw-r--r--noncore/apps/oxygen/datawidgetui.cpp3
2 files changed, 4 insertions, 7 deletions
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 951788b..46eaeba 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -6,79 +6,75 @@
email : cniehaus@handhelds.org
**************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* ( at your option ) any later version. *
* *
**************************************************************************/
#include <qpe/config.h>
#include "dataTable.h"
#include <qwidget.h>
#include <qhbox.h>
#include <qlabel.h>
#include <qfont.h>
#include <qlayout.h>
#include <qpe/qpeapplication.h>
#include <qstringlist.h>
-OxydataWidget::OxydataWidget(QWidget *parent, const char *name, const QStringList &list ) : QWidget( parent,name )
+OxydataWidget::OxydataWidget(QWidget *parent, const char *name, const QStringList &list ) : QWidget( parent,name ), names( list )
{
- names = list;
- QStringList::ConstIterator it = names.at(10);
- qDebug( *it );
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 );
setTable();
qgrid->addWidget( hbox,0,0 );
qgrid->addWidget( DataTable,1,0 );
}
void OxydataWidget::setElement( int el )
{
- QStringList::ConstIterator it = names.at(el+1);
- qDebug( *it );
+ QStringList::ConstIterator it = names.at(el);
Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File );
configobj.setGroup( QString::number( el+1 ));
left->setText( configobj.readEntry( "Symbol" ) );
middle->setText( *it );
right->setText( QString::number( el+1 ) );
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" ) );
DataTable->setText( 4,1,tr( "%1 pm" ).arg( configobj.readEntry( "AR" ) ) ) ;
DataTable->setText( 5,1,tr( "%1 J" ).arg( configobj.readEntry( "IE" ) ) );
DataTable->setText( 6,1,tr( "%1 g/cm^3" ).arg( configobj.readEntry( "Density" ) ) );
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 e28ee4d..91d669f 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -22,60 +22,61 @@
#include <qstring.h>
#include <qcombobox.h>
#include <qlayout.h>
#include <qhbox.h>
#include <qlabel.h>
#include <qpe/qpeapplication.h>
dataWidgetUI::dataWidgetUI() : QWidget()
{
names = 0;
loadNames();
this->setCaption( tr( "Chemical Data" ));
QGridLayout *qgrid = new QGridLayout( this, 2,1 );
dataCombo = new QComboBox( this );
//read in all names of the 118 elements
int i = 0;
for ( QStringList::ConstIterator it = names.begin() ; it != names.end() ; ++it,i++)
{
dataCombo->insertItem( QString::number( i+1 )+" - "+*it );
}
-
+ QStringList::ConstIterator it = names.begin();
OxydataWidget *oxyDW = new OxydataWidget(this, "OxydataWidget_oxyDW", names);
connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) );
oxyDW->setElement( 0 );
oxyDW->setLayout();
qgrid->addWidget( dataCombo, 0,0);
qgrid->addWidget( oxyDW , 1,0 );
}
void dataWidgetUI::loadNames()
{
+ names.clear();
names.append( tr("Hydrogen") );
names.append( tr("Helium") );
names.append( tr("Lithium") );
names.append( tr("Beryllium") );
names.append( tr("Boron") );
names.append( tr("Carbon") );
names.append( tr("Nitrogen") );
names.append( tr("Oxygen") );
names.append( tr("Fluorine") );
names.append( tr("Neon") );
names.append( tr("Sodium") );
names.append( tr("Magnesium") );
names.append( tr("Aluminum") );
names.append( tr("Silicon") );
names.append( tr("Phosphorus") );
names.append( tr("Sulfur") );
names.append( tr("Chlorine") );
names.append( tr("Argon") );
names.append( tr("Potassium") );
names.append( tr("Calcium") );
names.append( tr("Scandium") );
names.append( tr("Titanium") );
names.append( tr("Vanadium") );
names.append( tr("Chromium") );