author | cniehaus <cniehaus> | 2002-12-01 13:02:00 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2002-12-01 13:02:00 (UTC) |
commit | 5e82b4c17131cdc1b8be57e312f594d1a55520aa (patch) (unidiff) | |
tree | fad787c83503127f1e1b67b743730f250f9dd6e3 | |
parent | beb043f41e232e9dc8768e5fd619c2b80e805f73 (diff) | |
download | opie-5e82b4c17131cdc1b8be57e312f594d1a55520aa.zip opie-5e82b4c17131cdc1b8be57e312f594d1a55520aa.tar.gz opie-5e82b4c17131cdc1b8be57e312f594d1a55520aa.tar.bz2 |
is that the way it should be, Holger?
-rw-r--r-- | noncore/apps/oxygen/psewidget.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.h | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp index 2fd61bc..eb4093b 100644 --- a/noncore/apps/oxygen/psewidget.cpp +++ b/noncore/apps/oxygen/psewidget.cpp | |||
@@ -30,25 +30,24 @@ PSEWidget::PSEWidget() : QWidget() | |||
30 | 30 | ||
31 | QVBoxLayout *vlay = new QVBoxLayout( this ); | 31 | QVBoxLayout *vlay = new QVBoxLayout( this ); |
32 | 32 | ||
33 | QGridLayout *grid = new QGridLayout( 18,10 ); | 33 | QGridLayout *grid = new QGridLayout( 18,10 ); |
34 | int h=0, v=0; | 34 | int h=0, v=0; |
35 | 35 | ||
36 | Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File ); | 36 | Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File ); |
37 | for( int n = 0 ; n < 109 ; n++ ) | 37 | for( int n = 0 ; n < 109 ; n++ ) |
38 | { | 38 | { |
39 | configobj.setGroup( QString::number( n+1 )); | 39 | configobj.setGroup( QString::number( n+1 )); |
40 | 40 | ||
41 | position( n+1,h,v ); | 41 | position( n+1,h,v ); |
42 | QList<OxyFrame> PSEframe; | ||
43 | PSEframe.append( new OxyFrame( this , QString::number(n), configobj.readEntry( "Symbol" ) ) ); | 42 | PSEframe.append( new OxyFrame( this , QString::number(n), configobj.readEntry( "Symbol" ) ) ); |
44 | grid->addWidget( PSEframe.current() , v/40+1 , h/40 ); | 43 | grid->addWidget( PSEframe.current() , v/40+1 , h/40 ); |
45 | PSEframe.current()->setMinimumHeight( 11 ); | 44 | PSEframe.current()->setMinimumHeight( 11 ); |
46 | PSEframe.current()->setPalette( QPalette( PSEColor( configobj.readEntry( "Block" ) ) ) ); | 45 | PSEframe.current()->setPalette( QPalette( PSEColor( configobj.readEntry( "Block" ) ) ) ); |
47 | connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) )); | 46 | connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) )); |
48 | } | 47 | } |
49 | 48 | ||
50 | oxyDW = new OxydataWidget(this); | 49 | oxyDW = new OxydataWidget(this); |
51 | oxyDW->setElement( 0 ); | 50 | oxyDW->setElement( 0 ); |
52 | oxyDW->setLayout(); | 51 | oxyDW->setLayout(); |
53 | 52 | ||
54 | vlay->addLayout( grid ); | 53 | vlay->addLayout( grid ); |
@@ -56,24 +55,29 @@ PSEWidget::PSEWidget() : QWidget() | |||
56 | } | 55 | } |
57 | 56 | ||
58 | QColor PSEWidget::PSEColor( QString block ) | 57 | QColor PSEWidget::PSEColor( QString block ) |
59 | { | 58 | { |
60 | QColor c; | 59 | QColor c; |
61 | if ( block == "s" ) c.setRgb( 213 , 233 , 231 ); | 60 | if ( block == "s" ) c.setRgb( 213 , 233 , 231 ); |
62 | else if ( block == "d" ) c.setRgb( 200,230,160 ); | 61 | else if ( block == "d" ) c.setRgb( 200,230,160 ); |
63 | else if ( block == "p" ) c.setRgb( 238,146,138 ); | 62 | else if ( block == "p" ) c.setRgb( 238,146,138 ); |
64 | else if ( block == "f" ) c.setRgb( 190 , 190 , 190 ); | 63 | else if ( block == "f" ) c.setRgb( 190 , 190 , 190 ); |
65 | return c; | 64 | return c; |
66 | }; | 65 | }; |
67 | 66 | ||
67 | void PSEWidget::inverseColor( QString number ) | ||
68 | { | ||
69 | //foo | ||
70 | } | ||
71 | |||
68 | void PSEWidget::slotShowElement(QString number) | 72 | void PSEWidget::slotShowElement(QString number) |
69 | { | 73 | { |
70 | oxyDW->setElement( number.toInt() ); | 74 | oxyDW->setElement( number.toInt() ); |
71 | }; | 75 | }; |
72 | 76 | ||
73 | void PSEWidget::position(int n, int& h, int& v) | 77 | void PSEWidget::position(int n, int& h, int& v) |
74 | { | 78 | { |
75 | //Hydrogen | 79 | //Hydrogen |
76 | if (n == 1) | 80 | if (n == 1) |
77 | { | 81 | { |
78 | h=0; v=0; | 82 | h=0; v=0; |
79 | } | 83 | } |
diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h index fdf838e..d8d2c5f 100644 --- a/noncore/apps/oxygen/psewidget.h +++ b/noncore/apps/oxygen/psewidget.h | |||
@@ -9,37 +9,43 @@ | |||
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * ( at your option ) any later version. * | 14 | * ( at your option ) any later version. * |
15 | * * | 15 | * * |
16 | **************************************************************************/ | 16 | **************************************************************************/ |
17 | #ifndef _PSEWIDGET_H | 17 | #ifndef _PSEWIDGET_H |
18 | #define _PSEWIDGET_H | 18 | #define _PSEWIDGET_H |
19 | 19 | ||
20 | #include <qwidget.h> | 20 | #include <qwidget.h> |
21 | #include <qlist.h> | ||
22 | #include "oxyframe.h" | ||
21 | 23 | ||
22 | class QGridLayout; | 24 | class QGridLayout; |
23 | class OxydataWidget; | 25 | class OxydataWidget; |
26 | class PSEframe; | ||
24 | 27 | ||
25 | class PSEWidget : public QWidget | 28 | class PSEWidget : public QWidget |
26 | { | 29 | { |
27 | Q_OBJECT | 30 | Q_OBJECT |
28 | 31 | ||
29 | public: | 32 | public: |
30 | PSEWidget(); | 33 | PSEWidget(); |
31 | QGridLayout *bottom_grid; | 34 | QGridLayout *bottom_grid; |
32 | OxydataWidget *oxyDW; | 35 | OxydataWidget *oxyDW; |
33 | 36 | ||
37 | void inverseColor( QString ); | ||
38 | QList<OxyFrame> PSEframe; | ||
39 | |||
34 | private: | 40 | private: |
35 | QGridLayout *maingrid; | 41 | QGridLayout *maingrid; |
36 | 42 | ||
37 | void position( int, int&, int& ); | 43 | void position( int, int&, int& ); |
38 | QColor PSEColor( QString ); | 44 | QColor PSEColor( QString ); |
39 | 45 | ||
40 | public slots: | 46 | public slots: |
41 | void slotShowElement(QString); | 47 | void slotShowElement(QString); |
42 | 48 | ||
43 | }; | 49 | }; |
44 | 50 | ||
45 | #endif | 51 | #endif |