diff options
| author | Titta Heikkala <EXT-Titta.2.Heikkala@nokia.com> | 2011-03-30 09:41:24 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2011-03-31 06:12:54 (GMT) |
| commit | d75b10cf969c4d3b068d84bc650a76efcadc1012 (patch) | |
| tree | a03cd8d4e754e5439eb2219145a3004bef4f7923 /src/gui/kernel/qsoftkeymanager_s60.cpp | |
| parent | 0b2446df2908a17496aadb70f403ba361cfc2142 (diff) | |
| download | Qt-d75b10cf969c4d3b068d84bc650a76efcadc1012.zip Qt-d75b10cf969c4d3b068d84bc650a76efcadc1012.tar.gz Qt-d75b10cf969c4d3b068d84bc650a76efcadc1012.tar.bz2 | |
Support for new softkey in Symbian^3
QSoftKeyManager maps the StandardSoftKey values to Symbian commands.
This way the softkeys are using Symbian defined icons.
Task-number: QT-4620
Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_s60.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp index 09e2b5f..79ed91a 100644 --- a/src/gui/kernel/qsoftkeymanager_s60.cpp +++ b/src/gui/kernel/qsoftkeymanager_s60.cpp @@ -298,6 +298,10 @@ bool QSoftKeyManagerPrivateS60::setSoftkey(CEikButtonGroupContainer &cba, QString text = softkeyText(*action); TPtrC nativeText = qt_QString2TPtrC(text); int command = S60_COMMAND_START + position; +#ifdef SYMBIAN_VERSION_SYMBIAN3 + if (softKeyCommandActions.contains(action)) + command = softKeyCommandActions.value(action); +#endif setNativeSoftkey(cba, position, command, nativeText); const bool dimmed = !action->isEnabled() && !QSoftKeyManager::isForceEnabledInSofkeys(action); cba.DimCommand(command, dimmed); |