author | cniehaus <cniehaus> | 2002-09-20 19:24:32 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2002-09-20 19:24:32 (UTC) |
commit | 681e6e75efaa5577d376d0bb191afdf323cb4e75 (patch) (unidiff) | |
tree | d35ee106655e5b288e73491a2701ddc0141f4fde /noncore | |
parent | c958d7cb5069e06b5cf9e9df6e78bcb644ce26a2 (diff) | |
download | opie-681e6e75efaa5577d376d0bb191afdf323cb4e75.zip opie-681e6e75efaa5577d376d0bb191afdf323cb4e75.tar.gz opie-681e6e75efaa5577d376d0bb191afdf323cb4e75.tar.bz2 |
before starting to hack QTableItem I wanted to have a safe point in cvs
-rw-r--r-- | noncore/apps/oxygen/calcdlgui.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/oxygen/dataTable.cpp | 24 | ||||
-rw-r--r-- | noncore/apps/oxygen/dataTable.h | 11 | ||||
-rw-r--r-- | noncore/apps/oxygen/datawidgetui.cpp | 25 | ||||
-rw-r--r-- | noncore/apps/oxygen/datawidgetui.h | 18 | ||||
-rw-r--r-- | noncore/apps/oxygen/main.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxyframe.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxyframe.h | 7 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxygen.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.h | 7 |
11 files changed, 121 insertions, 11 deletions
diff --git a/noncore/apps/oxygen/calcdlgui.cpp b/noncore/apps/oxygen/calcdlgui.cpp index e40e2c7..b6dfff3 100644 --- a/noncore/apps/oxygen/calcdlgui.cpp +++ b/noncore/apps/oxygen/calcdlgui.cpp | |||
@@ -1,3 +1,11 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | application: : Oxygen | ||
3 | |||
4 | begin : September 2002 | ||
5 | copyright : ( C ) 2002 by Carsten Niehaus | ||
6 | email : cniehaus@handhelds.org | ||
7 | **************************************************************************/ | ||
8 | |||
9 | /*************************************************************************** | ||
2 | * * | 10 | * * |
3 | * 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 * |
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp index 70b5a6a..ff01417 100644 --- a/noncore/apps/oxygen/dataTable.cpp +++ b/noncore/apps/oxygen/dataTable.cpp | |||
@@ -1,3 +1,11 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | application: : Oxygen | ||
3 | |||
4 | begin : September 2002 | ||
5 | copyright : ( C ) 2002 by Carsten Niehaus | ||
6 | email : cniehaus@handhelds.org | ||
7 | **************************************************************************/ | ||
8 | |||
9 | /*************************************************************************** | ||
2 | * * | 10 | * * |
3 | * 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 * |
@@ -20,4 +28,5 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent) | |||
20 | { | 28 | { |
21 | QGridLayout *qgrid = new QGridLayout( this, 2,1 ); | 29 | QGridLayout *qgrid = new QGridLayout( this, 2,1 ); |
30 | |||
22 | QHBox *hbox = new QHBox( this ); | 31 | QHBox *hbox = new QHBox( this ); |
23 | left = new QLabel( hbox ); | 32 | left = new QLabel( hbox ); |
@@ -25,6 +34,7 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent) | |||
25 | right = new QLabel( hbox ); | 34 | right = new QLabel( hbox ); |
26 | 35 | ||
27 | DataTable = new OxydataTable( 9,2, this ); | 36 | right->setAlignment( AlignRight ); |
28 | 37 | middle->setAlignment( AlignHCenter ); | |
38 | |||
29 | QFont bf; | 39 | QFont bf; |
30 | bf.setBold( true ); | 40 | bf.setBold( true ); |
@@ -32,4 +42,7 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent) | |||
32 | middle->setFont( bf ); | 42 | middle->setFont( bf ); |
33 | 43 | ||
44 | DataTable = new OxydataTable( 9,2, this ); | ||
45 | DataTable->setColumnWidth ( 1 , 118 ); | ||
46 | DataTable->setColumnWidth ( 0 , 118 ); | ||
34 | setTable(); | 47 | setTable(); |
35 | 48 | ||
@@ -82,4 +95,11 @@ OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent, | |||
82 | } | 95 | } |
83 | 96 | ||
97 | int OxydataTable::alignment() const | ||
98 | { | ||
99 | return AlignLeft | AlignVCenter; | ||
100 | }; | ||
101 | |||
102 | |||
103 | |||
84 | void OxydataTable::paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected) | 104 | void OxydataTable::paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected) |
85 | { | 105 | { |
diff --git a/noncore/apps/oxygen/dataTable.h b/noncore/apps/oxygen/dataTable.h index ccc4300..00063d4 100644 --- a/noncore/apps/oxygen/dataTable.h +++ b/noncore/apps/oxygen/dataTable.h | |||
@@ -17,4 +17,5 @@ | |||
17 | class QLabel; | 17 | class QLabel; |
18 | class OxydataTable; | 18 | class OxydataTable; |
19 | class QTableItem; | ||
19 | 20 | ||
20 | /* | 21 | /* |
@@ -60,4 +61,7 @@ class OxydataTable : public QTable | |||
60 | QWidget *parent = 0, const char *name = 0 ); | 61 | QWidget *parent = 0, const char *name = 0 ); |
61 | 62 | ||
63 | virtual int alignment() const; | ||
64 | // virtual QTableItem *item( int row, int col ) const; | ||
65 | |||
62 | protected: | 66 | protected: |
63 | /* | 67 | /* |
@@ -68,3 +72,10 @@ class OxydataTable : public QTable | |||
68 | }; | 72 | }; |
69 | 73 | ||
74 | //X class OxydataQTI : QTableItem | ||
75 | //X { | ||
76 | //X Q_OBJECT | ||
77 | //X | ||
78 | //X public: | ||
79 | //X OxydataQTI( | ||
80 | |||
70 | #endif | 81 | #endif |
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp index 2e99c0b..4dab109 100644 --- a/noncore/apps/oxygen/datawidgetui.cpp +++ b/noncore/apps/oxygen/datawidgetui.cpp | |||
@@ -1,3 +1,11 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | application: : Oxygen | ||
3 | |||
4 | begin : September 2002 | ||
5 | copyright : ( C ) 2002 by Carsten Niehaus | ||
6 | email : cniehaus@handhelds.org | ||
7 | **************************************************************************/ | ||
8 | |||
9 | /*************************************************************************** | ||
2 | * * | 10 | * * |
3 | * 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 * |
@@ -9,4 +17,5 @@ | |||
9 | 17 | ||
10 | #include "datawidgetui.h" | 18 | #include "datawidgetui.h" |
19 | #include "dataTable.h" | ||
11 | 20 | ||
12 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
@@ -20,17 +29,10 @@ dataWidgetUI::dataWidgetUI() : QWidget() | |||
20 | { | 29 | { |
21 | this->setCaption( tr( "Chemical Data" )); | 30 | this->setCaption( tr( "Chemical Data" )); |
22 | |||
23 | QGridLayout *qgrid = new QGridLayout( this, 2,1 ); | 31 | QGridLayout *qgrid = new QGridLayout( this, 2,1 ); |
24 | 32 | ||
25 | dataCombo = new QComboBox( this ); | 33 | dataCombo = new QComboBox( this ); |
26 | OxydataWidget *oxyDW = new OxydataWidget(this); | ||
27 | oxyDW->setElement( 1 ); | ||
28 | qgrid->addWidget( dataCombo, 0,0); | ||
29 | qgrid->addWidget( oxyDW , 1,0 ); | ||
30 | |||
31 | connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) ); | ||
32 | Config configobj( "oxygendata" ); | ||
33 | 34 | ||
34 | //read in all names of the 118 elements | 35 | //read in all names of the 118 elements |
36 | Config configobj( "oxygendata" ); | ||
35 | for ( int i = 1 ; i < 119 ; i++ ) | 37 | for ( int i = 1 ; i < 119 ; i++ ) |
36 | { | 38 | { |
@@ -39,4 +41,11 @@ dataWidgetUI::dataWidgetUI() : QWidget() | |||
39 | dataCombo->insertItem( foo ); | 41 | dataCombo->insertItem( foo ); |
40 | } | 42 | } |
43 | |||
44 | OxydataWidget *oxyDW = new OxydataWidget(this); | ||
45 | connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) ); | ||
46 | oxyDW->setElement( 1 ); | ||
47 | |||
48 | qgrid->addWidget( dataCombo, 0,0); | ||
49 | qgrid->addWidget( oxyDW , 1,0 ); | ||
41 | } | 50 | } |
42 | 51 | ||
diff --git a/noncore/apps/oxygen/datawidgetui.h b/noncore/apps/oxygen/datawidgetui.h index 5399c81..cd716ad 100644 --- a/noncore/apps/oxygen/datawidgetui.h +++ b/noncore/apps/oxygen/datawidgetui.h | |||
@@ -1,2 +1,13 @@ | |||
1 | #ifndef DATAWIDGETUI_H | ||
2 | #define DATAWIDGETUI_H | ||
3 | |||
4 | |||
5 | /*************************************************************************** | ||
6 | application: : Oxygen | ||
7 | |||
8 | begin : September 2002 | ||
9 | copyright : ( C ) 2002 by Carsten Niehaus | ||
10 | email : cniehaus@handhelds.org | ||
11 | **************************************************************************/ | ||
1 | 12 | ||
2 | /*************************************************************************** | 13 | /*************************************************************************** |
@@ -8,7 +19,11 @@ | |||
8 | * * | 19 | * * |
9 | **************************************************************************/ | 20 | **************************************************************************/ |
10 | #include "dataTable.h" | 21 | |
22 | |||
23 | class OxydataWidget; | ||
24 | class OxydataTable; | ||
11 | 25 | ||
12 | class QComboBox; | 26 | class QComboBox; |
27 | #include <qwidget.h> | ||
13 | 28 | ||
14 | class dataWidgetUI : public QWidget | 29 | class dataWidgetUI : public QWidget |
@@ -24,2 +39,3 @@ class dataWidgetUI : public QWidget | |||
24 | OxydataWidget *oxyDW; | 39 | OxydataWidget *oxyDW; |
25 | }; | 40 | }; |
41 | #endif | ||
diff --git a/noncore/apps/oxygen/main.cpp b/noncore/apps/oxygen/main.cpp index 31e44dc..c8fcdb4 100644 --- a/noncore/apps/oxygen/main.cpp +++ b/noncore/apps/oxygen/main.cpp | |||
@@ -1,3 +1,11 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | application: : Oxygen | ||
3 | |||
4 | begin : September 2002 | ||
5 | copyright : ( C ) 2002 by Carsten Niehaus | ||
6 | email : cniehaus@handhelds.org | ||
7 | **************************************************************************/ | ||
8 | |||
9 | /*************************************************************************** | ||
2 | * * | 10 | * * |
3 | * 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 * |
diff --git a/noncore/apps/oxygen/oxyframe.cpp b/noncore/apps/oxygen/oxyframe.cpp index a5f262e..c61c8e5 100644 --- a/noncore/apps/oxygen/oxyframe.cpp +++ b/noncore/apps/oxygen/oxyframe.cpp | |||
@@ -1,3 +1,11 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | application: : Oxygen | ||
3 | |||
4 | begin : September 2002 | ||
5 | copyright : ( C ) 2002 by Carsten Niehaus | ||
6 | email : cniehaus@handhelds.org | ||
7 | **************************************************************************/ | ||
8 | |||
9 | /*************************************************************************** | ||
2 | * * | 10 | * * |
3 | * 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 * |
diff --git a/noncore/apps/oxygen/oxyframe.h b/noncore/apps/oxygen/oxyframe.h index a19f13c..4543504 100644 --- a/noncore/apps/oxygen/oxyframe.h +++ b/noncore/apps/oxygen/oxyframe.h | |||
@@ -1,2 +1,9 @@ | |||
1 | /*************************************************************************** | ||
2 | application: : Oxygen | ||
3 | |||
4 | begin : September 2002 | ||
5 | copyright : ( C ) 2002 by Carsten Niehaus | ||
6 | email : cniehaus@handhelds.org | ||
7 | **************************************************************************/ | ||
1 | 8 | ||
2 | /*************************************************************************** | 9 | /*************************************************************************** |
diff --git a/noncore/apps/oxygen/oxygen.cpp b/noncore/apps/oxygen/oxygen.cpp index 4e293c7..b3392e1 100644 --- a/noncore/apps/oxygen/oxygen.cpp +++ b/noncore/apps/oxygen/oxygen.cpp | |||
@@ -1,3 +1,11 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | application: : Oxygen | ||
3 | |||
4 | begin : September 2002 | ||
5 | copyright : ( C ) 2002 by Carsten Niehaus | ||
6 | email : cniehaus@handhelds.org | ||
7 | **************************************************************************/ | ||
8 | |||
9 | /*************************************************************************** | ||
2 | * * | 10 | * * |
3 | * 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 * |
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp index 78e54d5..a3bb505 100644 --- a/noncore/apps/oxygen/psewidget.cpp +++ b/noncore/apps/oxygen/psewidget.cpp | |||
@@ -1,3 +1,11 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | application: : Oxygen | ||
3 | |||
4 | begin : September 2002 | ||
5 | copyright : ( C ) 2002 by Carsten Niehaus | ||
6 | email : cniehaus@handhelds.org | ||
7 | **************************************************************************/ | ||
8 | |||
9 | /*************************************************************************** | ||
2 | * * | 10 | * * |
3 | * 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 * |
diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h index f69eeb3..fdf838e 100644 --- a/noncore/apps/oxygen/psewidget.h +++ b/noncore/apps/oxygen/psewidget.h | |||
@@ -1,2 +1,9 @@ | |||
1 | /*************************************************************************** | ||
2 | application: : Oxygen | ||
3 | |||
4 | begin : September 2002 | ||
5 | copyright : ( C ) 2002 by Carsten Niehaus | ||
6 | email : cniehaus@handhelds.org | ||
7 | **************************************************************************/ | ||
1 | 8 | ||
2 | /*************************************************************************** | 9 | /*************************************************************************** |