Diffstat (limited to 'noncore/apps/oxygen/datawidgetui.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/oxygen/datawidgetui.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
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,2 +1,10 @@ | |||
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 | * * |
@@ -10,2 +18,3 @@ | |||
10 | #include "datawidgetui.h" | 18 | #include "datawidgetui.h" |
19 | #include "dataTable.h" | ||
11 | 20 | ||
@@ -21,3 +30,2 @@ dataWidgetUI::dataWidgetUI() : QWidget() | |||
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 ); |
@@ -25,11 +33,5 @@ dataWidgetUI::dataWidgetUI() : QWidget() | |||
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++ ) |
@@ -40,2 +42,9 @@ dataWidgetUI::dataWidgetUI() : QWidget() | |||
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 | } |