summaryrefslogtreecommitdiff
Unidiff
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
@@ -87,16 +87,16 @@ void OxydataTable::paintCell( QPainter *p, int row, int col, const QRect &cr, b
87 return; 87 return;
88 selected = FALSE; 88 selected = FALSE;
89 89
90 QTableItem *itm = item( row, col ); 90 QTableItem *itm = item( row, col );
91 QColorGroup colgrp = colorGroup(); 91 QColorGroup colgrp = colorGroup();
92 if ( itm ) 92 if ( itm )
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 );
100 p->restore(); 100 p->restore();
101 } 101 }
102} 102}
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
@@ -9,17 +9,17 @@
9#include "oxygen.h" 9#include "oxygen.h"
10 10
11#include <qpe/config.h> 11#include <qpe/config.h>
12#include "oxyframe.h" 12#include "oxyframe.h"
13 13
14OxyFrame::OxyFrame(QWidget *parent, const char *name) : QFrame(parent,name) 14OxyFrame::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
23void OxyFrame::mousePressEvent ( QMouseEvent * e ){ 23void OxyFrame::mousePressEvent ( QMouseEvent * e ){
24 emit num( N ); 24 emit num( N );
25}; 25};
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
@@ -18,33 +18,48 @@
18PSEWidget::PSEWidget() : QWidget() 18PSEWidget::PSEWidget() : QWidget()
19{ 19{
20 this->setCaption( tr( "Periodic System" ) ); 20 this->setCaption( tr( "Periodic System" ) );
21 21
22 QVBoxLayout *vlay = new QVBoxLayout( this ); 22 QVBoxLayout *vlay = new QVBoxLayout( this );
23 23
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;
30 PSEframe.append( new OxyFrame( this , QString::number(n) ) ); 34 PSEframe.append( new OxyFrame( this , QString::number(n) ) );
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 }
35 40
36 oxyDW = new OxydataWidget(this); 41 oxyDW = new OxydataWidget(this);
37 oxyDW->setElement( 1 ); 42 oxyDW->setElement( 1 );
38 43
39 vlay->addLayout( grid ); 44 vlay->addLayout( grid );
40 vlay->addWidget( oxyDW ); 45 vlay->addWidget( oxyDW );
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{
45 oxyDW->setElement( number.toInt() ); 60 oxyDW->setElement( number.toInt() );
46}; 61};
47 62
48void PSEWidget::position(int n, int& h, int& v) 63void PSEWidget::position(int n, int& h, int& v)
49{ 64{
50 //Hydrogen 65 //Hydrogen
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
@@ -23,15 +23,16 @@ class PSEWidget : public QWidget
23 PSEWidget(); 23 PSEWidget();
24 QGridLayout *bottom_grid; 24 QGridLayout *bottom_grid;
25 OxydataWidget *oxyDW; 25 OxydataWidget *oxyDW;
26 26
27 private: 27 private:
28 QGridLayout *maingrid; 28 QGridLayout *maingrid;
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:
33 void slotShowElement(QString); 34 void slotShowElement(QString);
34 35
35}; 36};
36 37
37#endif 38#endif