4 files changed, 42 insertions, 20 deletions

diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index ff01417..f034c45 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -61,2 +61,3 @@ void OxydataWidget::setElement( int el )
 
+
     DataTable->setText( 0,1,configobj.readEntry( "Weight" ) ); 
@@ -70,2 +71,3 @@ void OxydataWidget::setElement( int el )
     DataTable->setText( 8,1,configobj.readEntry( "MP" ) ); 
+    
 }
@@ -83,2 +85,3 @@ void OxydataWidget::setTable() const
     DataTable->setText( 8,0, tr( "Meltingpoint" ) );
+    
 }
@@ -86,4 +89,13 @@ void OxydataWidget::setTable() const
 OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent,
-        const char *name) : QTable(numRows, numRows, parent, name)
+        const char *name) : QTable(numRows, numCols,parent, name)
 {
+
+    for (int zeile = 0; zeile < numRows; zeile++)
+        for ( int spalte = 0; spalte < numCols; spalte++ )
+        {
+            OxydataQTI *testus = new OxydataQTI (this, OxydataQTI::Never, "hm" );
+            setItem(zeile, spalte, (QTableItem*)testus);
+        }
+
+
     this->setShowGrid( false );
@@ -96,9 +108,2 @@ OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent,
 
-int OxydataTable::alignment() const
-{
-    return AlignLeft | AlignVCenter;
-};
-
-
-
 void OxydataTable::paintCell(  QPainter *p, int row, int col, const QRect &cr, bool selected)
@@ -122 +127,15 @@ void OxydataTable::paintCell(  QPainter *p, int row, int col, const QRect &cr, b
 }
+
+OxydataQTI::OxydataQTI(QTable * table, EditType et, const QString & text )
+    : QTableItem ( table, et, text )
+{
+}
+
+int OxydataQTI::alignment() const
+{
+    if ( col()%2 ) 
+    {
+        return AlignRight | AlignVCenter; 
+    }else return AlignLeft | AlignVCenter;
+};
+
diff --git a/noncore/apps/oxygen/dataTable.h b/noncore/apps/oxygen/dataTable.h
index 00063d4..a4a3b18 100644
--- a/noncore/apps/oxygen/dataTable.h
+++ b/noncore/apps/oxygen/dataTable.h
@@ -18,3 +18,2 @@ class QLabel;
 class OxydataTable;
-class QTableItem;
 
@@ -62,5 +61,2 @@ class OxydataTable : public QTable
 
-        virtual int alignment() const;
-//        virtual QTableItem *item(  int row, int col ) const;
-
     protected:
@@ -72,9 +68,16 @@ class OxydataTable : public QTable
 };
+/*
+ * A OxydataQTI is a QTableItem which has the ability to set an alignment.
+ * In Oxygen we only have two colums so I can use the simple col()%2.
+ *
+ * Author: Robert Gogolok <robertgogolok@gmx.de>
+ */
 
-//X class OxydataQTI : QTableItem
-//X {
-//X     Q_OBJECT
-//X 
-//X     public:
-//X         OxydataQTI( 
+class OxydataQTI : public QTableItem
+{
+     public:
+         OxydataQTI(QTable * table, EditType et, const QString & text );
+
+         virtual int alignment() const;
+};
 
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index 4dab109..422b6f8 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -45,3 +45,3 @@ dataWidgetUI::dataWidgetUI() : QWidget()
     connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) );
-    oxyDW->setElement( 1 );
+    oxyDW->setElement( 0 );
 
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index a3bb505..449afef 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -49,3 +49,3 @@ PSEWidget::PSEWidget() : QWidget()
     oxyDW = new OxydataWidget(this);
-    oxyDW->setElement( 1 );
+    oxyDW->setElement( 0 );