5 files changed, 97 insertions, 35 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index deadfc9..de964da 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -167,9 +167,9 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
                    const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
    
-
+    mAllAgendaPopup = 0;
   mColumns = columns;
   mRows = rows;
   mGridSpacingY = rowSize;
   mAllDayMode = false; 
@@ -186,8 +186,9 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
 */
 KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
+    mAllAgendaPopup = 0;
   blockResize = false;
   mColumns = columns;
   mRows = 1;
   //qDebug("aaaaaaaaaaaaaaaaaaldays %d ", KOPrefs::instance()->mAllDaySize);
@@ -231,9 +232,9 @@ void KOAgenda::init()
     if ( QApplication::desktop()->width() < 480 )
         pathString += "icons16/";
     } else
         pathString += "iconsmini/";
-
+    
     mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 
     mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ),  i18n("New Todo..."),2 ); 
     mNewItemPopup->insertSeparator ( ); 
     mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
@@ -386,45 +387,84 @@ void KOAgenda::popupMenu()
         }
         mLeftMouseDown = false; // no more leftMouse computation
         if (mPopupItem) {
             selectItem(mPopupItem);
+            if ( mAllAgendaPopup )
+                mAllAgendaPopup->installEventFilter( this );
             emit showIncidencePopupSignal(mPopupItem->incidence());
             
         } 
     } else if ( mPopupKind == 2 ) {
         if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action
             endSelectAction( false ); // do not emit new event signal
             mLeftMouseDown = false; // no more leftMouse computation
         }
+        mNewItemPopup->installEventFilter( this );
         mNewItemPopup->popup( mPopupPos);
+        
     }
     mLeftMouseDown = false;
     mPopupItem = 0;
     mPopupKind = 0;
 }
 
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
- //qDebug("KOAgenda::eventFilter_mous ");
+    static int startX = 0;
+    static int startY = 0;
+    static int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 15 : 20 );
+    static bool blockMoving = true;
+
+    //qDebug("KOAgenda::eventFilter_mous ");
+    if ( object == mNewItemPopup ) {
+        //qDebug("mNewItemPopup ");
+        if ( me->type() == QEvent::MouseButtonRelease ) {
+            mNewItemPopup->removeEventFilter( this ); 
+            int dX = me->globalPos().x() - mPopupPos.x();;
+            if ( dX < 0   )
+                dX = -dX;
+            int dY =  me->globalPos().y() - mPopupPos.y();
+            if ( dY < 0 )
+                dY = -dY;
+            if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
+                mNewItemPopup->hide();
+            }
+        }
+        return true;
+    }
+    if ( object == mAllAgendaPopup ) {
+        //qDebug(" mAllAgendaPopup ");
+        if ( me->type() == QEvent::MouseButtonRelease ) {
+            mAllAgendaPopup->removeEventFilter( this );
+            int dX = me->globalPos().x() - mPopupPos.x();;
+            if ( dX < 0   )
+                dX = -dX;
+            int dY =  me->globalPos().y() - mPopupPos.y();
+            if ( dY < 0 )
+                dY = -dY;
+            if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
+                mAllAgendaPopup->hide();
+            } 
+        }
+        return true;
+    }
     QPoint viewportPos;
     if (object != viewport()) {
         viewportPos = ((QWidget *)object)->mapToParent(me->pos());
     } else {
         viewportPos = me->pos();
     }
-    static int startX = 0;
-    static int startY = 0;
-    static int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 15 : 20 );
-    static bool blockMoving = true;
+    
     switch (me->type())  {
     case QEvent::MouseButtonPress:
         if (me->button() == LeftButton) {
             mPopupTimer->start( 600 );
             mLeftMouseDown = true;
         }
         blockMoving = true;
         startX = viewportPos.x();
-        startY = viewportPos.y(); 
+        startY = viewportPos.y();  
+        mPopupPos = me->globalPos();
         if (object != viewport()) {
             mPopupItem = (KOAgendaItem *)object;
             mPopupKind = 1;
             if (me->button() == RightButton) {
@@ -454,9 +494,8 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
             mPopupItem = 0;
             mPopupKind = 2;
             selectItem(0);
             mActionItem = 0;   
-            mPopupPos =  viewport()->mapToGlobal( me->pos() );
             if (me->button() == RightButton) {
                 int x,y;
                 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
                 int gx,gy;
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 35c08b6..4f1fdb9 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -30,8 +30,9 @@
 #include <qpixmap.h>
 #include <qguardedptr.h>
 
 #include "koagendaitem.h"
+#include "koeventview.h"
 
 class QPopupMenu;
 class QTime;
 class KConfig;
@@ -122,9 +123,9 @@ class KOAgenda : public QScrollView
     void finishUpdate();
     void printSelection();
     void storePosition();
     void restorePosition();
-
+    void setPopup( KOEventPopupMenu * p ) { mAllAgendaPopup = p; }
 
   public slots:
     void popupMenu();
     void newItem( int );
@@ -167,8 +168,9 @@ class KOAgenda : public QScrollView
     void addToCalSignal(Incidence *, Incidence *);
     void resizedSignal();
 
   protected:
+    KOEventPopupMenu * mAllAgendaPopup;
     QPainter mPixPainter;
     QPixmap mPaintPixmap;
     QPixmap mHighlightPixmap;
     void drawContents(QPainter *p,int cx, int cy, int cw, int ch);
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8d32152..95388ef 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -504,11 +504,9 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     mAllDayAgenda->setFocusPolicy(NoFocus);
     QLabel *dummyAllDayRight = new QLabel (mAllDayFrame);
 
     // Create event context menu for all day agenda
-    mAllDayAgendaPopup = eventPopup();
-    connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
-            mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
+    //mAllDayAgendaPopup = eventPopup();
 
     // Create agenda frame
     QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3);
     //  QHBox *agendaFrame = new QHBox(splitterAgenda);
@@ -543,18 +541,22 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2);
     agendaLayout->setColStretch(1,1);
     mAgenda->setFocusPolicy(NoFocus);
     // Create event context menu for agenda
-    mAgendaPopup = eventPopup();
+    mAllAgendaPopup = eventPopup();
   
-    mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
+    mAllAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
                                     i18n("Toggle Alarm"),mAgenda,
                                     SLOT(popupAlarm()),true);
 
 
     connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
-            mAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
+            mAllAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
   
+    connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
+            mAllAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
+    mAgenda->setPopup( mAllAgendaPopup );
+    mAllDayAgenda->setPopup( mAllAgendaPopup );
     // make connections between dependent widgets
     mTimeLabels->setAgenda(mAgenda);
 
     // Update widgets to reflect user preferences
@@ -666,10 +668,10 @@ void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld )
 }
 
 KOAgendaView::~KOAgendaView()
 {
-    delete mAgendaPopup;
-    delete mAllDayAgendaPopup;
+    delete mAllAgendaPopup;
+    //delete mAllDayAgendaPopup;
     delete KOAgendaItem::paintPix();
     delete KOAgendaItem::paintPixSel();
 }
 void KOAgendaView::resizeEvent( QResizeEvent* e )
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 30c9b05..c6e6602 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -270,10 +270,10 @@ class KOAgendaView : public KOEventView {
 
     bool mWeekStartsMonday;
     int mStartHour;
 
-    KOEventPopupMenu *mAgendaPopup;
-    KOEventPopupMenu *mAllDayAgendaPopup;
+    KOEventPopupMenu *mAllAgendaPopup;
+    //KOEventPopupMenu *mAllDayAgendaPopup;
 
     EventIndicator *mEventIndicatorTop;
     EventIndicator *mEventIndicatorBottom;
 
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index ccc4b01..0a315cb 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -206,27 +206,38 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
 }
 
 void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
 {
+
+    QPoint p(contentsToViewport(e->pos()));
+    QListViewItem *i = itemAt(p);
+    bool rootClicked = true;
+    if (i) {
+        // if the user clicked into the root decoration of the item, don't
+        // try to start a drag!
+        int X = p.x();
+        //qDebug("%d %d %d", X, header()->sectionPos(0), treeStepSize() );
+        if (X > header()->sectionPos(0) +
+            treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
+            itemMargin() ||
+            X < header()->sectionPos(0)) {
+            rootClicked = false;
+        }
+    }
 #ifndef KORG_NODND
-  QPoint p(contentsToViewport(e->pos()));
-  QListViewItem *i = itemAt(p);
-  mMousePressed = false; 
-  if (i) {
-    // if the user clicked into the root decoration of the item, don't
-    // try to start a drag!
-    if (p.x() > header()->sectionPos(header()->mapToIndex(0)) +
-        treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
-        itemMargin() ||
-        p.x() < header()->sectionPos(header()->mapToIndex(0))) {
-      if (e->button()==Qt::LeftButton) {
+    mMousePressed = false; 
+    if (! rootClicked ) {
         mPressPos = e->pos();
         mMousePressed = true;
-      }
     }
-  }
 #endif
-   QListView::contentsMousePressEvent(e);   
+    //qDebug("KOTodoListView::contentsMousePressEvent %d", rootClicked);
+#ifndef DESKTOP_VERSION
+    if (!( e->button() == RightButton && rootClicked) )
+        QListView::contentsMousePressEvent(e);   
+#else
+    QListView::contentsMousePressEvent(e);   
+#endif
 }
 void KOTodoListView::paintEvent(QPaintEvent* e)
 {
     emit paintNeeded();
@@ -1062,20 +1073,28 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
     if ( pendingSubtodo != 0 ) {
         topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
     }
     pendingSubtodo = 0;
+    int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
+    //qDebug("ROW %d ", row);
     if (!item) {
         newTodo();
         return;
+    } else {
+        if ( row == 1 ) {
+            mActiveItem = (KOTodoViewItem *) item;
+            newSubTodo();
+            return;
+        }
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
         editItem( item );
     else
         showItem( item , QPoint(), 0 );
 }
 void KOTodoView::itemClicked(QListViewItem *item)
 {
-
+    //qDebug("KOTodoView::itemClicked %d", item);
   if (!item) {
       if ( pendingSubtodo != 0 ) {
           topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
       }