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

Formatting, tr() for UI strings

Browse Source
This commit is contained in:
saneki 2014-11-09 18:04:35 -06:00
parent 55bb6ac367
commit d74d060e99
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core.cpp
View File

@ -715,17 +715,22 @@ void Core::requestFriendship(const QString& friendAddress, const QString& messag
{
const QString userId = friendAddress.mid(0, TOX_CLIENT_ID_SIZE * 2);
if(hasFriendWithAddress(friendAddress)) {
emit failedToAddFriend(userId, "Friend is already added");
if(hasFriendWithAddress(friendAddress))
{
emit failedToAddFriend(userId, QString(tr("Friend is already added")));
}
else {
else
{
qDebug() << "Core: requesting friendship of "+friendAddress;
CString cMessage(message);
int friendId = tox_add_friend(tox, CFriendAddress(friendAddress).data(), cMessage.data(), cMessage.size());
if (friendId < 0) {
if (friendId < 0)
{
emit failedToAddFriend(userId);
} else {
}
else
{
// Update our friendAddresses
Settings::getInstance().updateFriendAdress(friendAddress);
emit friendAdded(friendId, userId);
@ -1601,7 +1606,8 @@ void Core::createGroup()
bool Core::hasFriendWithAddress(const QString &addr) const
{
// Valid length check
if(addr.length() != (TOX_FRIEND_ADDRESS_SIZE * 2)) {
if(addr.length() != (TOX_FRIEND_ADDRESS_SIZE * 2))
{
return false;
}
@ -1612,21 +1618,25 @@ bool Core::hasFriendWithAddress(const QString &addr) const
bool Core::hasFriendWithPublicKey(const QString &pubkey) const
{
// Valid length check
if(pubkey.length() != (TOX_CLIENT_ID_SIZE * 2)) {
if(pubkey.length() != (TOX_CLIENT_ID_SIZE * 2))
{
return false;
}
bool found = false;
const uint32_t friendCount = tox_count_friendlist(tox);
if (friendCount > 0) {
if (friendCount > 0)
{
int32_t *ids = new int32_t[friendCount];
tox_get_friendlist(tox, ids, friendCount);
for (int32_t i = 0; i < static_cast<int32_t>(friendCount); ++i) {
for (int32_t i = 0; i < static_cast<int32_t>(friendCount); ++i)
{
// getFriendAddress may return either id (public key) or address
QString addrOrId = getFriendAddress(ids[i]);
// Set true if found
if(addrOrId.toUpper().startsWith(pubkey.toUpper())) {
if(addrOrId.toUpper().startsWith(pubkey.toUpper()))
{
found = true;
break;
}

2
src/widget/widget.cpp
View File

@ -646,7 +646,7 @@ void Widget::addFriend(int friendId, const QString &userId)
void Widget::addFriendFailed(const QString&, const QString& errorInfo)
{
QString info = QString("Couldn't request friendship");
QString info = QString(tr("Couldn't request friendship"));
if(!errorInfo.isEmpty()) {
info = info + (QString(": ") + errorInfo);
}