summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/oxyframe.cpp10
-rw-r--r--noncore/apps/oxygen/oxyframe.h6
-rw-r--r--noncore/apps/oxygen/psewidget.cpp2
3 files changed, 13 insertions, 5 deletions
diff --git a/noncore/apps/oxygen/oxyframe.cpp b/noncore/apps/oxygen/oxyframe.cpp
index c61c8e5..2ce40e7 100644
--- a/noncore/apps/oxygen/oxyframe.cpp
+++ b/noncore/apps/oxygen/oxyframe.cpp
@@ -18,15 +18,23 @@
18 18
19#include <qpe/config.h> 19#include <qpe/config.h>
20#include "oxyframe.h" 20#include "oxyframe.h"
21 21
22OxyFrame::OxyFrame(QWidget *parent, const char *name) : QFrame(parent,name) 22OxyFrame::OxyFrame(QWidget *parent, const char *name, QString symbol )
23 : QLabel(parent,name)
23{ 24{
24 N = name; 25 N = name;
25 this->setFrameStyle( QFrame::Box ); 26 this->setFrameStyle( QFrame::Box );
26 this->setLineWidth( 0 ); 27 this->setLineWidth( 0 );
27 this->setMidLineWidth( 1 ); 28 this->setMidLineWidth( 1 );
28 this->setFrameShadow( QFrame::Sunken ); 29 this->setFrameShadow( QFrame::Sunken );
30 setMinimumSize(6,6);
31 setScaledContents( true );
32 QFont font;
33 font.setWeight(QFont::Light);
34 font.setPixelSize(3);
35 setFont( font );
36 setText( symbol );
29} 37}
30 38
31void OxyFrame::mousePressEvent ( QMouseEvent * e ){ 39void OxyFrame::mousePressEvent ( QMouseEvent * e ){
32 emit num( N ); 40 emit num( N );
diff --git a/noncore/apps/oxygen/oxyframe.h b/noncore/apps/oxygen/oxyframe.h
index 4543504..9736ea9 100644
--- a/noncore/apps/oxygen/oxyframe.h
+++ b/noncore/apps/oxygen/oxyframe.h
@@ -17,16 +17,16 @@
17#ifndef _OXYFRAME_H 17#ifndef _OXYFRAME_H
18#define _OXYFRAME_H 18#define _OXYFRAME_H
19 19
20 20
21#include <qframe.h> 21#include <qlabel.h>
22 22
23class OxyFrame : public QFrame 23class OxyFrame : public QLabel
24{ 24{
25 Q_OBJECT 25 Q_OBJECT
26 26
27 public: 27 public:
28 OxyFrame( QWidget *parent=0, const char *name=0); 28 OxyFrame( QWidget *parent=0, const char *name=0, QString symbol="" );
29 29
30 void mousePressEvent( QMouseEvent *); 30 void mousePressEvent( QMouseEvent *);
31 31
32 QString N; 32 QString N;
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index 18b41c3..d742e9c 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -39,9 +39,9 @@ PSEWidget::PSEWidget() : QWidget()
39 configobj.setGroup( QString::number( n+1 )); 39 configobj.setGroup( QString::number( n+1 ));
40 40
41 position( n+1,h,v ); 41 position( n+1,h,v );
42 QList<OxyFrame> PSEframe; 42 QList<OxyFrame> PSEframe;
43 PSEframe.append( new OxyFrame( this , QString::number(n) ) ); 43 PSEframe.append( new OxyFrame( this , QString::number(n), configobj.readEntry( "Symbol" ) ) );
44 grid->addWidget( PSEframe.current() , v/40+1 , h/40 ); 44 grid->addWidget( PSEframe.current() , v/40+1 , h/40 );
45 PSEframe.current()->setMinimumHeight( 11 ); 45 PSEframe.current()->setMinimumHeight( 11 );
46 PSEframe.current()->setPalette( QPalette( PSEColor( configobj.readEntry( "Block" ) ) ) ); 46 PSEframe.current()->setPalette( QPalette( PSEColor( configobj.readEntry( "Block" ) ) ) );
47 connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) )); 47 connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) ));