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

rsstatus

Browse source 
-implemented simple rsStatus for messenger window
- fixed minor bug with messenger window (starts new pop-up chat dialog when peer responds, if private chat started from messenger window) solution: messenger windows start peers dialogs pop-up chat dialog instead


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2010-04-15 12:02:23 +00:00
parent 7aa487e2b6
commit 76a4c34440
8 changed files with 80 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

29
retroshare-gui/src/gui/PeersDialog.cpp
View file

@ -103,7 +103,8 @@ PeersDialog::PeersDialog(QWidget *parent)
connect( ui.peertreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( peertreeWidgetCostumPopupMenu( QPoint ) ) );
connect( ui.peertreeWidget, SIGNAL( itemDoubleClicked ( QTreeWidgetItem *, int)), this, SLOT(chatfriend()));
connect( ui.peertreeWidget, SIGNAL( itemDoubleClicked ( QTreeWidgetItem *, int)), this, SLOT(chatfriend(QTreeWidgetItem *)));
connect( this , SIGNAL( startChat( QTreeWidgetItem *) ), this, SLOT(chatfriend(QTreeWidgetItem *)));
connect( ui.avatartoolButton, SIGNAL(clicked()), SLOT(getAvatar()));
connect( ui.mypersonalstatuslabel, SIGNAL(clicked()), SLOT(statusmessage()));
@ -250,7 +251,7 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
connect( collapseAll , SIGNAL( triggered() ), ui.peertreeWidget, SLOT(collapseAll()) );
chatAct = new QAction(QIcon(IMAGE_CHAT), tr( "Chat" ), this );
connect( chatAct , SIGNAL( triggered() ), this, SLOT( chatfriend() ) );
connect( chatAct , SIGNAL( triggered() ), this, SLOT( chatfriendproxy() ) );
msgAct = new QAction(QIcon(IMAGE_MSG), tr( "Message Friend" ), this );
connect( msgAct , SIGNAL( triggered() ), this, SLOT( msgfriend() ) );
@ -614,15 +615,27 @@ void PeersDialog::exportfriend()
}
void PeersDialog::chatfriend()
{
QTreeWidgetItem *i = getCurrentPeer();
void PeersDialog::chatfriendproxy(){
if (!i)
QTreeWidgetItem* i = getCurrentPeer();
if(!i)
return;
emit startChat(i);
return;
}
void PeersDialog::chatfriend(QTreeWidgetItem* currPeer)
{
// QTreeWidgetItem *currPeer = getCurrentPeer();
if (!currPeer){
return;
}
//std::string name = (i -> text(2)).toStdString();
std::string id = (i -> text(3)).toStdString();
std::string id = (currPeer -> text(3)).toStdString();
bool oneLocationConnected = false;
@ -745,7 +758,7 @@ void PeersDialog::removefriend()
if (!c)
{
#ifdef PEERS_DEBUG
std::cerr << "PeersDialog::removefriend() Noone Selected -- sorry" << std::endl;
std::cerr << "PeersDialog::removefriend() None Selected -- sorry" << std::endl;
#endif
return;
}