author | zautrix <zautrix> | 2005-01-29 17:41:47 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-29 17:41:47 (UTC) |
commit | 078f8bb7d4eca69b799d79ac39d098e1752778a8 (patch) (unidiff) | |
tree | 1cc29a057b3954149a5c007c2de4ba1eedde9ecc /korganizer | |
parent | 41baa2e15a1ec5e14750297e0a21020c9e53d953 (diff) | |
download | kdepimpi-078f8bb7d4eca69b799d79ac39d098e1752778a8.zip kdepimpi-078f8bb7d4eca69b799d79ac39d098e1752778a8.tar.gz kdepimpi-078f8bb7d4eca69b799d79ac39d098e1752778a8.tar.bz2 |
fixes
-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/koagenda.cpp | 2 | ||||
-rw-r--r-- | korganizer/kotodoeditor.cpp | 5 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 62 | ||||
-rw-r--r-- | korganizer/kotodoview.h | 7 |
5 files changed, 73 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index e7b6755..0c39590 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2716,7 +2716,7 @@ void CalendarView::newSubTodo(Todo *parentEvent) | |||
2716 | { | 2716 | { |
2717 | 2717 | ||
2718 | showTodoEditor(); | 2718 | showTodoEditor(); |
2719 | mTodoEditor->newTodo(QDateTime::currentDateTime().addDays(7),parentEvent,true); | 2719 | mTodoEditor->newTodo(QDateTime(),parentEvent,true); |
2720 | } | 2720 | } |
2721 | 2721 | ||
2722 | void CalendarView::newFloatingEvent() | 2722 | void CalendarView::newFloatingEvent() |
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 0eeacb3..002234d 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -438,7 +438,7 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
438 | mActionItem = 0; | 438 | mActionItem = 0; |
439 | if (me->button() == RightButton ) { | 439 | if (me->button() == RightButton ) { |
440 | blockNewEvent = true; | 440 | blockNewEvent = true; |
441 | qDebug("right "); | 441 | //qDebug("right "); |
442 | int x,y; | 442 | int x,y; |
443 | viewportToContents(viewportPos.x(),viewportPos.y(),x,y); | 443 | viewportToContents(viewportPos.x(),viewportPos.y(),x,y); |
444 | int gx,gy; | 444 | int gx,gy; |
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index abeb068..16c19a4 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp | |||
@@ -273,8 +273,11 @@ void KOTodoEditor::setDefaults(QDateTime due,Todo *relatedEvent,bool allDay) | |||
273 | mGeneral->setDefaults(due,allDay); | 273 | mGeneral->setDefaults(due,allDay); |
274 | mDetails->setDefaults(); | 274 | mDetails->setDefaults(); |
275 | showPage( 0 ); | 275 | showPage( 0 ); |
276 | if ( mRelatedTodo ) | 276 | if ( mRelatedTodo ) { |
277 | mGeneral->setCategories (mRelatedTodo->categoriesStr ()); | 277 | mGeneral->setCategories (mRelatedTodo->categoriesStr ()); |
278 | mGeneral->setSecrecy (mRelatedTodo->secrecy ()); | ||
279 | |||
280 | } | ||
278 | mGeneral->setFocusOn( 2 ); | 281 | mGeneral->setFocusOn( 2 ); |
279 | } | 282 | } |
280 | 283 | ||
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 30adb06..22486ba 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -429,6 +429,7 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
429 | mItemPopupMenu->insertItem(i18n("Reparent Todo"), this, | 429 | mItemPopupMenu->insertItem(i18n("Reparent Todo"), this, |
430 | SLOT (reparentTodo()),0,22); | 430 | SLOT (reparentTodo()),0,22); |
431 | mItemPopupMenu->insertSeparator(); | 431 | mItemPopupMenu->insertSeparator(); |
432 | #if 0 | ||
432 | mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed"), | 433 | mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed"), |
433 | this, SLOT( purgeCompleted() ) ); | 434 | this, SLOT( purgeCompleted() ) ); |
434 | mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"), | 435 | mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"), |
@@ -438,6 +439,7 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
438 | mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), | 439 | mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), |
439 | this, SLOT( toggleRunning() ),0, 35 ); | 440 | this, SLOT( toggleRunning() ),0, 35 ); |
440 | 441 | ||
442 | #endif | ||
441 | mPopupMenu = new QPopupMenu(this); | 443 | mPopupMenu = new QPopupMenu(this); |
442 | mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this, | 444 | mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this, |
443 | SLOT (newTodo()),0,1); | 445 | SLOT (newTodo()),0,1); |
@@ -449,8 +451,15 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
449 | this, SLOT( toggleQuickTodo() ),0,4 ); | 451 | this, SLOT( toggleQuickTodo() ),0,4 ); |
450 | mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), | 452 | mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), |
451 | this, SLOT( toggleRunning() ),0,5 ); | 453 | this, SLOT( toggleRunning() ),0,5 ); |
454 | mPopupMenu->insertItem(i18n(" set all open","Display all opened"), | ||
455 | this, SLOT( setAllOpen() ),0,6 ); | ||
456 | mPopupMenu->insertItem(i18n(" set all close","Display all closed"), | ||
457 | this, SLOT( setAllClose() ),0,7 ); | ||
458 | mPopupMenu->insertItem(i18n(" set all flat","Display all flat"), | ||
459 | this, SLOT( setAllFlat() ),0,8 ); | ||
452 | mDocPrefs = new DocPrefs( name ); | 460 | mDocPrefs = new DocPrefs( name ); |
453 | 461 | ||
462 | mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu ); | ||
454 | mPopupMenu->setCheckable( true ); | 463 | mPopupMenu->setCheckable( true ); |
455 | mItemPopupMenu->setCheckable( true ); | 464 | mItemPopupMenu->setCheckable( true ); |
456 | 465 | ||
@@ -522,6 +531,10 @@ void KOTodoView::updateView() | |||
522 | //qDebug("blocked "); | 531 | //qDebug("blocked "); |
523 | return; | 532 | return; |
524 | } | 533 | } |
534 | if ( isFlatDisplay ) { | ||
535 | setAllFlat(); | ||
536 | return; | ||
537 | } | ||
525 | //qDebug("update "); | 538 | //qDebug("update "); |
526 | // kdDebug() << "KOTodoView::updateView()" << endl; | 539 | // kdDebug() << "KOTodoView::updateView()" << endl; |
527 | QFont fo = KOPrefs::instance()->mTodoViewFont; | 540 | QFont fo = KOPrefs::instance()->mTodoViewFont; |
@@ -997,6 +1010,53 @@ void KOTodoView::clearSelection() | |||
997 | { | 1010 | { |
998 | mTodoListView->selectAll( false ); | 1011 | mTodoListView->selectAll( false ); |
999 | } | 1012 | } |
1013 | void KOTodoView::setAllOpen() | ||
1014 | { | ||
1015 | if ( isFlatDisplay ) { | ||
1016 | isFlatDisplay = false; | ||
1017 | mPopupMenu->setItemChecked( 8,false ); | ||
1018 | updateView(); | ||
1019 | } | ||
1020 | setOpen(mTodoListView->firstChild(), true); | ||
1021 | } | ||
1022 | void KOTodoView::setAllClose() | ||
1023 | { | ||
1024 | if ( isFlatDisplay ) { | ||
1025 | isFlatDisplay = false; | ||
1026 | mPopupMenu->setItemChecked( 8,false ); | ||
1027 | updateView(); | ||
1028 | } | ||
1029 | setOpen(mTodoListView->firstChild(), false); | ||
1030 | } | ||
1031 | void KOTodoView::setOpen( QListViewItem* item, bool setOpenI) | ||
1032 | { | ||
1033 | |||
1034 | while ( item ) { | ||
1035 | setOpen( item->firstChild(), setOpenI ); | ||
1036 | item->setOpen( setOpenI ); | ||
1037 | item = item->nextSibling(); | ||
1038 | } | ||
1039 | } | ||
1040 | |||
1041 | void KOTodoView::setAllFlat() | ||
1042 | { | ||
1043 | pendingSubtodo = 0; | ||
1044 | if ( mBlockUpdate ) { | ||
1045 | return; | ||
1046 | } | ||
1047 | mPopupMenu->setItemChecked( 8,true ); | ||
1048 | isFlatDisplay = true; | ||
1049 | QPtrList<Todo> todoList = calendar()->todos(); | ||
1050 | mTodoMap.clear(); | ||
1051 | mTodoListView->clear(); | ||
1052 | Todo *todo; | ||
1053 | for(todo = todoList.first(); todo; todo = todoList.next()) { | ||
1054 | KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this); | ||
1055 | mTodoMap.insert(todo,todoItem); | ||
1056 | } | ||
1057 | mTodoListView->setFocus(); | ||
1058 | processSelectionChange(); | ||
1059 | } | ||
1000 | 1060 | ||
1001 | void KOTodoView::purgeCompleted() | 1061 | void KOTodoView::purgeCompleted() |
1002 | { | 1062 | { |
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 5ca0362..f11518d 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h | |||
@@ -161,6 +161,10 @@ class KOTodoView : public KOrg::BaseView | |||
161 | void setNewPercentage(int); | 161 | void setNewPercentage(int); |
162 | void changedCategories(int); | 162 | void changedCategories(int); |
163 | 163 | ||
164 | void setAllOpen(); | ||
165 | void setAllClose(); | ||
166 | void setAllFlat(); | ||
167 | |||
164 | void purgeCompleted(); | 168 | void purgeCompleted(); |
165 | void toggleCompleted(); | 169 | void toggleCompleted(); |
166 | void toggleRunning(); | 170 | void toggleRunning(); |
@@ -210,7 +214,8 @@ class KOTodoView : public KOrg::BaseView | |||
210 | void restoreItemState( QListViewItem * ); | 214 | void restoreItemState( QListViewItem * ); |
211 | 215 | ||
212 | bool checkTodo( Todo * ); | 216 | bool checkTodo( Todo * ); |
213 | 217 | bool isFlatDisplay; | |
218 | void setOpen( QListViewItem*, bool setOpen); | ||
214 | KOTodoListView *mTodoListView; | 219 | KOTodoListView *mTodoListView; |
215 | QPopupMenu *mItemPopupMenu; | 220 | QPopupMenu *mItemPopupMenu; |
216 | QPopupMenu *mPopupMenu; | 221 | QPopupMenu *mPopupMenu; |