summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/koagenda.cpp3
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/koprefs.h2
-rw-r--r--korganizer/koprefsdialog.cpp14
-rw-r--r--korganizer/kotodoview.cpp9
6 files changed, 22 insertions, 9 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
@@ -1344,9 +1344,9 @@
{ "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
@@ -388,9 +388,9 @@ void KOAgenda::popupMenu()
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());
}
@@ -398,8 +398,9 @@ void KOAgenda::popupMenu()
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
}
+ 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
@@ -227,8 +227,9 @@ 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);
addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index d511faa..2a0ee64 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -220,8 +220,10 @@ class KOPrefs : public KPimPrefs
bool mShowTodoInAgenda;
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,14 +381,20 @@ 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 =
// addWidBool(i18n("Send copy to owner when mailing events"),
@@ -403,9 +409,10 @@ void KOPrefsDialog::setupMainTab()
// &(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);
/*
@@ -421,9 +428,10 @@ 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;
/*
KPrefsDialogWidBool *confirmCheck =
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 9b5d4ce..7817a75 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1094,20 +1094,21 @@ 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;
}