1 files changed, 27 insertions, 0 deletions

diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 90caaf4..41d331a 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -36,100 +36,127 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
 {
   mCurrentIncidence = 0;
   mHasAdditionalItems = false;
 
   
   mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow())));
   mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit())));
   mEditOnlyItems.append(insertItem (i18n("&Delete"),
       this,SLOT(popupDelete())));
   mEditOnlyItems.append(insertItem (i18n("&Clone..."),
       this,SLOT(popupClone())));
   mEditOnlyItems.append(insertItem (i18n("&Move..."),
       this,SLOT(popupMove())));
 #ifndef DESKTOP_VERSION
   mEditOnlyItems.append(insertItem (i18n("&Beam..."),
       this,SLOT(popupBeam())));
 #endif
   mEditOnlyItems.append(insertItem (i18n("&Toggle Cancel"),
       this,SLOT(popupCancel())));
    isDisabled = false;  
    mCatPopup = new QPopupMenu ( this );
    mCatPopup->setCheckable (true);
    connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup()));
    connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCatPopup( int )));
+    mCalPopup = new QPopupMenu ( this );
+    mCalPopup->setCheckable (true);
+    connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup()));
+    connect(mCalPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCalPopup( int )));
    mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup ));
+    mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup ));
    QValueList<int>::Iterator it;
    for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
        mSingleOnlyItems.append(*it);
    }
 
 }
 void KOEventPopupMenu::enableDefault( bool enable )
 {
     isDisabled = !enable;
     QValueList<int>::Iterator it;
     for( it = mSingleOnlyItems.begin(); it != mSingleOnlyItems.end(); ++it ) {
         setItemEnabled(*it,enable);
     }
     
 }
 
+void KOEventPopupMenu::fillCalPopup() // CAL
+{
+    mCalPopup->clear();
+    if (!mCurrentIncidence) return;
+    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+    while ( kkf ) {
+        int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
+        if ( kkf->mErrorOnLoad || kkf->isReadOnly )
+            mCalPopup->setItemEnabled( index, false );
+        mCalPopup->setItemChecked (index, kkf->mCalNumber == mCurrentIncidence->calID());
+        kkf = KOPrefs::instance()->mCalendars.next();
+    }
+}
+void KOEventPopupMenu::computeCalPopup( int index ) // CAL
+{
+    if (!mCurrentIncidence) return;
+    mCurrentIncidence->setCalID( index );
+    emit categoryChanged( mCurrentIncidence );
+}
 void KOEventPopupMenu::fillCatPopup()
 {
     mCatPopup->clear(); 
+    if (!mCurrentIncidence) return;
     QStringList checkedCategories = mCurrentIncidence->categories();
     int index = 0;
     for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin ();
          it != KOPrefs::instance()->mCustomCategories.end ();
          ++it) {
         mCatPopup->insertItem (*it, index );
         if (checkedCategories.find (*it) != checkedCategories.end ()) {
             mCatPopup->setItemChecked (index, true);
         }
         ++index;
     }
 }
 void KOEventPopupMenu::computeCatPopup( int index )
 {
+    if (!mCurrentIncidence) return;
     QStringList categories =  mCurrentIncidence->categories();
     QString colcat = categories.first();
     if (categories.find (KOPrefs::instance()->mCustomCategories[index]) != categories.end ())
       categories.remove (KOPrefs::instance()->mCustomCategories[index]);
     else
         categories.insert (categories.end(), KOPrefs::instance()->mCustomCategories[index]);
     categories.sort ();
     if ( !colcat.isEmpty() ) {
         if ( categories.find ( colcat ) != categories.end () ) {
             categories.remove( colcat );
             categories.prepend( colcat );
         }
     }
      mCurrentIncidence->setCategories( categories );
     emit categoryChanged( mCurrentIncidence );
 }
 void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
 {
+    if ( !incidence) return;
   mCurrentIncidence = incidence;
   
   if (mCurrentIncidence) {
     // Enable/Disabled menu items only valid for editable events.
       if ( !isDisabled  ) {
           QValueList<int>::Iterator it;
           for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
               setItemEnabled(*it,!mCurrentIncidence->isReadOnly());
           }
       }
     popup(QCursor::pos());
   }
 }
 
 void KOEventPopupMenu::addAdditionalItem(const QIconSet &icon,const QString &text,
                                     const QObject *receiver, const char *member,
                                     bool editOnly)
 {
   if (!mHasAdditionalItems) {
     mHasAdditionalItems = true;
     insertSeparator();
   }
   int id = insertItem(icon,text,receiver,member);
   if (editOnly) mEditOnlyItems.append(id);