-rw-r--r-- | noncore/apps/oxygen/dataTable.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/oxygen/datawidgetui.cpp | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp index 951788b..46eaeba 100644 --- a/noncore/apps/oxygen/dataTable.cpp +++ b/noncore/apps/oxygen/dataTable.cpp | |||
@@ -27,11 +27,8 @@ | |||
27 | 27 | ||
28 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
29 | 29 | ||
30 | OxydataWidget::OxydataWidget(QWidget *parent, const char *name, const QStringList &list ) : QWidget( parent,name ) | 30 | OxydataWidget::OxydataWidget(QWidget *parent, const char *name, const QStringList &list ) : QWidget( parent,name ), names( list ) |
31 | { | 31 | { |
32 | names = list; | ||
33 | QStringList::ConstIterator it = names.at(10); | ||
34 | qDebug( *it ); | ||
35 | QGridLayout *qgrid = new QGridLayout( this, 2,1 ); | 32 | QGridLayout *qgrid = new QGridLayout( this, 2,1 ); |
36 | 33 | ||
37 | QHBox *hbox = new QHBox( this ); | 34 | QHBox *hbox = new QHBox( this ); |
@@ -56,8 +53,7 @@ OxydataWidget::OxydataWidget(QWidget *parent, const char *name, const QStringLis | |||
56 | 53 | ||
57 | void OxydataWidget::setElement( int el ) | 54 | void OxydataWidget::setElement( int el ) |
58 | { | 55 | { |
59 | QStringList::ConstIterator it = names.at(el+1); | 56 | QStringList::ConstIterator it = names.at(el); |
60 | qDebug( *it ); | ||
61 | Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File ); | 57 | Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File ); |
62 | 58 | ||
63 | configobj.setGroup( QString::number( el+1 )); | 59 | configobj.setGroup( QString::number( el+1 )); |
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp index e28ee4d..91d669f 100644 --- a/noncore/apps/oxygen/datawidgetui.cpp +++ b/noncore/apps/oxygen/datawidgetui.cpp | |||
@@ -43,7 +43,7 @@ dataWidgetUI::dataWidgetUI() : QWidget() | |||
43 | { | 43 | { |
44 | dataCombo->insertItem( QString::number( i+1 )+" - "+*it ); | 44 | dataCombo->insertItem( QString::number( i+1 )+" - "+*it ); |
45 | } | 45 | } |
46 | 46 | QStringList::ConstIterator it = names.begin(); | |
47 | OxydataWidget *oxyDW = new OxydataWidget(this, "OxydataWidget_oxyDW", names); | 47 | OxydataWidget *oxyDW = new OxydataWidget(this, "OxydataWidget_oxyDW", names); |
48 | connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) ); | 48 | connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) ); |
49 | oxyDW->setElement( 0 ); | 49 | oxyDW->setElement( 0 ); |
@@ -55,6 +55,7 @@ dataWidgetUI::dataWidgetUI() : QWidget() | |||
55 | 55 | ||
56 | void dataWidgetUI::loadNames() | 56 | void dataWidgetUI::loadNames() |
57 | { | 57 | { |
58 | names.clear(); | ||
58 | names.append( tr("Hydrogen") ); | 59 | names.append( tr("Hydrogen") ); |
59 | names.append( tr("Helium") ); | 60 | names.append( tr("Helium") ); |
60 | names.append( tr("Lithium") ); | 61 | names.append( tr("Lithium") ); |