wow, this works now :)) Elemental: ich hab' dich!

4 files changed, 26 insertions, 3 deletions

diff --git a/noncore/apps/oxygen/oxyframe.cpp b/noncore/apps/oxygen/oxyframe.cpp
index a7833be..d459d2b 100644
--- a/noncore/apps/oxygen/oxyframe.cpp
+++ b/noncore/apps/oxygen/oxyframe.cpp
@@ -1,21 +1,24 @@
 /***************************************************************************
  *                                                                         *
  * 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 "oxygen.h"
 
 #include <qpe/config.h>
 #include "oxyframe.h"
 
 OxyFrame::OxyFrame(QWidget *parent, const char *name) : QFrame(parent,name)
 {
     this->setFrameStyle( QFrame::Panel );
     this->setLineWidth( 2 );
     this->setFrameShadow( QFrame::Raised );
     this->setBackgroundColor( QColor( cyan ) );
 }
 
+void OxyFrame::mousePressEvent (  QMouseEvent * e ){
+    emit clicked();
+};
diff --git a/noncore/apps/oxygen/oxyframe.h b/noncore/apps/oxygen/oxyframe.h
index 9c7dab5..6ff9e27 100644
--- a/noncore/apps/oxygen/oxyframe.h
+++ b/noncore/apps/oxygen/oxyframe.h
@@ -1,24 +1,29 @@
 
 /***************************************************************************
  *                                                                         *
  * 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 _OXYFRAME_H
 #define _OXYFRAME_H
 
 
 #include <qframe.h>
 
 class OxyFrame : public QFrame
 {
 	Q_OBJECT
 	
     public:
         OxyFrame(  QWidget *parent=0, const char *name=0);
+
+        void mousePressEvent( QMouseEvent *);
+
+    signals:
+        void clicked();
 };
 
 #endif
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index ab1467c..506e0cb 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -1,71 +1,83 @@
 /***************************************************************************
  *                                                                         *
  * 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 <qlabel.h>
 #include <qlist.h>
 #include <qvbox.h>
 #include "dataTable.h"
 #include "psewidget.h"
 #include "oxyframe.h"
 
 
-Element::Element( const QString &name )
+/*Element::Element( const QString &name )
 {
-}
+}*/
 
 
 PSEWidget::PSEWidget() : QWidget()
 {
     this->setCaption( "Periodic System" );
 
-    QGridLayout *grid = new QGridLayout( this, 18,10 );
+    QVBoxLayout *vlay = new QVBoxLayout( this );
+    
+    QGridLayout *grid = new QGridLayout( 18,10 );
     int h=0, v=0;
     for( int n = 0 ; n < 118 ; n++ )
     {
         position( n+1,h,v );
         QList<OxyFrame> PSEframe;
         PSEframe.append( new OxyFrame( this , QString::number( n ) ) );
         grid->addWidget( PSEframe.current() , v/40+1 , h/40 );
+        PSEframe.current()->setMinimumHeight( 11 );
+        connect( PSEframe.current(), SIGNAL( clicked() ), this, SLOT( slotShowElement() ));
     }
+    
+    OxydataWidget *oxyDW = new OxydataWidget(this);
+    oxyDW->setElement( 1 );
+
+    vlay->addLayout( grid );
+    vlay->addWidget( oxyDW );
 }
 
+void PSEWidget::slotShowElement(){ qDebug( "ja genau" );};
+
 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))
diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h
index 3ea58e3..2a1e85c 100644
--- a/noncore/apps/oxygen/psewidget.h
+++ b/noncore/apps/oxygen/psewidget.h
@@ -47,35 +47,38 @@ class Element
         QString elar() const{ return ar; };
 
     private:
         QString name,     // The name of the element
         weight,           //     weight
         density,          //     density
         group,            //     group
         ie,               //     ionisationenergie
         num,              //     number ( e.g. Carbon is 6 )
         az,               //     state of aggregation
         date,             //     date of discovery
         en,               //     electronegativity
         mp,               //     meltingpoint
         bp,               //     boilingpoint 
         ar;               //     atomic radius
 };
 
 class QGridLayout;
 
 class PSEWidget : public QWidget
 {
 	Q_OBJECT
 	
     public:
 		PSEWidget();
         QGridLayout *bottom_grid;
 
     private:
         QGridLayout *maingrid;
         
         void position( int, int&, int& );
 
+    public slots:
+        void slotShowElement();
+
 };
 
 #endif