summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagenda.cpp31
-rw-r--r--korganizer/kodaymatrix.cpp5
-rw-r--r--korganizer/kotodoview.cpp2
-rw-r--r--korganizer/koviewmanager.cpp4
-rw-r--r--korganizer/kowhatsnextview.cpp1
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
@@ -438,28 +438,34 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
mActionItem = 0;
if (me->button() == RightButton ) {
blockNewEvent = true;
- //qDebug("right ");
+ block = false;
+ } else {
+ blockNewEvent = false;
+ setCursor(arrowCursor);
+ startSelectAction(viewportPos);
+ }
+ }
+ break;
+
+ case QEvent::MouseButtonRelease:
+ //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);
- mStartCellX = gx;
- mStartCellY = 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;
- setCursor(arrowCursor);
- startSelectAction(viewportPos);
}
- }
- break;
-
- case QEvent::MouseButtonRelease:
- //qDebug("QEvent::MouseButtonRelease: ");
- if (me->button() == RightButton && block ) {
+ } else if (me->button() == RightButton && block ) {
if (object != viewport()) {
mClickedItem = (KOAgendaItem *)object;
if (mActionItem ) {
@@ -491,7 +497,6 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
endItemAction();
} else if ( mActionType == SELECT ) {
if (me->button() == RightButton ) {
-
} else {
endSelectAction( !blockNewEvent );
}
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 060b4c4..faa2c21 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -148,7 +148,6 @@ void KODayMatrix::setStartDate(QDate start)
void KODayMatrix::addSelectedDaysTo(DateList& selDays)
{
- kdDebug() << "KODayMatrix::addSelectedDaysTo() - " << "mSelStart:" << mSelStart << endl;
if (mSelStart == NOSELECTION) {
return;
@@ -289,9 +288,9 @@ void KODayMatrix::updateView(QDate actdate)
startdate = actdate;
mDayChanged = true;
}
- qDebug("restart Timer %d", mDayChanged );
+ qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
static int iii = 0;
- if ( iii < 5 ) {
+ if ( iii < 2 ) {
++iii;
updateViewTimed();
} else {
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 2f5259f..8d8fc2a 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -753,7 +753,7 @@ void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
emit showTodoSignal(((KOTodoViewItem *)item)->todo());
}
-void KOTodoView::popupMenu(QListViewItem *item,const QPoint &,int column)
+void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column)
{
pendingSubtodo = 0;
mActiveItem = (KOTodoViewItem *)item;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 4c03f9a..35774d6 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -117,9 +117,11 @@ void KOViewManager::showDateView( int view, QDate date)
} else if (view == 5 ) {
mMainView->dateNavigator()->selectDates( date, 14);
} 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 ) {
mMainView->dateNavigator()->selectDate( date );
showJournalView();
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index d7ff9f2..10665f4 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -177,6 +177,7 @@ void KOWhatsNextView::restartTimer()
}
void KOWhatsNextView::updateView()
{
+ //qDebug("KOWhatsNextView::updateView() ");
if ( mTimer->isActive() )
restartTimer();
//qDebug("KOWhatsNextView::updateView() ");