3 files changed, 11 insertions, 7 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 0c35bb3..1f2c6da 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -289,49 +289,49 @@ void CalendarView::init()
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 1 );
 
     mLeftFrame = mLeftSplitter;
 #else
     QWidget *mainBox = new QWidget( this );
     QWidget *leftFrame = new QWidget( mainBox );
 
     QBoxLayout * mainBoxLayout;
     QBoxLayout * leftFrameLayout;
     if ( KOPrefs::instance()->mVerticalScreen ) {
         mainBoxLayout  = new QVBoxLayout(mainBox); 
         leftFrameLayout = new QHBoxLayout(leftFrame ); 
     } else {
         mainBoxLayout  = new QHBoxLayout(mainBox);
         leftFrameLayout = new  QVBoxLayout(leftFrame ); 
     }
     topLayout->addWidget( mainBox );
     mainBoxLayout->addWidget (leftFrame);
     mDateNavigator = new KDateNavigator(leftFrame, mCalendar, TRUE,
                                         "CalendarView::DateNavigator", QDate::currentDate());
     // mDateNavigator->blockSignals( true );
     leftFrameLayout->addWidget( mDateNavigator  );
     mFilterView = new KOFilterView(&mFilters,leftFrame,"CalendarView::FilterView");
-    mTodoList = new KOTodoView(mCalendar, leftFrame, "todolist");
+    mTodoList = new KOTodoView(mCalendar, leftFrame, "todolistsmall");
     
     if (  QApplication::desktop()->width() < 480 ) {
         leftFrameLayout->addWidget(mFilterView);
         leftFrameLayout->addWidget(mTodoList, 2 );
       
     } else {
         leftFrameLayout->addWidget(mTodoList,2 );
         leftFrameLayout->addWidget(mFilterView );
     } 
     mFilterView->hide();
     QWidget *rightBox = new QWidget( mainBox );
     mainBoxLayout->addWidget ( rightBox, 10 );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
     mNavigatorBar = new NavigatorBar( QDate::currentDate(), rightBox, "useBigPixmaps" );
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mNavigatorBar );
     rightLayout->addWidget( mRightFrame, 10 );
 
     mLeftFrame = leftFrame;
     if ( KOPrefs::instance()->mVerticalScreen ) {
         mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() );
         leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() );
     } else {
         mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() );
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index da46eca..ca5eadd 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -36,48 +36,49 @@
 #include <libkcal/icaldrag.h>
 #include <libkcal/vcaldrag.h>
 #include <libkcal/calfilter.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "docprefs.h"
 
 #include "kotodoview.h"
 using namespace KOrg;
 
 KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent,
                                const char *name) :
   KListView(parent,name)
 {
+  mName = QString ( name );
   mCalendar = calendar;
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
   mOldCurrent = 0;
   mMousePressed = false;
 
   setAcceptDrops(true);
   viewport()->setAcceptDrops(true);
   int size = 16;
   if (qApp->desktop()->width() < 300 )
       size = 12;
   setTreeStepSize( size + 6 );
 
 }
 
 void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDragEnterEvent" << endl;
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
        !QTextDrag::canDecode( e ) ) {
     e->ignore();
     return;
@@ -243,54 +244,58 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
     
     QListViewItem* cn;
     if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) {
         cn = currentItem();
         if ( cn ) {
             KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 
             if ( ci ){
                 if ( e->state() == ShiftButton )
                     ci->setOn( false );
                 else
                     ci->setOn( true );
                 cn = cn->nextSibling();
                 if ( cn ) {
                     setCurrentItem ( cn );
                     ensureItemVisible ( cn );
                 }
                 
             }
         }
         
         return;
     }
    
     //  qDebug("KOTodoListView::keyPressEvent  ");
-    if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || ( height() > 150 &&  width() > 200 ) ) {
+    if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall"  ) {
         switch ( e->key() ) {
         case Qt::Key_Down:
         case Qt::Key_Up:
             QListView::keyPressEvent (  e );
             break;
+        case Qt::Key_Left:
+        case Qt::Key_Right:
+            QListView::keyPressEvent (  e );
+            break; 
         default:
             e->ignore();
             break;
         }
         return;
     }
     e->ignore();
 }
 void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
   QListView::contentsMouseReleaseEvent(e);
   mMousePressed = false;
 }
 
 void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
   if (!e) return;
 
   QPoint vp = contentsToViewport(e->pos());
 
   QListViewItem *item = itemAt(vp);
 
   emit double_Clicked(item);
   if (!item) return;
@@ -311,49 +316,49 @@ void KOQuickTodo::focusInEvent(QFocusEvent *ev)
   if ( text()==i18n("Click to add a new Todo") )
     setText("");
   QLineEdit::focusInEvent(ev);
 }
 
 void KOQuickTodo::focusOutEvent(QFocusEvent *ev)
 {
   setText(i18n("Click to add a new Todo"));
   QLineEdit::focusOutEvent(ev);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   KOrg::BaseView(calendar,parent,name)
 {
   QBoxLayout *topLayout = new QVBoxLayout(this);
   mName = QString ( name );
   mBlockUpdate = false;
   mQuickAdd = new KOQuickTodo(this);
   topLayout->addWidget(mQuickAdd);
 
   if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickAdd->hide();
 
-  mTodoListView = new KOTodoListView(calendar,this);
+  mTodoListView = new KOTodoListView(calendar,this, name );
   topLayout->addWidget(mTodoListView);
   //mTodoListView->header()->setMaximumHeight(30);
   mTodoListView->setRootIsDecorated(true);
   mTodoListView->setAllColumnsShowFocus(true);
 
   mTodoListView->setShowSortIndicator(true);
 
   mTodoListView->addColumn(i18n("Todo"));
   mTodoListView->addColumn(i18n("Prio"));
   mTodoListView->setColumnAlignment(1,AlignHCenter);
   mTodoListView->addColumn(i18n("Complete"));
   mTodoListView->setColumnAlignment(2,AlignHCenter);
   mTodoListView->addColumn(i18n("Due Date"));
   mTodoListView->setColumnAlignment(3,AlignLeft);
   mTodoListView->addColumn(i18n("Due Time"));
   mTodoListView->setColumnAlignment(4,AlignHCenter);
   mTodoListView->addColumn(i18n("Cancelled"));
   mTodoListView->addColumn(i18n("Categories"));
 #if 0
   mTodoListView->addColumn(i18n("Sort Id"));
   mTodoListView->setColumnAlignment(4,AlignHCenter);
 #endif
 
   mTodoListView->setMinimumHeight( 60 );
@@ -950,63 +955,61 @@ void KOTodoView::toggleCompleted()
 void KOTodoView::addQuickTodo()
 {
   Todo *todo = new Todo();
   todo->setSummary(mQuickAdd->text());
   todo->setOrganizer(KOPrefs::instance()->email());
   CalFilter * cf = mCalendar->filter();
   if ( cf ) {
       if ( cf->isEnabled()&& cf->showCategories()) {
           todo->setCategories(cf->categoryList());
       }
       if ( cf->isEnabled() )
           todo->setSecrecy( cf->getSecrecy());
   }
   mCalendar->addTodo(todo);
   mQuickAdd->setText("");
   todoModified (todo,  KOGlobals::EVENTADDED );
   updateView();
 }
 void KOTodoView::keyPressEvent ( QKeyEvent * e )
 {
     //    e->ignore();
     //return;
     switch ( e->key() ) {
     case Qt::Key_Down:
-        QWidget::keyPressEvent (  e );
-        break;
-              
     case Qt::Key_Up:
         QWidget::keyPressEvent (  e );
         break; 
+   
     case Qt::Key_Q:
         toggleQuickTodo();
         break; 
    
     default:
         e->ignore();
     }
     
-    if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || ( height() > 150 &&  width() > 200 ) ) {
+    if ( true ) {
         if (  e->key() == Qt::Key_I ) {
             KOTodoViewItem*cn = (KOTodoViewItem*)mTodoListView->currentItem();
             if ( cn ) {
                 mActiveItem = cn;
                 KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 
                 if ( ci ){
                     showTodo();
                     cn = (KOTodoViewItem*)cn->itemBelow();
                     if ( cn ) {
                         mTodoListView->setCurrentItem ( cn );
                         mTodoListView->ensureItemVisible ( cn );
                     }
                     
                 }
             }
         e->accept();
         
         }
         
     }
     
 }
 void KOTodoView::updateTodo( Todo * t, int type )
 {
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 4495702..6bf0203 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -53,48 +53,49 @@ class DocPrefs;
 
 class KOTodoListView : public KListView
 {
     Q_OBJECT
   public:
     KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0);
     virtual ~KOTodoListView() {}
 
   signals:
     void todoDropped(Todo *);  
     void double_Clicked(QListViewItem *item);
 
   protected:
     void contentsDragEnterEvent(QDragEnterEvent *);
     void contentsDragMoveEvent(QDragMoveEvent *);
     void contentsDragLeaveEvent(QDragLeaveEvent *);
     void contentsDropEvent(QDropEvent *);
 
     void contentsMousePressEvent(QMouseEvent *);
     void contentsMouseMoveEvent(QMouseEvent *);
     void contentsMouseReleaseEvent(QMouseEvent *);
     void contentsMouseDoubleClickEvent(QMouseEvent *);
 
   private:
+    QString mName;
     Calendar *mCalendar;
     QPoint mPressPos;
     bool mMousePressed;
     QListViewItem *mOldCurrent;
     void keyPressEvent ( QKeyEvent * ) ;
 };
 
 
 /**
   This is the line-edit on top of the todoview for fast addition of new todos
 */
 class KOQuickTodo : public QLineEdit
 {
   public:
     KOQuickTodo(QWidget *parent=0);
   protected:
     void focusInEvent(QFocusEvent *ev);
     void focusOutEvent(QFocusEvent *ev);
 };
 
 
 /**
   This class provides a multi-column list view of todo events.