fixes

3 files changed, 39 insertions, 11 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index dbe0668..bdad248 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -372,4 +372,3 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         QDateTime t = alarm->time();
-        int min = t.secsTo( event->dtStart() )/60;
-        QString s =i18n("( %1 min before )").arg( min );
+        QString s =i18n("( %1 before )").arg( alarm->offsetText() );
         addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
@@ -471,2 +470,13 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     }
+
+
+    if (event->isAlarmEnabled()) {
+        Alarm *alarm =event->alarms().first() ;
+        QDateTime t = alarm->time();
+        QString s =i18n("( %1 before )").arg( alarm->offsetText() );
+        addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
+        addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
+        //addTag("p",s);
+    }
+
     addTag("b",i18n("Access: "));
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 15e094d..e0e138e 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -122,3 +122,7 @@ bool ListItemVisitor::visit(Event *e)
     mItem->setText(4,e->dtEndTimeStr());
-    mItem->setText(5,e->isAlarmEnabled() ? i18n("Yes") : i18n("No"));
+    if ( e->isAlarmEnabled() ) {
+        mItem->setText(5,e->alarms().first()->offsetText() );
+    } else {
+        mItem->setText(5, i18n("No"));
+    }
     mItem->setText(6, e->recurrence()->recurrenceText());
@@ -157,3 +161,7 @@ bool ListItemVisitor::visit(Todo *t)
     mItem->setText(4,"---");
-    mItem->setText(5,t->isAlarmEnabled() ? i18n("Yes") : i18n("No"));
+    if ( t->isAlarmEnabled() ) {
+        mItem->setText(5,t->alarms().first()->offsetText() );
+    } else {
+        mItem->setText(5, i18n("No"));
+    }
     mItem->setText(6, t->recurrence()->recurrenceText());
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 0a315cb..01cf0ff 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -220,3 +220,3 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
             treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
-            itemMargin() ||
+            itemMargin() +i->height()||
             X < header()->sectionPos(0)) {
@@ -224,2 +224,4 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
         }
+    } else {
+        rootClicked = false;
     }
@@ -732,5 +734,5 @@ void KOTodoView::storeCurrentItem()
             mCurItemAbove = activeItemAbove->todo();
-        while ( mActiveItem->parent() != 0 )
-            mActiveItem = (KOTodoViewItem*)mActiveItem->parent();
-        mCurItemRootParent = mActiveItem->todo();
+        mCurItemRootParent = mCurItem;
+        while ( mCurItemRootParent->relatedTo() != 0 )
+            mCurItemRootParent = mCurItemRootParent->relatedTo();
     }
@@ -761,6 +763,6 @@ void KOTodoView::resetCurrentItem()
             if ( ! foundItem ) {
-                if ( foundItemAbove )
-                    foundItem = foundItemAbove;
-                else
+                if ( foundItemRoot )
                     foundItem = foundItemRoot;
+                else
+                    foundItem = foundItemAbove;
             }  
@@ -1207,4 +1209,7 @@ void  KOTodoView::setAllOpen()
         updateView();
+    } else {
+        storeCurrentItem();
     }
     setOpen(mTodoListView->firstChild(), true);
+    resetCurrentItem();
 }
@@ -1216,4 +1221,7 @@ void  KOTodoView::setAllClose()
         updateView();
+    } else {
+        storeCurrentItem();
     }
     setOpen(mTodoListView->firstChild(), false);
+    resetCurrentItem();
 }
@@ -1257,3 +1265,5 @@ void  KOTodoView::setAllFlat()
     }
+    storeCurrentItem();
     displayAllFlat();
+    resetCurrentItem();
 }