summaryrefslogtreecommitdiffabout
Unidiff
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
@@ -1345,7 +1345,7 @@
1345{ "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?" }, 1345{ "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?" },
1346{ "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?" }, 1346{ "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?" },
1347{ "Todo has subtodos","Todo hat Untertodos" }, 1347{ "Todo has subtodos","Todo hat Untertodos" },
1348{ "","" }, 1348{ "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" },
1349{ "","" }, 1349{ "","" },
1350{ "","" }, 1350{ "","" },
1351{ "","" }, 1351{ "","" },
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()
389 if (mPopupItem) { 389 if (mPopupItem) {
390 //mClickedItem = mPopupItem; 390 //mClickedItem = mPopupItem;
391 selectItem(mPopupItem); 391 selectItem(mPopupItem);
392 if ( mAllAgendaPopup ) 392 if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu )
393 mAllAgendaPopup->installEventFilter( this ); 393 mAllAgendaPopup->installEventFilter( this );
394 emit showIncidencePopupSignal(mPopupItem->incidence()); 394 emit showIncidencePopupSignal(mPopupItem->incidence());
395 395
@@ -399,6 +399,7 @@ void KOAgenda::popupMenu()
399 endSelectAction( false ); // do not emit new event signal 399 endSelectAction( false ); // do not emit new event signal
400 mLeftMouseDown = false; // no more leftMouse computation 400 mLeftMouseDown = false; // no more leftMouse computation
401 } 401 }
402 if ( KOPrefs::instance()->mBlockPopupMenu )
402 mNewItemPopup->installEventFilter( this ); 403 mNewItemPopup->installEventFilter( this );
403 mNewItemPopup->popup( mPopupPos); 404 mNewItemPopup->popup( mPopupPos);
404 405
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() :
228 228
229 229
230 KPrefs::setCurrentGroup("Views"); 230 KPrefs::setCurrentGroup("Views");
231 addItemBool("Block Popup Menu",&mBlockPopupMenu,true);
231 addItemBool("Show Date Navigator",&mShowDateNavigator,true); 232 addItemBool("Show Date Navigator",&mShowDateNavigator,true);
232 addItemInt("Hour Size",&mHourSize,8); 233 addItemInt("Hour Size",&mHourSize,8);
233 addItemBool("Show Daily Recurrences",&mDailyRecur,true); 234 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
221 bool mShowTimeInAgenda; 221 bool mShowTimeInAgenda;
222 bool mHideNonStartedTodos; 222 bool mHideNonStartedTodos;
223 223
224 bool mBlockPopupMenu;
225
224 int mLastSyncTime; 226 int mLastSyncTime;
225 void setCategoryColor(QString cat,const QColor & color); 227 void setCategoryColor(QString cat,const QColor & color);
226 QColor *categoryColor(QString cat); 228 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
@@ -382,12 +382,18 @@ void KOPrefsDialog::setupMainTab()
382 topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1); 382 topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1);
383 383
384 384
385 int iii = 5;
386 widbool = addWidBool(i18n("Block popup until mouse button release"),
387 &(KOPrefs::instance()->mBlockPopupMenu),topFrame);
388 topLayout->addMultiCellWidget( widbool->checkBox(), iii,iii,0,1);
389 ++iii;
385 QHBox *dummy = new QHBox(topFrame); 390 QHBox *dummy = new QHBox(topFrame);
386 new QLabel(i18n("Days in Next-X-Days:"),dummy); 391 new QLabel(i18n("Days in Next-X-Days:"),dummy);
387 mNextXDaysSpin = new QSpinBox(2,14,1,dummy); 392 mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
388 393
389 topLayout->addMultiCellWidget(dummy,5,5,0,1); 394 topLayout->addMultiCellWidget(dummy,iii,iii,0,1);
390 395
396 ++iii;
391 397
392 398
393 // KPrefsDialogWidBool *bcc = 399 // KPrefsDialogWidBool *bcc =
@@ -404,7 +410,8 @@ void KOPrefsDialog::setupMainTab()
404 410
405 QHBox *intervalBox = new QHBox(topFrame); 411 QHBox *intervalBox = new QHBox(topFrame);
406 // intervalBox->setSpacing(mSpacingHint); 412 // intervalBox->setSpacing(mSpacingHint);
407 topLayout->addMultiCellWidget(intervalBox,6,6,0,1); 413 topLayout->addMultiCellWidget(intervalBox,iii,iii,0,1);
414 ++iii;
408 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); 415 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
409 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); 416 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
410 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 417 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin);
@@ -422,7 +429,8 @@ void KOPrefsDialog::setupMainTab()
422 KPrefsDialogWidBool *ask = 429 KPrefsDialogWidBool *ask =
423 addWidBool(i18n("Ask for quit when closing KO/Pi"), 430 addWidBool(i18n("Ask for quit when closing KO/Pi"),
424 &(KOPrefs::instance()->mAskForQuit),topFrame); 431 &(KOPrefs::instance()->mAskForQuit),topFrame);
425 topLayout->addMultiCellWidget(ask->checkBox(),7,7,0,1); 432 topLayout->addMultiCellWidget(ask->checkBox(),iii,iii,0,1);
433 ++iii;
426 434
427 435
428 /* 436 /*
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)
1095 topLevelWidget()->setCaption(i18n("Reparenting aborted!")); 1095 topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
1096 } 1096 }
1097 pendingSubtodo = 0; 1097 pendingSubtodo = 0;
1098 int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() ); 1098 //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
1099 //qDebug("ROW %d ", row); 1099 int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() );
1100 qDebug("ROW %d ", row);
1100 if (!item) { 1101 if (!item) {
1101 newTodo(); 1102 newTodo();
1102 return; 1103 return;
1103 } else { 1104 } else {
1104 if ( row == 2 ) { 1105 if ( row == 2 || row == 1 ) {
1105 mActiveItem = (KOTodoViewItem *) item; 1106 mActiveItem = (KOTodoViewItem *) item;
1106 newSubTodo(); 1107 newSubTodo();
1107 return; 1108 return;
1108 } 1109 }
1109 if ( row == 1 ) { 1110 if ( row == 5 || row == 6 ) {
1110 mActiveItem = (KOTodoViewItem *) item; 1111 mActiveItem = (KOTodoViewItem *) item;
1111 toggleRunningItem(); 1112 toggleRunningItem();
1112 return; 1113 return;