more fixes

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
@@ -170,3 +170,3 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
    
-
+    mAllAgendaPopup = 0;
   mColumns = columns;
@@ -189,2 +189,3 @@ KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
 {
+    mAllAgendaPopup = 0;
   blockResize = false;
@@ -234,3 +235,3 @@ void KOAgenda::init()
         pathString += "iconsmini/";
-
+    
     mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 
@@ -389,2 +390,4 @@ void KOAgenda::popupMenu()
             selectItem(mPopupItem);
+            if ( mAllAgendaPopup )
+                mAllAgendaPopup->installEventFilter( this );
             emit showIncidencePopupSignal(mPopupItem->incidence());
@@ -397,3 +400,5 @@ void KOAgenda::popupMenu()
         }
+        mNewItemPopup->installEventFilter( this );
         mNewItemPopup->popup( mPopupPos);
+        
     }
@@ -406,3 +411,40 @@ 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;
@@ -413,6 +455,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
     }
-    static int startX = 0;
-    static int startY = 0;
-    static int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 15 : 20 );
-    static bool blockMoving = true;
+    
     switch (me->type())  {
@@ -425,3 +464,4 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
         startX = viewportPos.x();
-        startY = viewportPos.y(); 
+        startY = viewportPos.y();  
+        mPopupPos = me->globalPos();
         if (object != viewport()) {
@@ -457,3 +497,2 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
             mActionItem = 0;   
-            mPopupPos =  viewport()->mapToGlobal( me->pos() );
             if (me->button() == RightButton) {
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 35c08b6..4f1fdb9 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -33,2 +33,3 @@
 #include "koagendaitem.h"
+#include "koeventview.h"
 
@@ -125,3 +126,3 @@ class KOAgenda : public QScrollView
     void restorePosition();
-
+    void setPopup( KOEventPopupMenu * p ) { mAllAgendaPopup = p; }
 
@@ -170,2 +171,3 @@ class KOAgenda : public QScrollView
   protected:
+    KOEventPopupMenu * mAllAgendaPopup;
     QPainter mPixPainter;
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8d32152..95388ef 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -507,5 +507,3 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     // Create event context menu for all day agenda
-    mAllDayAgendaPopup = eventPopup();
-    connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
-            mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
+    //mAllDayAgendaPopup = eventPopup();
 
@@ -546,5 +544,5 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     // Create event context menu for agenda
-    mAgendaPopup = eventPopup();
+    mAllAgendaPopup = eventPopup();
   
-    mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
+    mAllAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
                                     i18n("Toggle Alarm"),mAgenda,
@@ -554,4 +552,8 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     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
@@ -669,4 +671,4 @@ KOAgendaView::~KOAgendaView()
 {
-    delete mAgendaPopup;
-    delete mAllDayAgendaPopup;
+    delete mAllAgendaPopup;
+    //delete mAllDayAgendaPopup;
     delete KOAgendaItem::paintPix();
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 30c9b05..c6e6602 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -273,4 +273,4 @@ class KOAgendaView : public KOEventView {
 
-    KOEventPopupMenu *mAgendaPopup;
-    KOEventPopupMenu *mAllDayAgendaPopup;
+    KOEventPopupMenu *mAllAgendaPopup;
+    //KOEventPopupMenu *mAllDayAgendaPopup;
 
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index ccc4b01..0a315cb 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -209,21 +209,32 @@ 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
 }
@@ -1065,2 +1076,4 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
     pendingSubtodo = 0;
+    int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
+    //qDebug("ROW %d ", row);
     if (!item) {
@@ -1068,2 +1081,8 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
         return;
+    } else {
+        if ( row == 1 ) {
+            mActiveItem = (KOTodoViewItem *) item;
+            newSubTodo();
+            return;
+        }
     }
@@ -1076,3 +1095,3 @@ void KOTodoView::itemClicked(QListViewItem *item)
 {
-
+    //qDebug("KOTodoView::itemClicked %d", item);
   if (!item) {