diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-09-19 17:12:10 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-09-21 08:07:39 (GMT) |
| commit | 6248dff2c7f3288d675de639abfbbc6c1d618006 (patch) | |
| tree | 11c8a736b8b2b3a8fd474225cab630370f369d57 /src/gui/itemviews | |
| parent | 789303e0f80a299eb3cfacc1d84dbdc1d3e4abeb (diff) | |
| download | Qt-6248dff2c7f3288d675de639abfbbc6c1d618006.zip Qt-6248dff2c7f3288d675de639abfbbc6c1d618006.tar.gz Qt-6248dff2c7f3288d675de639abfbbc6c1d618006.tar.bz2 | |
Give the soft key functionality it's own macro.
Re-using QT_KEYPAD_NAVIGATION for soft keys is wrong since the two
are independant concepts. This puts everything in a new macro called
QT_SOFTKEYS_ENABLED. This will also insulate the embedded customers
who use keypad navigation from the soft key changes.
Reviewed-by: Alessandro Portale
Diffstat (limited to 'src/gui/itemviews')
| -rw-r--r-- | src/gui/itemviews/qabstractitemview.cpp | 8 | ||||
| -rw-r--r-- | src/gui/itemviews/qabstractitemview_p.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 8eb5425..715f92d 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -88,7 +88,7 @@ QAbstractItemViewPrivate::QAbstractItemViewPrivate() overwrite(false), dropIndicatorPosition(QAbstractItemView::OnItem), #endif -#ifdef QT_KEYPAD_NAVIGATION +#ifdef QT_SOFTKEYS_ENABLED doneSoftKey(0), #endif autoScroll(true), @@ -132,7 +132,7 @@ void QAbstractItemViewPrivate::init() q->setAttribute(Qt::WA_InputMethodEnabled); -#ifdef QT_KEYPAD_NAVIGATION +#ifdef QT_SOFTKEYS_ENABLED doneSoftKey = QSoftKeyManager::createKeyedAction(QAction::EndEditSoftKey, Qt::Key_Back, q); #endif } @@ -2071,14 +2071,18 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event) if (QApplication::keypadNavigationEnabled()) { if (!hasEditFocus()) { setEditFocus(true); +#ifdef QT_SOFTKEYS_ENABLED addAction(d->doneSoftKey); +#endif return; } } break; case Qt::Key_Back: if (QApplication::keypadNavigationEnabled() && hasEditFocus()) { +#ifdef QT_SOFTKEYS_ENABLED removeAction(d->doneSoftKey); +#endif setEditFocus(false); } else { event->ignore(); diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h index 0bd272d..84c0892 100644 --- a/src/gui/itemviews/qabstractitemview_p.h +++ b/src/gui/itemviews/qabstractitemview_p.h @@ -379,7 +379,7 @@ public: QAbstractItemView::DropIndicatorPosition dropIndicatorPosition; #endif -#ifdef QT_KEYPAD_NAVIGATION +#ifdef QT_SOFTKEYS_ENABLED QAction *doneSoftKey; #endif |