-rw-r--r-- | korganizer/kotodoview.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 03a8f1c..1a1bce5 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -593,13 +593,13 @@ void KOTodoView::updateView() | |||
593 | if ( !isVisible() ) { | 593 | if ( !isVisible() ) { |
594 | mPendingUpdateBeforeRepaint = true; | 594 | mPendingUpdateBeforeRepaint = true; |
595 | return; | 595 | return; |
596 | } | 596 | } |
597 | //qDebug("KOTodoView::updateView() %x", this); | 597 | //qDebug("KOTodoView::updateView() %x", this); |
598 | if ( isFlatDisplay ) { | 598 | if ( isFlatDisplay ) { |
599 | setAllFlat(); | 599 | displayAllFlat(); |
600 | return; | 600 | return; |
601 | } | 601 | } |
602 | //qDebug("update "); | 602 | //qDebug("update "); |
603 | // kdDebug() << "KOTodoView::updateView()" << endl; | 603 | // kdDebug() << "KOTodoView::updateView()" << endl; |
604 | QFont fo = KOPrefs::instance()->mTodoViewFont; | 604 | QFont fo = KOPrefs::instance()->mTodoViewFont; |
605 | mTodoListView->clear(); | 605 | mTodoListView->clear(); |
@@ -1120,20 +1120,14 @@ void KOTodoView::setOpen( QListViewItem* item, bool setOpenI) | |||
1120 | setOpen( item->firstChild(), setOpenI ); | 1120 | setOpen( item->firstChild(), setOpenI ); |
1121 | item->setOpen( setOpenI ); | 1121 | item->setOpen( setOpenI ); |
1122 | item = item->nextSibling(); | 1122 | item = item->nextSibling(); |
1123 | } | 1123 | } |
1124 | } | 1124 | } |
1125 | 1125 | ||
1126 | void KOTodoView::setAllFlat() | 1126 | void KOTodoView::displayAllFlat() |
1127 | { | 1127 | { |
1128 | if ( isFlatDisplay ) { | ||
1129 | isFlatDisplay = false; | ||
1130 | mPopupMenu->setItemChecked( 8,false ); | ||
1131 | updateView(); | ||
1132 | return; | ||
1133 | } | ||
1134 | pendingSubtodo = 0; | 1128 | pendingSubtodo = 0; |
1135 | if ( mBlockUpdate ) { | 1129 | if ( mBlockUpdate ) { |
1136 | return; | 1130 | return; |
1137 | } | 1131 | } |
1138 | mPopupMenu->setItemChecked( 8,true ); | 1132 | mPopupMenu->setItemChecked( 8,true ); |
1139 | isFlatDisplay = true; | 1133 | isFlatDisplay = true; |
@@ -1146,12 +1140,23 @@ void KOTodoView::setAllFlat() | |||
1146 | mTodoMap.insert(todo,todoItem); | 1140 | mTodoMap.insert(todo,todoItem); |
1147 | } | 1141 | } |
1148 | mTodoListView->setFocus(); | 1142 | mTodoListView->setFocus(); |
1149 | processSelectionChange(); | 1143 | processSelectionChange(); |
1150 | } | 1144 | } |
1151 | 1145 | ||
1146 | void KOTodoView::setAllFlat() | ||
1147 | { | ||
1148 | if ( isFlatDisplay ) { | ||
1149 | isFlatDisplay = false; | ||
1150 | mPopupMenu->setItemChecked( 8,false ); | ||
1151 | updateView(); | ||
1152 | return; | ||
1153 | } | ||
1154 | displayAllFlat(); | ||
1155 | } | ||
1156 | |||
1152 | void KOTodoView::purgeCompleted() | 1157 | void KOTodoView::purgeCompleted() |
1153 | { | 1158 | { |
1154 | emit purgeCompletedSignal(); | 1159 | emit purgeCompletedSignal(); |
1155 | } | 1160 | } |
1156 | void KOTodoView::toggleQuickTodo() | 1161 | void KOTodoView::toggleQuickTodo() |
1157 | { | 1162 | { |