summaryrefslogtreecommitdiffstats
path: root/src/gui/inputmethod
diff options
context:
space:
mode:
authorJaakko Helanti <ext-jaakko.helanti@nokia.com>2012-09-04 06:47:31 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-09-07 12:29:58 (GMT)
commitbcb5afdf7a059693eedd09ac15c284f02b7685af (patch)
treed4c237e625ef38609cd2022793427e7b8a52714c /src/gui/inputmethod
parent7e221d37153974774d6d9af4cae399a38ed21281 (diff)
downloadQt-bcb5afdf7a059693eedd09ac15c284f02b7685af.zip
Qt-bcb5afdf7a059693eedd09ac15c284f02b7685af.tar.gz
Qt-bcb5afdf7a059693eedd09ac15c284f02b7685af.tar.bz2
Symbian: Handle Qt input hints for email and url editors
Earlier Qt input hints ImhEmailCharactersOnly and ImhUrlCharactersOnly were handled in Symbian by function CAknEdwinState::SetSpecialCharacterTableResourceId. Along with the new QML touch input any support for this mechanism has apparently ceased, and the input hint has no effect. To get '/' to the first page of url editor virtual keyboard, or '@' to the first page of email editor virtual keyboard, one has to use function CAknEdwinState::SetExtensionFlags instead. Smileys are disabled when these hints are set. Change-Id: Iec87274da40a7d59c97a479affed7d143dd5aa25 Task-id: ou1cimx1#1012431 Reviewed-by: Marko Kenttälä <ext-marko.r.kenttala@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
Diffstat (limited to 'src/gui/inputmethod')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 966edc7..afa0426 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -1339,20 +1339,16 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
}
m_fepState->SetNumericKeymap(static_cast<TAknEditorNumericKeymap>(flags));
- bool enableSmileys = false;
-
if (hints & ImhUrlCharactersOnly) {
// URL characters is everything except space, so a superset of the other restrictions
- m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_URL_SPECIAL_CHARACTER_TABLE_DIALOG);
+ m_fepState->SetExtensionFlags(EAknEditorExtFlagKeyboardUrl);
} else if (hints & ImhEmailCharactersOnly) {
- m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_EMAIL_ADDR_SPECIAL_CHARACTER_TABLE_DIALOG);
- } else if (needsCharMap) {
- m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG);
- enableSmileys = !(hints & ImhHiddenText);
+ m_fepState->SetExtensionFlags(EAknEditorExtFlagKeyboardEmail);
} else {
- m_fepState->SetSpecialCharacterTableResourceId(0);
+ m_fepState->SetExtensionFlags(0);
}
+ bool enableSmileys = needsCharMap && !(hints & (ImhHiddenText | ImhUrlCharactersOnly | ImhEmailCharactersOnly));
if (enableSmileys)
m_dummyEditor->AddFlagToUserFlags(CEikEdwin::EAvkonEnableSmileySupport);
else