ompi layout fixes

1 files changed, 347 insertions, 307 deletions

diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui
index 029922c..610907c 100644
--- a/kmicromail/composemailui.ui
+++ b/kmicromail/composemailui.ui
@@ -33,69 +33,136 @@
     <property>
         <name>layoutSpacing</name>
     </property>
-    <grid>
+    <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>2</number>
+            <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>1</number>
+            <number>0</number>
         </property>
-        <widget row="1"  column="0"  rowspan="1"  colspan="4" >
-            <class>QTabWidget</class>
+        <widget>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>tabWidget</cstring>
-            </property>
-            <property>
-                <name>layoutMargin</name>
+                <cstring>Layout4</cstring>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
-            <widget>
-                <class>QWidget</class>
+            <vbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>mailTab</cstring>
+                    <name>spacing</name>
+                    <number>0</number>
                 </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Mail</string>
-                </attribute>
-                <vbox>
+                <widget>
+                    <class>QLayoutWidget</class>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>1</number>
+                        <name>name</name>
+                        <cstring>Layout3</cstring>
                     </property>
+                    <property>
+                        <name>layoutSpacing</name>
+                    </property>
+                    <hbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>0</number>
+                        </property>
+                        <widget>
+                            <class>QCheckBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>checkBoxLater</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>send later</string>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>accountLabel</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>use:</string>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QComboBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>smtpAccountBox</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>sizePolicy</name>
+                                <sizepolicy>
+                                    <hsizetype>3</hsizetype>
+                                    <vsizetype>0</vsizetype>
+                                </sizepolicy>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QPushButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>SaveButton</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string> S</string>
+                            </property>
+                        </widget>
+                    </hbox>
+                </widget>
+                <widget>
+                    <class>QTabWidget</class>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>1</number>
+                        <name>name</name>
+                        <cstring>tabWidget</cstring>
+                    </property>
+                    <property>
+                        <name>layoutMargin</name>
+                    </property>
+                    <property>
+                        <name>layoutSpacing</name>
                     </property>
                     <widget>
-                        <class>QLayoutWidget</class>
+                        <class>QWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout10</cstring>
-                        </property>
-                        <property>
-                            <name>layoutSpacing</name>
+                            <cstring>mailTab</cstring>
                         </property>
-                        <grid>
+                        <attribute>
+                            <name>title</name>
+                            <string>Mail</string>
+                        </attribute>
+                        <vbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>0</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
-                                <number>1</number>
+                                <number>0</number>
                             </property>
-                            <widget row="0"  column="1" >
+                            <widget>
                                 <class>QLayoutWidget</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Layout9</cstring>
+                                    <cstring>Layout10</cstring>
                                 </property>
                                 <property>
                                     <name>layoutSpacing</name>
@@ -107,13 +174,83 @@
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
-                                        <number>3</number>
+                                        <number>1</number>
                                     </property>
                                     <widget row="0"  column="1" >
-                                        <class>QComboBox</class>
+                                        <class>QLayoutWidget</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>Layout9</cstring>
+                                        </property>
+                                        <property>
+                                            <name>layoutSpacing</name>
+                                        </property>
+                                        <grid>
+                                            <property stdset="1">
+                                                <name>margin</name>
+                                                <number>0</number>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>spacing</name>
+                                                <number>3</number>
+                                            </property>
+                                            <widget row="0"  column="1" >
+                                                <class>QComboBox</class>
+                                                <property stdset="1">
+                                                    <name>name</name>
+                                                    <cstring>fromBox</cstring>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>sizePolicy</name>
+                                                    <sizepolicy>
+                                                        <hsizetype>3</hsizetype>
+                                                        <vsizetype>0</vsizetype>
+                                                    </sizepolicy>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>editable</name>
+                                                    <bool>true</bool>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>duplicatesEnabled</name>
+                                                    <bool>false</bool>
+                                                </property>
+                                            </widget>
+                                            <widget row="0"  column="0" >
+                                                <class>QLineEdit</class>
+                                                <property stdset="1">
+                                                    <name>name</name>
+                                                    <cstring>senderNameEdit</cstring>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>sizePolicy</name>
+                                                    <sizepolicy>
+                                                        <hsizetype>0</hsizetype>
+                                                        <vsizetype>0</vsizetype>
+                                                    </sizepolicy>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>minimumSize</name>
+                                                    <size>
+                                                        <width>70</width>
+                                                        <height>0</height>
+                                                    </size>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>maximumSize</name>
+                                                    <size>
+                                                        <width>180</width>
+                                                        <height>32767</height>
+                                                    </size>
+                                                </property>
+                                            </widget>
+                                        </grid>
+                                    </widget>
+                                    <widget row="2"  column="1" >
+                                        <class>QLineEdit</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>fromBox</cstring>
+                                            <cstring>subjectLine</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>sizePolicy</name>
@@ -122,342 +259,245 @@
                                                 <vsizetype>0</vsizetype>
                                             </sizepolicy>
                                         </property>
-                                        <property stdset="1">
-                                            <name>editable</name>
-                                            <bool>true</bool>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>duplicatesEnabled</name>
-                                            <bool>false</bool>
-                                        </property>
                                     </widget>
-                                    <widget row="0"  column="0" >
+                                    <widget row="1"  column="1" >
                                         <class>QLineEdit</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>senderNameEdit</cstring>
+                                            <cstring>toLine</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>sizePolicy</name>
                                             <sizepolicy>
-                                                <hsizetype>0</hsizetype>
+                                                <hsizetype>3</hsizetype>
                                                 <vsizetype>0</vsizetype>
                                             </sizepolicy>
                                         </property>
+                                    </widget>
+                                    <widget row="2"  column="0" >
+                                        <class>QLabel</class>
                                         <property stdset="1">
-                                            <name>minimumSize</name>
-                                            <size>
-                                                <width>70</width>
-                                                <height>0</height>
-                                            </size>
+                                            <name>name</name>
+                                            <cstring>subjectLabel</cstring>
                                         </property>
                                         <property stdset="1">
-                                            <name>maximumSize</name>
-                                            <size>
-                                                <width>180</width>
-                                                <height>32767</height>
-                                            </size>
+                                            <name>text</name>
+                                            <string>Subject</string>
+                                        </property>
+                                    </widget>
+                                    <widget row="0"  column="0" >
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>fromLabel</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>From</string>
+                                        </property>
+                                    </widget>
+                                    <widget row="1"  column="0" >
+                                        <class>QPushButton</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>toButton</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>To</string>
                                         </property>
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget row="2"  column="1" >
-                                <class>QLineEdit</class>
+                            <widget>
+                                <class>QMultiLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>subjectLine</cstring>
+                                    <cstring>message</cstring>
+                                </property>
+                            </widget>
+                        </vbox>
+                    </widget>
+                    <widget>
+                        <class>QWidget</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>optionsTab</cstring>
+                        </property>
+                        <attribute>
+                            <name>title</name>
+                            <string>Options</string>
+                        </attribute>
+                        <grid>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>3</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>3</number>
+                            </property>
+                            <widget row="3"  column="0" >
+                                <class>QPushButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>replyButton</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>3</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                    </sizepolicy>
+                                    <name>text</name>
+                                    <string>Reply-To</string>
+                                </property>
+                            </widget>
+                            <widget row="2"  column="0" >
+                                <class>QPushButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>bccButton</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>BCC</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="1" >
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>toLine</cstring>
+                                    <cstring>ccLine</cstring>
                                 </property>
+                            </widget>
+                            <widget row="2"  column="1" >
+                                <class>QLineEdit</class>
                                 <property stdset="1">
-                                    <name>sizePolicy</name>
-                                    <sizepolicy>
-                                        <hsizetype>3</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                    </sizepolicy>
+                                    <name>name</name>
+                                    <cstring>bccLine</cstring>
                                 </property>
                             </widget>
-                            <widget row="2"  column="0" >
-                                <class>QLabel</class>
+                            <widget row="3"  column="1" >
+                                <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>subjectLabel</cstring>
+                                    <cstring>replyLine</cstring>
                                 </property>
+                            </widget>
+                            <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+                                <class>QMultiLineEdit</class>
                                 <property stdset="1">
-                                    <name>text</name>
-                                    <string>Subject</string>
+                                    <name>name</name>
+                                    <cstring>sigMultiLine</cstring>
                                 </property>
                             </widget>
-                            <widget row="0"  column="0" >
+                            <widget row="5"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>fromLabel</cstring>
+                                    <cstring>sigLabel</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>From</string>
+                                    <string>Signature</string>
                                 </property>
                             </widget>
+                            <spacer row="4"  column="0" >
+                                <property>
+                                    <name>name</name>
+                                    <cstring>Spacer3</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>orientation</name>
+                                    <enum>Vertical</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>sizeType</name>
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property>
+                                    <name>sizeHint</name>
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
                             <widget row="1"  column="0" >
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>toButton</cstring>
+                                    <cstring>ccButton</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>To</string>
+                                    <string>CC</string>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                     <widget>
-                        <class>QMultiLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>message</cstring>
-                        </property>
-                    </widget>
-                </vbox>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>optionsTab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Options</string>
-                </attribute>
-                <grid>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>4</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>3</number>
-                    </property>
-                    <widget row="3"  column="0" >
-                        <class>QPushButton</class>
+                        <class>QWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>replyButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Reply-To</string>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="0" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>bccButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>BCC</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="1" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>ccLine</cstring>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="1" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>bccLine</cstring>
-                        </property>
-                    </widget>
-                    <widget row="3"  column="1" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>replyLine</cstring>
-                        </property>
-                    </widget>
-                    <widget row="6"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QMultiLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>sigMultiLine</cstring>
-                        </property>
-                    </widget>
-                    <widget row="5"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>sigLabel</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Signature</string>
-                        </property>
-                    </widget>
-                    <spacer row="4"  column="0" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer3</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Vertical</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget row="1"  column="0" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>ccButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>CC</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>attachTab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Attachment</string>
-                </attribute>
-                <grid>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>4</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>3</number>
-                    </property>
-                    <widget row="0"  column="0"  rowspan="1"  colspan="3" >
-                        <class>QListView</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>attList</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>selectionMode</name>
-                            <enum>Single</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>allColumnsShowFocus</name>
-                            <bool>true</bool>
-                        </property>
-                        <property stdset="1">
-                            <name>showSortIndicator</name>
-                            <bool>true</bool>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="2" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>deleteButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Delete File</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="0" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>addButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Add File</string>
+                            <cstring>attachTab</cstring>
                         </property>
+                        <attribute>
+                            <name>title</name>
+                            <string>Attachment</string>
+                        </attribute>
+                        <grid>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>3</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>3</number>
+                            </property>
+                            <widget row="0"  column="0"  rowspan="1"  colspan="3" >
+                                <class>QListView</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>attList</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>selectionMode</name>
+                                    <enum>Single</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>allColumnsShowFocus</name>
+                                    <bool>true</bool>
+                                </property>
+                                <property stdset="1">
+                                    <name>showSortIndicator</name>
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                            <widget row="1"  column="2" >
+                                <class>QPushButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>deleteButton</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Delete File</string>
+                                </property>
+                            </widget>
+                            <widget row="1"  column="0" >
+                                <class>QPushButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>addButton</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Add File</string>
+                                </property>
+                            </widget>
+                        </grid>
                     </widget>
-                </grid>
-            </widget>
-        </widget>
-        <widget row="0"  column="0" >
-            <class>QCheckBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>checkBoxLater</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>send later</string>
-            </property>
-        </widget>
-        <widget row="0"  column="1" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>accountLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>use:</string>
-            </property>
-        </widget>
-        <widget row="0"  column="2" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>smtpAccountBox</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>3</hsizetype>
-                    <vsizetype>0</vsizetype>
-                </sizepolicy>
-            </property>
-        </widget>
-        <widget row="0"  column="3" >
-            <class>QPushButton</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>SaveButton</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string> S</string>
-            </property>
+                </widget>
+            </vbox>
         </widget>
-    </grid>
+    </vbox>
 </widget>
 <tabstops>
     <tabstop>fromBox</tabstop>