summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show 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
@@ -3689,7 +3689,7 @@ void CalendarView::toggleExpand()
3689 // mLeftFrame->hide(); 3689 // mLeftFrame->hide();
3690 // emit calendarViewExpanded( true ); 3690 // emit calendarViewExpanded( true );
3691 // } 3691 // }
3692 3692 //qDebug(" CalendarView::toggleExpand()");
3693 globalFlagBlockAgenda = 1; 3693 globalFlagBlockAgenda = 1;
3694 emit calendarViewExpanded( !mLeftFrame->isHidden() ); 3694 emit calendarViewExpanded( !mLeftFrame->isHidden() );
3695 globalFlagBlockAgenda = 5; 3695 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()
210 QDate d = QDate::currentDate(); 210 QDate d = QDate::currentDate();
211 211
212 int dateCount = mSelectedDates.count(); 212 int dateCount = mSelectedDates.count();
213 213 if ( dateCount == 5 && d.dayOfWeek() < 6 ) selectWorkWeek( d );
214 if ( dateCount == 5 ) selectWorkWeek( d );
215 else if ( dateCount == 7 ) selectWeek( d ); 214 else if ( dateCount == 7 ) selectWeek( d );
216 else selectDates( d, dateCount ); 215 else selectDates( d, dateCount );
217} 216}
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()
967 //qDebug("KOMonthView::updateView() "); 967 //qDebug("KOMonthView::updateView() ");
968 processSelectionChange(); 968 processSelectionChange();
969 // qDebug("---------------------------------------------------------------------+ "); 969 // qDebug("---------------------------------------------------------------------+ ");
970 setFocus(); 970 mCells[0]->setFocus();
971} 971}
972 972
973void KOMonthView::resizeEvent(QResizeEvent * e) 973void KOMonthView::resizeEvent(QResizeEvent * e)
@@ -1131,19 +1131,20 @@ void KOMonthView::clearSelection()
1131} 1131}
1132void KOMonthView::keyPressEvent ( QKeyEvent * e ) 1132void KOMonthView::keyPressEvent ( QKeyEvent * e )
1133{ 1133{
1134 //qDebug("KOMonthView::keyPressEvent ");
1134 switch(e->key()) { 1135 switch(e->key()) {
1135 break;
1136 case Key_Up: 1136 case Key_Up:
1137 { 1137 {
1138 emit prevMonth(); 1138 emit prevMonth();
1139 setFocus(); 1139 mCells[0]->setFocus();
1140 } 1140 }
1141 e->accept(); 1141 e->accept();
1142 break; 1142 break;
1143 case Key_Down: 1143 case Key_Down:
1144 { 1144 {
1145 emit nextMonth(); 1145 emit nextMonth();
1146 setFocus(); 1146 mCells[0]->setFocus();
1147
1147 } 1148 }
1148 e->accept(); 1149 e->accept();
1149 break; 1150 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)
102void KOViewManager::showDateView( int view, QDate date) 102void KOViewManager::showDateView( int view, QDate date)
103{ 103{
104 104
105 qDebug("date %d %s", view, date.toString().latin1()); 105 //qDebug("date %d %s", view, date.toString().latin1());
106#if 0 106#if 0
107 mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ), i18n("Day view"),3 ); 107 mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ), i18n("Day view"),3 );
108 mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next Week"),4 ); 108 mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next Week"),4 );
@@ -192,7 +192,6 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
192 full = mMainView->leftFrame()->isVisible(); 192 full = mMainView->leftFrame()->isVisible();
193 } else { 193 } else {
194 mCurrentView = view; 194 mCurrentView = view;
195
196 // bool full = fullScreen; 195 // bool full = fullScreen;
197 bool isFull = !mMainView->leftFrame()->isVisible(); 196 bool isFull = !mMainView->leftFrame()->isVisible();
198 if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) 197 if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen )
@@ -210,7 +209,6 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
210 209
211void KOViewManager::raiseCurrentView( bool fullScreen ) 210void KOViewManager::raiseCurrentView( bool fullScreen )
212{ 211{
213 //qDebug("raiseCurrentView ");
214 mCurrentAgendaView = 0; 212 mCurrentAgendaView = 0;
215 int wid = mMainView->width() ; 213 int wid = mMainView->width() ;
216 int hei = mMainView->height(); 214 int hei = mMainView->height();