fixes

1 files changed, 41 insertions, 12 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index e2966f8..4f42c83 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -558,42 +558,56 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
     mPriority[mPriorityPopupMenu->insertItem (label)] = i;
   }
   connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int)));
 
   mPercentageCompletedPopupMenu = new QPopupMenu(this);
   for (int i = 0; i <= 100; i+=20) {
     QString label = QString ("%1 %").arg (i);
     mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i;
   }
   connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int)));
 
 
+  mCategoryPopupMenu = new QPopupMenu (this);
+  mCategoryPopupMenu->setCheckable (true);
+  connect (mCategoryPopupMenu, SIGNAL (activated (int)), SLOT (changedCategories (int)));
+  connect (mCategoryPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCategories ()));
+
+  mCalPopupMenu = new QPopupMenu (this);
+  mCalPopupMenu->setCheckable (true);
+  connect (mCalPopupMenu, SIGNAL (activated (int)), SLOT (changedCal (int)));
+  connect (mCalPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCal ()));
+
+
+
   
   mItemPopupMenu = new QPopupMenu(this); 
-  mItemPopupMenu->insertItem(i18n("Show..."), this,
+  mItemPopupMenu->insertItem(i18n("Show"), this,
                              SLOT (showTodo()));
   mItemPopupMenu->insertItem(i18n("Edit..."), this,
                              SLOT (editTodo()));
   mItemPopupMenu->insertItem( i18n("Delete"), this,
                              SLOT (deleteTodo()));
   mItemPopupMenu->insertItem( i18n("Clone..."), this,
                              SLOT (cloneTodo()));
   mItemPopupMenu->insertItem( i18n("Move..."), this,
                              SLOT (moveTodo()));
 #ifndef DESKTOP_VERSION
   mItemPopupMenu->insertItem( i18n("Beam..."), this,
                              SLOT (beamTodo()));
 #endif
   mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this,
                              SLOT (cancelTodo()));
+  mItemPopupMenu->insertItem( i18n("Categories"), mCategoryPopupMenu);
+  mItemPopupMenu->insertItem( i18n("Calendar"), mCalPopupMenu);
   mItemPopupMenu->insertSeparator();
   mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
                              SLOT (toggleRunningItem()));
   mItemPopupMenu->insertSeparator();
   /*
   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()),0,21);
@@ -1044,25 +1058,27 @@ void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column)
     pendingSubtodo = 0;
   mActiveItem = (KOTodoViewItem *)item;
   if (item) {
     switch (column){
     case 1:
       mPriorityPopupMenu->popup(QCursor::pos ()); break;
     case 2:
       mPercentageCompletedPopupMenu->popup(QCursor::pos ()); break;
     case 3:
          moveTodo();
         break;
     case 8:
-      getCategoryPopupMenu((KOTodoViewItem *)item)->popup(QCursor::pos ()); break;
+      mCategoryPopupMenu->popup(QCursor::pos ()); break;
+    case 9:
+      mCalPopupMenu->popup(QCursor::pos ()); break;
     default:
             mItemPopupMenu->popup(QCursor::pos());
     }
  } else mPopupMenu->popup(QCursor::pos());
 }
 void KOTodoView::newTodo()
 {
   emit newTodoSignal();
 }
 
 void KOTodoView::newSubTodo()
 {
@@ -1155,43 +1171,56 @@ void KOTodoView::setNewPercentage(int index)
         if (mPercentage[index] == 100) {
             mActiveItem->todo()->setCompleted(QDateTime::currentDateTime());
         } else {
             mActiveItem->todo()->setCompleted(false);
         }
         mActiveItem->todo()->setPercentComplete(mPercentage[index]);
         mActiveItem->construct();
         todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED);
         mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
     }
 }
 
-
-QPopupMenu * KOTodoView::getCategoryPopupMenu (KOTodoViewItem *todoItem)
+void KOTodoView::fillCategories ()
 {
-    if ( !mCategoryPopupMenu ) {
-        mCategoryPopupMenu = new QPopupMenu (this);
-        mCategoryPopupMenu->setCheckable (true);
-        connect (mCategoryPopupMenu, SIGNAL (activated (int)), SLOT (changedCategories (int)));
-    }
     mCategoryPopupMenu->clear();
-    QStringList checkedCategories = todoItem->todo()->categories ();
-
+    if ( ! mActiveItem ) return;
+    QStringList checkedCategories = mActiveItem->todo()->categories ();
     for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin ();
          it != KOPrefs::instance()->mCustomCategories.end ();
          ++it) {
         int index = mCategoryPopupMenu->insertItem (*it);
         mCategory[index] = *it;
         if (checkedCategories.find (*it) != checkedCategories.end ()) mCategoryPopupMenu->setItemChecked (index, true);
     }
-    return mCategoryPopupMenu;
+}
+void KOTodoView::fillCal ()
+{
+    mCalPopupMenu->clear();
+    if (!mActiveItem) return;
+    bool readO = mActiveItem->todo()->isReadOnly();
+    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+    while ( kkf ) {
+        int index = mCalPopupMenu->insertItem( kkf->mName, kkf->mCalNumber);
+        if ( kkf->mErrorOnLoad || kkf->isReadOnly || readO )
+            mCalPopupMenu->setItemEnabled( index, false );
+        mCalPopupMenu->setItemChecked (index, kkf->mCalNumber == mActiveItem->todo()->calID());
+        kkf = KOPrefs::instance()->mCalendars.next();
+    }
+}
+void KOTodoView::changedCal (int index )
+{
+    if (!mActiveItem) return;
+    mActiveItem->todo()->setCalID( index );
+    mActiveItem->construct();
 }
 void KOTodoView::changedCategories(int index)
 {
   if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
     QStringList categories = mActiveItem->todo()->categories ();
     QString colcat = categories.first();
     if (categories.find (mCategory[index]) != categories.end ())
       categories.remove (mCategory[index]);
     else
       categories.insert (categories.end(), mCategory[index]);
     categories.sort ();
     if ( !colcat.isEmpty() ) {