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 #205

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-09-11 13:40:27 +02:00
parent 5198dd1404
commit e91846e821
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core.cpp
View File

@ -701,6 +701,14 @@ void Core::setUsername(const QString& username)
}
}
QString Core::getSelfId()
{
uint8_t friendAddress[TOX_FRIEND_ADDRESS_SIZE];
tox_get_address(tox, friendAddress);
return CFriendAddress::toString(friendAddress);
}
QString Core::getStatusMessage()
{
int size = tox_get_self_status_message_size(tox);

1
core.h
View File

@ -127,6 +127,7 @@ public:
QString getUsername();
QString getStatusMessage();
QString getSelfId();
void increaseVideoBusyness();
void decreaseVideoBusyness();

8
widget/form/addfriendform.cpp
View File

@ -19,6 +19,8 @@
#include <QFont>
#include <QMessageBox>
#include <tox/tox.h>
#include "widget/widget.h"
#include "core.h"
#define TOX_ID_LENGTH 2*TOX_FRIEND_ADDRESS_SIZE
@ -74,6 +76,7 @@ bool AddFriendForm::isToxId(const QString &value) const
void AddFriendForm::showWarning(const QString &message) const
{
QMessageBox warning(main);
warning.setWindowTitle("Tox");
warning.setText(message);
warning.setIcon(QMessageBox::Warning);
warning.exec();
@ -92,7 +95,10 @@ void AddFriendForm::onSendTriggered()
if (id.isEmpty()) {
showWarning(tr("Please fill in a valid Tox ID","Tox ID of the friend you're sending a friend request to"));
} else if (isToxId(id)) {
emit friendRequested(id, getMessage());
if (id.toUpper() == Widget::getInstance()->getCore()->getSelfId().toUpper())
showWarning(tr("You can't add yourself as a friend !","When trying to add your own Tox ID as friend"));
else
emit friendRequested(id, getMessage());
this->toxId.setText("");
this->message.setText("");
} else {

3
widget/widget.cpp
View File

@ -404,7 +404,8 @@ void Widget::setStatusMessage(const QString &statusMessage)
void Widget::addFriend(int friendId, const QString &userId)
{
qDebug() << "Adding friend with id "+userId;
qDebug() << "Widget: Adding friend with id "+userId;
Friend* newfriend = FriendList::addFriend(friendId, userId);
QLayout* layout = contactListWidget->getFriendLayout(Status::Offline);
layout->addWidget(newfriend->widget);