author | zautrix <zautrix> | 2004-10-10 20:52:35 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-10 20:52:35 (UTC) |
commit | ad409bf71ce6c3733f9e5ae4e4aa38765329d7d8 (patch) (unidiff) | |
tree | 1e8b4286ed0d30499bfdb048fc4163caf05f69ce /korganizer/kotodoview.cpp | |
parent | ee6e29a5092d32165b7bf6b39069bd8a1dcd5b0a (diff) | |
download | kdepimpi-ad409bf71ce6c3733f9e5ae4e4aa38765329d7d8.zip kdepimpi-ad409bf71ce6c3733f9e5ae4e4aa38765329d7d8.tar.gz kdepimpi-ad409bf71ce6c3733f9e5ae4e4aa38765329d7d8.tar.bz2 |
todo list fixes
-rw-r--r-- | korganizer/kotodoview.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index da46eca..ca5eadd 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -52,16 +52,17 @@ | |||
52 | 52 | ||
53 | #include "kotodoview.h" | 53 | #include "kotodoview.h" |
54 | using namespace KOrg; | 54 | using namespace KOrg; |
55 | 55 | ||
56 | KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent, | 56 | KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent, |
57 | const char *name) : | 57 | const char *name) : |
58 | KListView(parent,name) | 58 | KListView(parent,name) |
59 | { | 59 | { |
60 | mName = QString ( name ); | ||
60 | mCalendar = calendar; | 61 | mCalendar = calendar; |
61 | #ifndef DESKTOP_VERSION | 62 | #ifndef DESKTOP_VERSION |
62 | QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); | 63 | QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); |
63 | #endif | 64 | #endif |
64 | mOldCurrent = 0; | 65 | mOldCurrent = 0; |
65 | mMousePressed = false; | 66 | mMousePressed = false; |
66 | 67 | ||
67 | setAcceptDrops(true); | 68 | setAcceptDrops(true); |
@@ -259,22 +260,26 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e ) | |||
259 | 260 | ||
260 | } | 261 | } |
261 | } | 262 | } |
262 | 263 | ||
263 | return; | 264 | return; |
264 | } | 265 | } |
265 | 266 | ||
266 | // qDebug("KOTodoListView::keyPressEvent "); | 267 | // qDebug("KOTodoListView::keyPressEvent "); |
267 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || ( height() > 150 && width() > 200 ) ) { | 268 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) { |
268 | switch ( e->key() ) { | 269 | switch ( e->key() ) { |
269 | case Qt::Key_Down: | 270 | case Qt::Key_Down: |
270 | case Qt::Key_Up: | 271 | case Qt::Key_Up: |
271 | QListView::keyPressEvent ( e ); | 272 | QListView::keyPressEvent ( e ); |
272 | break; | 273 | break; |
274 | case Qt::Key_Left: | ||
275 | case Qt::Key_Right: | ||
276 | QListView::keyPressEvent ( e ); | ||
277 | break; | ||
273 | default: | 278 | default: |
274 | e->ignore(); | 279 | e->ignore(); |
275 | break; | 280 | break; |
276 | } | 281 | } |
277 | return; | 282 | return; |
278 | } | 283 | } |
279 | e->ignore(); | 284 | e->ignore(); |
280 | } | 285 | } |
@@ -327,17 +332,17 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
327 | QBoxLayout *topLayout = new QVBoxLayout(this); | 332 | QBoxLayout *topLayout = new QVBoxLayout(this); |
328 | mName = QString ( name ); | 333 | mName = QString ( name ); |
329 | mBlockUpdate = false; | 334 | mBlockUpdate = false; |
330 | mQuickAdd = new KOQuickTodo(this); | 335 | mQuickAdd = new KOQuickTodo(this); |
331 | topLayout->addWidget(mQuickAdd); | 336 | topLayout->addWidget(mQuickAdd); |
332 | 337 | ||
333 | if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickAdd->hide(); | 338 | if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickAdd->hide(); |
334 | 339 | ||
335 | mTodoListView = new KOTodoListView(calendar,this); | 340 | mTodoListView = new KOTodoListView(calendar,this, name ); |
336 | topLayout->addWidget(mTodoListView); | 341 | topLayout->addWidget(mTodoListView); |
337 | //mTodoListView->header()->setMaximumHeight(30); | 342 | //mTodoListView->header()->setMaximumHeight(30); |
338 | mTodoListView->setRootIsDecorated(true); | 343 | mTodoListView->setRootIsDecorated(true); |
339 | mTodoListView->setAllColumnsShowFocus(true); | 344 | mTodoListView->setAllColumnsShowFocus(true); |
340 | 345 | ||
341 | mTodoListView->setShowSortIndicator(true); | 346 | mTodoListView->setShowSortIndicator(true); |
342 | 347 | ||
343 | mTodoListView->addColumn(i18n("Todo")); | 348 | mTodoListView->addColumn(i18n("Todo")); |
@@ -966,47 +971,45 @@ void KOTodoView::addQuickTodo() | |||
966 | updateView(); | 971 | updateView(); |
967 | } | 972 | } |
968 | void KOTodoView::keyPressEvent ( QKeyEvent * e ) | 973 | void KOTodoView::keyPressEvent ( QKeyEvent * e ) |
969 | { | 974 | { |
970 | // e->ignore(); | 975 | // e->ignore(); |
971 | //return; | 976 | //return; |
972 | switch ( e->key() ) { | 977 | switch ( e->key() ) { |
973 | case Qt::Key_Down: | 978 | case Qt::Key_Down: |
974 | QWidget::keyPressEvent ( e ); | ||
975 | break; | ||
976 | |||
977 | case Qt::Key_Up: | 979 | case Qt::Key_Up: |
978 | QWidget::keyPressEvent ( e ); | 980 | QWidget::keyPressEvent ( e ); |
979 | break; | 981 | break; |
982 | |||
980 | case Qt::Key_Q: | 983 | case Qt::Key_Q: |
981 | toggleQuickTodo(); | 984 | toggleQuickTodo(); |
982 | break; | 985 | break; |
983 | 986 | ||
984 | default: | 987 | default: |
985 | e->ignore(); | 988 | e->ignore(); |
986 | } | 989 | } |
987 | 990 | ||
988 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || ( height() > 150 && width() > 200 ) ) { | 991 | if ( true ) { |
989 | if ( e->key() == Qt::Key_I ) { | 992 | if ( e->key() == Qt::Key_I ) { |
990 | KOTodoViewItem*cn = (KOTodoViewItem*)mTodoListView->currentItem(); | 993 | KOTodoViewItem*cn = (KOTodoViewItem*)mTodoListView->currentItem(); |
991 | if ( cn ) { | 994 | if ( cn ) { |
992 | mActiveItem = cn; | 995 | mActiveItem = cn; |
993 | KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); | 996 | KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); |
994 | if ( ci ){ | 997 | if ( ci ){ |
995 | showTodo(); | 998 | showTodo(); |
996 | cn = (KOTodoViewItem*)cn->itemBelow(); | 999 | cn = (KOTodoViewItem*)cn->itemBelow(); |
997 | if ( cn ) { | 1000 | if ( cn ) { |
998 | mTodoListView->setCurrentItem ( cn ); | 1001 | mTodoListView->setCurrentItem ( cn ); |
999 | mTodoListView->ensureItemVisible ( cn ); | 1002 | mTodoListView->ensureItemVisible ( cn ); |
1000 | } | 1003 | } |
1001 | 1004 | ||
1002 | } | 1005 | } |
1003 | } | 1006 | } |
1004 | e->accept(); | 1007 | e->accept(); |
1005 | 1008 | ||
1006 | } | 1009 | } |
1007 | 1010 | ||
1008 | } | 1011 | } |
1009 | 1012 | ||
1010 | } | 1013 | } |
1011 | void KOTodoView::updateTodo( Todo * t, int type ) | 1014 | void KOTodoView::updateTodo( Todo * t, int type ) |
1012 | { | 1015 | { |