fixes

1 files changed, 9 insertions, 3 deletions

diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 0b0fe8e..77322e7 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -63,4 +63,6 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
     connect(mCalPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCalPopup( int )));
-    mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup ));
-    mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup ));
+    //mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup ));
+    //mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup ));
+    insertItem (i18n("Categories"),mCatPopup );
+    insertItem (i18n("Calendar"),mCalPopup );
     QValueList<int>::Iterator it;
@@ -85,2 +87,3 @@ void KOEventPopupMenu::fillCalPopup() // CAL
     if (!mCurrentIncidence) return;
+    bool readO = mCurrentIncidence->isReadOnly()|| isDisabled;
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
@@ -88,3 +91,3 @@ void KOEventPopupMenu::fillCalPopup() // CAL
         int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
-        if ( kkf->mErrorOnLoad || kkf->isReadOnly )
+        if ( kkf->mErrorOnLoad || kkf->isReadOnly || readO )
             mCalPopup->setItemEnabled( index, false );
@@ -104,2 +107,3 @@ void KOEventPopupMenu::fillCatPopup()
     if (!mCurrentIncidence) return;
+    bool readO = mCurrentIncidence->isReadOnly() || isDisabled;
     QStringList checkedCategories = mCurrentIncidence->categories();
@@ -113,2 +117,4 @@ void KOEventPopupMenu::fillCatPopup()
         }
+        if ( readO )
+            mCatPopup->setItemEnabled( index, false );
         ++index;