More decent layout of date entry dialog

1 files changed, 79 insertions, 15 deletions

diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui
index 22ff32d..dc5195f 100644
--- a/core/pim/datebook/dateentry.ui
+++ b/core/pim/datebook/dateentry.ui
@@ -11,70 +11,64 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ** $Id$
 **
 *********************************************************************</comment>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>DateEntryBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
             <width>242</width>
             <height>339</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>New Event</string>
     </property>
-    <property>
-        <name>layoutMargin</name>
-    </property>
-    <property>
-        <name>layoutSpacing</name>
-    </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>0</number>
         </property>
         <widget row="1"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel2</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
                 <enum>MShape</enum>
             </property>
             <property stdset="1">
                 <name>frameShadow</name>
                 <enum>MShadow</enum>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Location</string>
             </property>
         </widget>
         <widget row="2"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
@@ -124,203 +118,273 @@
             <property stdset="1">
                 <name>name</name>
                 <cstring>comboDescription</cstring>
             </property>
             <property stdset="1">
                 <name>sizePolicy</name>
                 <sizepolicy>
                     <hsizetype>7</hsizetype>
                     <vsizetype>0</vsizetype>
                 </sizepolicy>
             </property>
             <property stdset="1">
                 <name>editable</name>
                 <bool>true</bool>
             </property>
             <property stdset="1">
                 <name>currentItem</name>
                 <number>0</number>
             </property>
             <property stdset="1">
                 <name>duplicatesEnabled</name>
                 <bool>false</bool>
             </property>
         </widget>
         <widget row="0"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel1</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Description:</string>
+                <string>Description</string>
             </property>
         </widget>
         <widget row="1"  column="1"  rowspan="1"  colspan="3" >
             <class>QComboBox</class>
             <item>
                 <property>
                     <name>text</name>
                     <string></string>
                 </property>
             </item>
             <item>
                 <property>
                     <name>text</name>
                     <string>Office</string>
                 </property>
             </item>
             <item>
                 <property>
                     <name>text</name>
                     <string>Home</string>
                 </property>
             </item>
             <property stdset="1">
                 <name>name</name>
                 <cstring>comboLocation</cstring>
             </property>
             <property stdset="1">
                 <name>sizePolicy</name>
                 <sizepolicy>
                     <hsizetype>7</hsizetype>
                     <vsizetype>0</vsizetype>
                 </sizepolicy>
             </property>
             <property stdset="1">
                 <name>editable</name>
                 <bool>true</bool>
             </property>
             <property stdset="1">
                 <name>currentItem</name>
                 <number>0</number>
             </property>
             <property stdset="1">
                 <name>duplicatesEnabled</name>
                 <bool>false</bool>
             </property>
         </widget>
         <widget row="2"  column="1"  rowspan="1"  colspan="3" >
             <class>CategorySelect</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>comboCategory</cstring>
             </property>
         </widget>
-        <widget row="3"  column="0" >
+        <widget row="3"  column="0" rowspan="2">
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel3</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Start</string>
+                <string>Start - End</string>
             </property>
         </widget>
         <widget row="3"  column="1" >
             <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>buttonStart</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Jan 02 00</string>
             </property>
+            <property stdset="1">
+                <name>minimumSize</name>
+                <size>
+                    <width>70</width>
+                    <height>0</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>maximumSize</name>
+                <size>
+                    <width>70</width>
+                    <height>32767</height>
+                </size>
+            </property>
         </widget>
-        <widget row="3"  column="2"  rowspan="1"  colspan="2" >
+        <widget row="4"  column="1"  rowspan="1"  colspan="1" >
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>comboStart</cstring>
             </property>
+            <property stdset="1">
+                <name>minimumSize</name>
+                <size>
+                    <width>70</width>
+                    <height>0</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>maximumSize</name>
+                <size>
+                    <width>70</width>
+                    <height>32767</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>alignment</name>
+                <set>AlignHCenter</set>
+            </property>
+            <property>
+                <name>hAlign</name>
+            </property>
         </widget>
 	<widget row="5"  column="1" colspan="3">
 	    <class>TimePicker</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>timePickerStart</cstring>
             </property>
  	</widget>
-        <widget row="4"  column="1" >
+        <widget row="3"  column="2" colspan="2">
             <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>buttonEnd</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Jan 02 00</string>
             </property>
+            <property stdset="1">
+                <name>minimumSize</name>
+                <size>
+                    <width>70</width>
+                    <height>0</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>maximumSize</name>
+                <size>
+                    <width>70</width>
+                    <height>32767</height>
+                </size>
+            </property>
         </widget>
-        <widget row="4"  column="2"  rowspan="1"  colspan="2" >
+        <widget row="4"  column="2" colspan="2">
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>comboEnd</cstring>
             </property>
+            <property stdset="1">
+                <name>minimumSize</name>
+                <size>
+                    <width>70</width>
+                    <height>0</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>maximumSize</name>
+                <size>
+                    <width>70</width>
+                    <height>32767</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>alignment</name>
+                <set>AlignHCenter</set>
+            </property>
+            <property>
+                <name>hAlign</name>
+            </property>
         </widget>
-        <widget row="4"  column="0" >
+        <widget row="5"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel3_2</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>End</string>
+                <string>Start time</string>
             </property>
         </widget>
         <widget row="6"  column="0" >
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>checkAllDay</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>All day</string>
             </property>
         </widget>
         <widget row="7"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel3_2_2</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Time zone:</string>
+                <string>Time zone</string>
             </property>
         </widget>
         <widget row="7"  column="1"  rowspan="1"  colspan="3" >
             <class>TimeZoneSelector</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>timezone</cstring>
             </property>
         </widget>
         <widget row="8"  column="0" >
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>checkAlarm</cstring>
             </property>
             <property stdset="1">
                 <name>enabled</name>
                 <bool>true</bool>
             </property>
             <property stdset="1">
                 <name>autoMask</name>
                 <bool>false</bool>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>&amp;Alarm</string>
             </property>
             <property stdset="1">
                 <name>checked</name>
                 <bool>false</bool>
             </property>
         </widget>