author | zautrix <zautrix> | 2005-02-04 23:05:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-04 23:05:50 (UTC) |
commit | c6dceabcb41f6300ca97e69872fc801451944a32 (patch) (unidiff) | |
tree | 40a47b4c306329f47645f1ac7f2bc9420a67066c | |
parent | 53099ae3a9ef02549536dab3dd6870b7a2874284 (diff) | |
download | kdepimpi-c6dceabcb41f6300ca97e69872fc801451944a32.zip kdepimpi-c6dceabcb41f6300ca97e69872fc801451944a32.tar.gz kdepimpi-c6dceabcb41f6300ca97e69872fc801451944a32.tar.bz2 |
nochn fixxx
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 2 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 21 | ||||
-rw-r--r-- | korganizer/kotodoview.h | 1 |
3 files changed, 16 insertions, 8 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 7214035..14dcdac 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -16,8 +16,10 @@ Made month view better useable with keyboard. | |||
16 | Now TAB key jumps to next cell with an event/todo. | 16 | Now TAB key jumps to next cell with an event/todo. |
17 | Scroll in cell with coursor keys, scroll in time (next week) with | 17 | Scroll in cell with coursor keys, scroll in time (next week) with |
18 | Shift/Control + coursorkeys. | 18 | Shift/Control + coursorkeys. |
19 | 19 | ||
20 | Fixeg bug that the todo view flat mode was reset after first view update. | ||
21 | |||
20 | ********** VERSION 2.0.2 ************ | 22 | ********** VERSION 2.0.2 ************ |
21 | 23 | ||
22 | KO/Pi: | 24 | KO/Pi: |
23 | Fixed the layout problem of the day label buttons | 25 | Fixed the layout problem of the day label buttons |
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 03a8f1c..1a1bce5 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -595,9 +595,9 @@ void KOTodoView::updateView() | |||
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; |
@@ -1122,16 +1122,10 @@ void KOTodoView::setOpen( QListViewItem* item, bool 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 | } |
@@ -1148,8 +1142,19 @@ void KOTodoView::setAllFlat() | |||
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 | } |
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 1642132..462f0a6 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h | |||
@@ -169,8 +169,9 @@ class KOTodoView : public KOrg::BaseView | |||
169 | 169 | ||
170 | void setAllOpen(); | 170 | void setAllOpen(); |
171 | void setAllClose(); | 171 | void setAllClose(); |
172 | void setAllFlat(); | 172 | void setAllFlat(); |
173 | void displayAllFlat(); | ||
173 | 174 | ||
174 | void purgeCompleted(); | 175 | void purgeCompleted(); |
175 | void toggleCompleted(); | 176 | void toggleCompleted(); |
176 | void toggleRunning(); | 177 | void toggleRunning(); |