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
@@ -1,112 +1,129 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qcursor.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
 #include <libkcal/event.h>
 
 #include "koeventpopupmenu.h"
 
 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..."),
       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;  
+   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;
   }
 }
 
 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);
 }
 
 void KOEventPopupMenu::popupShow()
 {
   if (mCurrentIncidence) emit showIncidenceSignal(mCurrentIncidence);
 }
 
 void KOEventPopupMenu::popupEdit()
 {
   if (mCurrentIncidence) emit editIncidenceSignal(mCurrentIncidence);
 }
 
 void KOEventPopupMenu::popupDelete()
 {
   if (mCurrentIncidence) emit deleteIncidenceSignal(mCurrentIncidence);
 }
 void KOEventPopupMenu::popupClone()
 {
   if (mCurrentIncidence) emit cloneIncidenceSignal(mCurrentIncidence);
 }
 void KOEventPopupMenu::popupCancel()
 {
   if (mCurrentIncidence) emit cancelIncidenceSignal(mCurrentIncidence);
 }
 void KOEventPopupMenu::popupMove()
 {
   if (mCurrentIncidence) emit moveIncidenceSignal(mCurrentIncidence);
 }
 
 void KOEventPopupMenu::popupBeam()
 {
   if (mCurrentIncidence) emit beamIncidenceSignal(mCurrentIncidence);
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index 6993899..8fb51fa 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -1,73 +1,76 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOEVENTPOPUPMENU_H
 #define KOEVENTPOPUPMENU_H
 //
 // Context menu for event views with standard event actions
 //
 
 #include <qpopupmenu.h>
 
 #include <libkcal/incidence.h>
 
 using namespace KCal;
 
 class KOEventPopupMenu : public QPopupMenu {
     Q_OBJECT
   public:
     KOEventPopupMenu();
   
     void addAdditionalItem(const QIconSet &icon,const QString &text,
                            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();
     void popupCancel();
     void popupMove();
     void popupBeam();
 
   signals:
     void editIncidenceSignal(Incidence *);
     void showIncidenceSignal(Incidence *);
     void deleteIncidenceSignal(Incidence *);
     void cloneIncidenceSignal(Incidence *);
     void cancelIncidenceSignal(Incidence *);
     void moveIncidenceSignal(Incidence *);
     void beamIncidenceSignal(Incidence *);
     
   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
@@ -958,96 +958,97 @@ void KOListView::changeEventDisplay(Event *event, int action)
     KOListViewItem *item;
 
     switch(action) {
     case KOGlobals::EVENTADDED:
         addIncidence( event );
         break;
     case KOGlobals::EVENTEDITED:
         item = getItemForEvent(event);
         if (item) { 
             mUidDict.remove( event->uid() ); 
             delete item;
             addIncidence( event );
         }
         break;
     case KOGlobals::EVENTDELETED:
         item = getItemForEvent(event);
         if (item) {
             mUidDict.remove( event->uid() ); 
             delete item;
         }
         break;
     default:
         ;
     }
 }
 
 KOListViewItem *KOListView::getItemForEvent(Event *event)
 {
     KOListViewItem *item = (KOListViewItem *)mListView->firstChild();
     while (item) {
         if (item->data() == event) return item;
         item = (KOListViewItem *)item->nextSibling();
     }
     return 0;
 }
 
 void KOListView::defaultItemAction(QListViewItem *i)
 {
     KOListViewItem *item = static_cast<KOListViewItem *>( i );
     if ( item ) defaultAction( item->data() );
       
 }
 
 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);
           }
         */
     }
 }
 
 void KOListView::readSettings(KConfig *config, QString setting)
 {
     //  qDebug("KOListView::readSettings ");
     mListView->restoreLayout(config,setting);
 }
 
 void KOListView::writeSettings(KConfig *config, QString setting)
 {
     // qDebug("KOListView::writeSettings ");
     mListView->saveLayout(config, setting);
 }
 
 void KOListView::processSelectionChange(QListViewItem *)
 {
   
     KOListViewItem *item =
         static_cast<KOListViewItem *>( mListView->currentItem() );
 
     if ( !item ) {
         emit incidenceSelected( 0 );
     } else {
         emit incidenceSelected( item->data() );
     }
 }
 
 void KOListView::clearSelection()
 {
     mListView->selectAll( false );
 }
 void KOListView::allSelection()
 {
     mListView->selectAll( true );
 }
 
 void KOListView::clear()
 {
     mListView->clear();
@@ -1150,96 +1151,107 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
                 if ( cn ) {
                     setCurrentItem ( cn );
                     ensureItemVisible ( cn );
                 }
                 emit showIncidence( ci->data());
             }
         }
         e->accept();
     }
         break;          
     case Qt::Key_Return:
     case Qt::Key_Enter:
         {
             QListViewItem* cn;
             cn = currentItem();
             if ( cn ) {
                 KOListViewItem* ci = (KOListViewItem*)( cn ); 
                 if ( ci ){ 
                     if ( e->state() == ShiftButton )
                         ci->setSelected( false );
                     else
                         ci->setSelected( true );
                     cn = cn->nextSibling();
                     if ( cn ) {
                         setCurrentItem ( cn );
                         ensureItemVisible ( cn );
                     }
                 }
             }
             e->accept();
         }
     break;             
     default:
         e->ignore();
     }
 }
 KOListViewListView::KOListViewListView(KOListView * lv ) 
     : KListView( lv, "kolistlistview", false )
 {  
     mYMousePos = 0; 
     mPopupTimer = new QTimer(this);
     connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu()));
 #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) {
         emit newEvent();
         return;
     }
     KListView::contentsMouseDoubleClickEvent(e);
 }
 #if 0
 void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
 {
     //qDebug("contentsMousePressEvent++++ ");
     KListView::contentsMousePressEvent( e );
     if (  e->button() == RightButton    ) {
         QListViewItem* ci =  currentItem();
         clearSelection () ;
         if ( ci )
             ci->setSelected( true );
     }
 }
 void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
     KListView::contentsMouseReleaseEvent(e);
 }
 void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
 {
     KListView::contentsMouseMoveEvent(e);
 }
 #endif
 void KOListViewListView::popupMenu()
 {
     mPopupTimer->stop();
     QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton );
     QApplication::postEvent( this->viewport(), e ); 
 
 }
 void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
 {
     //qDebug("contentsMousePressEvent++++ %d %d", e->pos().y(), e->globalPos().y());
     mYMousePos = mapToGlobal( (e->pos())).y();
     if (  e->button() == LeftButton ) {
         mPopupTimer->start( 600 ); 
         mEventPos = contentsToViewport(e->pos());
         mEventGlobalPos = e->globalPos();
     }
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 2051d60..dee69f6 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -170,96 +170,97 @@ void pickAlarmProgram()
 };
   
 };
 
 
 
 
 
 
 
 typedef CustomListViewItem<Incidence *> KOListViewItem;
 
 /**
   This class provides the initialisation of a KOListViewItem for calendar
   components using the Incidence::Visitor.
 */
 class ListItemVisitor : public Incidence::Visitor
 {
   public:
     ListItemVisitor(KOListViewItem *, QDate d);
     ~ListItemVisitor();
     
     bool visit(Event *);
     bool visit(Todo *);
     bool visit(Journal *);
 
   private:
     KOListViewItem *mItem;
     QDate mDate;
 };
 
 /**
   This class provides a multi-column list view of events.  It can
   display events from one particular day or several days, it doesn't 
   matter.  To use a view that only handles one day at a time, use
   KODayListView.
 
   @short multi-column list view of various events.
   @author Preston Brown <pbrown@kde.org>
   @see KOBaseView, KODayListView
 */
 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: 
     QPoint mEventPos;
     QPoint mEventGlobalPos;
     QTimer* mPopupTimer;
     int mYMousePos;
     void keyPressEvent ( QKeyEvent * ) ;
     void contentsMouseDoubleClickEvent(QMouseEvent *e);
     void contentsMousePressEvent(QMouseEvent *e);
     void contentsMouseReleaseEvent(QMouseEvent *e);
     void contentsMouseMoveEvent(QMouseEvent *e);
     bool mMouseDown;
 };
 
 class KOListView : public KOEventView
 {
     Q_OBJECT
   public:
     KOListView(Calendar *calendar, QWidget *parent = 0, 
                const char *name = 0);
     ~KOListView();
 
     virtual int maxDatesHint();
     virtual int currentDateCount();
     virtual QPtrList<Incidence> selectedIncidences();
     virtual DateList selectedDates();
     
     void showDates(bool show);
     Incidence* currentItem();
     void addTodos(QPtrList<Todo> eventList);
     void addJournals(QPtrList<Journal> eventList);
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
     
     void readSettings(KConfig *config, QString setting = "KOListView Layout");
     void writeSettings(KConfig *config, QString setting = "KOListView Layout");
     void updateList();
     void setStartDate(const QDate &start);
     int count();
     QString getWhatsThisText(QPoint p);
  signals:
     void signalNewEvent();
     void beamIncidenceList(QPtrList<Incidence>);