summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2002-09-20 12:13:58 (UTC)
committer cniehaus <cniehaus>2002-09-20 12:13:58 (UTC)
commite1c71743917aa6047c5ed7da6ca3a18024ceabde (patch) (unidiff)
tree097c975669e3372973b46431a9cc02cda6210cc7
parentb1f3d33cb0b3f203f153074a8812d5988c3031b2 (diff)
downloadopie-e1c71743917aa6047c5ed7da6ca3a18024ceabde.zip
opie-e1c71743917aa6047c5ed7da6ca3a18024ceabde.tar.gz
opie-e1c71743917aa6047c5ed7da6ca3a18024ceabde.tar.bz2
fixing the colors. THis looks almost cool :)
Diffstat (more/less context) (ignore 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
@@ -93,7 +93,7 @@ void OxydataTable::paintCell( QPainter *p, int row, int col, const QRect &cr, b
93 { 93 {
94 if ( row%2 ) 94 if ( row%2 )
95 colgrp.setColor( QColorGroup::Base, QColor( cyan ) ); 95 colgrp.setColor( QColorGroup::Base, QColor( 180,200,210 ) );
96 else 96 else
97 colgrp.setColor( QColorGroup::Base, QColor( white ) ); 97 colgrp.setColor( QColorGroup::Base, QColor( 230,235,235 ) );
98 p->save(); 98 p->save();
99 itm->paint( p, colgrp, cr, selected ); 99 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)
15{ 15{
16 N = name; 16 N = name;
17 this->setFrameStyle( QFrame::Panel ); 17 this->setFrameStyle( QFrame::Box );
18 this->setLineWidth( 2 ); 18 this->setLineWidth( 0 );
19 this->setFrameShadow( QFrame::Raised ); 19 this->setMidLineWidth( 1 );
20 this->setBackgroundColor( QColor( green ) ); 20 this->setFrameShadow( QFrame::Sunken );
21} 21}
22 22
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()
24 QGridLayout *grid = new QGridLayout( 18,10 ); 24 QGridLayout *grid = new QGridLayout( 18,10 );
25 int h=0, v=0; 25 int h=0, v=0;
26
27 Config configobj( "oxygendata" );
26 for( int n = 0 ; n < 118 ; n++ ) 28 for( int n = 0 ; n < 118 ; n++ )
27 { 29 {
30 configobj.setGroup( QString::number( n+1 ));
31
28 position( n+1,h,v ); 32 position( n+1,h,v );
29 QList<OxyFrame> PSEframe; 33 QList<OxyFrame> PSEframe;
@@ -31,4 +35,5 @@ PSEWidget::PSEWidget() : QWidget()
31 grid->addWidget( PSEframe.current() , v/40+1 , h/40 ); 35 grid->addWidget( PSEframe.current() , v/40+1 , h/40 );
32 PSEframe.current()->setMinimumHeight( 11 ); 36 PSEframe.current()->setMinimumHeight( 11 );
37 PSEframe.current()->setPalette( QPalette( PSEColor( configobj.readEntry( "Block" ) ) ) );
33 connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) )); 38 connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) ));
34 } 39 }
@@ -41,4 +46,14 @@ PSEWidget::PSEWidget() : QWidget()
41} 46}
42 47
48QColor PSEWidget::PSEColor( QString block )
49{
50 QColor c;
51 if ( block == "s" ) c.setRgb( 213 , 233 , 231 );
52 else if ( block == "d" ) c.setRgb( 200,230,160 );
53 else if ( block == "p" ) c.setRgb( 238,146,138 );
54 else if ( block == "f" ) c.setRgb( 190 , 190 , 190 );
55 return c;
56};
57
43void PSEWidget::slotShowElement(QString number) 58void PSEWidget::slotShowElement(QString number)
44{ 59{
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
29 29
30 void position( int, int&, int& ); 30 void position( int, int&, int& );
31 QColor PSEColor( QString );
31 32
32 public slots: 33 public slots: