5 files changed, 23 insertions, 10 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 18c506e..114ed75 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -389,7 +389,7 @@ void KOAgenda::popupMenu()
         if (mPopupItem) {
             //mClickedItem = mPopupItem;
             selectItem(mPopupItem);
-            if ( mAllAgendaPopup )
+            if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu )
                 mAllAgendaPopup->installEventFilter( this );
             emit showIncidencePopupSignal(mPopupItem->incidence());
             
@@ -399,7 +399,8 @@ void KOAgenda::popupMenu()
             endSelectAction( false ); // do not emit new event signal
             mLeftMouseDown = false; // no more leftMouse computation
         }
-        mNewItemPopup->installEventFilter( this );
+        if ( KOPrefs::instance()->mBlockPopupMenu )
+            mNewItemPopup->installEventFilter( this );
         mNewItemPopup->popup( mPopupPos);
         
     }
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index e8c7c76..a571ed4 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -228,6 +228,7 @@ KOPrefs::KOPrefs() :
   
 
   KPrefs::setCurrentGroup("Views");
+  addItemBool("Block Popup Menu",&mBlockPopupMenu,true);
   addItemBool("Show Date Navigator",&mShowDateNavigator,true);
   addItemInt("Hour Size",&mHourSize,8);
   addItemBool("Show Daily Recurrences",&mDailyRecur,true);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index d511faa..2a0ee64 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -221,6 +221,8 @@ class KOPrefs : public KPimPrefs
     bool mShowTimeInAgenda;
     bool mHideNonStartedTodos;
 
+    bool mBlockPopupMenu;
+
     int mLastSyncTime;
     void setCategoryColor(QString cat,const QColor & color);
     QColor *categoryColor(QString cat);
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index a8943de..ad3c61c 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -381,13 +381,19 @@ void KOPrefsDialog::setupMainTab()
   //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
   topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1);
 
-
+  
+  int iii = 5;
+  widbool = addWidBool(i18n("Block popup until mouse button release"),
+             &(KOPrefs::instance()->mBlockPopupMenu),topFrame);
+  topLayout->addMultiCellWidget(  widbool->checkBox(), iii,iii,0,1); 
+  ++iii;
   QHBox *dummy = new QHBox(topFrame);
   new QLabel(i18n("Days in Next-X-Days:"),dummy);
   mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
  
-  topLayout->addMultiCellWidget(dummy,5,5,0,1);
+  topLayout->addMultiCellWidget(dummy,iii,iii,0,1);
 
+  ++iii;
  
 
   // KPrefsDialogWidBool *bcc =
@@ -404,7 +410,8 @@ void KOPrefsDialog::setupMainTab()
 
   QHBox *intervalBox = new QHBox(topFrame);
   // intervalBox->setSpacing(mSpacingHint);
-  topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
+  topLayout->addMultiCellWidget(intervalBox,iii,iii,0,1);
+  ++iii;
   QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
   mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
   autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 
@@ -422,7 +429,8 @@ void KOPrefsDialog::setupMainTab()
   KPrefsDialogWidBool *ask =
     addWidBool(i18n("Ask for quit when closing KO/Pi"),
                &(KOPrefs::instance()->mAskForQuit),topFrame);
-  topLayout->addMultiCellWidget(ask->checkBox(),7,7,0,1);
+  topLayout->addMultiCellWidget(ask->checkBox(),iii,iii,0,1);
+  ++iii;
  
 
   /*
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 9b5d4ce..7817a75 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1095,18 +1095,19 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
         topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
     }
     pendingSubtodo = 0;
-    int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
-    //qDebug("ROW %d ", row);
+    //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
+    int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() );
+    qDebug("ROW %d ", row);
     if (!item) {
         newTodo();
         return;
     } else {
-        if ( row == 2 ) {
+        if ( row == 2 || row == 1 ) {
             mActiveItem = (KOTodoViewItem *) item;
             newSubTodo();
             return;
         }
-        if ( row == 1 ) {
+        if ( row == 5 || row == 6 ) {
             mActiveItem = (KOTodoViewItem *) item;
             toggleRunningItem();
             return;