diff options
| author | Basil Semuonov <basil.semuonov@gmail.com> | 2014-08-10 14:43:40 +0400 |
|---|---|---|
| committer | Basil Semuonov <basil.semuonov@gmail.com> | 2014-08-10 14:43:40 +0400 |
| commit | c460e2d73be49313fb989fe9cbc4f1ae2c4d4d5b (patch) | |
| tree | 77ab3d0e82d77318e20651a6e6ab305850f9b3ee | |
| parent | e0c926bd934d857e84faecd970b9e78f7a9e0dcd (diff) | |
Phone call transliteration. Added missed chars
| -rw-r--r-- | daemon/manager.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/daemon/manager.cpp b/daemon/manager.cpp index 14d2020..9f2a484 100644 --- a/daemon/manager.cpp +++ b/daemon/manager.cpp @@ -181,14 +181,18 @@ void Manager::onActiveVoiceCallStatusChanged() QString Manager::findPersonByNumber(QString number) { + QString person; numberFilter.setValue(number); const QList<QContact> &found = contacts->contacts(numberFilter); if (found.size() == 1) { - return found[0].detail(QContactDetail::TypeDisplayLabel).value(0).toString(); + person = found[0].detail(QContactDetail::TypeDisplayLabel).value(0).toString(); } - return QString(); + if (settings->property("transliterateCyrillic").toBool()) { + transliterateCyrillic(person); + } + return person; } void Manager::onVoiceError(const QString &message) @@ -350,12 +354,12 @@ void Manager::transliterateCyrillic(const QString &text) static QStringList latUpper; static QStringList latLower; if (rusLower.isEmpty()) { - rusLower = QString::fromUtf8("абвгдеёжзийклмнопрстуфхцчшщыэюя"); - rusUpper = QString::fromUtf8("АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ"); + rusLower = QString::fromUtf8("абвгдеёжзийклмнопрстуфхцчшщъыьэюя"); + rusUpper = QString::fromUtf8("АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"); latUpper <<"A"<<"B"<<"V"<<"G"<<"D"<<"E"<<"Jo"<<"Zh"<<"Z"<<"I"<<"J"<<"K"<<"L"<<"M"<<"N" - <<"O"<<"P"<<"R"<<"S"<<"T"<<"U"<<"F"<<"H"<<"C"<<"Ch"<<"Sh"<<"Sh"<<"I"<<"E"<<"Ju"<<"Ja"; + <<"O"<<"P"<<"R"<<"S"<<"T"<<"U"<<"F"<<"H"<<"C"<<"Ch"<<"Sh"<<"Sh'"<<""<<"I"<<"'"<<"E"<<"Ju"<<"Ja"; latLower <<"a"<<"b"<<"v"<<"g"<<"d"<<"e"<<"jo"<<"zh"<<"z"<<"i"<<"j"<<"k"<<"l"<<"m"<<"n" - <<"o"<<"p"<<"r"<<"s"<<"t"<<"u"<<"f"<<"h"<<"c"<<"ch"<<"sh"<<"sh"<<"i"<<"e"<<"ju"<<"ja"; + <<"o"<<"p"<<"r"<<"s"<<"t"<<"u"<<"f"<<"h"<<"c"<<"ch"<<"sh"<<"sh'"<<""<<"i"<<"'"<<"e"<<"ju"<<"ja"; } for (int i=0; i < text.size(); ++i){ QChar ch = text[i]; |