-rw-r--r-- | noncore/apps/oxygen/calcdlg.ui | 4 | ||||
-rw-r--r-- | noncore/apps/oxygen/dataTable.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/oxygen/dataTable.h | 3 | ||||
-rw-r--r-- | noncore/apps/oxygen/datawidgetui.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.cpp | 1 |
5 files changed, 15 insertions, 4 deletions
diff --git a/noncore/apps/oxygen/calcdlg.ui b/noncore/apps/oxygen/calcdlg.ui index a8ed170..c817a47 100644 --- a/noncore/apps/oxygen/calcdlg.ui +++ b/noncore/apps/oxygen/calcdlg.ui | |||
@@ -13,3 +13,3 @@ | |||
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>241</width> | 14 | <width>237</width> |
15 | <height>318</height> | 15 | <height>318</height> |
@@ -78,3 +78,3 @@ | |||
78 | <name>text</name> | 78 | <name>text</name> |
79 | <string>chemical Formula</string> | 79 | <string>Chemical Formula</string> |
80 | </property> | 80 | </property> |
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp index 98d3bd8..82b425e 100644 --- a/noncore/apps/oxygen/dataTable.cpp +++ b/noncore/apps/oxygen/dataTable.cpp | |||
@@ -45,3 +45,2 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent) | |||
45 | DataTable = new OxydataTable( 9,2, this ); | 45 | DataTable = new OxydataTable( 9,2, this ); |
46 | //DataTable->setColumnWidth ( 1 , ( parent->width())-10 ); | ||
47 | setTable(); | 46 | setTable(); |
@@ -85,3 +84,12 @@ void OxydataWidget::setTable() const | |||
85 | DataTable->setText( 8,0, tr( "Meltingpoint" ) ); | 84 | DataTable->setText( 8,0, tr( "Meltingpoint" ) ); |
85 | } | ||
86 | |||
87 | void OxydataWidget::setLayout() | ||
88 | { | ||
89 | #warning this is not working and I have no idea why! | ||
90 | // DataTable->setColumnWidth ( 0 , this->width()/2 ); | ||
91 | // DataTable->setColumnWidth ( 1 , this->width()/2 ); | ||
86 | 92 | ||
93 | DataTable->setColumnWidth ( 0 , 110 ); | ||
94 | DataTable->setColumnWidth ( 1 , 110 ); | ||
87 | } | 95 | } |
diff --git a/noncore/apps/oxygen/dataTable.h b/noncore/apps/oxygen/dataTable.h index a4a3b18..f2eb71d 100644 --- a/noncore/apps/oxygen/dataTable.h +++ b/noncore/apps/oxygen/dataTable.h | |||
@@ -36,6 +36,7 @@ class OxydataWidget : public QWidget | |||
36 | QLabel *left, *middle, *right; | 36 | QLabel *left, *middle, *right; |
37 | void setLayout(); | ||
37 | 38 | ||
38 | private: | 39 | private: |
39 | OxydataTable *DataTable; | ||
40 | void setTable() const; | 40 | void setTable() const; |
41 | OxydataTable *DataTable; | ||
41 | 42 | ||
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp index c7afa32..99c4fd7 100644 --- a/noncore/apps/oxygen/datawidgetui.cpp +++ b/noncore/apps/oxygen/datawidgetui.cpp | |||
@@ -47,2 +47,3 @@ dataWidgetUI::dataWidgetUI() : QWidget() | |||
47 | oxyDW->setElement( 0 ); | 47 | oxyDW->setElement( 0 ); |
48 | oxyDW->setLayout(); | ||
48 | 49 | ||
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp index ba9b71a..18b41c3 100644 --- a/noncore/apps/oxygen/psewidget.cpp +++ b/noncore/apps/oxygen/psewidget.cpp | |||
@@ -51,2 +51,3 @@ PSEWidget::PSEWidget() : QWidget() | |||
51 | oxyDW->setElement( 0 ); | 51 | oxyDW->setElement( 0 ); |
52 | oxyDW->setLayout(); | ||
52 | 53 | ||