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

* Cleaned up more debug output.

Browse source 
* Fixed Popup Chats with new Peer Dialog.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-07-10 18:52:56 +00:00
parent d36b15d526
commit 67a27744f8
8 changed files with 65 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -423,26 +423,22 @@ void PeersDialog::chatfriend()
return;
}
/*if (detail.state & RS_PEER_STATE_CONNECTED)
{*/
/* must reference ChatDialog */
if (chatDialog)
{
chatDialog->getPrivateChat(id, name, true);
}
/*}
if (detail.state & RS_PEER_STATE_CONNECTED)
{
getPrivateChat(id, name, true);
}
else
{*/
{
/* info dialog */
// QMessageBox::StandardButton sb = QMessageBox::question ( NULL,
// "Friend Not Online",
//"Your Friend is offline \nDo you want to send them a Message instead",
// (QMessageBox::Yes | QMessageBox::No));
/*if (sb == QMessageBox::Yes)
QMessageBox::StandardButton sb = QMessageBox::question ( NULL,
"Friend Not Online",
"Your Friend is offline \nDo you want to send them a Message instead",
(QMessageBox::Yes | QMessageBox::No));
if (sb == QMessageBox::Yes)
{
msgfriend();
}
}*/
}
return;
}
@ -643,7 +639,9 @@ void PeersDialog::insertChat()
for(it = newchat.begin(); it != newchat.end(); it++)
{
std::string msg(it->msg.begin(), it->msg.end());
std::cerr << "ChatDialog::insertChat(): " << msg << std::endl;
#ifdef PEERS_DEBUG
std::cerr << "PeersDialog::insertChat(): " << msg << std::endl;
#endif
/* are they private? */
if (it->chatflags & RS_CHAT_PRIVATE)
@ -717,7 +715,9 @@ void PeersDialog::sendMsg()
ci.chatflags = RS_CHAT_PUBLIC;
std::string msg(ci.msg.begin(), ci.msg.end());
std::cerr << "ChatDialog::sendMsg(): " << msg << std::endl;
#ifdef PEERS_DEBUG
std::cerr << "PeersDialog::sendMsg(): " << msg << std::endl;
#endif
rsMsgs -> ChatSend(ci);
ui.lineEdit->clear();
@ -799,7 +799,9 @@ void PeersDialog::insertSendList()
void PeersDialog::toggleSendItem( QTreeWidgetItem *item, int col )
{
#ifdef PEERS_DEBUG
std::cerr << "ToggleSendItem()" << std::endl;
#endif
/* extract id */
std::string id = (item -> text(4)).toStdString();