Patch from Stefan Eilers to make the Table align better and the viewing of events more easy

2 files changed, 29 insertions, 23 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index 5609211..b7b1da0 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -252,16 +252,19 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f ) :
              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 & ) ) );
diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp
index 877308a..52a3087 100644
--- a/core/pim/todo/todotable.cpp
+++ b/core/pim/todo/todotable.cpp
@@ -301,30 +301,27 @@ void TodoTable::slotClicked( int row, int col, int, const QPoint &pos )
                     }
                     emit signalDoneChanged( i->isChecked() );
                 }
             }
             break;
         case 1:
             break;
         case 2:
-          // may as well edit it...
-          // menuTimer->stop();
-          // emit signalEdit();
           // Show detailed view of the selected entry
           {
             menuTimer->stop();
             ToDoEvent *todo = todoList[static_cast<CheckItem*>(item(row, 0))];
             emit showDetails( *todo );
           }
           break;
         case 3: 
           // may as well edit it...
           menuTimer->stop();
-          // emit signalEdit();
+          emit signalEdit();
           break;
     }
 }
 
 void TodoTable::slotPressed( int row, int col, int, const QPoint &pos )
 {
     if ( col == 2 && cellGeometry( row, col ).contains(pos) )
         menuTimer->start( 750, TRUE );
@@ -654,37 +651,43 @@ void TodoTable::journalFreeRemoveEntry( int row )
         return;
     todoList.remove( chk );
 
     realignTable( row );
 }
 
 void TodoTable::keyPressEvent( QKeyEvent *e )
 {
-    if ( e->key() == Key_Space || e->key() == Key_Return ) {
-        switch ( currentColumn() ) {
-            case 0: {
-                CheckItem *i = static_cast<CheckItem*>(item(currentRow(),
-                                                            currentColumn()));
-                if ( i )
-                    i->toggle();
-                break;
-            }
-            case 1:
-                break;
-            case 2:
-                emit signalEdit();
-            default:
-                break;
-        }
-    } else {
-        QTable::keyPressEvent( e );
-    }
+        if ( e->key() == Key_Space || e->key() == Key_Return ) {
+                switch ( currentColumn() ) {
+                case 0: {
+                        CheckItem *i = static_cast<CheckItem*>(item(currentRow(),
+                                                                    currentColumn()));
+                        if ( i )
+                                i->toggle();
+                        break;
+                }
+                case 1:
+                        break;
+                case 2:{
+                        ToDoEvent *todo = todoList[static_cast<CheckItem*>(item(currentRow(), 0))];
+                        emit showDetails(*todo);
+                        break;
+                }
+                case 3:
+                        // Future: Let us change the dueDate directly...
+                        emit signalEdit();
+                default:
+                        break;
+                        }       
+        } else
+                QTable::keyPressEvent( e );
 }
 
+
 QStringList TodoTable::categories()
 {
     // This is called seldom, so calling a load in here
     // should be fine.
     mCat.load( categoryFileName() );
     QStringList categoryList = mCat.labels( "Todo List" );
     return categoryList;
 }