| -rw-r--r-- | korganizer/koagenda.cpp | 35 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.cpp | 7 | ||||
| -rw-r--r-- | korganizer/kotodoview.cpp | 4 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 4 | ||||
| -rw-r--r-- | korganizer/kowhatsnextview.cpp | 1 |
5 files changed, 29 insertions, 22 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 0aef929..ffa2678 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -440,13 +440,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) blockNewEvent = true; - //qDebug("right "); - int x,y; - viewportToContents(viewportPos.x(),viewportPos.y(),x,y); - int gx,gy; - contentsToGrid(x,y,gx,gy); - mStartCellX = gx; - mStartCellY = gy; - mCurrentCellX = gx; - mCurrentCellY = gy; - mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) ); - + block = false; } else { @@ -460,4 +450,20 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) case QEvent::MouseButtonRelease: - //qDebug("QEvent::MouseButtonRelease: "); - if (me->button() == RightButton && block ) { + //qDebug("QEvent::MouseButtonRelease: %d",blockNewEvent ); + if (me->button() == RightButton && blockNewEvent && !block) { + int x,y; + viewportToContents(viewportPos.x(),viewportPos.y(),x,y); + int gx,gy; + contentsToGrid(x,y,gx,gy); + if ( mCurrentCellY < mStartCellY +1 ) { + //qDebug("mCurrentCellY %d mStartCellY %d ", mCurrentCellY,mStartCellY); + mCurrentCellX = gx; + mCurrentCellY = gy; + mStartCellX = gx; + mStartCellY = gy; + mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) ); + break; + } else { + blockNewEvent = false; + } + } else if (me->button() == RightButton && block ) { if (object != viewport()) { @@ -491,5 +497,4 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) endItemAction(); - } else if ( mActionType == SELECT ) { + } else if ( mActionType == SELECT ) { if (me->button() == RightButton ) { - } else { diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 060b4c4..faa2c21 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -150,4 +150,3 @@ void KODayMatrix::addSelectedDaysTo(DateList& selDays) { - kdDebug() << "KODayMatrix::addSelectedDaysTo() - " << "mSelStart:" << mSelStart << endl; - + if (mSelStart == NOSELECTION) { @@ -291,5 +290,5 @@ void KODayMatrix::updateView(QDate actdate) } - qDebug("restart Timer %d", mDayChanged ); + qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() ); static int iii = 0; - if ( iii < 5 ) { + if ( iii < 2 ) { ++iii; diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 2f5259f..8d8fc2a 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -755,3 +755,3 @@ void KOTodoView::showItem(QListViewItem *item,const QPoint &,int) -void KOTodoView::popupMenu(QListViewItem *item,const QPoint &,int column) +void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column) { @@ -771,3 +771,3 @@ void KOTodoView::popupMenu(QListViewItem *item,const QPoint &,int column) default: - mItemPopupMenu->popup(QCursor::pos()); + mItemPopupMenu->popup(QCursor::pos()); } diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 4c03f9a..35774d6 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -119,5 +119,7 @@ void KOViewManager::showDateView( int view, QDate date) } else if (view == 6 ) { - showMonthView(); + mMainView->dateNavigator()->blockSignals( true ); mMainView->dateNavigator()->selectMonthByDate( date ); mMainView->dateNavigator()->selectDate( date ); + mMainView->dateNavigator()->blockSignals( false ); + showMonthView(); } else if (view == 7 ) { diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index d7ff9f2..10665f4 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -179,2 +179,3 @@ void KOWhatsNextView::updateView() { + //qDebug("KOWhatsNextView::updateView() "); if ( mTimer->isActive() ) |