From 51ac6e1486ff9e399f8306a6520d911beb7a8090 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Fri, 15 Feb 2013 22:12:50 +0000
Subject: [PATCH] added double click to cite someone in chat lobbies. Removed
 double click to mute. Only left mute on right click to avoid confusion

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ImprovedGUI@6128 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/chat/ChatLobbyDialog.cpp          | 34 +++++++++++--------
 retroshare-gui/src/gui/chat/ChatWidget.cpp    | 10 ++++--
 retroshare-gui/src/gui/chat/ChatWidget.h      |  1 +
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
index 237b5b54e..2ecb1449f 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
@@ -324,10 +324,10 @@ void ChatLobbyDialog::updateParticipantsList()
 			} else {
 				widgetitem->setIcon(COLUMN_ICON, QIcon(":/images/greenled.png"));
 			}
-			widgetitem->setToolTip(COLUMN_ICON, tr("Double click to mute/unmute participant"));
+			//widgetitem->setToolTip(COLUMN_ICON, tr("Double click to mute/unmute participant"));
 
 			widgetitem->setText(COLUMN_NAME, participant);
-			widgetitem->setToolTip(COLUMN_NAME, tr("Right click to mute/unmute participants"));
+			widgetitem->setToolTip(COLUMN_NAME,tr("Right click to mute/unmute participants<br/>Double click to address this person"));
 
 			ui.participantsList->addTopLevelItem(widgetitem);
 			if (selectedParcipants.contains(participant)) {
@@ -379,20 +379,26 @@ void ChatLobbyDialog::participantsTreeWidgetDoubleClicked(QTreeWidgetItem *item,
 		return;
 	}
 
-	if (column != COLUMN_ICON) {
-		return;
+	if(column == COLUMN_NAME)
+	{
+		getChatWidget()->pasteText("@"+item->text(COLUMN_NAME)) ;
+		return ;
 	}
 
-	QString nickname = item->text(COLUMN_NAME);
-	if (isParticipantMuted(nickname)) {
-		unMuteParticipant(nickname);
-	} else {
-		muteParticipant(nickname);
-	}
-
-	mutedParticipants->removeDuplicates();
-
-	updateParticipantsList();
+//	if (column == COLUMN_ICON) {
+//		return;
+//	}
+//
+//	QString nickname = item->text(COLUMN_NAME);
+//	if (isParticipantMuted(nickname)) {
+//		unMuteParticipant(nickname);
+//	} else {
+//		muteParticipant(nickname);
+//	}
+//
+//	mutedParticipants->removeDuplicates();
+//
+//	updateParticipantsList();
 }
 
 void ChatLobbyDialog::muteParticipant(const QString &nickname) {
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index b1c9c72d9..f89cf48d2 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -387,15 +387,21 @@ bool ChatWidget::isActive()
 	return true;
 }
 
+void ChatWidget::pasteText(const QString& S)
+{
+	//std::cerr << "In paste link" << std::endl;
+	ui->chatTextEdit->insertHtml(S);
+}
+
 void ChatWidget::pasteLink()
 {
-	std::cerr << "In paste link" << std::endl;
+	//std::cerr << "In paste link" << std::endl;
 	ui->chatTextEdit->insertHtml(RSLinkClipboard::toHtml());
 }
 
 void ChatWidget::pasteOwnCertificateLink()
 {
-	std::cerr << "In paste own certificate link" << std::endl;
+	//std::cerr << "In paste own certificate link" << std::endl;
 	RetroShareLink link ;
 	std::string ownId = rsPeers->getOwnId() ;
 
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.h b/retroshare-gui/src/gui/chat/ChatWidget.h
index f20c1c1f8..f8361db65 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.h
+++ b/retroshare-gui/src/gui/chat/ChatWidget.h
@@ -78,6 +78,7 @@ public:
 
 	bool isActive();
 	void setDefaultExtraFileFlags(TransferRequestFlags f) ;
+	void pasteText(const QString&);
 
 private slots:
 	void clearChatHistory();