| -rw-r--r-- | korganizer/koagenda.cpp | 5 | ||||
| -rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
| -rw-r--r-- | korganizer/koprefs.h | 2 | ||||
| -rw-r--r-- | korganizer/koprefsdialog.cpp | 16 | ||||
| -rw-r--r-- | korganizer/kotodoview.cpp | 9 |
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 @@ -391,3 +391,3 @@ void KOAgenda::popupMenu() selectItem(mPopupItem); - if ( mAllAgendaPopup ) + if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu ) mAllAgendaPopup->installEventFilter( this ); @@ -401,3 +401,4 @@ void KOAgenda::popupMenu() } - 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 @@ -230,2 +230,3 @@ KOPrefs::KOPrefs() : KPrefs::setCurrentGroup("Views"); + addItemBool("Block Popup Menu",&mBlockPopupMenu,true); addItemBool("Show Date Navigator",&mShowDateNavigator,true); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index d511faa..2a0ee64 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -223,2 +223,4 @@ class KOPrefs : public KPimPrefs + bool mBlockPopupMenu; + int mLastSyncTime; diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index a8943de..ad3c61c 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -383,3 +383,8 @@ void KOPrefsDialog::setupMainTab() - + + 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); @@ -388,4 +393,5 @@ void KOPrefsDialog::setupMainTab() - topLayout->addMultiCellWidget(dummy,5,5,0,1); + topLayout->addMultiCellWidget(dummy,iii,iii,0,1); + ++iii; @@ -406,3 +412,4 @@ void KOPrefsDialog::setupMainTab() // 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); @@ -424,3 +431,4 @@ void KOPrefsDialog::setupMainTab() &(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 @@ -1097,4 +1097,5 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item) 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) { @@ -1103,3 +1104,3 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item) } else { - if ( row == 2 ) { + if ( row == 2 || row == 1 ) { mActiveItem = (KOTodoViewItem *) item; @@ -1108,3 +1109,3 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item) } - if ( row == 1 ) { + if ( row == 5 || row == 6 ) { mActiveItem = (KOTodoViewItem *) item; |