Wow, Oxygen starts to become usable. The 2 added files are without any content

sofar, will start that tomorrow or so.

6 files changed, 82 insertions, 3 deletions

diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index c8492e5..7256777 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -12,20 +12,30 @@
 #include "datawidgetui.h"
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qlayout.h>
+#include <qtable.h>
+#include <qhbox.h>
+#include <qlabel.h>
 
 dataWidgetUI::dataWidgetUI() : QDialog()
 {
     this->setCaption("Chemical Data");
     
     QVBoxLayout *vbox = new QVBoxLayout( this );
     
     dataCombo = new QComboBox( this );
-    DataTable = new OxydataTable( 7,2, this );
+    DataTable = new OxydataTable( 8,2, this );
     DataTable->setShowGrid( false );
+    DataTable->setHScrollBarMode(QScrollView::AlwaysOff);
+
+    QHBox *hbox = new QHBox( this );
+    left = new QLabel( hbox );
+    middle = new QLabel( hbox );
+    right = new QLabel( hbox );
 
     vbox->addWidget( dataCombo );
+    vbox->addWidget( hbox );
     vbox->addWidget( DataTable );
     
     DataTable->show();
     dataCombo->show();
@@ -58,15 +68,26 @@ void dataWidgetUI::createTableLayout(){
     DataTable->setText( 3,0,"Electronegativity" );
     DataTable->setText( 4,0,"Atomic radius" );
     DataTable->setText( 5,0,"Ionizationenergie" );
     DataTable->setText( 6,0,"Density" );
-    DataTable->setText( 7,0,"Boilingpoint" );
+    DataTable->setText( 7,0, tr( "Boilingpoint" ) );
+    DataTable->setText( 8,0, tr( "Meltingpoint" ) );
 }
 
 
 void dataWidgetUI::slotShowData(int number){
     Config test( "/home/opie/Settings/oxygendata", Config::File );
     test.setGroup( QString::number( number+1 ));
+    
+    left->setText( test.readEntry( "Symbol" ) );
+    middle->setText( test.readEntry( "Name" ) );
+    right->setText( QString::number( number+1 ) );
+
+    QFont bf;
+    bf.setBold( true );
+    bf.setPointSize( bf.pointSize()+2 );
+    middle->setFont( bf );
+
     QString weight = test.readEntry( "Weight" );
     DataTable->setText( 0,1,weight ); 
     QString block = test.readEntry( "Block" );
     DataTable->setText( 1,1,block ); 
@@ -81,5 +102,7 @@ void dataWidgetUI::slotShowData(int number){
     QString dens = test.readEntry( "Density" );
     DataTable->setText( 6,1,dens ); 
     QString bp = test.readEntry( "BP" );
     DataTable->setText( 7,1,bp ); 
+    QString mp = test.readEntry( "MP" );
+    DataTable->setText( 7,1,mp ); 
 }
diff --git a/noncore/apps/oxygen/datawidgetui.h b/noncore/apps/oxygen/datawidgetui.h
index 9427adf..64599a7 100644
--- a/noncore/apps/oxygen/datawidgetui.h
+++ b/noncore/apps/oxygen/datawidgetui.h
@@ -11,8 +11,9 @@
 #include <qdialog.h>
 
 class QTable;
 class QComboBox;
+class QLabel;
 
 class dataWidgetUI : public QDialog
 {
 	Q_OBJECT
@@ -23,8 +24,9 @@ class dataWidgetUI : public QDialog
     private:
         void createTableLayout();
         OxydataTable *DataTable;
         QComboBox *dataCombo;
+        QLabel *left, *middle, *right;
 
     private slots:
         void slotShowData(int);
 };
diff --git a/noncore/apps/oxygen/oxygen.cpp b/noncore/apps/oxygen/oxygen.cpp
index a9c2276..2574841 100644
--- a/noncore/apps/oxygen/oxygen.cpp
+++ b/noncore/apps/oxygen/oxygen.cpp
@@ -14,8 +14,9 @@
 #include <qvbox.h>
 #include "calcdlg.h"
 #include "calcdlgui.h"
 #include "datawidgetui.h"
+#include "psewidget.h"
 
 Oxygen::Oxygen()
   : QMainWindow()
 {
@@ -47,10 +48,16 @@ void Oxygen::slotCalculations(){
 };
 
 void Oxygen::slotData(){ 
     dataWidgetUI *DataWidgetUI = new dataWidgetUI();
+    DataWidgetUI->showMaximized();
     DataWidgetUI->show();
 };
 
 void Oxygen::slotSettings(){ };
-void Oxygen::slotPSE(){ };
+
+void Oxygen::slotPSE(){
+    PSEWidget *pse = new PSEWidget();
+    pse->showMaximized();
+    pse->show();
+};
 
diff --git a/noncore/apps/oxygen/oxygen.pro b/noncore/apps/oxygen/oxygen.pro
index 1bbeb94..c447330 100644
--- a/noncore/apps/oxygen/oxygen.pro
+++ b/noncore/apps/oxygen/oxygen.pro
@@ -4,16 +4,18 @@ HEADERS		= oxygen.h \
             kmolcalc.h \
             kmolelements.h \
             calcdlgui.h \
             dataTable.h \
+            psewidget.h \
             datawidgetui.h
 
 SOURCES		= main.cpp \
 		  oxygen.cpp \
           kmolcalc.cpp \
           calcdlgui.cpp \
           kmolelements.cpp \
           dataTable.cpp \
+          psewidget.cpp \
           datawidgetui.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS		+= -lqpe
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
new file mode 100644
index 0000000..66450be
--- a/dev/null
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -0,0 +1,16 @@
+/***************************************************************************
+ *                                                                         *
+ * 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 <qpe/config.h>
+#include "psewidget.h"
+
+PSEWidget::PSEWidget() : QWidget()
+{
+}
diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h
new file mode 100644
index 0000000..ebdec94
--- a/dev/null
+++ b/noncore/apps/oxygen/psewidget.h
@@ -0,0 +1,29 @@
+
+/***************************************************************************
+ *                                                                         *
+ * 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.                                   *
+ *                                                                         *
+ **************************************************************************/
+#ifndef _PSEWIDGET_H
+#define _PSEWIDGET_H
+
+#include <qwidget.h>
+
+class QTable;
+class QComboBox;
+class QLabel;
+
+
+class PSEWidget : public QWidget
+{
+	Q_OBJECT
+	
+    public:
+		PSEWidget();
+
+};
+
+#endif