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

- Removed not used function RsDirUtil::createBackup.

Browse source 
- Moved ProfileView and ProfileEdit to the folder unfinished.
- Removed "location:" before the ssl name in FriendsDialog and MessengerWindow.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4567 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-08-14 22:31:05 +00:00
parent 39708cdd0b
commit d25730eabb
12 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -47,7 +47,9 @@
#include "chat/PopupChatDialog.h"
#include "msgs/MessageComposer.h"
#include "connect/ConfCertDialog.h"
#include "profile/ProfileView.h"
#ifdef UNFINISHED
#include "unfinished/profile/ProfileView.h"
#endif
#include "profile/ProfileWidget.h"
#include "profile/StatusMessage.h"
@ -912,7 +914,7 @@ void FriendsDialog::insertPeers()
if (sslDetail.state & RS_PEER_STATE_CONNECTED) {
customStateString = QString::fromUtf8(rsMsgs->getCustomStateString(sslDetail.id).c_str());
}
sText = tr("location") + " : " + QString::fromUtf8(sslDetail.location.c_str());
sText = QString::fromUtf8(sslDetail.location.c_str());
if (customStateString.isEmpty() == false) {
sText += " - " + customStateString;
}
@ -1763,6 +1765,7 @@ void FriendsDialog::addSmileys()
ui.lineEdit->textCursor().insertText(qobject_cast<QPushButton*>(sender())->toolTip().split("|").first());
}
#ifdef UNFINISHED
/* GUI stuff -> don't do anything directly with Control */
void FriendsDialog::viewprofile()
{
@ -1771,7 +1774,7 @@ void FriendsDialog::viewprofile()
QTreeWidgetItem *c = getCurrentPeer();
static ProfileView *profileview = new ProfileView();
// static ProfileView *profileview = new ProfileView();
if (!c)
@ -1783,6 +1786,7 @@ void FriendsDialog::viewprofile()
profileview -> setPeerId(id);
profileview -> show();
}
#endif
void FriendsDialog::updateAvatar()
{