| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
| -rw-r--r-- | korganizer/koeditorgeneraltodo.cpp | 2 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 18 | ||||
| -rw-r--r-- | korganizer/komonthview.h | 3 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 3 |
5 files changed, 25 insertions, 6 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 4251283..e21bb44 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -6,4 +6,9 @@ KO/Pi: Fixed problem loading translations for summary/location edit boxes in event/todo editor. +Added a general "select week number" to the toolbar. + +Fixed some small problem of the new features introduced in version 2.0.3. + + ********** VERSION 2.0.3 ************ diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index ce66863..da5ef07 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -165,5 +165,5 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout) mCompleteDateEdit->setMaximumWidth( 85 ); else - mCompleteDateEdit->setMaximumWidth( 130 ); + mCompleteDateEdit->setMaximumWidth( 140 ); topLayout->setSpacing( 0 ); } diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 5926abe..ffb2e1e 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -554,4 +554,5 @@ void MonthViewCell::insertTodo(Todo *todo) { QString text; + mItemList->setFocusPolicy(WheelFocus); if (todo->hasDueDate()) { if (!todo->doesFloat()) { @@ -560,5 +561,5 @@ void MonthViewCell::insertTodo(Todo *todo) } } - text += i18n("Td: %1").arg(todo->summary()); + text += i18n("T: %1").arg(todo->summary()); MonthViewItem *item = new MonthViewItem( todo, mDate, text ); @@ -783,5 +784,4 @@ void MonthViewCell::selection( QListBoxItem *item ) { if ( !item ) return; - mMonthView->setSelectedCell( this ); } @@ -1266,8 +1266,14 @@ void KOMonthView::resizeEvent(QResizeEvent * e) qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height()); if ( ignoreResizeEvent ) { + int diff = e->size().height() - e->oldSize().height(); + if ( diff < 0 ) + diff = diff * (-1); + if ( diff == ignoreResizeEventHeight ) { qDebug("KOMonthView::resizeEvent ignored "); --ignoreResizeEvent; return; } + ignoreResizeEvent = 0; + } if ( e->size().width()+ e->size().height() < 240 ) return; @@ -1512,5 +1518,5 @@ MonthViewCell * KOMonthView::selectedCell( ) void KOMonthView::setSelectedCell( MonthViewCell *cell ) { - // qDebug("KOMonthView::setSelectedCell "); + //qDebug("KOMonthView::setSelectedCell %x ", cell); if ( mSelectedCell && mSelectedCell != cell ) { MonthViewCell * mvc = mSelectedCell; @@ -1551,4 +1557,7 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) { emit prevMonth(); + if ( mShowWeekView ) + mCellsW[0]->setFocus(); + else mCells[0]->setFocus(); } @@ -1558,4 +1567,7 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) { emit nextMonth(); + if ( mShowWeekView ) + mCellsW[0]->setFocus(); + else mCells[0]->setFocus(); diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 9dbe319..d70cda1 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -227,5 +227,5 @@ class KOMonthView: public KOEventView bool isMonthView() { return true; } bool isUpdatePossible() { return updatePossible; } - void setIgnoreResizeEvent( int c ) { ignoreResizeEvent = c ;} + void setIgnoreResizeEvent( int c, int h ) { ignoreResizeEvent = c ;ignoreResizeEventHeight = h;} MonthViewCell * selectedCell(); @@ -261,4 +261,5 @@ class KOMonthView: public KOEventView private: int ignoreResizeEvent; + int ignoreResizeEventHeight; int currentWeek(); bool clPending; diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index dcb51dc..c35de0a 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -224,5 +224,6 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) if ( mCurrentView == mMonthView ) { if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) { - mMonthView->setIgnoreResizeEvent( 2 ); + + mMonthView->setIgnoreResizeEvent( 2 ,mMainView->navigatorBar()->height()); mMainView->navigatorBar()->show(); hei -= mMainView->navigatorBar()->sizeHint().height(); |