revert

1 files changed, 54 insertions, 306 deletions

diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui
index 6e4ada1..f776911 100644
--- a/core/pim/datebook/dateentry.ui
+++ b/core/pim/datebook/dateentry.ui
@@ -33,6 +33,6 @@
             <x>0</x>
             <y>0</y>
-            <width>286</width>
-            <height>396</height>
+            <width>242</width>
+            <height>339</height>
         </rect>
     </property>
@@ -41,10 +41,4 @@
         <string>New Event</string>
     </property>
-    <property>
-        <name>layoutMargin</name>
-    </property>
-    <property>
-        <name>layoutSpacing</name>
-    </property>
     <grid>
         <property stdset="1">
@@ -54,48 +48,41 @@
         <property stdset="1">
             <name>spacing</name>
-            <number>2</number>
-        </property>
-        <widget row="0"  column="0" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout19</cstring>
-            </property>
-            <vbox>
-                <property stdset="1">
-                    <name>margin</name>
                     <number>0</number>
                 </property>
+        <widget row="1"  column="0" >
+            <class>QLabel</class>
                 <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
+                <name>name</name>
+                <cstring>TextLabel2</cstring>
                 </property>
-                <widget>
-                    <class>QLayoutWidget</class>
                     <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout1</cstring>
+                <name>frameShape</name>
+                <enum>MShape</enum>
                     </property>
-                    <hbox>
                         <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
+                <name>frameShadow</name>
+                <enum>MShadow</enum>
                         </property>
                         <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
+                <name>text</name>
+                <string>Location</string>
                         </property>
-                        <widget>
+        </widget>
+        <widget row="2"  column="0" >
                             <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>TextLabel1</cstring>
+                <cstring>TextLabel2_2</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Description </string>
+                <string>Category</string>
+            </property>
+            <property>
+                <name>buddy</name>
+                <cstring>comboPriority</cstring>
                             </property>
                         </widget>
-                        <widget>
+        <widget row="0"  column="1"  rowspan="1"  colspan="3" >
                             <class>QComboBox</class>
                             <item>
@@ -153,41 +140,16 @@
                             </property>
                         </widget>
-                    </hbox>
-                </widget>
-                <widget>
-                    <class>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout2</cstring>
-                    </property>
-                    <hbox>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget>
+        <widget row="0"  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>
+                <cstring>TextLabel1</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Location</string>
+                <string>Description </string>
                             </property>
                         </widget>
-                        <widget>
+        <widget row="1"  column="1"  rowspan="1"  colspan="3" >
                             <class>QComboBox</class>
                             <item>
@@ -233,37 +195,5 @@
                             </property>
                         </widget>
-                    </hbox>
-                </widget>
-                <widget>
-                    <class>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <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>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>TextLabel2_2</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Category</string>
-                            </property>
-                            <property>
-                                <name>buddy</name>
-                                <cstring>comboPriority</cstring>
-                            </property>
-                        </widget>
-                        <widget>
+        <widget row="2"  column="1"  rowspan="1"  colspan="3" >
                             <class>CategorySelect</class>
                             <property stdset="1">
@@ -279,37 +209,5 @@
                             </property>
                         </widget>
-                    </hbox>
-                </widget>
-                <widget>
-                    <class>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout18</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>QLayoutWidget</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>Layout17</cstring>
-                            </property>
-                            <vbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
-                                </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
-                                </property>
-                                <widget>
+        <widget row="3"  column="0"  rowspan="2"  colspan="1" >
                                     <class>QLabel</class>
                                     <property stdset="1">
@@ -322,22 +220,5 @@
                                     </property>
                                 </widget>
-                            </vbox>
-                        </widget>
-                        <widget>
-                            <class>QLayoutWidget</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>Layout4</cstring>
-                            </property>
-                            <vbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
-                                </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
-                                </property>
-                                <widget>
+        <widget row="3"  column="1" >
                                     <class>QPushButton</class>
                                     <property stdset="1">
@@ -364,5 +245,5 @@
                                     </property>
                                 </widget>
-                                <widget>
+        <widget row="4"  column="1" >
                                     <class>QLineEdit</class>
                                     <property stdset="1">
@@ -399,10 +280,8 @@
                                     </property>
                                 </widget>
-                            </vbox>
-                        </widget>
-                        <spacer>
+        <spacer row="3"  column="2"  rowspan="2"  colspan="1" >
                             <property>
                                 <name>name</name>
-                                <cstring>Spacer12</cstring>
+                <cstring>Spacer1_2</cstring>
                             </property>
                             <property stdset="1">
@@ -422,20 +301,19 @@
                             </property>
                         </spacer>
-                        <widget>
-                            <class>QLayoutWidget</class>
+        <widget row="5"  column="1"  rowspan="1"  colspan="3" >
+            <class>TimePicker</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>Layout5</cstring>
-                            </property>
-                            <vbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
+                <cstring>timePickerStart</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                </sizepolicy>
                                 </property>
-                                <widget>
+        </widget>
+        <widget row="3"  column="3" >
                                     <class>QPushButton</class>
                                     <property stdset="1">
@@ -462,5 +340,5 @@
                                     </property>
                                 </widget>
-                                <widget>
+        <widget row="4"  column="3" >
                                     <class>QLineEdit</class>
                                     <property stdset="1">
@@ -497,24 +375,5 @@
                                     </property>
                                 </widget>
-                            </vbox>
-                        </widget>
-                    </hbox>
-                </widget>
-                <widget>
-                    <class>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout7</cstring>
-                    </property>
-                    <hbox>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget>
+        <widget row="5"  column="0" >
                             <class>QLabel</class>
                             <property stdset="1">
@@ -527,21 +386,5 @@
                             </property>
                         </widget>
-                        <widget>
-                            <class>TimePicker</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>timePickerStart</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>3</hsizetype>
-                                    <vsizetype>1</vsizetype>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                    </hbox>
-                </widget>
-                <widget>
+        <widget row="6"  column="0" >
                     <class>QCheckBox</class>
                     <property stdset="1">
@@ -554,20 +397,5 @@
                     </property>
                 </widget>
-                <widget>
-                    <class>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout8</cstring>
-                    </property>
-                    <hbox>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget>
+        <widget row="7"  column="0" >
                             <class>QLabel</class>
                             <property stdset="1">
@@ -580,5 +408,5 @@
                             </property>
                         </widget>
-                        <widget>
+        <widget row="7"  column="1"  rowspan="1"  colspan="3" >
                             <class>TimeZoneSelector</class>
                             <property stdset="1">
@@ -594,25 +422,5 @@
                             </property>
                         </widget>
-                    </hbox>
-                </widget>
-                <widget>
-                    <class>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout9</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>1</number>
-                        </property>
-                        <widget>
+        <widget row="8"  column="0" >
                             <class>QCheckBox</class>
                             <property stdset="1">
@@ -637,5 +445,5 @@
                             </property>
                         </widget>
-                        <widget>
+        <widget row="8"  column="1"  rowspan="1"  colspan="2" >
                             <class>QSpinBox</class>
                             <property stdset="1">
@@ -649,5 +457,5 @@
                             <property stdset="1">
                                 <name>suffix</name>
-                                <string></string>
+                <string> minutes</string>
                             </property>
                             <property stdset="1">
@@ -661,5 +469,5 @@
                             <property stdset="1">
                                 <name>lineStep</name>
-                                <number>1</number>
+                <number>5</number>
                             </property>
                             <property stdset="1">
@@ -668,38 +476,5 @@
                             </property>
                         </widget>
-                        <widget>
-                            <class>QComboBox</class>
-                            <item>
-                                <property>
-                                    <name>text</name>
-                                    <string>minutes</string>
-                                </property>
-                            </item>
-                            <item>
-                                <property>
-                                    <name>text</name>
-                                    <string>hours</string>
-                                </property>
-                            </item>
-                            <item>
-                                <property>
-                                    <name>text</name>
-                                    <string>days</string>
-                                </property>
-                            </item>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>ComboInterval</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>enabled</name>
-                                <bool>false</bool>
-                            </property>
-                            <property stdset="1">
-                                <name>currentItem</name>
-                                <number>0</number>
-                            </property>
-                        </widget>
-                        <widget>
+        <widget row="8"  column="3" >
                             <class>QComboBox</class>
                             <item>
@@ -724,22 +499,5 @@
                             </property>
                         </widget>
-                    </hbox>
-                </widget>
-                <widget>
-                    <class>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout11</cstring>
-                    </property>
-                    <hbox>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget>
+        <widget row="9"  column="0" >
                             <class>QLabel</class>
                             <property stdset="1">
@@ -752,5 +510,5 @@
                             </property>
                         </widget>
-                        <widget>
+        <widget row="9"  column="1"  rowspan="1"  colspan="3" >
                             <class>QToolButton</class>
                             <property stdset="1">
@@ -774,7 +532,5 @@
                             </property>
                         </widget>
-                    </hbox>
-                </widget>
-                <widget>
+        <widget row="10"  column="0"  rowspan="1"  colspan="4" >
                     <class>QToolButton</class>
                     <property stdset="1">
@@ -787,6 +543,4 @@
                     </property>
                 </widget>
-            </vbox>
-        </widget>
     </grid>
 </widget>
@@ -894,10 +648,4 @@
         <slot>setDisabled(bool)</slot>
     </connection>
-    <connection>
-        <sender>checkAlarm</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>ComboInterval</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
     <slot access="public">endDateChanged( const QString &amp; )</slot>
     <slot access="public">endDateChanged( int, int, int )</slot>