summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-30 15:38:08 (UTC)
committer zautrix <zautrix>2005-01-30 15:38:08 (UTC)
commit11736af9b5348f251b0e8a3cf90fdb960c877936 (patch) (side-by-side diff)
treeeda181731c3dd76cb448d103b8d8f9d30757450c
parent8d543aa1d1d1ed20001c8b18352d1d29c2979e48 (diff)
downloadkdepimpi-11736af9b5348f251b0e8a3cf90fdb960c877936.zip
kdepimpi-11736af9b5348f251b0e8a3cf90fdb960c877936.tar.gz
kdepimpi-11736af9b5348f251b0e8a3cf90fdb960c877936.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp2
-rw-r--r--korganizer/datenavigator.cpp3
-rw-r--r--korganizer/komonthview.cpp9
-rw-r--r--korganizer/koviewmanager.cpp4
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
@@ -3690,5 +3690,5 @@ void CalendarView::toggleExpand()
// emit calendarViewExpanded( true );
// }
-
+ //qDebug(" CalendarView::toggleExpand()");
globalFlagBlockAgenda = 1;
emit calendarViewExpanded( !mLeftFrame->isHidden() );
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index 3156b2b..d2824de 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -211,6 +211,5 @@ void DateNavigator::selectToday()
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
@@ -968,5 +968,5 @@ void KOMonthView::updateView()
processSelectionChange();
// qDebug("---------------------------------------------------------------------+ ");
- setFocus();
+ mCells[0]->setFocus();
}
@@ -1132,10 +1132,10 @@ 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();
@@ -1144,5 +1144,6 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
{
emit nextMonth();
- setFocus();
+ mCells[0]->setFocus();
+
}
e->accept();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 6da4799..4c03f9a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -103,5 +103,5 @@ 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 );
@@ -193,5 +193,4 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
} else {
mCurrentView = view;
-
// bool full = fullScreen;
bool isFull = !mMainView->leftFrame()->isVisible();
@@ -211,5 +210,4 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
void KOViewManager::raiseCurrentView( bool fullScreen )
{
- //qDebug("raiseCurrentView ");
mCurrentAgendaView = 0;
int wid = mMainView->width() ;