-rw-r--r-- | noncore/apps/oxygen/calcdlg.ui | 58 | ||||
-rw-r--r-- | noncore/apps/oxygen/dataTable.cpp | 2 |
2 files changed, 40 insertions, 20 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 | |||
@@ -11,24 +11,40 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>237</width> | 14 | <width>323</width> |
15 | <height>318</height> | 15 | <height>380</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <widget> | 18 | <property stdset="1"> |
19 | <name>caption</name> | ||
20 | <string>CalcDlg</string> | ||
21 | </property> | ||
22 | <property> | ||
23 | <name>layoutMargin</name> | ||
24 | </property> | ||
25 | <property> | ||
26 | <name>layoutSpacing</name> | ||
27 | </property> | ||
28 | <grid> | ||
29 | <property stdset="1"> | ||
30 | <name>margin</name> | ||
31 | <number>-1</number> | ||
32 | </property> | ||
33 | <property stdset="1"> | ||
34 | <name>spacing</name> | ||
35 | <number>-1</number> | ||
36 | </property> | ||
37 | <widget row="0" column="0" > | ||
19 | <class>QTabWidget</class> | 38 | <class>QTabWidget</class> |
20 | <property stdset="1"> | 39 | <property stdset="1"> |
21 | <name>name</name> | 40 | <name>name</name> |
22 | <cstring>TabWidget3</cstring> | 41 | <cstring>TabWidget3</cstring> |
23 | </property> | 42 | </property> |
24 | <property stdset="1"> | 43 | <property> |
25 | <name>geometry</name> | 44 | <name>layoutMargin</name> |
26 | <rect> | 45 | </property> |
27 | <x>0</x> | 46 | <property> |
28 | <y>0</y> | 47 | <name>layoutSpacing</name> |
29 | <width>240</width> | ||
30 | <height>320</height> | ||
31 | </rect> | ||
32 | </property> | 48 | </property> |
33 | <widget> | 49 | <widget> |
34 | <class>QWidget</class> | 50 | <class>QWidget</class> |
@@ -40,21 +56,21 @@ | |||
40 | <name>title</name> | 56 | <name>title</name> |
41 | <string>Molecular Weight</string> | 57 | <string>Molecular Weight</string> |
42 | </attribute> | 58 | </attribute> |
59 | <vbox> | ||
60 | <property stdset="1"> | ||
61 | <name>margin</name> | ||
62 | <number>-1</number> | ||
63 | </property> | ||
64 | <property stdset="1"> | ||
65 | <name>spacing</name> | ||
66 | <number>-1</number> | ||
67 | </property> | ||
43 | <widget> | 68 | <widget> |
44 | <class>QLayoutWidget</class> | 69 | <class>QLayoutWidget</class> |
45 | <property stdset="1"> | 70 | <property stdset="1"> |
46 | <name>name</name> | 71 | <name>name</name> |
47 | <cstring>Layout6</cstring> | 72 | <cstring>Layout6</cstring> |
48 | </property> | 73 | </property> |
49 | <property stdset="1"> | ||
50 | <name>geometry</name> | ||
51 | <rect> | ||
52 | <x>0</x> | ||
53 | <y>0</y> | ||
54 | <width>230</width> | ||
55 | <height>290</height> | ||
56 | </rect> | ||
57 | </property> | ||
58 | <vbox> | 74 | <vbox> |
59 | <property stdset="1"> | 75 | <property stdset="1"> |
60 | <name>margin</name> | 76 | <name>margin</name> |
@@ -163,7 +179,9 @@ | |||
163 | </widget> | 179 | </widget> |
164 | </vbox> | 180 | </vbox> |
165 | </widget> | 181 | </widget> |
182 | </vbox> | ||
166 | </widget> | 183 | </widget> |
167 | </widget> | 184 | </widget> |
185 | </grid> | ||
168 | </widget> | 186 | </widget> |
169 | </UI> | 187 | </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 | |||
@@ -97,6 +97,8 @@ void OxydataWidget::setLayout() | |||
97 | OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent, | 97 | OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent, |
98 | const char *name) : QTable(numRows, numCols,parent, name) | 98 | const char *name) : QTable(numRows, numCols,parent, name) |
99 | { | 99 | { |
100 | setColumnStretchable( 0, true ); | ||
101 | setColumnStretchable( 1, true ); | ||
100 | 102 | ||
101 | for (int zeile = 0; zeile < numRows; zeile++) | 103 | for (int zeile = 0; zeile < numRows; zeile++) |
102 | for ( int spalte = 0; spalte < numCols; spalte++ ) | 104 | for ( int spalte = 0; spalte < numCols; spalte++ ) |