Fool Qt and fool QtDesigner to unfuck the designer .ui *evilgrin*

3 files changed, 340 insertions, 296 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index fa9c221..d419166 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -205,9 +205,9 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f ) :
     a = new QAction( tr( "Find" ), Resource::loadIconSet( "mag" ),
 		     QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
 	     this, SLOT( slotFind() ) );
-    a->addTo( bar );
+//    a->addTo( bar );
     a->addTo( options );
     options->insertSeparator();
 
     if ( table->numRows() )
diff --git a/core/pim/todo/todoentry.ui b/core/pim/todo/todoentry.ui
index 9ffa89b..1091852 100644
--- a/core/pim/todo/todoentry.ui
+++ b/core/pim/todo/todoentry.ui
@@ -29,9 +29,9 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>425</width>
+            <width>262</width>
             <height>321</height>
         </rect>
     </property>
     <property stdset="1">
@@ -43,351 +43,391 @@
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
-    <widget>
-        <class>QLayoutWidget</class>
+    <grid>
         <property stdset="1">
-            <name>name</name>
-            <cstring>Layout31</cstring>
+            <name>margin</name>
+            <number>11</number>
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>1</x>
-                <y>6</y>
-                <width>240</width>
-                <height>310</height>
-            </rect>
+            <name>spacing</name>
+            <number>6</number>
         </property>
-        <grid>
+        <widget row="2"  column="0" >
+            <class>QLayoutWidget</class>
             <property stdset="1">
-                <name>margin</name>
-                <number>0</number>
+                <name>name</name>
+                <cstring>Layout19</cstring>
             </property>
-            <property stdset="1">
-                <name>spacing</name>
-                <number>6</number>
-            </property>
-            <widget row="2"  column="0" >
-                <class>QLayoutWidget</class>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>Layout19</cstring>
+                    <name>spacing</name>
+                    <number>6</number>
                 </property>
-                <hbox>
+                <widget>
+                    <class>QLabel</class>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>0</number>
+                        <name>name</name>
+                        <cstring>txtProg</cstring>
                     </property>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
                     </property>
-                    <widget>
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>txtProg</cstring>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Progress:</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QComboBox</class>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>0%</string>
                         </property>
-                        <property stdset="1">
+                    </item>
+                    <item>
+                        <property>
                             <name>text</name>
-                            <string>Progress:</string>
+                            <string>20%</string>
                         </property>
-                    </widget>
-                    <widget>
-                        <class>QComboBox</class>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>0%</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>20%</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>40%</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>60%</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>80%</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>100%</string>
-                            </property>
-                        </item>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>cmbProg</cstring>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>40%</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>60%</string>
                         </property>
-                        <property stdset="1">
-                            <name>maximumSize</name>
-                            <size>
-                                <width>45</width>
-                                <height>32767</height>
-                            </size>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>80%</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>100%</string>
                         </property>
-                    </widget>
-                </hbox>
-            </widget>
-            <widget row="3"  column="0" >
-                <class>QLayoutWidget</class>
+                    </item>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmbProg</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>maximumSize</name>
+                        <size>
+                            <width>45</width>
+                            <height>32767</height>
+                        </size>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget row="0"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout20</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>Layout18</cstring>
+                    <name>spacing</name>
+                    <number>6</number>
                 </property>
-                <hbox>
+                <widget>
+                    <class>QLabel</class>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>0</number>
+                        <name>name</name>
+                        <cstring>TextLabel2</cstring>
                     </property>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
                     </property>
-                    <widget>
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel3</cstring>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Priority:</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QComboBox</class>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>1 - Very High</string>
                         </property>
-                        <property stdset="1">
-                            <name>frameShape</name>
-                            <enum>NoFrame</enum>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>2 - High</string>
                         </property>
-                        <property stdset="1">
+                    </item>
+                    <item>
+                        <property>
                             <name>text</name>
-                            <string>Category:</string>
+                            <string>3 - Normal</string>
                         </property>
-                    </widget>
-                    <widget>
-                        <class>CategorySelect</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>comboCategory</cstring>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>4 - Low</string>
                         </property>
-                        <property stdset="1">
-                            <name>minimumSize</name>
-                            <size>
-                                <width>60</width>
-                                <height>0</height>
-                            </size>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>5 - Very Low</string>
                         </property>
-                    </widget>
-                </hbox>
-            </widget>
-            <widget row="0"  column="0" >
-                <class>QLayoutWidget</class>
+                    </item>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>comboPriority</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>currentItem</name>
+                        <number>2</number>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget row="4"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout30</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>Layout20</cstring>
+                    <name>spacing</name>
+                    <number>6</number>
                 </property>
-                <hbox>
+                <widget>
+                    <class>QLabel</class>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>0</number>
+                        <name>name</name>
+                        <cstring>TextLabel1</cstring>
                     </property>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
                     </property>
-                    <widget>
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel2</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Priority:</string>
-                        </property>
-                    </widget>
-                    <widget>
-                        <class>QComboBox</class>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>1 - Very High</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>2 - High</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>3 - Normal</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>4 - Low</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>5 - Very Low</string>
-                            </property>
-                        </item>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>comboPriority</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>sizePolicy</name>
-                            <sizepolicy>
-                                <hsizetype>7</hsizetype>
-                                <vsizetype>0</vsizetype>
-                            </sizepolicy>
-                        </property>
-                        <property stdset="1">
-                            <name>currentItem</name>
-                            <number>2</number>
-                        </property>
-                    </widget>
-                </hbox>
-            </widget>
-            <widget row="5"  column="0" >
-                <class>QMultiLineEdit</class>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Summary:</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>lneSum</cstring>
+                    </property>
+                </widget>
+                <widget>
+                    <class>OClickableLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>lblDown</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>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                    <property stdset="1">
+                        <name>maximumSize</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget row="1"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout21</cstring>
+            </property>
+            <hbox>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>txtTodo</cstring>
+                    <name>margin</name>
+                    <number>0</number>
                 </property>
-            </widget>
-            <widget row="1"  column="0" >
-                <class>QLayoutWidget</class>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>Layout21</cstring>
+                    <name>spacing</name>
+                    <number>6</number>
                 </property>
-                <hbox>
+                <widget>
+                    <class>QCheckBox</class>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>0</number>
+                        <name>name</name>
+                        <cstring>checkCompleted</cstring>
                     </property>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
+                        <name>text</name>
+                        <string>&amp;Completed</string>
                     </property>
-                    <widget>
-                        <class>QCheckBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>checkCompleted</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Completed</string>
-                        </property>
-                    </widget>
-                    <widget>
-                        <class>QCheckBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>checkDate</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>D&amp;ue</string>
-                        </property>
-                    </widget>
-                    <widget>
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>buttonDate</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>enabled</name>
-                            <bool>false</bool>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>1 Jan 2001</string>
-                        </property>
-                    </widget>
-                </hbox>
-            </widget>
-            <widget row="4"  column="0" >
-                <class>QLayoutWidget</class>
+                </widget>
+                <widget>
+                    <class>QCheckBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>checkDate</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>D&amp;ue</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>buttonDate</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>1 Jan 2001</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget row="5"  column="0" >
+            <class>QMultiLineEdit</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>txtTodo</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
+            </property>
+        </widget>
+        <widget row="3"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout33</cstring>
+            </property>
+            <hbox>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>Layout30</cstring>
+                    <name>margin</name>
+                    <number>0</number>
                 </property>
-                <hbox>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLabel</class>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>0</number>
+                        <name>name</name>
+                        <cstring>TextLabel3</cstring>
                     </property>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
                     </property>
-                    <widget>
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel1</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Summary:</string>
-                        </property>
-                    </widget>
-                    <widget>
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>lneSum</cstring>
-                        </property>
-                    </widget>
-                    <widget>
-                        <class>OClickableLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>lblDown</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>minimumSize</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                        <property stdset="1">
-                            <name>maximumSize</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </widget>
-                </hbox>
-            </widget>
-        </grid>
-    </widget>
+                    <property stdset="1">
+                        <name>frameShape</name>
+                        <enum>NoFrame</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Category:</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>CategorySelect</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>comboCategory</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>minimumSize</name>
+                        <size>
+                            <width>60</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+    </grid>
 </widget>
 <customwidgets>
     <customwidget>
         <class>CategorySelect</class>
diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp
index dd01130..6af229c 100644
--- a/core/pim/todo/todoentryimpl.cpp
+++ b/core/pim/todo/todoentryimpl.cpp
@@ -32,8 +32,9 @@
 #include <qpe/imageedit.h>
 #include <qpe/timestring.h>
 #include <qpe/palmtoprecord.h>
 
+#include <qlayout.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qcombobox.h>
@@ -89,8 +90,11 @@ NewTaskDialog::NewTaskDialog( int id, QWidget* parent,  const char* name, bool m
 }
 
 void NewTaskDialog::init()
 {
+    if( layout() != 0 ){
+      layout()->setMargin( 0 );
+    }
     QPopupMenu *m1 = new QPopupMenu( this );
     picker = new DateBookMonth( m1, 0, TRUE );
     m1->insertItem( picker );
     buttonDate->setPopup( m1 );