Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-22 22:21:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed "location" to "node" in gui (Patch from Henry)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7802 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-12-30 11:11:08 +00:00
parent 1b77e09684
commit 530fcab61d
19 changed files with 228 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -112,7 +112,7 @@ QString ConnectFriendWizard::getErrorString(uint32_t error_code)
switch(error_code)
{
case CERTIFICATE_PARSING_ERROR_SIZE_ERROR: return tr("Abnormal size read is bigger than memory block.") ;
case CERTIFICATE_PARSING_ERROR_INVALID_LOCATION_ID: return tr("Invalid location id.") ;
case CERTIFICATE_PARSING_ERROR_INVALID_LOCATION_ID: return tr("Invalid node id.") ;
case CERTIFICATE_PARSING_ERROR_INVALID_EXTERNAL_IP: return tr("Invalid external IP.") ;
case CERTIFICATE_PARSING_ERROR_INVALID_LOCAL_IP: return tr("Invalid local IP.") ;
case CERTIFICATE_PARSING_ERROR_INVALID_CHECKSUM_SECTION: return tr("Invalid checksum section.") ;
@ -355,7 +355,7 @@ void ConnectFriendWizard::initializePage(int id)
}
}
ui->locationEdit->setText(loc);
ui->nodeEdit->setText(loc);
ui->signersEdit->setPlainText(ts);
fillGroups(this, ui->groupComboBox, groupId);
@ -412,7 +412,7 @@ void ConnectFriendWizard::initializePage(int id)
}
}
ui->fr_locationEdit->setText(loc);
ui->fr_nodeEdit->setText(loc);
ui->fr_label->setText(tr("You have a friend request from") + " " + QString::fromUtf8(peerDetails.name.c_str()));
@ -694,7 +694,7 @@ void ConnectFriendWizard::accept()
runProgressDialog = true;
if (!peerDetails.location.empty()) {
std::cerr << "ConnectFriendWizard::accept() : setting peerLocation." << std::endl;
std::cerr << "ConnectFriendWizard::accept() : setting peer node." << std::endl;
rsPeers->setLocation(peerDetails.id, peerDetails.location);
}