summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2002-12-27 11:12:37 (UTC)
committer cniehaus <cniehaus>2002-12-27 11:12:37 (UTC)
commit5e10bb67a740fdbe5744cd2a780a833fafd5c0e5 (patch) (side-by-side diff)
tree4d70f5a524fbe136c67585ac7b8550962af35503
parent6ca8a429b121dbbdbbfbde453cd2cd1412315aa8 (diff)
downloadopie-5e10bb67a740fdbe5744cd2a780a833fafd5c0e5.zip
opie-5e10bb67a740fdbe5744cd2a780a833fafd5c0e5.tar.gz
opie-5e10bb67a740fdbe5744cd2a780a833fafd5c0e5.tar.bz2
go mickeyl go
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/oxygen/dataTable.cpp9
-rw-r--r--noncore/apps/oxygen/dataTable.h5
-rw-r--r--noncore/apps/oxygen/datawidgetui.cpp223
-rw-r--r--noncore/apps/oxygen/datawidgetui.h2
4 files changed, 123 insertions, 116 deletions
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 661eb5a..951788b 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -27,8 +27,11 @@
#include <qstringlist.h>
-OxydataWidget::OxydataWidget(QWidget *parent, const char *name, QStringList *list ) : QWidget( parent,name )
+OxydataWidget::OxydataWidget(QWidget *parent, const char *name, const QStringList &list ) : QWidget( parent,name )
{
+ names = list;
+ QStringList::ConstIterator it = names.at(10);
+ qDebug( *it );
QGridLayout *qgrid = new QGridLayout( this, 2,1 );
QHBox *hbox = new QHBox( this );
@@ -53,12 +56,14 @@ OxydataWidget::OxydataWidget(QWidget *parent, const char *name, QStringList *lis
void OxydataWidget::setElement( int el )
{
+ QStringList::ConstIterator it = names.at(el+1);
+ qDebug( *it );
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" ) );
+ middle->setText( *it );
right->setText( QString::number( el+1 ) );
diff --git a/noncore/apps/oxygen/dataTable.h b/noncore/apps/oxygen/dataTable.h
index a8c9b6e..8be78a9 100644
--- a/noncore/apps/oxygen/dataTable.h
+++ b/noncore/apps/oxygen/dataTable.h
@@ -16,7 +16,7 @@
class QLabel;
class OxydataTable;
-//class QStringList;
+class QStringList;
/*
* A OxydataWidget shows all known data of an element. It can
@@ -32,10 +32,11 @@ class OxydataWidget : public QWidget
Q_OBJECT
public:
- OxydataWidget(QWidget *parent=0, const char *name=0, QStringList *list =0 );
+ OxydataWidget(QWidget *parent=0, const char *name=0, const QStringList &list =0 );
QLabel *left, *middle, *right;
void setLayout();
+ QStringList names;
private:
void setTable() const;
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index 68c025f..e28ee4d 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -28,7 +28,8 @@
dataWidgetUI::dataWidgetUI() : QWidget()
{
- names = new QStringList();
+
+ names = 0;
loadNames();
this->setCaption( tr( "Chemical Data" ));
@@ -38,7 +39,7 @@ dataWidgetUI::dataWidgetUI() : QWidget()
//read in all names of the 118 elements
int i = 0;
- for ( QStringList::Iterator it = names->begin() ; it != names->end() ; ++it,i++)
+ for ( QStringList::ConstIterator it = names.begin() ; it != names.end() ; ++it,i++)
{
dataCombo->insertItem( QString::number( i+1 )+" - "+*it );
}
@@ -54,114 +55,114 @@ dataWidgetUI::dataWidgetUI() : QWidget()
void dataWidgetUI::loadNames()
{
- 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") );
- names->append( tr("Manganese") );
- names->append( tr("Iron") );
- names->append( tr("Cobalt") );
- names->append( tr("Nickel") );
- names->append( tr("Copper") );
- names->append( tr("Zinc") );
- names->append( tr("Gallium") );
- names->append( tr("Germanium") );
- names->append( tr("Arsenic") );
- names->append( tr("Selenium") );
- names->append( tr("Bromine") );
- names->append( tr("Krypton") );
- names->append( tr("Rubidium") );
- names->append( tr("Strontium") );
- names->append( tr("Yttrium") );
- names->append( tr("Zirconium") );
- names->append( tr("Niobium") );
- names->append( tr("Molybdenum") );
- names->append( tr("Technetium") );
- names->append( tr("Ruthenium") );
- names->append( tr("Rhodium") );
- names->append( tr("Palladium") );
- names->append( tr("Silver") );
- names->append( tr("Cadmium") );
- names->append( tr("Indium") );
- names->append( tr("Tin") );
- names->append( tr("Antimony") );
- names->append( tr("Tellurium") );
- names->append( tr("Iodine") );
- names->append( tr("Xenon") );
- names->append( tr("Cesium") );
- names->append( tr("Barium") );
- names->append( tr("Lanthanum") );
- names->append( tr("Cerium") );
- names->append( tr("Praseodymium") );
- names->append( tr("Neodymium") );
- names->append( tr("Promethium") );
- names->append( tr("Samarium") );
- names->append( tr("Europium") );
- names->append( tr("Gadolinium") );
- names->append( tr("Terbium") );
- names->append( tr("Dysprosium") );
- names->append( tr("Holmium") );
- names->append( tr("Erbium") );
- names->append( tr("Thulium") );
- names->append( tr("Ytterbium") );
- names->append( tr("Lutetium") );
- names->append( tr("Hafnium") );
- names->append( tr("Tantalum") );
- names->append( tr("Tungsten") );
- names->append( tr("Rhenium") );
- names->append( tr("Osmium") );
- names->append( tr("Iridium") );
- names->append( tr("Platinum") );
- names->append( tr("Gold") );
- names->append( tr("Mercury") );
- names->append( tr("Thallium") );
- names->append( tr("Lead") );
- names->append( tr("Bismuth") );
- names->append( tr("Polonium") );
- names->append( tr("Astatine") );
- names->append( tr("Radon") );
- names->append( tr("Francium") );
- names->append( tr("Radium") );
- names->append( tr("Actinium") );
- names->append( tr("Thorium") );
- names->append( tr("Protactinium") );
- names->append( tr("Uranium") );
- names->append( tr("Neptunium") );
- names->append( tr("Plutonium") );
- names->append( tr("Americium") );
- names->append( tr("Curium") );
- names->append( tr("Berkelium") );
- names->append( tr("Californium") );
- names->append( tr("Einsteinium") );
- names->append( tr("Fermium") );
- names->append( tr("Mendelevium") );
- names->append( tr("Nobelium") );
- names->append( tr("Lawrencium") );
- names->append( tr("Rutherfordium") );
- names->append( tr("Dubnium") );
- names->append( tr("Seaborgium") );
- names->append( tr("Bohrium") );
- names->append( tr("Hassium") );
- names->append( tr("Meitnerium") );
+ 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") );
+ names.append( tr("Manganese") );
+ names.append( tr("Iron") );
+ names.append( tr("Cobalt") );
+ names.append( tr("Nickel") );
+ names.append( tr("Copper") );
+ names.append( tr("Zinc") );
+ names.append( tr("Gallium") );
+ names.append( tr("Germanium") );
+ names.append( tr("Arsenic") );
+ names.append( tr("Selenium") );
+ names.append( tr("Bromine") );
+ names.append( tr("Krypton") );
+ names.append( tr("Rubidium") );
+ names.append( tr("Strontium") );
+ names.append( tr("Yttrium") );
+ names.append( tr("Zirconium") );
+ names.append( tr("Niobium") );
+ names.append( tr("Molybdenum") );
+ names.append( tr("Technetium") );
+ names.append( tr("Ruthenium") );
+ names.append( tr("Rhodium") );
+ names.append( tr("Palladium") );
+ names.append( tr("Silver") );
+ names.append( tr("Cadmium") );
+ names.append( tr("Indium") );
+ names.append( tr("Tin") );
+ names.append( tr("Antimony") );
+ names.append( tr("Tellurium") );
+ names.append( tr("Iodine") );
+ names.append( tr("Xenon") );
+ names.append( tr("Cesium") );
+ names.append( tr("Barium") );
+ names.append( tr("Lanthanum") );
+ names.append( tr("Cerium") );
+ names.append( tr("Praseodymium") );
+ names.append( tr("Neodymium") );
+ names.append( tr("Promethium") );
+ names.append( tr("Samarium") );
+ names.append( tr("Europium") );
+ names.append( tr("Gadolinium") );
+ names.append( tr("Terbium") );
+ names.append( tr("Dysprosium") );
+ names.append( tr("Holmium") );
+ names.append( tr("Erbium") );
+ names.append( tr("Thulium") );
+ names.append( tr("Ytterbium") );
+ names.append( tr("Lutetium") );
+ names.append( tr("Hafnium") );
+ names.append( tr("Tantalum") );
+ names.append( tr("Tungsten") );
+ names.append( tr("Rhenium") );
+ names.append( tr("Osmium") );
+ names.append( tr("Iridium") );
+ names.append( tr("Platinum") );
+ names.append( tr("Gold") );
+ names.append( tr("Mercury") );
+ names.append( tr("Thallium") );
+ names.append( tr("Lead") );
+ names.append( tr("Bismuth") );
+ names.append( tr("Polonium") );
+ names.append( tr("Astatine") );
+ names.append( tr("Radon") );
+ names.append( tr("Francium") );
+ names.append( tr("Radium") );
+ names.append( tr("Actinium") );
+ names.append( tr("Thorium") );
+ names.append( tr("Protactinium") );
+ names.append( tr("Uranium") );
+ names.append( tr("Neptunium") );
+ names.append( tr("Plutonium") );
+ names.append( tr("Americium") );
+ names.append( tr("Curium") );
+ names.append( tr("Berkelium") );
+ names.append( tr("Californium") );
+ names.append( tr("Einsteinium") );
+ names.append( tr("Fermium") );
+ names.append( tr("Mendelevium") );
+ names.append( tr("Nobelium") );
+ names.append( tr("Lawrencium") );
+ names.append( tr("Rutherfordium") );
+ names.append( tr("Dubnium") );
+ names.append( tr("Seaborgium") );
+ names.append( tr("Bohrium") );
+ names.append( tr("Hassium") );
+ names.append( tr("Meitnerium") );
}
diff --git a/noncore/apps/oxygen/datawidgetui.h b/noncore/apps/oxygen/datawidgetui.h
index 154f4be..a2b48fa 100644
--- a/noncore/apps/oxygen/datawidgetui.h
+++ b/noncore/apps/oxygen/datawidgetui.h
@@ -34,7 +34,7 @@ class dataWidgetUI : public QWidget
public:
dataWidgetUI();
- QStringList *names;
+ QStringList names;
private:
OxydataTable *DataTable;