-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 | |||
@@ -7,2 +7,7 @@ Fixed problem loading translations for summary/location edit boxes in event/todo | |||
7 | 7 | ||
8 | Added a general "select week number" to the toolbar. | ||
9 | |||
10 | Fixed some small problem of the new features introduced in version 2.0.3. | ||
11 | |||
12 | |||
8 | ********** VERSION 2.0.3 ************ | 13 | ********** 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 | |||
@@ -166,3 +166,3 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout) | |||
166 | else | 166 | else |
167 | mCompleteDateEdit->setMaximumWidth( 130 ); | 167 | mCompleteDateEdit->setMaximumWidth( 140 ); |
168 | topLayout->setSpacing( 0 ); | 168 | 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 | |||
@@ -555,2 +555,3 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
555 | QString text; | 555 | QString text; |
556 | mItemList->setFocusPolicy(WheelFocus); | ||
556 | if (todo->hasDueDate()) { | 557 | if (todo->hasDueDate()) { |
@@ -561,3 +562,3 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
561 | } | 562 | } |
562 | text += i18n("Td: %1").arg(todo->summary()); | 563 | text += i18n("T: %1").arg(todo->summary()); |
563 | 564 | ||
@@ -784,3 +785,2 @@ void MonthViewCell::selection( QListBoxItem *item ) | |||
784 | if ( !item ) return; | 785 | if ( !item ) return; |
785 | |||
786 | mMonthView->setSelectedCell( this ); | 786 | mMonthView->setSelectedCell( this ); |
@@ -1267,2 +1267,6 @@ void KOMonthView::resizeEvent(QResizeEvent * e) | |||
1267 | if ( ignoreResizeEvent ) { | 1267 | if ( ignoreResizeEvent ) { |
1268 | int diff = e->size().height() - e->oldSize().height(); | ||
1269 | if ( diff < 0 ) | ||
1270 | diff = diff * (-1); | ||
1271 | if ( diff == ignoreResizeEventHeight ) { | ||
1268 | qDebug("KOMonthView::resizeEvent ignored "); | 1272 | qDebug("KOMonthView::resizeEvent ignored "); |
@@ -1271,2 +1275,4 @@ void KOMonthView::resizeEvent(QResizeEvent * e) | |||
1271 | } | 1275 | } |
1276 | ignoreResizeEvent = 0; | ||
1277 | } | ||
1272 | if ( e->size().width()+ e->size().height() < 240 ) | 1278 | if ( e->size().width()+ e->size().height() < 240 ) |
@@ -1513,3 +1519,3 @@ void KOMonthView::setSelectedCell( MonthViewCell *cell ) | |||
1513 | { | 1519 | { |
1514 | // qDebug("KOMonthView::setSelectedCell "); | 1520 | //qDebug("KOMonthView::setSelectedCell %x ", cell); |
1515 | if ( mSelectedCell && mSelectedCell != cell ) { | 1521 | if ( mSelectedCell && mSelectedCell != cell ) { |
@@ -1552,2 +1558,5 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) | |||
1552 | emit prevMonth(); | 1558 | emit prevMonth(); |
1559 | if ( mShowWeekView ) | ||
1560 | mCellsW[0]->setFocus(); | ||
1561 | else | ||
1553 | mCells[0]->setFocus(); | 1562 | mCells[0]->setFocus(); |
@@ -1559,2 +1568,5 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) | |||
1559 | emit nextMonth(); | 1568 | emit nextMonth(); |
1569 | if ( mShowWeekView ) | ||
1570 | mCellsW[0]->setFocus(); | ||
1571 | else | ||
1560 | mCells[0]->setFocus(); | 1572 | 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 | |||
@@ -228,3 +228,3 @@ class KOMonthView: public KOEventView | |||
228 | bool isUpdatePossible() { return updatePossible; } | 228 | bool isUpdatePossible() { return updatePossible; } |
229 | void setIgnoreResizeEvent( int c ) { ignoreResizeEvent = c ;} | 229 | void setIgnoreResizeEvent( int c, int h ) { ignoreResizeEvent = c ;ignoreResizeEventHeight = h;} |
230 | 230 | ||
@@ -262,2 +262,3 @@ class KOMonthView: public KOEventView | |||
262 | int ignoreResizeEvent; | 262 | int ignoreResizeEvent; |
263 | int ignoreResizeEventHeight; | ||
263 | int currentWeek(); | 264 | int currentWeek(); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index dcb51dc..c35de0a 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -225,3 +225,4 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) | |||
225 | if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) { | 225 | if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) { |
226 | mMonthView->setIgnoreResizeEvent( 2 ); | 226 | |
227 | mMonthView->setIgnoreResizeEvent( 2 ,mMainView->navigatorBar()->height()); | ||
227 | mMainView->navigatorBar()->show(); | 228 | mMainView->navigatorBar()->show(); |