-rw-r--r-- | noncore/apps/oxygen/oxyframe.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxyframe.h | 5 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.cpp | 18 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.h | 3 |
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 @@ -21 +21,4 @@ OxyFrame::OxyFrame(QWidget *parent, const char *name) : QFrame(parent,name) +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 @@ -21,2 +21,7 @@ class OxyFrame : public QFrame OxyFrame( QWidget *parent=0, const char *name=0); + + void mousePressEvent( QMouseEvent *); + + signals: + void clicked(); }; 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 @@ -19,5 +19,5 @@ -Element::Element( const QString &name ) +/*Element::Element( const QString &name ) { -} +}*/ @@ -28,3 +28,5 @@ PSEWidget::PSEWidget() : QWidget() - QGridLayout *grid = new QGridLayout( this, 18,10 ); + QVBoxLayout *vlay = new QVBoxLayout( this ); + + QGridLayout *grid = new QGridLayout( 18,10 ); int h=0, v=0; @@ -36,5 +38,15 @@ PSEWidget::PSEWidget() : QWidget() 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) 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 @@ -78,2 +78,5 @@ class PSEWidget : public QWidget + public slots: + void slotShowElement(); + }; |