StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr981'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2015-01-04 21:47:32 +01:00
commit a071e8b41f
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/toxdns.cpp
View File

@ -220,8 +220,8 @@ fallbackOnTox1:
#if TOX1_SILENT_FALLBACK
toxIdStr = queryTox1(record, silent);
#elif TOX1_ASK_FALLBACK
QMessageBox::StandardButton btn = QMessageBox::warning(nullptr, "qTox", tr("qTox needs to use the old tox1 protocol.\n\
But tox1 is insecure and doesn't protect metadata. Should we use it anyway ?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
QMessageBox::StandardButton btn = QMessageBox::warning(nullptr, "qTox", tr("It appears that qTox has to use the old tox1 protocol.\n\
Unfortunately tox1 is not secure. Should it be used anyway?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
if (btn == QMessageBox::Ok)
queryTox1(record, silent);
#endif
@ -264,8 +264,8 @@ ToxID ToxDNS::resolveToxAddress(const QString &address, bool silent)
#if TOX1_SILENT_FALLBACK
toxId = ToxID::fromString(queryTox1(address, silent));
#elif TOX1_ASK_FALLBACK
QMessageBox::StandardButton btn = QMessageBox::warning(nullptr, "qTox", tr("qTox needs to use the old tox1 protocol.\n\
But tox1 is insecure and doesn't protect metadata. Should we use it anyway ?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
QMessageBox::StandardButton btn = QMessageBox::warning(nullptr, "qTox", tr("It appears that qTox has to use the old tox1 protocol.\n\
Unfortunately tox1 is not secure. Should it be used anyway?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
if (btn == QMessageBox::Ok)
toxId = ToxID::fromString(queryTox1(address, silent));
#else

5
src/widget/form/settings/privacysettings.ui
View File

@ -43,8 +43,11 @@
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="cbTypingNotification">
<property name="toolTip">
<string extracomment="Your friends will be able to see when you are typing."/>
</property>
<property name="text">
<string>Typing Notification</string>
<string>Send Typing Notifications</string>
</property>
</widget>
</item>