author | zautrix <zautrix> | 2005-02-06 15:21:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-06 15:21:01 (UTC) |
commit | 38898c49275bf27fb8c2df96d145f2a5abb62331 (patch) (unidiff) | |
tree | b96f0a336fccf4d6c67e6a4b5c1239b4d647b3b9 /korganizer | |
parent | 26b0c69fb3b11c29475ec02b2cfe52e33eb24e5f (diff) | |
download | kdepimpi-38898c49275bf27fb8c2df96d145f2a5abb62331.zip kdepimpi-38898c49275bf27fb8c2df96d145f2a5abb62331.tar.gz kdepimpi-38898c49275bf27fb8c2df96d145f2a5abb62331.tar.bz2 |
fixxeess
-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 |
4 files changed, 20 insertions, 6 deletions
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) | |||
165 | mCompleteDateEdit->setMaximumWidth( 85 ); | 165 | mCompleteDateEdit->setMaximumWidth( 85 ); |
166 | else | 166 | else |
167 | mCompleteDateEdit->setMaximumWidth( 130 ); | 167 | mCompleteDateEdit->setMaximumWidth( 140 ); |
168 | topLayout->setSpacing( 0 ); | 168 | topLayout->setSpacing( 0 ); |
169 | } | 169 | } |
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) | |||
554 | { | 554 | { |
555 | QString text; | 555 | QString text; |
556 | mItemList->setFocusPolicy(WheelFocus); | ||
556 | if (todo->hasDueDate()) { | 557 | if (todo->hasDueDate()) { |
557 | if (!todo->doesFloat()) { | 558 | if (!todo->doesFloat()) { |
@@ -560,5 +561,5 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
560 | } | 561 | } |
561 | } | 562 | } |
562 | text += i18n("Td: %1").arg(todo->summary()); | 563 | text += i18n("T: %1").arg(todo->summary()); |
563 | 564 | ||
564 | MonthViewItem *item = new MonthViewItem( todo, mDate, text ); | 565 | MonthViewItem *item = new MonthViewItem( todo, mDate, text ); |
@@ -783,5 +784,4 @@ void MonthViewCell::selection( QListBoxItem *item ) | |||
783 | { | 784 | { |
784 | if ( !item ) return; | 785 | if ( !item ) return; |
785 | |||
786 | mMonthView->setSelectedCell( this ); | 786 | mMonthView->setSelectedCell( this ); |
787 | } | 787 | } |
@@ -1266,8 +1266,14 @@ void KOMonthView::resizeEvent(QResizeEvent * e) | |||
1266 | qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height()); | 1266 | qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height()); |
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 "); |
1269 | --ignoreResizeEvent; | 1273 | --ignoreResizeEvent; |
1270 | return; | 1274 | return; |
1271 | } | 1275 | } |
1276 | ignoreResizeEvent = 0; | ||
1277 | } | ||
1272 | if ( e->size().width()+ e->size().height() < 240 ) | 1278 | if ( e->size().width()+ e->size().height() < 240 ) |
1273 | return; | 1279 | return; |
@@ -1512,5 +1518,5 @@ MonthViewCell * KOMonthView::selectedCell( ) | |||
1512 | void KOMonthView::setSelectedCell( MonthViewCell *cell ) | 1518 | 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 ) { |
1516 | MonthViewCell * mvc = mSelectedCell; | 1522 | MonthViewCell * mvc = mSelectedCell; |
@@ -1551,4 +1557,7 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) | |||
1551 | { | 1557 | { |
1552 | emit prevMonth(); | 1558 | emit prevMonth(); |
1559 | if ( mShowWeekView ) | ||
1560 | mCellsW[0]->setFocus(); | ||
1561 | else | ||
1553 | mCells[0]->setFocus(); | 1562 | mCells[0]->setFocus(); |
1554 | } | 1563 | } |
@@ -1558,4 +1567,7 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) | |||
1558 | { | 1567 | { |
1559 | emit nextMonth(); | 1568 | emit nextMonth(); |
1569 | if ( mShowWeekView ) | ||
1570 | mCellsW[0]->setFocus(); | ||
1571 | else | ||
1560 | mCells[0]->setFocus(); | 1572 | mCells[0]->setFocus(); |
1561 | 1573 | ||
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 | |||
227 | bool isMonthView() { return true; } | 227 | bool isMonthView() { return true; } |
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 | ||
231 | MonthViewCell * selectedCell(); | 231 | MonthViewCell * selectedCell(); |
@@ -261,4 +261,5 @@ class KOMonthView: public KOEventView | |||
261 | private: | 261 | private: |
262 | int ignoreResizeEvent; | 262 | int ignoreResizeEvent; |
263 | int ignoreResizeEventHeight; | ||
263 | int currentWeek(); | 264 | int currentWeek(); |
264 | bool clPending; | 265 | 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 ) | |||
224 | if ( mCurrentView == mMonthView ) { | 224 | if ( mCurrentView == mMonthView ) { |
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(); |
228 | hei -= mMainView->navigatorBar()->sizeHint().height(); | 229 | hei -= mMainView->navigatorBar()->sizeHint().height(); |