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

fix uri parsing and tox URI detection, closes #2118

Browse Source
This commit is contained in:
agilob 2015-08-29 23:26:05 +01:00
parent 126ca6337c
commit d6a0910fc8
No known key found for this signature in database
GPG Key ID: 296F0B764741106C
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/toxuri.cpp
View File

@ -57,7 +57,7 @@ bool handleToxURI(const QString &toxURI)
qApp->processEvents(); qApp->processEvents();
QString toxaddr; QString toxaddr;
if (toxURI.startsWith("tox://")) if (toxURI.startsWith("tox:"))
toxaddr = toxURI.mid(6); toxaddr = toxURI.mid(6);
else else
toxaddr = toxURI.mid(4); toxaddr = toxURI.mid(4);
@ -66,11 +66,13 @@ bool handleToxURI(const QString &toxURI)
if (toxid.isEmpty()) if (toxid.isEmpty())
{ {
QMessageBox::warning(0, "qTox", toxaddr+" is not a valid Tox address."); QMessageBox::warning(0, "qTox", toxaddr + " is not a valid Tox address.");
} }
else else
{ {
ToxURIDialog dialog(0, toxaddr, QObject::tr("%1 here! Tox me maybe?","Default message in Tox URI friend requests. Write something appropriate!").arg(Nexus::getCore()->getUsername())); ToxURIDialog dialog(0, toxaddr, QObject::tr("%1 here! Tox me maybe?",
"Default message in Tox URI friend requests. Write something appropriate!")
.arg(Nexus::getCore()->getUsername()));
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
Core::getInstance()->requestFriendship(toxid, dialog.getRequestMessage()); Core::getInstance()->requestFriendship(toxid, dialog.getRequestMessage());
} }
@ -81,7 +83,7 @@ ToxURIDialog::ToxURIDialog(QWidget *parent, const QString &userId, const QString
QDialog(parent) QDialog(parent)
{ {
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowTitle(tr("Add a friend","Title of the window to add a friend through Tox URI")); setWindowTitle(tr("Add a friend", "Title of the window to add a friend through Tox URI"));
QLabel *friendsLabel = new QLabel(tr("Do you want to add %1 as a friend?").arg(userId), this); QLabel *friendsLabel = new QLabel(tr("Do you want to add %1 as a friend?").arg(userId), this);
QLabel *userIdLabel = new QLabel(tr("User ID:"), this); QLabel *userIdLabel = new QLabel(tr("User ID:"), this);
@ -93,8 +95,8 @@ ToxURIDialog::ToxURIDialog(QWidget *parent, const QString &userId, const QString
QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal, this); QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal, this);
buttonBox->addButton(tr("Send","Send a friend request"), QDialogButtonBox::AcceptRole); buttonBox->addButton(tr("Send", "Send a friend request"), QDialogButtonBox::AcceptRole);
buttonBox->addButton(tr("Cancel","Don't send a friend request"), QDialogButtonBox::RejectRole); buttonBox->addButton(tr("Cancel", "Don't send a friend request"), QDialogButtonBox::RejectRole);
connect(buttonBox, &QDialogButtonBox::accepted, this, &FriendRequestDialog::accept); connect(buttonBox, &QDialogButtonBox::accepted, this, &FriendRequestDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &FriendRequestDialog::reject); connect(buttonBox, &QDialogButtonBox::rejected, this, &FriendRequestDialog::reject);