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

remove duplicate code

Browse Source
This commit is contained in:
Dubslow 2015-03-11 21:17:52 -05:00
parent e9babcee07
commit 21780b9d31
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@
#include "src/misc/cdata.h" #include "src/misc/cdata.h"
#include "src/toxdns.h" #include "src/toxdns.h"
#include "src/misc/settings.h" #include "src/misc/settings.h"
#include "src/widget/gui.h"
AddFriendForm::AddFriendForm() AddFriendForm::AddFriendForm()
{ {
@ -73,15 +74,6 @@ QString AddFriendForm::getMessage() const
return !msg.isEmpty() ? msg : message.placeholderText(); return !msg.isEmpty() ? msg : message.placeholderText();
} }
void AddFriendForm::showWarning(const QString &message) const
{
QMessageBox warning(main);
warning.setWindowTitle("Tox");
warning.setText(message);
warning.setIcon(QMessageBox::Warning);
warning.exec();
}
void AddFriendForm::onUsernameSet(const QString& username) void AddFriendForm::onUsernameSet(const QString& username)
{ {
message.setPlaceholderText(tr("%1 here! Tox me maybe?","Default message in friend requests if the field is left blank. Write something appropriate!").arg(username)); message.setPlaceholderText(tr("%1 here! Tox me maybe?","Default message in friend requests if the field is left blank. Write something appropriate!").arg(username));
@ -92,10 +84,10 @@ void AddFriendForm::onSendTriggered()
QString id = toxId.text().trimmed(); QString id = toxId.text().trimmed();
if (id.isEmpty()) { if (id.isEmpty()) {
showWarning(tr("Please fill in a valid Tox ID","Tox ID of the friend you're sending a friend request to")); GUI::showWarning(tr("Couldn't add friend"), tr("Please fill in a valid Tox ID","Tox ID of the friend you're sending a friend request to"));
} else if (ToxID::isToxId(id)) { } else if (ToxID::isToxId(id)) {
if (id.toUpper() == Core::getInstance()->getSelfId().toString().toUpper()) if (id.toUpper() == Core::getInstance()->getSelfId().toString().toUpper())
showWarning(tr("You can't add yourself as a friend!","When trying to add your own Tox ID as friend")); GUI::showWarning(tr("Couldn't add friend"), tr("You can't add yourself as a friend!","When trying to add your own Tox ID as friend"));
else else
emit friendRequested(id, getMessage()); emit friendRequested(id, getMessage());
this->toxId.clear(); this->toxId.clear();
@ -113,7 +105,7 @@ Ignore the proxy and connect to the Internet directly?"), QMessageBox::Yes|QMess
if (toxId.toString().isEmpty()) if (toxId.toString().isEmpty())
{ {
showWarning(tr("This Tox ID does not exist","DNS error")); GUI::showWarning(tr("Couldn't add friend"), tr("This Tox ID does not exist","DNS error"));
return; return;
} }

3
src/widget/form/addfriendform.h
View File

@ -38,9 +38,6 @@ public:
signals: signals:
void friendRequested(const QString& friendAddress, const QString& message); void friendRequested(const QString& friendAddress, const QString& message);
protected:
void showWarning(const QString& message) const;
public slots: public slots:
void onUsernameSet(const QString& userName); void onUsernameSet(const QString& userName);