popup selection fix

4 files changed, 38 insertions, 5 deletions

diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index b274810..17ef81e 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -33,13 +33,14 @@
 
 KOEventPopupMenu::KOEventPopupMenu()
 {
   mCurrentIncidence = 0;
   mHasAdditionalItems = false;
 
-  insertItem (i18n("&Show"),this,SLOT(popupShow()));
+  
+  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..."),
@@ -47,24 +48,40 @@ KOEventPopupMenu::KOEventPopupMenu()
 #ifndef DESKTOP_VERSION
   mEditOnlyItems.append(insertItem (i18n("&Beam..."),
       this,SLOT(popupBeam())));
 #endif
   mEditOnlyItems.append(insertItem (i18n("&Toggle Cancel"),
       this,SLOT(popupCancel())));
+   isDisabled = false;  
+   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::showIncidencePopup(Incidence *incidence)
 {
   mCurrentIncidence = incidence;
   
   if (mCurrentIncidence) {
     // Enable/Disabled menu items only valid for editable events.
-    QValueList<int>::Iterator it;
-    for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
-      setItemEnabled(*it,!mCurrentIncidence->isReadOnly());
-    }
+      if ( !isDisabled  ) {
+          QValueList<int>::Iterator it;
+          for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
+              setItemEnabled(*it,!mCurrentIncidence->isReadOnly());
+          }
+      }
     popup(QCursor::pos());
   } else {
     kdDebug() << "KOEventPopupMenu::showEventPopup(): No event selected" << endl;
   }
 }
 
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index 6993899..8fb51fa 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -41,12 +41,13 @@ class KOEventPopupMenu : public QPopupMenu {
                            const QObject *receiver, const char *member,
                            bool editOnly=false);
 
 
   public slots:
     void showIncidencePopup(Incidence *);
+    void enableDefault( bool );
 
   protected slots:
     void popupShow();
     void popupEdit();
     void popupDelete();
     void popupClone();
@@ -65,9 +66,11 @@ class KOEventPopupMenu : public QPopupMenu {
     
   private:
     Incidence *mCurrentIncidence;
     
     bool mHasAdditionalItems;
     QValueList<int> mEditOnlyItems;
+    QValueList<int> mSingleOnlyItems;
+    bool isDisabled;
 };
 
 #endif
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index b94916a..02247c8 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1000,12 +1000,13 @@ void KOListView::defaultItemAction(QListViewItem *i)
 
 void KOListView::popupMenu(QListViewItem *item,const QPoint &,int)
 {
     mActiveItem = (KOListViewItem *)item;
     if (mActiveItem) {
         Incidence *incidence = mActiveItem->data();
+        mPopupMenu->enableDefault( !mListView->hasMultiSelection( item ) );
         mPopupMenu->showIncidencePopup(incidence);
 
         /*
           if ( incidence && incidence->type() == "Event" ) {
           Event *event = static_cast<Event *>( incidence );
           mPopupMenu->showEventPopup(event);
@@ -1192,12 +1193,23 @@ KOListViewListView::KOListViewListView(KOListView * lv )
 #ifndef DESKTOP_VERSION
     //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
     setSelectionMode( QListView::Multi );   
     setMultiSelection( true);
 }
+bool KOListViewListView::hasMultiSelection(QListViewItem* item)
+{
+    int selCount = 0;
+    QListViewItem *qitem  = firstChild ();
+    while ( qitem ) {
+        if ( qitem->isSelected() && item != qitem ) 
+            return true;
+        qitem = qitem->nextSibling();
+    }
+    return false;
+}
 void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
     if (!e) return;
     QPoint vp = contentsToViewport(e->pos());
     QListViewItem *item = itemAt(vp);
     if (!item) {
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 2051d60..dee69f6 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -212,12 +212,13 @@ class KOListView;
 
 class KOListViewListView : public KListView
 {  
    Q_OBJECT
  public:
     KOListViewListView(KOListView * lv );
+    bool hasMultiSelection(QListViewItem*);
  signals:
     void newEvent();
     void showIncidence( Incidence* );
   public slots:
     void popupMenu();
  private: