7 files changed, 132 insertions, 128 deletions

diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index 91d669f..e1d6e41 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -26,11 +26,9 @@
 #include <qlabel.h>
 #include <qpe/qpeapplication.h>
 
-dataWidgetUI::dataWidgetUI() : QWidget()
+dataWidgetUI::dataWidgetUI(const QStringList &list) : QWidget()
 {
-
-        names = 0;
-    loadNames();
+        names = list;
         
         this->setCaption( tr( "Chemical Data" ));
     QGridLayout *qgrid = new QGridLayout( this, 2,1 );
@@ -43,7 +41,6 @@ dataWidgetUI::dataWidgetUI() : QWidget()
     {
         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 );
@@ -53,117 +50,4 @@ dataWidgetUI::dataWidgetUI() : QWidget()
     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") );
-        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 a2b48fa..3797418 100644
--- a/noncore/apps/oxygen/datawidgetui.h
+++ b/noncore/apps/oxygen/datawidgetui.h
@@ -33,14 +33,12 @@ class dataWidgetUI : public QWidget
         Q_OBJECT
         
     public:
-                dataWidgetUI();
-                QStringList names;
+                dataWidgetUI(const QStringList &list=0);
 
     private:
         OxydataTable *DataTable;
         QComboBox *dataCombo;
         OxydataWidget *oxyDW;
-
-                void loadNames();
+                QStringList names;
 };
 #endif
diff --git a/noncore/apps/oxygen/oxyframe.cpp b/noncore/apps/oxygen/oxyframe.cpp
index 2ce40e7..5a4dbbe 100644
--- a/noncore/apps/oxygen/oxyframe.cpp
+++ b/noncore/apps/oxygen/oxyframe.cpp
@@ -36,6 +36,6 @@ OxyFrame::OxyFrame(QWidget *parent, const char *name, QString symbol )
     setText( symbol );
 }
 
-void OxyFrame::mousePressEvent (  QMouseEvent * e ){
+void OxyFrame::mousePressEvent (  QMouseEvent* /*e*/ ){
     emit num( N );
 };
diff --git a/noncore/apps/oxygen/oxygen.cpp b/noncore/apps/oxygen/oxygen.cpp
index 22d1833..215cc19 100644
--- a/noncore/apps/oxygen/oxygen.cpp
+++ b/noncore/apps/oxygen/oxygen.cpp
@@ -27,9 +27,10 @@
 
 Oxygen::Oxygen() : QMainWindow()
 {
-    PSEWidget *pse = new PSEWidget();
+    loadNames();
     calcDlgUI *CalcDlgUI = new calcDlgUI();
-    dataWidgetUI *DataWidgetUI = new dataWidgetUI();
+    PSEWidget *pse = new PSEWidget(names);
+    dataWidgetUI *DataWidgetUI = new dataWidgetUI(names);
     
     this->setCaption( tr( "Oxygen" ) );
     
@@ -40,3 +41,117 @@ Oxygen::Oxygen() : QMainWindow()
     setCentralWidget( tabw );
 }
 
+void Oxygen::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") );
+        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/oxygen.h b/noncore/apps/oxygen/oxygen.h
index 36ee9bc..57fe9fe 100644
--- a/noncore/apps/oxygen/oxygen.h
+++ b/noncore/apps/oxygen/oxygen.h
@@ -7,6 +7,8 @@
  *                                                                         *
  **************************************************************************/
 
+class QStringList;
+
 #include <qmainwindow.h>
 
 class Oxygen : public QMainWindow
@@ -18,4 +20,5 @@ class Oxygen : public QMainWindow
 
         private:
                 void loadNames();
+                QStringList names;
 };
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index d8e4086..b396046 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -24,11 +24,12 @@
 #include "oxyframe.h"
 
 
-PSEWidget::PSEWidget() : QWidget()
+PSEWidget::PSEWidget(const QStringList &list) : QWidget()
 {
     this->setCaption( tr( "Periodic System" ) );
         
         lastElement=1;
+        names = list;
 
     QVBoxLayout *vlay = new QVBoxLayout( this );
     
@@ -49,7 +50,7 @@ PSEWidget::PSEWidget() : QWidget()
         connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( inverseColor(QString) ));
     }
     
-    oxyDW = new OxydataWidget(this);
+    oxyDW = new OxydataWidget(this, "PSEWidget_oxyDW", names);
     oxyDW->setElement( 0 );
     oxyDW->setLayout();
 
diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h
index ddeab9d..42a2e38 100644
--- a/noncore/apps/oxygen/psewidget.h
+++ b/noncore/apps/oxygen/psewidget.h
@@ -22,6 +22,8 @@
 #include "oxyframe.h"
 
 class QGridLayout;
+class QStringList;
+
 class OxydataWidget;
 class PSEframe;
 
@@ -30,7 +32,7 @@ class PSEWidget : public QWidget
         Q_OBJECT
         
     public:
-                PSEWidget();
+                PSEWidget(const QStringList &list=0);
         QGridLayout *bottom_grid;
         OxydataWidget *oxyDW;
 
@@ -43,6 +45,7 @@ class PSEWidget : public QWidget
         
         void position( int, int&, int& );
         QColor PSEColor( QString );
+                QStringList names;
 
     public slots:
         void slotShowElement(QString);