| -rw-r--r-- | noncore/apps/oxygen/dataTable.cpp | 4 | ||||
| -rw-r--r-- | noncore/apps/oxygen/oxyframe.cpp | 8 | ||||
| -rw-r--r-- | noncore/apps/oxygen/psewidget.cpp | 15 | ||||
| -rw-r--r-- | noncore/apps/oxygen/psewidget.h | 1 |
4 files changed, 22 insertions, 6 deletions
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp index 870ac56..70b5a6a 100644 --- a/noncore/apps/oxygen/dataTable.cpp +++ b/noncore/apps/oxygen/dataTable.cpp @@ -93,7 +93,7 @@ void OxydataTable::paintCell( QPainter *p, int row, int col, const QRect &cr, b { if ( row%2 ) - colgrp.setColor( QColorGroup::Base, QColor( cyan ) ); + colgrp.setColor( QColorGroup::Base, QColor( 180,200,210 ) ); else - colgrp.setColor( QColorGroup::Base, QColor( white ) ); + colgrp.setColor( QColorGroup::Base, QColor( 230,235,235 ) ); p->save(); itm->paint( p, colgrp, cr, selected ); diff --git a/noncore/apps/oxygen/oxyframe.cpp b/noncore/apps/oxygen/oxyframe.cpp index 2d7fc84..a5f262e 100644 --- a/noncore/apps/oxygen/oxyframe.cpp +++ b/noncore/apps/oxygen/oxyframe.cpp @@ -15,8 +15,8 @@ OxyFrame::OxyFrame(QWidget *parent, const char *name) : QFrame(parent,name) { N = name; - this->setFrameStyle( QFrame::Panel ); - this->setLineWidth( 2 ); - this->setFrameShadow( QFrame::Raised ); - this->setBackgroundColor( QColor( green ) ); + this->setFrameStyle( QFrame::Box ); + this->setLineWidth( 0 ); + this->setMidLineWidth( 1 ); + this->setFrameShadow( QFrame::Sunken ); } diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp index f7725e3..78e54d5 100644 --- a/noncore/apps/oxygen/psewidget.cpp +++ b/noncore/apps/oxygen/psewidget.cpp @@ -24,6 +24,10 @@ PSEWidget::PSEWidget() : QWidget() QGridLayout *grid = new QGridLayout( 18,10 ); int h=0, v=0; + + Config configobj( "oxygendata" ); for( int n = 0 ; n < 118 ; n++ ) { + configobj.setGroup( QString::number( n+1 )); + position( n+1,h,v ); QList<OxyFrame> PSEframe; @@ -31,4 +35,5 @@ PSEWidget::PSEWidget() : QWidget() 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) )); } @@ -41,4 +46,14 @@ PSEWidget::PSEWidget() : QWidget() } +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::slotShowElement(QString number) { diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h index a7a8603..f69eeb3 100644 --- a/noncore/apps/oxygen/psewidget.h +++ b/noncore/apps/oxygen/psewidget.h @@ -29,4 +29,5 @@ class PSEWidget : public QWidget void position( int, int&, int& ); + QColor PSEColor( QString ); public slots: |