adding a nice feature: now the user sees which element he is looking at

3 files changed, 17 insertions, 13 deletions

diff --git a/noncore/apps/oxygen/calcdlg.ui b/noncore/apps/oxygen/calcdlg.ui
index c817a47..51bf334 100644
--- a/noncore/apps/oxygen/calcdlg.ui
+++ b/noncore/apps/oxygen/calcdlg.ui
@@ -1,117 +1,113 @@
 <!DOCTYPE UI><UI>
 <class>CalcDlg</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>CalcDlg</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
             <width>237</width>
             <height>318</height>
         </rect>
     </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Form1</string>
-    </property>
     <widget>
         <class>QTabWidget</class>
         <property stdset="1">
             <name>name</name>
             <cstring>TabWidget3</cstring>
         </property>
         <property stdset="1">
             <name>geometry</name>
             <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>240</width>
                 <height>320</height>
             </rect>
         </property>
         <widget>
             <class>QWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tab</cstring>
             </property>
             <attribute>
                 <name>title</name>
                 <string>Molecular Weight</string>
             </attribute>
             <widget>
                 <class>QLayoutWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Layout6</cstring>
                 </property>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
                         <x>0</x>
                         <y>0</y>
                         <width>230</width>
                         <height>290</height>
                     </rect>
                 </property>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>0</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
                     <widget>
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel2</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Chemical Formula</string>
                         </property>
                     </widget>
                     <widget>
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>formula</cstring>
                         </property>
                     </widget>
                     <widget>
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Layout3</cstring>
                         </property>
                         <hbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>0</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>calculate</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Calculate</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QPushButton</class>
                                 <property stdset="1">
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index d7126b9..d8e4086 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -1,176 +1,182 @@
 /***************************************************************************
    application:             : Oxygen
 
    begin                    : September 2002
    copyright                : ( C ) 2002 by Carsten Niehaus
    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 <qlayout.h>
 #include <qpe/qpeapplication.h>
 #include <qlist.h>
 #include "dataTable.h"
 #include "psewidget.h"
 #include "oxyframe.h"
 
 
 PSEWidget::PSEWidget() : QWidget()
 {
     this->setCaption( tr( "Periodic System" ) );
+        
+        lastElement=1;
 
     QVBoxLayout *vlay = new QVBoxLayout( this );
     
     QGridLayout *grid = new QGridLayout( 18,10 );
     int h=0, v=0;
     
     Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File );
     for( int n = 0 ; n < 109 ; n++ )
     {
         configobj.setGroup( QString::number( n+1 ));
         
         position( n+1,h,v );
         PSEframe.append( new OxyFrame( this , QString::number(n), configobj.readEntry( "Symbol" ) ) );
         grid->addWidget( PSEframe.current() , v/40+1 , h/40 );
         PSEframe.current()->setMinimumHeight( 11 );
         PSEframe.current()->setPalette(  QPalette(  PSEColor( configobj.readEntry( "Block" )  ) ) );
         connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) ));
         connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( inverseColor(QString) ));
     }
     
     oxyDW = new OxydataWidget(this);
     oxyDW->setElement( 0 );
     oxyDW->setLayout();
 
     vlay->addLayout( grid );
     vlay->addWidget( oxyDW );
 }
 
 QColor PSEWidget::PSEColor( QString block )
 {
     QColor c;
     if ( block == "s" ) c.setRgb( 213 , 233 , 231 );
     else if ( block == "d" ) c.setRgb( 200,230,160 );
     else if ( block == "p" ) c.setRgb( 238,146,138 );
     else if ( block == "f" ) c.setRgb( 190 , 190 , 190 );
     return  c;
 };
 
-void PSEWidget::inverseColor( QString number )
+void PSEWidget::inverseColor( QString number)
 {
     Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File );
     configobj.setGroup(  number );
         QString block = configobj.readEntry( "Block" );
-    QColor c;
-    if ( block == "s" ) c.setRgb( 213 , 233 , 231 );
-    else if ( block == "d" ) c.setRgb( 200,230,160 );
-    else if ( block == "p" ) c.setRgb( 238,146,138 );
-    else if ( block == "f" ) c.setRgb( 190 , 190 , 190 );
-        c.dark();
-
-        PSEframe.at( number.toUInt() )->setPalette(  QPalette( c ) );
+    QColor c, d;
+        c = PSEColor( block );
+        d = c.dark();
+        
+        PSEframe.at( number.toUInt() )->setPalette(  QPalette( d ) );
+
+        configobj.setGroup( QString::number( lastElement+1 ) );
+        block = configobj.readEntry( "Block" );
+        c = PSEColor( block );
+        PSEframe.at( lastElement )->setPalette(  QPalette( c ) );
+
+        lastElement=number.toInt();
 }
 
 void PSEWidget::slotShowElement(QString number)
 { 
     oxyDW->setElement( number.toInt() );
 };
 
 void PSEWidget::position(int n, int& h, int& v)
 {
     //Hydrogen
     if (n == 1)
     {
         h=0; v=0;
     }
 
 
     //Helium
     if (n == 2)
     {
         h=680; v=0;
     }
 
 
     //Lithium
     if (n == 3)
     {
         h=0; v=40;
     }
 
 
     //Beryllium
     if (n == 4)
     {
         h=40; v=40;
     }
 
 
     //Boron-->Neon or Aluminum --> Argon
     if ((n >= 5 && n <= 10) || (n >= 13 && n <= 18))
         for (int i = 1; i <= (6-(10-n)); i++)
         {
             h=((i*40)+440);
             v = 40;
             if (n >= 13)
             {
                     v=80;
                 h=(h-320);
             }
         }
 
 
     //Sodium
     if (n == 11)
     {
         h=0; v=80;
     }
 
 
     //Magnesium
     if (n == 12)
     {
         h=40; v=80;
     }
 
 
     //Potassium --> Uuo without La and Ac
     if ((n >= 19 && n <= 56) || (n >= 72 && n <= 88) || n >= 104)
         for (int i = 1; i <= 18; i++)
         {
             int f = n;
             if (n > 18)
                     f = n-18;
             if (n > 36)
                     f = n-36;
             if (n > 54)
                     f = n-54;
             if (n > 71)
                     f = n-68;
             if (n > 86)
                     f = n-86;
             if (n > 103)
                     f = n-100;
 
             h=((f*40)-40);
 
             v = 120;
             if (n >= 37)
                     v=160;
             if (n >= 55)
                     v=200;
             if (n >= 87)
                     v=240;
         }
 
 
     //Lanthanum --> Lutetium and Actinum --> Lawrencium
diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h
index cfb629d..ddeab9d 100644
--- a/noncore/apps/oxygen/psewidget.h
+++ b/noncore/apps/oxygen/psewidget.h
@@ -1,51 +1,53 @@
 /***************************************************************************
    application:             : Oxygen
 
    begin                    : September 2002
    copyright                : ( C ) 2002 by Carsten Niehaus
    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.                                   *
  *                                                                         *
  **************************************************************************/
 #ifndef _PSEWIDGET_H
 #define _PSEWIDGET_H
 
 #include <qwidget.h>
 #include <qlist.h>
 #include "oxyframe.h"
 
 class QGridLayout;
 class OxydataWidget;
 class PSEframe;
 
 class PSEWidget : public QWidget
 {
         Q_OBJECT
         
     public:
                 PSEWidget();
         QGridLayout *bottom_grid;
         OxydataWidget *oxyDW;
 
         QList<OxyFrame> PSEframe;
 
+                int lastElement;
+
     private:
         QGridLayout *maingrid;
         
         void position( int, int&, int& );
         QColor PSEColor( QString );
 
     public slots:
         void slotShowElement(QString);
                 void inverseColor( QString );
 
 };
 
 #endif