summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/calcdlg.ui220
-rw-r--r--noncore/apps/oxygen/dataTable.cpp2
2 files changed, 121 insertions, 101 deletions
diff --git a/noncore/apps/oxygen/calcdlg.ui b/noncore/apps/oxygen/calcdlg.ui
index 51bf334..60d312d 100644
--- a/noncore/apps/oxygen/calcdlg.ui
+++ b/noncore/apps/oxygen/calcdlg.ui
@@ -8,162 +8,180 @@
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>237</width>
- <height>318</height>
+ <width>323</width>
+ <height>380</height>
</rect>
</property>
- <widget>
- <class>QTabWidget</class>
+ <property stdset="1">
+ <name>caption</name>
+ <string>CalcDlg</string>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <grid>
<property stdset="1">
- <name>name</name>
- <cstring>TabWidget3</cstring>
+ <name>margin</name>
+ <number>-1</number>
</property>
<property stdset="1">
- <name>geometry</name>
- <rect>
- <x>0</x>
- <y>0</y>
- <width>240</width>
- <height>320</height>
- </rect>
+ <name>spacing</name>
+ <number>-1</number>
</property>
- <widget>
- <class>QWidget</class>
+ <widget row="0" column="0" >
+ <class>QTabWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>tab</cstring>
+ <cstring>TabWidget3</cstring>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
</property>
- <attribute>
- <name>title</name>
- <string>Molecular Weight</string>
- </attribute>
<widget>
- <class>QLayoutWidget</class>
+ <class>QWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout6</cstring>
- </property>
- <property stdset="1">
- <name>geometry</name>
- <rect>
- <x>0</x>
- <y>0</y>
- <width>230</width>
- <height>290</height>
- </rect>
+ <cstring>tab</cstring>
</property>
+ <attribute>
+ <name>title</name>
+ <string>Molecular Weight</string>
+ </attribute>
<vbox>
<property stdset="1">
<name>margin</name>
- <number>0</number>
+ <number>-1</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>6</number>
+ <number>-1</number>
</property>
<widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel2</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Chemical Formula</string>
- </property>
- </widget>
- <widget>
- <class>QLineEdit</class>
- <property stdset="1">
- <name>name</name>
- <cstring>formula</cstring>
- </property>
- </widget>
- <widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout3</cstring>
+ <cstring>Layout6</cstring>
</property>
- <hbox>
+ <vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
- <class>QPushButton</class>
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>calculate</cstring>
+ <cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Calculate</string>
+ <string>Chemical Formula</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>formula</cstring>
</property>
</widget>
<widget>
- <class>QPushButton</class>
+ <class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>clear_fields</cstring>
+ <cstring>Layout3</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>calculate</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Calculate</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>clear_fields</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Clear</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel3</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Clear</string>
+ <string>Molecular Weight (u):</string>
</property>
</widget>
- </hbox>
- </widget>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel3</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Molecular Weight (u):</string>
- </property>
- </widget>
- <widget>
- <class>QLineEdit</class>
- <property stdset="1">
- <name>name</name>
- <cstring>result</cstring>
- </property>
- </widget>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Elemental Composition (%):</string>
- </property>
- </widget>
- <widget>
- <class>QMultiLineEdit</class>
- <property stdset="1">
- <name>name</name>
- <cstring>anal_display</cstring>
- </property>
- <property stdset="1">
- <name>readOnly</name>
- <bool>true</bool>
- </property>
+ <widget>
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>result</cstring>
+ </property>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Elemental Composition (%):</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QMultiLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>anal_display</cstring>
+ </property>
+ <property stdset="1">
+ <name>readOnly</name>
+ <bool>true</bool>
+ </property>
+ </widget>
+ </vbox>
</widget>
</vbox>
</widget>
</widget>
- </widget>
+ </grid>
</widget>
</UI>
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 48e2b20..798230a 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -94,12 +94,14 @@ void OxydataWidget::setLayout()
//X DataTable->setColumnWidth ( 1 , 110 );
}
OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent,
const char *name) : QTable(numRows, numCols,parent, name)
{
+ setColumnStretchable( 0, true );
+ setColumnStretchable( 1, true );
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);