summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/oxyframe.cpp3
-rw-r--r--noncore/apps/oxygen/oxyframe.h5
-rw-r--r--noncore/apps/oxygen/psewidget.cpp18
-rw-r--r--noncore/apps/oxygen/psewidget.h3
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
@@ -19,3 +19,6 @@ OxyFrame::OxyFrame(QWidget *parent, const char *name) : QFrame(parent,name)
19 this->setBackgroundColor( QColor( cyan ) ); 19 this->setBackgroundColor( QColor( cyan ) );
20} 20}
21 21
22void OxyFrame::mousePressEvent ( QMouseEvent * e ){
23 emit clicked();
24};
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
@@ -19,6 +19,11 @@ class OxyFrame : public QFrame
19 19
20 public: 20 public:
21 OxyFrame( QWidget *parent=0, const char *name=0); 21 OxyFrame( QWidget *parent=0, const char *name=0);
22
23 void mousePressEvent( QMouseEvent *);
24
25 signals:
26 void clicked();
22}; 27};
23 28
24#endif 29#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
@@ -17,16 +17,18 @@
17#include "oxyframe.h" 17#include "oxyframe.h"
18 18
19 19
20Element::Element( const QString &name ) 20/*Element::Element( const QString &name )
21{ 21{
22} 22}*/
23 23
24 24
25PSEWidget::PSEWidget() : QWidget() 25PSEWidget::PSEWidget() : QWidget()
26{ 26{
27 this->setCaption( "Periodic System" ); 27 this->setCaption( "Periodic System" );
28 28
29 QGridLayout *grid = new QGridLayout( this, 18,10 ); 29 QVBoxLayout *vlay = new QVBoxLayout( this );
30
31 QGridLayout *grid = new QGridLayout( 18,10 );
30 int h=0, v=0; 32 int h=0, v=0;
31 for( int n = 0 ; n < 118 ; n++ ) 33 for( int n = 0 ; n < 118 ; n++ )
32 { 34 {
@@ -34,9 +36,19 @@ PSEWidget::PSEWidget() : QWidget()
34 QList<OxyFrame> PSEframe; 36 QList<OxyFrame> PSEframe;
35 PSEframe.append( new OxyFrame( this , QString::number( n ) ) ); 37 PSEframe.append( new OxyFrame( this , QString::number( n ) ) );
36 grid->addWidget( PSEframe.current() , v/40+1 , h/40 ); 38 grid->addWidget( PSEframe.current() , v/40+1 , h/40 );
39 PSEframe.current()->setMinimumHeight( 11 );
40 connect( PSEframe.current(), SIGNAL( clicked() ), this, SLOT( slotShowElement() ));
37 } 41 }
42
43 OxydataWidget *oxyDW = new OxydataWidget(this);
44 oxyDW->setElement( 1 );
45
46 vlay->addLayout( grid );
47 vlay->addWidget( oxyDW );
38} 48}
39 49
50void PSEWidget::slotShowElement(){ qDebug( "ja genau" );};
51
40void PSEWidget::position(int n, int& h, int& v) 52void PSEWidget::position(int n, int& h, int& v)
41{ 53{
42 //Hydrogen 54 //Hydrogen
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
@@ -76,6 +76,9 @@ class PSEWidget : public QWidget
76 76
77 void position( int, int&, int& ); 77 void position( int, int&, int& );
78 78
79 public slots:
80 void slotShowElement();
81
79}; 82};
80 83
81#endif 84#endif