diff options
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_p.h | 1 | ||||
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 64cffe0..ed6f4c9 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -82,6 +82,9 @@ const char *QSoftKeyManager::standardSoftKeyText(StandardSoftKey standardKey) case DoneSoftKey: softKeyText = QT_TRANSLATE_NOOP("QSoftKeyManager", "Done"); break; + case MenuSoftKey: + softKeyText = QT_TRANSLATE_NOOP("QSoftKeyManager", "Options"); + break; case CancelSoftKey: softKeyText = QT_TRANSLATE_NOOP("QSoftKeyManager", "Cancel"); break; @@ -113,6 +116,7 @@ QAction *QSoftKeyManager::createAction(StandardSoftKey standardKey, QWidget *act case OkSoftKey: case SelectSoftKey: case DoneSoftKey: + case MenuSoftKey: softKeyRole = QAction::PositiveSoftKey; break; case CancelSoftKey: diff --git a/src/gui/kernel/qsoftkeymanager_p.h b/src/gui/kernel/qsoftkeymanager_p.h index 1bc6908..c4bb84d 100644 --- a/src/gui/kernel/qsoftkeymanager_p.h +++ b/src/gui/kernel/qsoftkeymanager_p.h @@ -73,6 +73,7 @@ public: OkSoftKey, SelectSoftKey, DoneSoftKey, + MenuSoftKey, CancelSoftKey, }; diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 8bdbba7..227a179 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -118,7 +118,7 @@ void QMainWindowPrivate::init() iconSize = QSize(metric, metric); q->setAttribute(Qt::WA_Hover); #ifdef QT_SOFTKEYS_ENABLED - menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::DoneSoftKey, q); + menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, q); #endif } |