| -rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/datenavigator.cpp | 3 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 9 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 96fb5ca..db33017 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -3689,7 +3689,7 @@ void CalendarView::toggleExpand() // mLeftFrame->hide(); // emit calendarViewExpanded( true ); // } - + //qDebug(" CalendarView::toggleExpand()"); globalFlagBlockAgenda = 1; emit calendarViewExpanded( !mLeftFrame->isHidden() ); globalFlagBlockAgenda = 5; diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index 3156b2b..d2824de 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp @@ -210,8 +210,7 @@ void DateNavigator::selectToday() QDate d = QDate::currentDate(); int dateCount = mSelectedDates.count(); - - if ( dateCount == 5 ) selectWorkWeek( d ); + if ( dateCount == 5 && d.dayOfWeek() < 6 ) selectWorkWeek( d ); else if ( dateCount == 7 ) selectWeek( d ); else selectDates( d, dateCount ); } diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 10e4f1d..4cefb26 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -967,7 +967,7 @@ void KOMonthView::updateView() //qDebug("KOMonthView::updateView() "); processSelectionChange(); // qDebug("---------------------------------------------------------------------+ "); - setFocus(); + mCells[0]->setFocus(); } void KOMonthView::resizeEvent(QResizeEvent * e) @@ -1131,19 +1131,20 @@ void KOMonthView::clearSelection() } void KOMonthView::keyPressEvent ( QKeyEvent * e ) { + //qDebug("KOMonthView::keyPressEvent "); switch(e->key()) { - break; case Key_Up: { emit prevMonth(); - setFocus(); + mCells[0]->setFocus(); } e->accept(); break; case Key_Down: { emit nextMonth(); - setFocus(); + mCells[0]->setFocus(); + } e->accept(); break; diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 6da4799..4c03f9a 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -102,7 +102,7 @@ void KOViewManager::readSettings(KConfig *config) void KOViewManager::showDateView( int view, QDate date) { - qDebug("date %d %s", view, date.toString().latin1()); + //qDebug("date %d %s", view, date.toString().latin1()); #if 0 mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ), i18n("Day view"),3 ); mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next Week"),4 ); @@ -192,7 +192,6 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) full = mMainView->leftFrame()->isVisible(); } else { mCurrentView = view; - // bool full = fullScreen; bool isFull = !mMainView->leftFrame()->isVisible(); if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) @@ -210,7 +209,6 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) void KOViewManager::raiseCurrentView( bool fullScreen ) { - //qDebug("raiseCurrentView "); mCurrentAgendaView = 0; int wid = mMainView->width() ; int hei = mMainView->height(); |