9 files changed, 114 insertions, 21 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index ea7071d..6723dc5 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1526,6 +1526,14 @@
 { "Writing back file ...","Schreibe Datei zurück..." },
 { "Sending back file ...","Sende Datei zurück..." },
 { "Eeek, there I am ticklish!","Hihi, da bin ich kitzlig!" },
+{ "Created","Angelegt" },
+{ "Last Modified Sub","Zuletzt geändertes Sub" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 7044e90..f9685e9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -367,7 +367,7 @@ CalendarView::CalendarView( Calendar *calendar,
 void CalendarView::init()
 { 
     mNextAlarmDateTime = QDateTime::currentDateTime();
-    setFocusPolicy ( NoFocus  ); 
+    //setFocusPolicy ( NoFocus  ); 
     mViewerCallerIsSearchDialog = false;
     mBlockShowDates = false;
    
@@ -4687,7 +4687,7 @@ void CalendarView::slotCalendarChanged()
 
 void CalendarView::keyPressEvent ( QKeyEvent *e) 
 {
-    //qDebug(" alendarView::keyPressEvent ");
+    //qDebug("CalendarView::keyPressEvent ");
     e->ignore();
 }
 
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index add1819..94f35e6 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -432,6 +432,7 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
             }
         }
         
+        e->accept();
         return;
     }
    
@@ -440,6 +441,7 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
         case Qt::Key_Down:
         case Qt::Key_Up:
             QListView::keyPressEvent (  e );
+            e->accept();
             break; 
         case Qt::Key_Left:
         case Qt::Key_Right:
@@ -514,30 +516,31 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mQuickAdd = new KOQuickTodo(mQuickBar); 
   QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar);
   quickLayout->addWidget( mQuickAdd );
+  mNewSubBut =  new QPushButton( "sub",mQuickBar );
+  QPushButton * s_done = new QPushButton( "D",mQuickBar );
+  QPushButton * s_run = new QPushButton( "R",mQuickBar );
+  QPushButton * allopen = new QPushButton( "O",mQuickBar );
+  QPushButton * allclose = new QPushButton( "C",mQuickBar );
   QPushButton * flat = new QPushButton( "F",mQuickBar );
+
   int fixwid = flat->sizeHint().height();
   if ( QApplication::desktop()->width() >= 800 )
       fixwid *= 2;
   flat->setFixedWidth( fixwid );
   connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat()));
-  QPushButton * allopen = new QPushButton( "O",mQuickBar );
   allopen->setFixedWidth( fixwid );
   connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen()));
-  QPushButton * allclose = new QPushButton( "C",mQuickBar );
   allclose->setFixedWidth( fixwid );
   connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose()));
-  QPushButton * s_done = new QPushButton( "D",mQuickBar );
   s_done->setPixmap( SmallIcon("greenhook16"));
   s_done->setFixedWidth( fixwid );
   s_done->setFixedHeight( flat->sizeHint().height() );
   connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted()));
-  QPushButton * s_run = new QPushButton( "R",mQuickBar );
   s_run->setPixmap( SmallIcon("ko16old"));
   s_run->setFixedWidth( fixwid );
   s_run->setFixedHeight( flat->sizeHint().height() );
   connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning()));
 
-  mNewSubBut =  new QPushButton( "sub",mQuickBar );
   mNewSubBut->setFixedWidth( fixwid*3/2 );
   connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo()));
   mNewSubBut->setEnabled( false );
@@ -575,9 +578,12 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mTodoListView->addColumn(i18n("Start Time"));
   mTodoListView->setColumnAlignment(6,AlignHCenter);
 
-  mTodoListView->addColumn(i18n("Cancelled"));
+  //mTodoListView->addColumn(i18n("Cancelled"));
   mTodoListView->addColumn(i18n("Categories"));
   mTodoListView->addColumn(i18n("Calendar"));
+  mTodoListView->addColumn(i18n("Last Modified"));
+  mTodoListView->addColumn(i18n("Created"));
+  mTodoListView->addColumn(i18n("Last Modified Sub"));
 #if 0
   mTodoListView->addColumn(i18n("Sort Id"));
   mTodoListView->setColumnAlignment(4,AlignHCenter);
@@ -588,7 +594,7 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mTodoListView->setRenameable( 0 );
   mTodoListView->setColumnWidth( 0, 120 );
   int iii = 0;
-  for ( iii = 0; iii< 10 ; ++iii )
+  for ( iii = 0; iii< 12 ; ++iii )
       mTodoListView->setColumnWidthMode( iii, QListView::Manual );
 
 
@@ -1603,7 +1609,6 @@ void KOTodoView::keyPressEvent ( QKeyEvent * e )
 {  
     //    e->ignore();
     //return;
-    //qDebug("KOTodoView::keyPressEvent  "); 
     if ( !isVisible() ) {
         e->ignore();
         return;
@@ -1611,7 +1616,8 @@ void KOTodoView::keyPressEvent ( QKeyEvent * e )
     switch ( e->key() ) {
     case Qt::Key_Down:
     case Qt::Key_Up:
-        QWidget::keyPressEvent (  e );
+        // KOrg::BaseView::keyPressEvent (  e );
+        e->ignore();
         break; 
    
     case Qt::Key_Q:
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 0cf6e4c..bdef94c 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -153,9 +153,25 @@ void KOTodoViewItem::construct()
   setSortKey(5,skeyd);
   setSortKey(6,skeyt);
 
-  setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
-  setText(8,mTodo->categoriesStr());
-  setText(9,KOPrefs::instance()->calName( mTodo->calID()));
+  //setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
+  setText(7,mTodo->categoriesStr());
+  setText(8,KOPrefs::instance()->calName( mTodo->calID()));
+  setText(9, KGlobal::locale()->formatDateTime( mTodo->lastModified(), true, true ));
+  setText(10, KGlobal::locale()->formatDateTime( mTodo->created(), true, true ));
+  setText(11, KGlobal::locale()->formatDateTime( mTodo->lastModifiedSub(), true, true ));
+  QString key; 
+  QDate d = mTodo->lastModified().date();
+  QTime t = mTodo->lastModified().time();
+  key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
+  setSortKey(9,key);
+  d = mTodo->created().date();
+  t = mTodo->created().time();
+  key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
+  setSortKey(10,key);
+  d = mTodo->lastModifiedSub().date();
+  t = mTodo->lastModifiedSub().time();
+  key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
+  setSortKey(11,key);
 
 #if 0
   // Find sort id in description. It's the text behind the last '#' character
@@ -317,12 +333,44 @@ void KOTodoViewItem::stateChange(bool state)
 
 bool KOTodoViewItem::isAlternate()
 {
-
+#if 0
+    //if ( m_known ) return m_odd;
+   //qDebug("test ");
+    KOTodoViewItem *item = static_cast<KOTodoViewItem *>(itemAbove());
+    if ( item ) {
+        m_known = item->m_known;
+        if ( m_known ) {
+            m_odd = !item->m_odd ;
+            return m_odd;
+        }
+    } else {
+        item = static_cast<KOTodoViewItem *>(itemBelow());
+        if ( item ) {
+            m_known = item->m_known;
+            if ( m_known ) {
+                m_odd = !item->m_odd ;
+                return m_odd;
+            }
+        }
+    }
   KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
-  if (lv && lv->alternateBackground().isValid())
+  item =  static_cast<KOTodoViewItem *>(lv->firstChild());
+  bool previous = true;
+  qDebug("WHILE ");
+  while ( item ) {
+      item->m_odd = !previous;
+      item->m_known = true;
+      previous = !previous;
+      item = static_cast<KOTodoViewItem *>(item->itemBelow());
+  }
+  return m_odd;
+  
+#else
+  
+  //KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
+  //if (lv && lv->alternateBackground().isValid())
   {
-    KOTodoViewItem *above = 0;
-    above = static_cast<KOTodoViewItem *>(itemAbove());
+    KOTodoViewItem *above = static_cast<KOTodoViewItem *>(itemAbove());
     m_known = above ? above->m_known : true;
     if (m_known)
     {
@@ -341,6 +389,7 @@ bool KOTodoViewItem::isAlternate()
        }
        else
        {
+           KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
           item = static_cast<KOTodoViewItem *>(lv->firstChild());
        }
 
@@ -354,6 +403,7 @@ bool KOTodoViewItem::isAlternate()
     return m_odd;
   }
   return false;
+#endif
 }
 
 void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 11f7ecc..e4bcc5e 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -281,7 +281,27 @@ void Incidence::setReadOnly( bool readOnly )
   IncidenceBase::setReadOnly( readOnly );
   recurrence()->setRecurReadOnly( readOnly);
 }
-
+void Incidence::setLastModifiedSubInvalid()
+{
+    mLastModifiedSub = QDateTime();
+    if ( mRelatedTo )
+        mRelatedTo->setLastModifiedSubInvalid();
+}
+QDateTime Incidence::lastModifiedSub()
+{
+    if ( !mRelations.count() )
+        return lastModified();
+    if ( mLastModifiedSub.isValid() )
+        return mLastModifiedSub;
+    mLastModifiedSub = lastModified();
+    Incidence * inc;
+    QPtrList<Incidence> Relations = relations();
+    for (inc=Relations.first();inc;inc=Relations.next()) {
+        if ( inc->lastModifiedSub() > mLastModifiedSub )
+            mLastModifiedSub = inc->lastModifiedSub();
+    }
+    return mLastModifiedSub;
+}
 void Incidence::setCreated(QDateTime created)
 {
   if (mReadOnly) return;
@@ -468,6 +488,7 @@ void Incidence::addRelationsToList(QPtrList<Incidence> *rel)
 
 void Incidence::addRelation(Incidence *event)
 {
+    setLastModifiedSubInvalid();
   if( mRelations.findRef( event ) == -1 ) {
     mRelations.append(event);
     //updated();
@@ -476,9 +497,8 @@ void Incidence::addRelation(Incidence *event)
 
 void Incidence::removeRelation(Incidence *event)
 {
-  
+    setLastModifiedSubInvalid();
   mRelations.removeRef(event); 
- 
 //  if (event->getRelatedTo() == this) event->setRelatedTo(0);
 }
 
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index c88ba2f..d4af9f0 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -277,6 +277,8 @@ class Incidence : public IncidenceBase
     bool isHoliday() const;
     bool isBirthday() const;
     bool isAnniversary() const;
+    QDateTime lastModifiedSub();
+    void setLastModifiedSubInvalid();
     
 
 protected:
@@ -292,6 +294,7 @@ protected:
 
     // base components of jounal, event and todo
     QDateTime mCreated;
+    QDateTime mLastModifiedSub;
     QString mDescription;
     QString mSummary;
     QStringList mCategories;
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 1a19f3e..022dead 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -191,13 +191,17 @@ QString IncidenceBase::uid() const
 {
   return mUid;
 }
+void IncidenceBase::setLastModifiedSubInvalid()
+{
 
+}
 void IncidenceBase::setLastModified(const QDateTime &lm)
 {
     if ( blockLastModified ) return;
   // DON'T! updated() because we call this from
   // Calendar::updateEvent().
   mLastModified = getEvenTime(lm);
+  setLastModifiedSubInvalid();
   //qDebug("IncidenceBase::setLastModified %s ",lm.toString().latin1());
 }
 
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index bed73db..665c1f6 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -149,6 +149,7 @@ class IncidenceBase : public CustomProperties
     bool alarmEnabled() const;
     bool isTagged() const;
     void setTagged( bool );
+    virtual void setLastModifiedSubInvalid();
   protected:
     bool blockLastModified;
     bool mIsTagged;
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index 5d83511..7f352d6 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -476,6 +476,7 @@ void  KDatePicker::keyPressEvent ( QKeyEvent * e )
         break;             
    
     case Qt::Key_Return:  
+    case Qt::Key_Enter:  
         tableClickedSlot();
         break;
      case Qt::Key_Escape: