summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/oxygen/dataTable.cpp4
-rw-r--r--noncore/apps/oxygen/oxyframe.cpp8
-rw-r--r--noncore/apps/oxygen/psewidget.cpp15
-rw-r--r--noncore/apps/oxygen/psewidget.h1
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
@@ -92,9 +92,9 @@ void OxydataTable::paintCell( QPainter *p, int row, int col, const QRect &cr, b
if ( itm )
{
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 );
p->restore();
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
@@ -14,10 +14,10 @@
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 );
}
void OxyFrame::mousePressEvent ( QMouseEvent * e ){
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
@@ -23,13 +23,18 @@ 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;
PSEframe.append( new OxyFrame( this , QString::number(n) ) );
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) ));
}
@@ -40,6 +45,16 @@ PSEWidget::PSEWidget() : QWidget()
vlay->addWidget( oxyDW );
}
+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)
{
oxyDW->setElement( number.toInt() );
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
@@ -28,6 +28,7 @@ class PSEWidget : public QWidget
QGridLayout *maingrid;
void position( int, int&, int& );
+ QColor PSEColor( QString );
public slots:
void slotShowElement(QString);