~michael-sheldon/ubuntu-keyboard/fix-1385518-rtm

Viewing changes to plugins/pinyin/src/chineselanguagefeatures.cpp

Committer: CI bot
Author(s): Michael Sheldon
Date: 2014-09-10 14:57:01 UTC
mfrom: (215.3.9 fix-1359404)
Revision ID: ps-jenkins@lists.canonical.com-20140910145701-j2o8iqkw4qtf4viw

Only switch back automatically from the symbol page if the user presses space or apostrophe and make pre-edit behaviour when entering symbols more consistent. Fixes: 1359404

files modified:
plugins/pinyin/src/chineselanguagefeatures.cpp

plugins/pinyin/src/chineselanguagefeatures.h

plugins/sr/src/database_sr.db

plugins/westernsupport/westernlanguagefeatures.cpp

plugins/westernsupport/westernlanguagefeatures.h

qml/Keyboard.qml

qml/KeyboardContainer.qml

qml/keys/CharKey.qml

qml/keys/ReturnKey.qml

qml/keys/SpaceKey.qml

qml/languages/Keyboard_symbols.qml

src/lib/logic/abstractlanguagefeatures.h

src/plugin/inputmethod.cpp

src/plugin/inputmethod.h

src/plugin/inputmethod_p.h

src/view/abstracttexteditor.cpp

src/view/abstracttexteditor.h

Show diffs side-by-side

added added

removed removed

plugins/pinyin/src/chineselanguagefeatures.cpp

}

return false;

}

b'\\ No newline at end of file'

}

bool ChineseLanguageFeatures::isSymbol(const QString &text) const

{

static const QString symbols = QString::fromUtf8("*#+=()@~/\\€£$¥₹%<>[]`^|_§{}¡¿«»\"“”„&0123456789");

if (text.isEmpty()) {

return false;

}

if (symbols.contains(text.right(1))) {

return true;

}

return false;

}

Older »