-rw-r--r-- | korganizer/koagenda.cpp | 31 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 5 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 2 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 4 | ||||
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 1 |
5 files changed, 25 insertions, 18 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 0aef929..ffa2678 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -439,26 +439,32 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
439 | if (me->button() == RightButton ) { | 439 | if (me->button() == RightButton ) { |
440 | blockNewEvent = true; | 440 | blockNewEvent = true; |
441 | //qDebug("right "); | 441 | block = false; |
442 | } else { | ||
443 | blockNewEvent = false; | ||
444 | setCursor(arrowCursor); | ||
445 | startSelectAction(viewportPos); | ||
446 | } | ||
447 | } | ||
448 | break; | ||
449 | |||
450 | case QEvent::MouseButtonRelease: | ||
451 | //qDebug("QEvent::MouseButtonRelease: %d",blockNewEvent ); | ||
452 | if (me->button() == RightButton && blockNewEvent && !block) { | ||
442 | int x,y; | 453 | int x,y; |
443 | viewportToContents(viewportPos.x(),viewportPos.y(),x,y); | 454 | viewportToContents(viewportPos.x(),viewportPos.y(),x,y); |
444 | int gx,gy; | 455 | int gx,gy; |
445 | contentsToGrid(x,y,gx,gy); | 456 | contentsToGrid(x,y,gx,gy); |
446 | mStartCellX = gx; | 457 | if ( mCurrentCellY < mStartCellY +1 ) { |
447 | mStartCellY = gy; | 458 | //qDebug("mCurrentCellY %d mStartCellY %d ", mCurrentCellY,mStartCellY); |
448 | mCurrentCellX = gx; | 459 | mCurrentCellX = gx; |
449 | mCurrentCellY = gy; | 460 | mCurrentCellY = gy; |
461 | mStartCellX = gx; | ||
462 | mStartCellY = gy; | ||
450 | mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) ); | 463 | mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) ); |
451 | 464 | break; | |
452 | } else { | 465 | } else { |
453 | blockNewEvent = false; | 466 | blockNewEvent = false; |
454 | setCursor(arrowCursor); | ||
455 | startSelectAction(viewportPos); | ||
456 | } | 467 | } |
457 | } | 468 | } else if (me->button() == RightButton && block ) { |
458 | break; | ||
459 | |||
460 | case QEvent::MouseButtonRelease: | ||
461 | //qDebug("QEvent::MouseButtonRelease: "); | ||
462 | if (me->button() == RightButton && block ) { | ||
463 | if (object != viewport()) { | 469 | if (object != viewport()) { |
464 | mClickedItem = (KOAgendaItem *)object; | 470 | mClickedItem = (KOAgendaItem *)object; |
@@ -492,5 +498,4 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
492 | } else if ( mActionType == SELECT ) { | 498 | } else if ( mActionType == SELECT ) { |
493 | if (me->button() == RightButton ) { | 499 | if (me->button() == RightButton ) { |
494 | |||
495 | } else { | 500 | } else { |
496 | endSelectAction( !blockNewEvent ); | 501 | endSelectAction( !blockNewEvent ); |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 060b4c4..faa2c21 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -149,5 +149,4 @@ void KODayMatrix::setStartDate(QDate start) | |||
149 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) | 149 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) |
150 | { | 150 | { |
151 | kdDebug() << "KODayMatrix::addSelectedDaysTo() - " << "mSelStart:" << mSelStart << endl; | ||
152 | 151 | ||
153 | if (mSelStart == NOSELECTION) { | 152 | if (mSelStart == NOSELECTION) { |
@@ -290,7 +289,7 @@ void KODayMatrix::updateView(QDate actdate) | |||
290 | mDayChanged = true; | 289 | mDayChanged = true; |
291 | } | 290 | } |
292 | qDebug("restart Timer %d", mDayChanged ); | 291 | qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() ); |
293 | static int iii = 0; | 292 | static int iii = 0; |
294 | if ( iii < 5 ) { | 293 | if ( iii < 2 ) { |
295 | ++iii; | 294 | ++iii; |
296 | updateViewTimed(); | 295 | updateViewTimed(); |
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 2f5259f..8d8fc2a 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -754,5 +754,5 @@ void KOTodoView::showItem(QListViewItem *item,const QPoint &,int) | |||
754 | } | 754 | } |
755 | 755 | ||
756 | void KOTodoView::popupMenu(QListViewItem *item,const QPoint &,int column) | 756 | void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column) |
757 | { | 757 | { |
758 | pendingSubtodo = 0; | 758 | pendingSubtodo = 0; |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 4c03f9a..35774d6 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -118,7 +118,9 @@ void KOViewManager::showDateView( int view, QDate date) | |||
118 | mMainView->dateNavigator()->selectDates( date, 14); | 118 | mMainView->dateNavigator()->selectDates( date, 14); |
119 | } else if (view == 6 ) { | 119 | } else if (view == 6 ) { |
120 | showMonthView(); | 120 | mMainView->dateNavigator()->blockSignals( true ); |
121 | mMainView->dateNavigator()->selectMonthByDate( date ); | 121 | mMainView->dateNavigator()->selectMonthByDate( date ); |
122 | mMainView->dateNavigator()->selectDate( date ); | 122 | mMainView->dateNavigator()->selectDate( date ); |
123 | mMainView->dateNavigator()->blockSignals( false ); | ||
124 | showMonthView(); | ||
123 | } else if (view == 7 ) { | 125 | } else if (view == 7 ) { |
124 | mMainView->dateNavigator()->selectDate( date ); | 126 | mMainView->dateNavigator()->selectDate( date ); |
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index d7ff9f2..10665f4 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -178,4 +178,5 @@ void KOWhatsNextView::restartTimer() | |||
178 | void KOWhatsNextView::updateView() | 178 | void KOWhatsNextView::updateView() |
179 | { | 179 | { |
180 | //qDebug("KOWhatsNextView::updateView() "); | ||
180 | if ( mTimer->isActive() ) | 181 | if ( mTimer->isActive() ) |
181 | restartTimer(); | 182 | restartTimer(); |