before starting to hack QTableItem I wanted to have a safe point in cvs

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,5 +1,13 @@
 /***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
+
+/***************************************************************************
  *                                                                         *
  * 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       *
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,5 +1,13 @@
 /***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
+
+/***************************************************************************
  *                                                                         *
  * 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       *
@@ -18,20 +26,25 @@
 
 OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
 {
     QGridLayout *qgrid = new QGridLayout( this, 2,1 );
+    
     QHBox *hbox = new QHBox( this );
     left = new QLabel( hbox );
     middle = new QLabel( hbox );
     right = new QLabel( hbox );
     
-    DataTable = new OxydataTable( 9,2, this );
-
+    right->setAlignment( AlignRight );
+    middle->setAlignment( AlignHCenter );
+    
     QFont bf;
     bf.setBold( true );
     bf.setPointSize( bf.pointSize()+2 );
     middle->setFont( bf );
 
+    DataTable = new OxydataTable( 9,2, this );
+    DataTable->setColumnWidth ( 1 , 118 );
+    DataTable->setColumnWidth ( 0 , 118 );
     setTable();
 
     qgrid->addWidget( hbox,0,0 );    
     qgrid->addWidget( DataTable,1,0 );    
@@ -80,8 +93,15 @@ OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent,
     this->setTopMargin( 0 );
     this->setLeftMargin( 0 );
 }
 
+int OxydataTable::alignment() const
+{
+    return AlignLeft | AlignVCenter;
+};
+
+
+
 void OxydataTable::paintCell(  QPainter *p, int row, int col, const QRect &cr, bool selected)
 {
     if ( cr.width() == 0 || cr.height() == 0 )
         return;
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
@@ -15,8 +15,9 @@
 #include <qtable.h>
 
 class QLabel;
 class OxydataTable;
+class QTableItem;
 
 /*
  * A OxydataWidget shows all known data of an element. It can 
  * be used for both the PSE and the pure Data-Dialog. It is 
@@ -58,13 +59,23 @@ class OxydataTable : public QTable
     public:
         OxydataTable( int numRows, int numCols,
                             QWidget *parent = 0, const char *name = 0 );
 
+        virtual int alignment() const;
+//        virtual QTableItem *item(  int row, int col ) const;
+
     protected:
         /*
          * This method is reimplemented form QTable. It implements the colourisation
          * of every second row.
          */
         virtual void paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected );
 };
 
+//X class OxydataQTI : QTableItem
+//X {
+//X     Q_OBJECT
+//X 
+//X     public:
+//X         OxydataQTI( 
+
 #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,5 +1,13 @@
 /***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
+
+/***************************************************************************
  *                                                                         *
  * 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       *
@@ -7,8 +15,9 @@
  *                                                                         *
  **************************************************************************/
 
 #include "datawidgetui.h"
+#include "dataTable.h"
 
 #include <qpe/config.h>
 #include <qstring.h>
 #include <qcombobox.h>
@@ -18,25 +27,25 @@
 
 dataWidgetUI::dataWidgetUI() : QWidget()
 {
     this->setCaption( tr( "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 configobj( "oxygendata" );
     
     //read in all names of the 118 elements
+    Config configobj( "oxygendata" );
     for ( int i = 1 ; i < 119 ; i++ )
     {
         configobj.setGroup( QString::number( i ) );
         QString foo = configobj.readEntry( "Name" );
         dataCombo->insertItem( foo );
     }
+    
+    OxydataWidget *oxyDW = new OxydataWidget(this);
+    connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) );
+    oxyDW->setElement( 1 );
+
+    qgrid->addWidget(  dataCombo, 0,0);
+    qgrid->addWidget(  oxyDW , 1,0 );
 }
 
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,4 +1,15 @@
+#ifndef DATAWIDGETUI_H
+#define DATAWIDGETUI_H
+
+
+/***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -6,11 +17,15 @@
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
-#include "dataTable.h"
+
+
+class OxydataWidget;
+class OxydataTable;
 
 class QComboBox;
+#include <qwidget.h>
 
 class dataWidgetUI : public QWidget
 {
         Q_OBJECT
@@ -22,4 +37,5 @@ class dataWidgetUI : public QWidget
         OxydataTable *DataTable;
         QComboBox *dataCombo;
         OxydataWidget *oxyDW;
 };
+#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,5 +1,13 @@
 /***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
+
+/***************************************************************************
  *                                                                         *
  * 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       *
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,5 +1,13 @@
 /***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
+
+/***************************************************************************
  *                                                                         *
  * 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       *
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,4 +1,11 @@
+/***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
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,5 +1,13 @@
 /***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
+
+/***************************************************************************
  *                                                                         *
  * 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       *
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,5 +1,13 @@
 /***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
+
+/***************************************************************************
  *                                                                         *
  * 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       *
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,4 +1,11 @@
+/***************************************************************************
+   application:             : Oxygen
+
+   begin                    : September 2002
+   copyright                : ( C ) 2002 by Carsten Niehaus
+   email                    : cniehaus@handhelds.org
+ **************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *