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
@@ -1,628 +1,628 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** Copyright (C) 2002 zecke
 ** Copyright (C) 2002 Stefan Eilers (se, eilers.stefan@epost.de)
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 #include "mainwindow.h"
 #include "todoentryimpl.h"
 #include "todotable.h"
 #include "todolabel.h"
 
 #include <opie/tododb.h>
 #include <opie/todovcalresource.h>
 #include <opie/ofontmenu.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/finddialog.h>
 #include <qpe/global.h>
 #include <qpe/ir.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 //#include <qpe/task.h>
 #include <qpe/qpetoolbar.h>
 
 #include <qaction.h>
 #include <qarray.h>
 #include <qdatastream.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qwidgetstack.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 
 static QString todolistXMLFilename()
 {
     return Global::applicationFileName("todolist","todolist.xml");
 }
 
 static QString categoriesXMLFilename()
 {
     return Global::applicationFileName("todolist","categories.xml");
 }
 
 TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f ) :
     QMainWindow( parent, name, f ), syncing(FALSE)
 {
 //     QTime t;
 //     t.start();
     mView = 0l;
     mStack = new QWidgetStack(this, "main stack");
     setCentralWidget( mStack );
     setCaption( tr("Todo") );
     QString str;
     table = new TodoTable( this );
     table->setColumnWidth( 2, 10 );
     table->setPaintingEnabled( FALSE );
     table->setUpdatesEnabled( FALSE );
     table->viewport()->setUpdatesEnabled( FALSE );
 
     {
         str = todolistXMLFilename();
         if ( str.isNull() )
             QMessageBox::critical( this,
                                    tr("Out of Space"),
                                    tr("Unable to create startup files\n"
                                       "Free up some space\n"
                                       "before you enter any data") );
         else
             table->load( str );
     }
 
     // repeat for categories...
     str = categoriesXMLFilename();
     if ( str.isNull() )
         QMessageBox::critical( this,
                                tr( "Out of Space" ),
                                tr( "Unable to create startup files\n"
                                    "Free up some space\n"
                                    "before you enter any data") );
 
     mStack->addWidget(table, 1 );
     mStack->raiseWidget( 1 );
     setCentralWidget( mStack );
     setToolBarsMovable( FALSE );
 
 //     qDebug("after load: t=%d", t.elapsed() );
     
     Config config( "todo" );
     config.setGroup( "View" );
     bool complete = config.readBoolEntry( "ShowComplete", true );
     table->setShowCompleted( complete );
 
     bool showdeadline = config.readBoolEntry("ShowDeadLine", true);
     table->setShowDeadline (showdeadline);
 
     QString category = config.readEntry( "Category", QString::null );
     table->setShowCategory( category );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( TRUE );
 
     QPEMenuBar *mb = new QPEMenuBar( bar );
 
     catMenu = new QPopupMenu( this );
     QPopupMenu *edit = new QPopupMenu( this );
     QPopupMenu *options = new QPopupMenu(this );
 
     contextMenu = new QPopupMenu( this );
 
     bar = new QPEToolBar( this );
 
     QAction *a = new QAction( tr( "New Task" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotNew() ) );
     a->addTo( bar );
     a->addTo( edit );
 
     a = new QAction( tr( "Edit Task" ), Resource::loadIconSet( "edit" ),
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotEdit() ) );
     a->addTo( bar );
     a->addTo( edit );
     a->addTo( contextMenu );
     a->setEnabled( FALSE );
     editAction = a;
 
     a = new QAction( QString::null, tr("View Task"), 0, this, 0 );
     a->addTo( edit );
     a->addTo( contextMenu );
     connect( a, SIGNAL( activated() ),
              this, SLOT(slotShowDetails() ) );
 
     edit->insertSeparator();
 
     a = new QAction( tr( "Delete..." ), Resource::loadIconSet( "trash" ),
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotDelete() ) );
     a->addTo( bar );
     a->addTo( edit );
     a->addTo( contextMenu );
     a->setEnabled( FALSE );
     deleteAction = a;
 
     // delete All in category is missing....
     // set All Done
     // set All Done in category
 
     a = new QAction( QString::null, tr( "Delete all..."), 0, this, 0 );
     connect(a, SIGNAL( activated() ),
             this, SLOT( slotDeleteAll() ) );
     a->addTo(edit );
     a->setEnabled( FALSE );
     deleteAllAction = a;  
 
     edit->insertSeparator();
     a = new QAction( QString::null, tr("Duplicate" ), 0, this, 0 );
     connect(a, SIGNAL( activated() ),
             this, SLOT( slotDuplicate() ) );
     a->addTo(edit );
     a->setEnabled( FALSE );
     duplicateAction = a;
     edit->insertSeparator();
 
    
 
     if ( Ir::supported() ) {
         a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ),
                          QString::null, 0, this, 0 );
         connect( a, SIGNAL( activated() ),
                  this, SLOT( slotBeam() ) );
         a->addTo( edit );
         a->addTo( bar );
     }
 
     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() )
         a->setEnabled( TRUE );
     else
         a->setEnabled( FALSE );
 
     //a->setEnabled( FALSE );
     findAction = a;
 //     qDebug("mainwindow #2: t=%d", t.elapsed() );
 
     completedAction = new QAction( QString::null, tr("Completed tasks"), 0, this, 0, TRUE );
 
     showdeadlineAction = new QAction( QString::null, tr( "Show Deadline" ), 0, this, 0, TRUE );
 
     catMenu->setCheckable( true );
     populateCategories();
 
     
     completedAction->addTo( options );
     completedAction->setOn( table->showCompleted() );
     showdeadlineAction->addTo( options );
     showdeadlineAction->setOn( table->showDeadline() );
     options->insertSeparator( );
     QList<QWidget> list;
     list.append(table );
     OFontMenu *menu = new OFontMenu(this, "menu",list );
     menu->forceSize( table->horizontalHeader(), 10 );
     //catMenu->insertItem(tr("Fonts"), menu );
     list.clear();
     options->insertItem( tr("Fonts"), menu );
 
 
     mb->insertItem( tr( "Data" ), edit );
     mb->insertItem( tr( "Category" ), catMenu );
     mb->insertItem( tr( "Options"), options );
     resize( 200, 300 );
     if ( table->numRows() > 0 )
         currentEntryChanged( 0, 0 );
     connect( table, SIGNAL( signalEdit() ),
              this, SLOT( slotEdit() ) );
     connect( table, SIGNAL(signalShowMenu(const QPoint &)),
              this, SLOT( slotShowPopup(const QPoint &)) );
 
 //     qDebug("mainwindow #3: t=%d", t.elapsed() );
     table->updateVisible();
     table->setUpdatesEnabled( TRUE );
     table->setPaintingEnabled( TRUE );
     table->viewport()->setUpdatesEnabled( TRUE );
 
     // Initialize the table
     table->updateVisible();
 
     connect( completedAction, SIGNAL( toggled(bool) ), this, SLOT( showCompleted(bool) ) );
     connect( showdeadlineAction, SIGNAL( toggled(bool) ), this, SLOT( showDeadline(bool) ) );
     connect( catMenu, SIGNAL(activated(int)), this, SLOT(setCategory(int)) );
     connect( table, SIGNAL( currentChanged( int, int ) ),
              this, SLOT( currentEntryChanged( int, int ) ) );
 
     connect( table, SIGNAL(showDetails(const ToDoEvent &) ),
              this, SLOT(slotShowDetails(const ToDoEvent & ) ) );
 //     qDebug("done: t=%d", t.elapsed() );
 }
 
 void TodoWindow::slotNew()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     int id;
     id = -1;
     QArray<int> ids;
     ids = table->currentEntry().categories();
     if ( ids.count() )
         id = ids[0];
     NewTaskDialog e( id, this, 0, TRUE );
 
     ToDoEvent todo;
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     e.showMaximized();
 #endif
     int ret = e.exec();
 //    qWarning("finished" );
     if ( ret == QDialog::Accepted ) {
         table->setPaintingEnabled( false );
         todo = e.todoEntry();
         //todo.assignUid();
         table->addEntry( todo );
         table->setPaintingEnabled( true );
         findAction->setEnabled( TRUE );
     }
     // I'm afraid we must call this every time now, otherwise
     // spend expensive time comparing all these strings...
     populateCategories();
     mStack->raiseWidget(1 );
 }
 
 TodoWindow::~TodoWindow()
 {
 }
 
 void TodoWindow::slotDelete()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     if ( table->currentRow() == -1 )
         return;
 
     QString strName = table->text( table->currentRow(), 2 ).left( 30 );
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), strName ) )
         return;
 
 
 
     table->setPaintingEnabled( false );
     table->removeCurrentEntry();
     table->setPaintingEnabled( true );
 
     if ( table->numRows() == 0 ) {
         currentEntryChanged( -1, 0 );
         findAction->setEnabled( FALSE );
     }
     mStack->raiseWidget(1);
 }
 void TodoWindow::slotDeleteAll()
 {
   if(syncing) {
     QMessageBox::warning(this, tr("Todo"),
                          tr("Can not edit data, currently syncing"));
     return;
   }
   
   //QString strName = table->text( table->currentRow(), 2 ).left( 30 );
   
   if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), tr("Delete all tasks?") ) )
     return;
   
   
   
   table->setPaintingEnabled( false );
   table->removeAllEntries();
   table->setPaintingEnabled( true );
   
   if ( table->numRows() == 0 ) {
     currentEntryChanged( -1, 0 );
     findAction->setEnabled( FALSE );
   }
   mStack->raiseWidget(1 );
 }
 
 void TodoWindow::slotEdit()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     ToDoEvent todo = table->currentEntry();
     qWarning("slotEdit" );
     NewTaskDialog e( todo, this, 0, TRUE );
     e.setCaption( tr( "Edit Task" ) );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     e.showMaximized();
 #endif
     int ret = e.exec();
 
     if ( ret == QDialog::Accepted ) {
       qWarning("Replacing now" );
         table->setPaintingEnabled( false );
         todo = e.todoEntry();
         table->replaceCurrentEntry( todo );
         table->setPaintingEnabled( true );
     }
     populateCategories();
     mStack->raiseWidget( 1 );
 }
 void TodoWindow::slotDuplicate()
 {
   if(syncing) {
     QMessageBox::warning(this, tr("Todo"),
                          tr("Can not edit data, currently syncing"));
     return;
   }
   ToDoEvent ev = table->currentEntry();
   ToDoEvent ev2 = ToDoEvent( ev ); // what about the uid
   int uid;
   { // uid
     Qtopia::UidGen *uidgen = new Qtopia::UidGen();
     uid = uidgen->generate();
     delete uidgen;
   }
   ev2.setUid( uid );
   table->setPaintingEnabled( false );
   table->addEntry( ev2 );
   table->setPaintingEnabled( true );
 
   mStack->raiseWidget( 1 );
 }
 void TodoWindow::slotShowPopup( const QPoint &p )
 {
     contextMenu->popup( p );
 }
 
 void TodoWindow::showCompleted( bool s )
 {
     if ( !table->isUpdatesEnabled() )
         return;
     table->setPaintingEnabled( false );
     table->setShowCompleted( s );
     table->setPaintingEnabled( true );
     mStack->raiseWidget( 1 );
 }
 
 void TodoWindow::currentEntryChanged( int r, int )
 {
     if ( r != -1 && table->rowHeight( r ) > 0 ) {
         editAction->setEnabled( TRUE );
         deleteAction->setEnabled( TRUE );
         duplicateAction->setEnabled( TRUE );
         deleteAllAction->setEnabled( TRUE );
     } else {
         editAction->setEnabled( FALSE );
         deleteAction->setEnabled( FALSE );
         duplicateAction->setEnabled( FALSE );
         deleteAllAction->setEnabled( FALSE );
     }
 }
 
 void TodoWindow::setCategory( int c )
 {
     if ( c <= 0 ) return;
     if ( !table->isUpdatesEnabled() )
         return; 
    table->setPaintingEnabled( false );
     for ( unsigned int i = 1; i < catMenu->count(); i++ )
         catMenu->setItemChecked( i, c == (int)i );
     if ( c == 1 ) {
         table->setShowCategory( QString::null );
         setCaption( tr("Todo") + " - " + tr( "All Categories" ) );
     } else if ( c == (int)catMenu->count() - 1 ) {
         table->setShowCategory( tr( "Unfiled" ) );
         setCaption( tr("Todo") + " - " + tr( "Unfiled" ) );
     } else {
         QString cat = table->categories()[c - 2];
         table->setShowCategory( cat );
         setCaption( tr("Todo") + " - " + cat );
     }
     table->setPaintingEnabled( true );
 
     mStack->raiseWidget( 1 );
 }
 
 void TodoWindow::populateCategories()
 {
     catMenu->clear();
     int id, rememberId;
     id = 1;
     rememberId = 0;
     catMenu->insertItem( tr( "All Categories" ), id++ );
     catMenu->insertSeparator();
     QStringList categories = table->categories();
     categories.append( tr( "Unfiled" ) );
     for ( QStringList::Iterator it = categories.begin();
           it != categories.end(); ++it ) {
         catMenu->insertItem( *it, id );
         if ( *it == table->showCategory() )
             rememberId = id;
         ++id;
     }
     if ( table->showCategory().isEmpty() )
         setCategory( 1 );
     else
         setCategory( rememberId );
 }
 
 void TodoWindow::reload()
 {
     table->clear();
     table->load( todolistXMLFilename() );
     syncing = FALSE;
 }
 
 void TodoWindow::flush()
 {
     syncing = TRUE;
     table->save( todolistXMLFilename() );
 }
 
 void TodoWindow::closeEvent( QCloseEvent *e )
 {
     if( mStack->visibleWidget() != table ){
       mStack->raiseWidget( 1 );
       e->ignore();
       return;
     }
     if(syncing) {
         /* no need to save if in the middle of syncing */
         e->accept();
         return;
     }
 
     if ( table->save( todolistXMLFilename() ) ) {
         e->accept();
             // repeat for categories...
         // if writing configs fail, it will emit an
         // error, but I feel that it is "ok" for us to exit
         // espically since we aren't told if the write succeeded...
         Config config( "todo" );
         config.setGroup( "View" );
         config.writeEntry( "ShowComplete", table->showCompleted() );
         config.writeEntry( "Category", table->showCategory() );
         /* added 20.01.2k2 by se */
         config.writeEntry( "ShowDeadLine", table->showDeadline());
     } else {
         if ( QMessageBox::critical( this, tr("Out of space"),
                                     tr("Todo was unable\n"
                                        "to save your changes.\n"
                                        "Free up some space\n"
                                        "and try again.\n"
                                        "\nQuit Anyway?"),
                                     QMessageBox::Yes|QMessageBox::Escape,
                                     QMessageBox::No|QMessageBox::Default)
              != QMessageBox::No )
             e->accept();
         else
             e->ignore();
     }
 }
 
 void TodoWindow::slotFind()
 {
     // put everything back to view all for searching...
     mStack->raiseWidget( 1 );
     if ( !catMenu->isItemChecked( 0 ) )
         setCategory( 0 );
 
     FindDialog dlg( "Todo List",  this );
     QObject::connect( &dlg,
                       SIGNAL(signalFindClicked(const QString &,
                                                bool, bool, int)),
                       table,
                       SLOT(slotDoFind(const QString&, bool, bool, int)) );
     QObject::connect( table, SIGNAL(signalNotFound()), &dlg,
                       SLOT(slotNotFound()) );
     QObject::connect( table, SIGNAL(signalWrapAround()), &dlg,
                       SLOT(slotWrapAround()) );
     dlg.exec();
     if ( table->numSelections() )
         table->clearSelection();
     table->clearFindRow();
 }
 
 
 void TodoWindow::setDocument( const QString &filename )
 {
     if ( filename.find(".vcs") != int(filename.length()) - 4 ) return;
 
     ToDoDB todoDB(filename, new ToDoVCalResource() );
     QValueList<ToDoEvent> tl = todoDB.rawToDos();
     for( QValueList<ToDoEvent>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
         table->addEntry( *it );
     }
 }
 
 static const char * beamfile = "/tmp/obex/todo.vcs";
 
 void TodoWindow::slotBeam()
 {
     unlink( beamfile ); // delete if exists
     ToDoEvent c = table->currentEntry();
     mkdir("/tmp/obex/", 0755);
     ToDoDB todoDB( beamfile, new ToDoVCalResource() );
     todoDB.addEvent( c );
     todoDB.save();
     Ir *ir = new Ir( this );
     connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
     QString description = c.summary();
     ir->send( beamfile, description, "text/x-vCalendar" );
 }
 
 void TodoWindow::beamDone( Ir *ir )
 {
     delete ir;
     unlink( beamfile );
 }
 
 void TodoWindow::showDeadline( bool s )
 {
     table->setPaintingEnabled( false );
     table->setShowDeadline( s );
     table->setPaintingEnabled( true );
 }
 void TodoWindow::slotShowDetails()
 {
   ToDoEvent event = table->currentEntry();
   slotShowDetails( event );
 }
 void TodoWindow::slotShowDetails( const ToDoEvent &event )
 {
   if( mView == 0l ){
     mView = new TodoLabel(mStack);
     mStack->addWidget( mView, 2 );
   }
   mView->init( event );
   mView->sync();
   mStack->raiseWidget( 2);
 }
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
@@ -1,447 +1,487 @@
 <!DOCTYPE UI><UI>
 <class>NewTaskDialogBase</class>
 <comment>*********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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.
 **
 *********************************************************************</comment>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>NewTaskDialogBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>425</width>
+            <width>262</width>
             <height>321</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>New Task</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </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>
         <header location="global">qpe/categoryselect.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
         </sizehint>
         <container>0</container>
         <sizepolicy>
             <hordata>7</hordata>
             <verdata>1</verdata>
         </sizepolicy>
         <pixmap>image0</pixmap>
     </customwidget>
     <customwidget>
         <class>OClickableLabel</class>
         <header location="global">opie/oclickablelabel.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
         </sizehint>
         <container>0</container>
         <sizepolicy>
             <hordata>5</hordata>
             <verdata>5</verdata>
         </sizepolicy>
         <pixmap>image0</pixmap>
         <signal>clicked()</signal>
         <signal>toggled(bool)</signal>
         <slot access="public">slotOn(bool)</slot>
     </customwidget>
 </customwidgets>
 <images>
     <image>
         <name>image0</name>
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
 <connections>
     <connection>
         <sender>checkDate</sender>
         <signal>toggled(bool)</signal>
         <receiver>buttonDate</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>lblDown</sender>
         <signal>clicked()</signal>
         <receiver>NewTaskDialogBase</receiver>
         <slot>slotCopy()</slot>
     </connection>
     <slot access="protected">dateChanged( const QString &amp; )</slot>
     <slot access="protected">dateChanged( int, int, int )</slot>
     <slot access="protected">slotCopy()</slot>
 </connections>
 </UI>
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
@@ -1,165 +1,169 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** Copyright (C) 2002 zecke
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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.
 **
 **********************************************************************/
 
 #include "todoentryimpl.h"
 
 #include <opie/oclickablelabel.h>
 #include <opie/todoevent.h>
 #include <opie/tododb.h>
 
 #include <qpe/categoryselect.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #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>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qapplication.h>
 
 
 NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent,
                               const char *name, bool modal, WFlags fl )
     : NewTaskDialogBase( parent, name, modal, fl ),
       todo( task )
 {
     todo.setCategories( task.allCategories() );
     if ( todo.hasDate() )
         date = todo.date();
     else
         date = QDate::currentDate();
 
     init();
     comboPriority->setCurrentItem( task.priority() - 1 );
 
     checkCompleted->setChecked( task.isCompleted() );
     checkDate->setChecked( task.hasDate() );
     buttonDate->setText( TimeString::longDateString( date ) );
 
     txtTodo->setText( task.description() );
     lneSum->setText( task.summary() );
     cmbProg->setCurrentItem( task.progress()/20 );
 }
 
 /*
  *  Constructs a NewTaskDialog which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
 NewTaskDialog::NewTaskDialog( int id, QWidget* parent,  const char* name, bool modal,
                               WFlags fl )
     : NewTaskDialogBase( parent, name, modal, fl ),
       date( QDate::currentDate() )
 {
     if ( id != -1 ) {
         QArray<int> ids( 1 );
         ids[0] = id;
         todo.setCategory( Qtopia::Record::idsToString( ids ) );
     }
     init();
 }
 
 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 );
     comboCategory->setCategories( todo.categories(), "Todo List", tr("Todo List") );
 
     connect( picker, SIGNAL( dateClicked( int, int, int ) ),
              this, SLOT( dateChanged( int, int, int ) ) );
 
     buttonDate->setText( TimeString::longDateString( date ) );
     picker->setDate( date.year(), date.month(), date.day() );
     lblDown->setPixmap(Resource::loadPixmap("down") );
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 NewTaskDialog::~NewTaskDialog()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 void NewTaskDialog::dateChanged( int y, int m, int d )
 {
     date = QDate( y, m, d );
     buttonDate->setText( TimeString::longDateString( date ) );
 }
 
 /*!
 */
 
 ToDoEvent NewTaskDialog::todoEntry()
 {
   if( checkDate->isChecked() ){
     todo.setDate( date );
     todo.setHasDate( true );
   }else{
     todo.setHasDate( false );
   }
   if ( comboCategory->currentCategory() != -1 ) {
     QArray<int> arr = comboCategory->currentCategories();
     QStringList list;
     list = QStringList::split(";", Qtopia::Record::idsToString( arr )) ;
     todo.setCategories( list );
   }
   todo.setPriority( comboPriority->currentItem() + 1 );
   todo.setCompleted( checkCompleted->isChecked() );
 
   todo.setDescription( txtTodo->text() );
   todo.setSummary( lneSum->text() );
   QString text = cmbProg->currentText();
   todo.setProgress( text.remove( text.length()-1, 1 ).toUShort() );
   return todo;
 }
 void NewTaskDialog::slotCopy() 
 {
     txtTodo->clear();
     txtTodo->setText( lneSum->text() );
 }
 
 /*!
 
 */
 
 void NewTaskDialog::accept()
 {
     QString strText = txtTodo->text();
     if ( strText.isEmpty() ) {
        // hmm... just decline it then, the user obviously didn't care about it
        QDialog::reject();
        return;
     }
     QDialog::accept();
 }