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
@@ -59,3 +59,8 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
    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;
@@ -76,2 +81,21 @@ void KOEventPopupMenu::enableDefault( bool 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()
@@ -79,2 +103,3 @@ void KOEventPopupMenu::fillCatPopup()
     mCatPopup->clear(); 
+    if (!mCurrentIncidence) return;
     QStringList checkedCategories = mCurrentIncidence->categories();
@@ -93,2 +118,3 @@ void KOEventPopupMenu::computeCatPopup( int index )
 {
+    if (!mCurrentIncidence) return;
     QStringList categories =  mCurrentIncidence->categories();
@@ -111,2 +137,3 @@ void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
 {
+    if ( !incidence) return;
   mCurrentIncidence = incidence;