9 files changed, 122 insertions, 7 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index eb232fa..e17297a 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,8 +1,16 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 1.9.8 ************
+
+Fixed character decoding in OM/Pi.
+(e.g. German "Umlaute" were not displayed properly.)
+
+Made is possible to reparent todos in KO/Pi.
+Use contextmenu or keys (look at Help-Keys + Colors) for that.
+
 ********** VERSION 1.9.7 ************
 
 KO/Pi - KA/Pi on Windows:
 Now a directory can be defined by the user, where the 
 application/config data should be saved.
   Define your desired path in the evironment variable
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index e4a11f5..1f8ad5b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -416,12 +416,14 @@ void CalendarView::init()
     connect( mTodoList, SIGNAL( beamTodoSignal( Incidence *  ) ),
             this, SLOT ( beamIncidence( Incidence * ) ) );
   
     connect( mTodoList, SIGNAL( unparentTodoSignal( Todo * ) ),
              this, SLOT ( todo_unsub( Todo * ) ) );
   
+    connect( mTodoList, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ),
+                 this, SLOT ( todo_resub( Todo *,Todo * ) ) );
     connect( this, SIGNAL( todoModified( Todo *, int )), mTodoList,
              SLOT( updateTodo( Todo *, int ) ) );
     connect( this, SIGNAL( todoModified( Todo *, int )), this,
              SLOT( changeTodoDisplay( Todo *, int ) ) );
 
 
@@ -2743,12 +2745,26 @@ void CalendarView::appointment_delete()
         return;
     }
 
     deleteEvent(anEvent);
 }
 
+void CalendarView::todo_resub( Todo * parent, Todo * sub )
+{
+    if (!sub) return;
+    if (!parent) return;
+    if ( sub->relatedTo() )
+        sub->relatedTo()->removeRelation(sub);
+    sub->setRelatedTo(parent);
+    sub->setRelatedToUid(parent->uid());
+    parent->addRelation(sub);
+    sub->updated();
+    parent->updated();
+    setModified(true);
+    updateView();
+}
 void CalendarView::todo_unsub(Todo *anTodo )
 {
     // Todo *anTodo = selectedTodo();
     if (!anTodo) return;
     if (!anTodo->relatedTo()) return;
     anTodo->relatedTo()->removeRelation(anTodo);
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 660cce7..9f56cc8 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -351,12 +351,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     /** mails the currently selected event to a particular user as a vCalendar
       attachment. */
     void action_mail();
 
     /* frees a subtodo from it's relation */
     void todo_unsub( Todo * );
+    void todo_resub( Todo * parent, Todo * sub );
 
     /** Take ownership of selected event. */
     void takeOverEvent();
 
     /** Take ownership of all events in calendar. */
     void takeOverCalendar();
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index ca5eadd..a8143a0 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -208,12 +208,13 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
   }
 #endif
 }
 
 void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
 {
+
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsMouseMoveEvent()" << endl;
   QListView::contentsMouseMoveEvent(e);
   if (mMousePressed && (mPressPos - e->pos()).manhattanLength() >
       QApplication::startDragDistance()) {
     mMousePressed = false;
@@ -271,12 +272,14 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
         case Qt::Key_Up:
             QListView::keyPressEvent (  e );
             break; 
         case Qt::Key_Left:
         case Qt::Key_Right:
             QListView::keyPressEvent (  e );
+            e->accept();
+            return;
             break; 
         default:
             e->ignore();
             break;
         }
         return;
@@ -411,13 +414,15 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 
   mItemPopupMenu->insertItem( i18n("New Todo..."), this,
                              SLOT (newTodo()));
   mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
                              SLOT (newSubTodo())); 
   mItemPopupMenu->insertItem(i18n("Unparent Todo"), this,
-                             SLOT (unparentTodo()));
+                             SLOT (unparentTodo()),0,21);
+  mItemPopupMenu->insertItem(i18n("Reparent Todo"), this,
+                             SLOT (reparentTodo()),0,22);
   mItemPopupMenu->insertSeparator();
   mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed"),
                              this, SLOT( purgeCompleted() ) );
   mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"),
                              this, SLOT( toggleCompleted() ),0, 33 );
   mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
@@ -436,15 +441,20 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 
   mPopupMenu->setCheckable( true );
   mItemPopupMenu->setCheckable( true );
   // Double clicking conflicts with opening/closing the subtree
   connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ),
            SLOT( editItem( QListViewItem *) ) );
+  /*
   connect( mTodoListView, SIGNAL(  rightButtonClicked ( QListViewItem *,
                                                         const QPoint &,int ) ),
            SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
+  */ 
+  connect( mTodoListView, SIGNAL(  contextRequest ( QListViewItem *,
+                                                        const QPoint &,int ) ),
+           SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
   connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ),
            SLOT( itemClicked( QListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ),
            SLOT( itemDoubleClicked( QListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( todoDropped( Todo * ) ),
            SLOT( updateView() ) );
@@ -692,13 +702,12 @@ void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
 {
   emit showTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 
 void KOTodoView::popupMenu(QListViewItem *item,const QPoint &,int column)
 {
-  
   mActiveItem = (KOTodoViewItem *)item;
   if (item) {
     switch (column){
     case 1:
       mPriorityPopupMenu->popup(QCursor::pos ()); break;
     case 2:
@@ -727,12 +736,21 @@ void KOTodoView::newSubTodo()
 void KOTodoView::unparentTodo()
 {
  if (mActiveItem) {
     emit unparentTodoSignal(mActiveItem->todo());
   }
 }
+
+void KOTodoView::reparentTodo()
+{ 
+    if (mActiveItem) {
+        qDebug("KOTodoView::reparentTodo() ");
+        topLevelWidget()->setCaption(i18n("Click on new parent item"));
+        pendingSubtodo = mActiveItem;
+    }
+}
 void KOTodoView::editTodo()
 {
   if (mActiveItem) {
     emit editTodoSignal(mActiveItem->todo());
   }
 }
@@ -840,28 +858,58 @@ void KOTodoView::changedCategories(int index)
     mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
     todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED);
   }
 }
 void KOTodoView::itemDoubleClicked(QListViewItem *item)
 {
+    if ( pendingSubtodo != 0 ) {
+        topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
+    }
+    pendingSubtodo = 0;
     if (!item) {
         newTodo();
         return;
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
         editItem( item );
     else
         showItem( item , QPoint(), 0 );
 }
 void KOTodoView::itemClicked(QListViewItem *item)
 {
+
   if (!item) {
+      if ( pendingSubtodo != 0 ) {
+          topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
+      }
+      pendingSubtodo = 0;
       return;
   }
-
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
+  if ( pendingSubtodo != 0 ) {
+      bool allowReparent = true;
+      QListViewItem *par = item;
+      while ( par ) {
+          if ( par ==  pendingSubtodo ) {
+              allowReparent = false;
+              break;
+          }
+          par = par->parent();
+      }
+      if ( !allowReparent  ) {
+          topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!"));
+          qDebug("Recursive reparenting not possible ");
+          pendingSubtodo = 0;
+      } else {
+          Todo* newParent = todoItem->todo();
+          Todo* newSub = pendingSubtodo->todo();
+          pendingSubtodo = 0;
+          emit reparentTodoSignal( newParent,newSub  );
+          return;
+      }
+  }
   int completed = todoItem->todo()->isCompleted();  // Completed or not?
 
   if (todoItem->isOn()) {
     if (!completed) {
       todoItem->todo()->setCompleted(QDateTime::currentDateTime());
     }
@@ -971,22 +1019,54 @@ void KOTodoView::addQuickTodo()
   updateView();
 }
 void KOTodoView::keyPressEvent ( QKeyEvent * e )
 {
     //    e->ignore();
     //return;
+    //qDebug("KOTodoView::keyPressEvent  ");
     switch ( e->key() ) {
     case Qt::Key_Down:
     case Qt::Key_Up:
         QWidget::keyPressEvent (  e );
         break; 
    
     case Qt::Key_Q:
         toggleQuickTodo();
         break; 
-   
+    case Qt::Key_U:
+        if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton ) {
+            mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
+            unparentTodo();
+            e->accept();
+        } else
+            e->ignore();
+        break; 
+    case Qt::Key_S:
+        if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton ) {
+            mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
+            reparentTodo();
+            e->accept();
+        } else
+            e->ignore();
+        break; 
+    case Qt::Key_P:
+        if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton ) {
+            mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
+            if ( pendingSubtodo )
+                itemClicked(mActiveItem);
+            e->accept();
+        } else
+            e->ignore();
+        break;  
+    case Qt::Key_Escape:
+        if ( pendingSubtodo ) {
+            itemClicked(0);
+            e->accept();
+        } else
+            e->ignore();
+        break; 
     default:
         e->ignore();
     }
     
     if ( true ) {
         if (  e->key() == Qt::Key_I ) {
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 6bf0203..0c08677 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -144,12 +144,13 @@ class KOTodoView : public KOrg::BaseView
     void editItem(QListViewItem *item);
     void showItem(QListViewItem *item,const QPoint &,int);
     void popupMenu(QListViewItem *item,const QPoint &,int);
     void newTodo();
     void newSubTodo();
     void unparentTodo();
+    void reparentTodo();
     void showTodo();
     void editTodo();
     void cloneTodo();
     void cancelTodo();
     void moveTodo();
     void beamTodo();
@@ -170,12 +171,13 @@ class KOTodoView : public KOrg::BaseView
     void itemDoubleClicked(QListViewItem *item);
 
   signals:
     void newTodoSignal();
     void newSubTodoSignal(Todo *);
     void unparentTodoSignal(Todo *);
+    void reparentTodoSignal( Todo *,Todo * );
     void showTodoSignal(Todo *);
 
     void editTodoSignal(Todo *);
     void deleteTodoSignal(Todo *);
     void todoModifiedSignal (Todo *, int);
 
@@ -223,9 +225,10 @@ class KOTodoView : public KOrg::BaseView
     DocPrefs *mDocPrefs;
     QString mCurrentDoc;
     KOQuickTodo *mQuickAdd;
     bool mBlockUpdate;
     void todoModified(Todo *, int );
     void keyPressEvent ( QKeyEvent * ) ;
+    KOTodoViewItem * pendingSubtodo;
 };
 
 #endif
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 8e6cc53..391f98c 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -495,12 +495,14 @@ void KOViewManager::showTodoView()
         connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ),
                  mMainView, SLOT ( todo_unsub( Todo * ) ) );
+        connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ),
+                 mMainView, SLOT ( todo_resub( Todo *, Todo *) ) );
         connect( mTodoView, SIGNAL( moveTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( beamTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         KConfig *config = KOGlobals::config();
         mTodoView->restoreLayout(config,"Todo View");
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8daacc7..06470b8 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1144,12 +1144,15 @@ void MainWindow::keyBindings()
         i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+
         i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+
         i18n("<p><h3>In agenda view:</h3></p>\n") +
         i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+
         i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+
         i18n("<p><h3>In todo view:</h3></p>\n") +
+        i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+
+        i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+
+        i18n("<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n")+
         i18n("<p><b>Q</b>: Toggle quick todo line edit.</p>\n")+
         i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
         i18n("<p><b>return</b>: Mark item as completed+one step down.</p>\n")+
         i18n("<p><b>return+shift</b>:  Mark item as not completed+one step down</p>\n")+
         i18n("<p><h3>In list view:</h3></p>\n") +
         i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp
index 2856f2d..6477d11 100644
--- a/microkde/kdeui/klistview.cpp
+++ b/microkde/kdeui/klistview.cpp
@@ -1884,16 +1884,17 @@ void KListView::emitContextMenu (KListView*, QListViewItem* i)
   else
         p = mapToGlobal(rect().center());
 
   emit contextMenu (this, i, p);
 }
 
-void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int)
+void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col)
 {
-    qDebug("KListView::emitContextMenu ");
-  emit contextMenu (this, i, p);
+    qDebug("KListView::emitContextMenu col");
+    emit contextRequest( i, p,  col );
+    emit contextMenu (this, i, p);
 }
 
 void KListView::setAcceptDrops (bool val)
 {
   QListView::setAcceptDrops (val);
   viewport()->setAcceptDrops (val);
diff --git a/microkde/kdeui/klistview.h b/microkde/kdeui/klistview.h
index f7d9f85..8d933f6 100644
--- a/microkde/kdeui/klistview.h
+++ b/microkde/kdeui/klistview.h
@@ -410,12 +410,13 @@ signals:
    *
    * This signal is more or less here for the sake of completeness.
    * You should normally not need to use this. In most cases its better
    * to use @ref #executed() instead.
    */
   void doubleClicked( QListViewItem *item, const QPoint &pos, int c );
+  void contextRequest( QListViewItem *item, const QPoint &pos, int c );
 
   /**
    * This signal gets emitted whenever something acceptable is
    * dropped onto the listview.
    *
    * @param e is the drop event itself (it has already been accepted)