summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/psewidget.cpp2
-rw-r--r--noncore/apps/oxygen/psewidget.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index b396046..4f990b0 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -45,33 +45,33 @@ PSEWidget::PSEWidget(const QStringList &list) : QWidget()
45 PSEframe.append( new OxyFrame( this , QString::number(n), configobj.readEntry( "Symbol" ) ) ); 45 PSEframe.append( new OxyFrame( this , QString::number(n), configobj.readEntry( "Symbol" ) ) );
46 grid->addWidget( PSEframe.current() , v/40+1 , h/40 ); 46 grid->addWidget( PSEframe.current() , v/40+1 , h/40 );
47 PSEframe.current()->setMinimumHeight( 11 ); 47 PSEframe.current()->setMinimumHeight( 11 );
48 PSEframe.current()->setPalette( QPalette( PSEColor( configobj.readEntry( "Block" ) ) ) ); 48 PSEframe.current()->setPalette( QPalette( PSEColor( configobj.readEntry( "Block" ) ) ) );
49 connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) )); 49 connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) ));
50 connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( inverseColor(QString) )); 50 connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( inverseColor(QString) ));
51 } 51 }
52 52
53 oxyDW = new OxydataWidget(this, "PSEWidget_oxyDW", names); 53 oxyDW = new OxydataWidget(this, "PSEWidget_oxyDW", names);
54 oxyDW->setElement( 0 ); 54 oxyDW->setElement( 0 );
55 oxyDW->setLayout(); 55 oxyDW->setLayout();
56 56
57 vlay->addLayout( grid ); 57 vlay->addLayout( grid );
58 vlay->addWidget( oxyDW ); 58 vlay->addWidget( oxyDW );
59} 59}
60 60
61QColor PSEWidget::PSEColor( QString block ) 61QColor PSEWidget::PSEColor( QString block ) const
62{ 62{
63 QColor c; 63 QColor c;
64 if ( block == "s" ) c.setRgb( 213 , 233 , 231 ); 64 if ( block == "s" ) c.setRgb( 213 , 233 , 231 );
65 else if ( block == "d" ) c.setRgb( 200,230,160 ); 65 else if ( block == "d" ) c.setRgb( 200,230,160 );
66 else if ( block == "p" ) c.setRgb( 238,146,138 ); 66 else if ( block == "p" ) c.setRgb( 238,146,138 );
67 else if ( block == "f" ) c.setRgb( 190 , 190 , 190 ); 67 else if ( block == "f" ) c.setRgb( 190 , 190 , 190 );
68 return c; 68 return c;
69}; 69};
70 70
71void PSEWidget::inverseColor( QString number) 71void PSEWidget::inverseColor( QString number)
72{ 72{
73 Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File ); 73 Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File );
74 configobj.setGroup( number ); 74 configobj.setGroup( number );
75 QString block = configobj.readEntry( "Block" ); 75 QString block = configobj.readEntry( "Block" );
76 QColor c, d; 76 QColor c, d;
77 c = PSEColor( block ); 77 c = PSEColor( block );
diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h
index 42a2e38..ad40cf1 100644
--- a/noncore/apps/oxygen/psewidget.h
+++ b/noncore/apps/oxygen/psewidget.h
@@ -31,26 +31,26 @@ class PSEWidget : public QWidget
31{ 31{
32 Q_OBJECT 32 Q_OBJECT
33 33
34 public: 34 public:
35 PSEWidget(const QStringList &list=0); 35 PSEWidget(const QStringList &list=0);
36 QGridLayout *bottom_grid; 36 QGridLayout *bottom_grid;
37 OxydataWidget *oxyDW; 37 OxydataWidget *oxyDW;
38 38
39 QList<OxyFrame> PSEframe; 39 QList<OxyFrame> PSEframe;
40 40
41 int lastElement; 41 int lastElement;
42 42
43 private: 43 private:
44 QGridLayout *maingrid; 44 QGridLayout *maingrid;
45 45
46 void position( int, int&, int& ); 46 void position( int, int&, int& );
47 QColor PSEColor( QString ); 47 QColor PSEColor( QString ) const;
48 QStringList names; 48 QStringList names;
49 49
50 public slots: 50 public slots:
51 void slotShowElement(QString); 51 void slotShowElement(QString);
52 void inverseColor( QString ); 52 void inverseColor( QString );
53 53
54}; 54};
55 55
56#endif 56#endif