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

Migration to QRegularExpression and text formulation fix

Browse Source
This commit is contained in:
bitok 2015-10-10 18:25:24 +03:00
parent f5bffa0f0c
commit 55f5357ce1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widget/form/addfriendform.cpp
View File

@ -24,6 +24,7 @@
#include <QErrorMessage> #include <QErrorMessage>
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
#include <QRegularExpression>
#include <tox/tox.h> #include <tox/tox.h>
#include "src/nexus.h" #include "src/nexus.h"
#include "src/core/core.h" #include "src/core/core.h"
@ -145,9 +146,12 @@ Ignore the proxy and connect to the Internet directly?"), QMessageBox::Yes|QMess
void AddFriendForm::onIdChanged(const QString &id) void AddFriendForm::onIdChanged(const QString &id)
{ {
QString tId = id.trimmed(); QString tId = id.trimmed();
bool isValidId = ToxId::isToxId(tId) || QRegExp("\\S+@\\S+").exactMatch(tId); QRegularExpression dnsIdExpression("^\\S+@\\S+$");
bool isValidId = ToxId::isToxId(tId) || tId.contains(dnsIdExpression);
toxId.setStyleSheet(isValidId ? QStringLiteral("") : QStringLiteral("QLineEdit { background-color: #FFC1C1; }")); toxId.setStyleSheet(isValidId ? QStringLiteral("") : QStringLiteral("QLineEdit { background-color: #FFC1C1; }"));
toxId.setToolTip(isValidId ? QStringLiteral("") : tr("Invalid Tox ID format. Is's must be 76 digital or alphabet characters length or similar name@domain.com.")); toxId.setToolTip(isValidId ? QStringLiteral("") : tr("Invalid Tox ID format. It must have length of 76 hexadecimal characters or similar name@domain.com."));
sendButton.setEnabled(isValidId); sendButton.setEnabled(isValidId);
} }