summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2002-09-19 10:29:38 (UTC)
committer cniehaus <cniehaus>2002-09-19 10:29:38 (UTC)
commit7bf6b71e9d7eadc9311af6a839b3425297346c2c (patch) (side-by-side diff)
tree2b9a08cfec6ace06c6c4321cfb4c6f654b809287
parentacf131576d76536872a6999274db19a20cb76a4d (diff)
downloadopie-7bf6b71e9d7eadc9311af6a839b3425297346c2c.zip
opie-7bf6b71e9d7eadc9311af6a839b3425297346c2c.tar.gz
opie-7bf6b71e9d7eadc9311af6a839b3425297346c2c.tar.bz2
* nothing is hardcoded anylonger (thanks Max for the .conf-hint)
* removing obsolete includes * making the PSE-data-widget a QWidget instead of a QDialog * removing one obsolete slot * making oxyDW private
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/dataTable.cpp27
-rw-r--r--noncore/apps/oxygen/datawidgetui.cpp16
-rw-r--r--noncore/apps/oxygen/datawidgetui.h8
-rw-r--r--noncore/apps/oxygen/psewidget.cpp2
4 files changed, 21 insertions, 32 deletions
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 642a8be..5c7b35c 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -9,13 +9,12 @@
#include <qpe/config.h>
#include "dataTable.h"
#include <qwidget.h>
#include <qhbox.h>
-#include <qvbox.h>
#include <qlabel.h>
#include <qfont.h>
#include <qlayout.h>
OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
{
@@ -37,36 +36,36 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
qgrid->addWidget( hbox,0,0 );
qgrid->addWidget( DataTable,1,0 );
}
void OxydataWidget::setElement( int el )
{
- Config test( "/home/opie/Settings/oxygendata", Config::File );
- test.setGroup( QString::number( el+1 ));
+ Config configobj( "oxygendata" );
+ configobj.setGroup( QString::number( el+1 ));
- left->setText( test.readEntry( "Symbol" ) );
- middle->setText( test.readEntry( "Name" ) );
+ left->setText( configobj.readEntry( "Symbol" ) );
+ middle->setText( configobj.readEntry( "Name" ) );
right->setText( QString::number( el+1 ) );
- QString weight = test.readEntry( "Weight" );
+ QString weight = configobj.readEntry( "Weight" );
DataTable->setText( 0,1,weight );
- QString block = test.readEntry( "Block" );
+ QString block = configobj.readEntry( "Block" );
DataTable->setText( 1,1,block );
- QString grp = test.readEntry( "Group" );
+ QString grp = configobj.readEntry( "Group" );
DataTable->setText( 2,1,grp );
- QString en = test.readEntry( "EN" );
+ QString en = configobj.readEntry( "EN" );
DataTable->setText( 3,1,en );
- QString ar = test.readEntry( "AR" );
+ QString ar = configobj.readEntry( "AR" );
DataTable->setText( 4,1,ar ) ;
- QString ion = test.readEntry( "IE" );
+ QString ion = configobj.readEntry( "IE" );
DataTable->setText( 5,1,ion );
- QString dens = test.readEntry( "Density" );
+ QString dens = configobj.readEntry( "Density" );
DataTable->setText( 6,1,dens );
- QString bp = test.readEntry( "BP" );
+ QString bp = configobj.readEntry( "BP" );
DataTable->setText( 7,1,bp );
- QString mp = test.readEntry( "MP" );
+ QString mp = configobj.readEntry( "MP" );
DataTable->setText( 8,1,mp );
}
void OxydataWidget::setTable()
{
DataTable->setText( 0,0, tr( "Weight:" ) );
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index fa3f40d..8188515 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -3,46 +3,40 @@
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* ( at your option ) any later version. *
* *
**************************************************************************/
-#include "oxygen.h"
+
#include "datawidgetui.h"
#include <qpe/config.h>
#include <qstring.h>
#include <qcombobox.h>
#include <qlayout.h>
-#include <qtable.h>
#include <qhbox.h>
#include <qlabel.h>
-dataWidgetUI::dataWidgetUI() : QDialog()
+dataWidgetUI::dataWidgetUI() : QWidget()
{
this->setCaption("Chemical Data");
QGridLayout *qgrid = new QGridLayout( this, 2,1 );
dataCombo = new QComboBox( this );
OxydataWidget *oxyDW = new OxydataWidget(this);
oxyDW->setElement( 1 );
qgrid->addWidget( dataCombo, 0,0);
qgrid->addWidget( oxyDW , 1,0 );
connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) );
- Config test( "/home/opie/Settings/oxygendata", Config::File );
+ Config configobj( "oxygendata" );
//read in all names of the 118 elements
for ( int i = 1 ; i < 119 ; i++ )
{
- test.setGroup( QString::number( i ) );
- QString foo = test.readEntry( "Name" );
+ configobj.setGroup( QString::number( i ) );
+ QString foo = configobj.readEntry( "Name" );
dataCombo->insertItem( foo );
}
}
-
-
-void dataWidgetUI::slotShowData(int number){
- oxyDW->setElement( 6 );
-}
diff --git a/noncore/apps/oxygen/datawidgetui.h b/noncore/apps/oxygen/datawidgetui.h
index 20622db..5399c81 100644
--- a/noncore/apps/oxygen/datawidgetui.h
+++ b/noncore/apps/oxygen/datawidgetui.h
@@ -5,25 +5,21 @@
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* ( at your option ) any later version. *
* *
**************************************************************************/
#include "dataTable.h"
-#include <qdialog.h>
class QComboBox;
-class dataWidgetUI : public QDialog
+class dataWidgetUI : public QWidget
{
Q_OBJECT
public:
dataWidgetUI();
- OxydataWidget *oxyDW;
private:
OxydataTable *DataTable;
QComboBox *dataCombo;
-
- private slots:
- void slotShowData(int);
+ OxydataWidget *oxyDW;
};
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index f48cebe..cf55635 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -12,8 +12,8 @@
#include "psewidget.h"
#include "oxyframe.h"
PSEWidget::PSEWidget() : QWidget()
{
maingrid = new QGridLayout( 18 , 10 , -1 , "maingridlayout" );
- OxyFrame *test = new OxyFrame(this);
+ OxyFrame *configobj = new OxyFrame(this);
}