-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 @@ <y>0</y> - <width>241</width> + <width>237</width> <height>318</height> @@ -78,3 +78,3 @@ <name>text</name> - <string>chemical Formula</string> + <string>Chemical Formula</string> </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) DataTable = new OxydataTable( 9,2, this ); - //DataTable->setColumnWidth ( 1 , ( parent->width())-10 ); setTable(); @@ -85,3 +84,12 @@ void OxydataWidget::setTable() const DataTable->setText( 8,0, tr( "Meltingpoint" ) ); +} + +void OxydataWidget::setLayout() +{ +#warning this is not working and I have no idea why! +// DataTable->setColumnWidth ( 0 , this->width()/2 ); +// DataTable->setColumnWidth ( 1 , this->width()/2 ); + DataTable->setColumnWidth ( 0 , 110 ); + DataTable->setColumnWidth ( 1 , 110 ); } 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 QLabel *left, *middle, *right; + void setLayout(); private: - OxydataTable *DataTable; void setTable() const; + OxydataTable *DataTable; 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() oxyDW->setElement( 0 ); + oxyDW->setLayout(); 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() oxyDW->setElement( 0 ); + oxyDW->setLayout(); |