fixxxxxx

6 files changed, 24 insertions, 11 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 9476a89..a688eaf 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1336,22 +1336,22 @@
 { "On: ","Am: " },
 { "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" },
 { "Start/Stop todo...","Starte/Stoppe Todo..." },
 { "Color for running todos:","Farbe für laufende Todos:" },
 { "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" },
 { "Todo is started","Todo is gestarted" },
 { "Stop todo","Stoppe Todo" },
 { "Todo is stopped","Todo ist gestoppt" },
 { "Start todo","Starte Todo" },
 { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" },
 { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie\nalle Untertodos auch klonen?" },
 { "Todo has subtodos","Todo hat Untertodos" },
-{ "","" },
+{ "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 18c506e..114ed75 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -380,35 +380,36 @@ bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
 }
 void KOAgenda::popupMenu()
 {
     mPopupTimer->stop();
     if (  mPopupKind == 1 ) {
         if (mActionItem ) {
             endItemAction();
         }
         mLeftMouseDown = false; // no more leftMouse computation
         if (mPopupItem) {
             //mClickedItem = mPopupItem;
             selectItem(mPopupItem);
-            if ( mAllAgendaPopup )
+            if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu )
                 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 );
+        if ( KOPrefs::instance()->mBlockPopupMenu )
+            mNewItemPopup->installEventFilter( this );
         mNewItemPopup->popup( mPopupPos);
         
     }
     mLeftMouseDown = false;
     mPopupItem = 0;
     mPopupKind = 0;
 }
 
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
     static int startX = 0;
     static int startY = 0;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index e8c7c76..a571ed4 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -219,24 +219,25 @@ KOPrefs::KOPrefs() :
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
   addItemBool("MonthViewWeek",&mMonthViewWeek,false);
   addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
   addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
   addItemBool("UseAppColors",&mUseAppColors,false); 
 
   
 
   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);
   addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
   addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
   addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
   addItemBool("ShowShortMonthName",&mMonthShowShort,false);
   addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
 #ifdef DESKTOP_VERION
   addItemBool("Enable ToolTips",&mEnableToolTips,true);
 #else
   addItemBool("Enable ToolTips",&mEnableToolTips,false);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index d511faa..2a0ee64 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -212,24 +212,26 @@ class KOPrefs : public KPimPrefs
     bool mToolBarUpN;
     bool mToolBarHorF;
     bool mToolBarUpF;
     bool mToolBarMiniIcons;
 
     bool mAskForQuit;
     bool mUsePassWd;
     bool mShowSyncEvents;
     bool mShowTodoInAgenda;
     bool mShowTimeInAgenda;
     bool mHideNonStartedTodos;
 
+    bool mBlockPopupMenu;
+
     int mLastSyncTime;
     void setCategoryColor(QString cat,const QColor & color);
     QColor *categoryColor(QString cat);
 
     QString mArchiveFile;
     QString mHtmlExportFile;
     bool    mHtmlWithSave;
 
     QStringList mSelectedPlugins;
   
     QString mLastImportFile;
     QString mLastVcalFile;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index a8943de..ad3c61c 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -372,66 +372,74 @@ void KOPrefsDialog::setupMainTab()
   
   widbool = addWidBool(i18n("Mini icons in toolbar(nr)"),
              &(KOPrefs::instance()->mToolBarMiniIcons),topFrame);
   topLayout->addMultiCellWidget(  widbool->checkBox(), 3,3,0,1); 
 
 
  KPrefsDialogWidBool *verticalScreen =
       addWidBool(i18n("Show vertical screen (Needs restart)"),
                  &(KOPrefs::instance()->mVerticalScreen),topFrame);
   //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 =
 //       addWidBool(i18n("Send copy to owner when mailing events"),
 //                  &(KOPrefs::instance()->mBcc),topFrame);
 //   topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
 
 
   // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"),  topFrame);
   //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
 
   // addWidBool(i18n("Enable automatic saving of calendar"),
   //         &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
 
   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); 
   /*
   QHBox * agendasize = new QHBox ( topFrame );
   
   new QLabel (i18n("AllDayAgenda Height:"), agendasize );
   
 
   mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
   topLayout->addMultiCellWidget(agendasize,7,7,0,1);
   */
   
 
   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;
  
 
   /*
   KPrefsDialogWidBool *confirmCheck =
       addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
                  topFrame);
   topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
 
 
   mEnableGroupScheduling =
       addWidBool(i18n("Enable group scheduling"),
                  &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 9b5d4ce..7817a75 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1086,36 +1086,37 @@ void KOTodoView::changedCategories(int index)
     mActiveItem->todo()->setCategories (categories);
     mActiveItem->construct();
     mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
     todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED);
   }
 }
 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);
+    //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;
         }
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
         editItem( item );
     else
         showItem( item , QPoint(), 0 );
 }
 void KOTodoView::toggleRunningItem()
 {