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

added double click to cite someone in chat lobbies. Removed double click to mute. Only left mute on right click to avoid confusion

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ImprovedGUI@6128 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-02-15 22:12:50 +00:00
parent 7715d86e8f
commit 51ac6e1486
3 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View file

@ -324,10 +324,10 @@ void ChatLobbyDialog::updateParticipantsList()
} else { } else {
widgetitem->setIcon(COLUMN_ICON, QIcon(":/images/greenled.png")); 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->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); ui.participantsList->addTopLevelItem(widgetitem);
if (selectedParcipants.contains(participant)) { if (selectedParcipants.contains(participant)) {
@ -379,20 +379,26 @@ void ChatLobbyDialog::participantsTreeWidgetDoubleClicked(QTreeWidgetItem *item,
return; return;
} }
if (column != COLUMN_ICON) { if(column == COLUMN_NAME)
{
getChatWidget()->pasteText("@"+item->text(COLUMN_NAME)) ;
return ; return ;
} }
QString nickname = item->text(COLUMN_NAME); // if (column == COLUMN_ICON) {
if (isParticipantMuted(nickname)) { // return;
unMuteParticipant(nickname); // }
} else { //
muteParticipant(nickname); // QString nickname = item->text(COLUMN_NAME);
} // if (isParticipantMuted(nickname)) {
// unMuteParticipant(nickname);
mutedParticipants->removeDuplicates(); // } else {
// muteParticipant(nickname);
updateParticipantsList(); // }
//
// mutedParticipants->removeDuplicates();
//
// updateParticipantsList();
} }
void ChatLobbyDialog::muteParticipant(const QString &nickname) { void ChatLobbyDialog::muteParticipant(const QString &nickname) {

10
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -387,15 +387,21 @@ bool ChatWidget::isActive()
return true; return true;
} }
void ChatWidget::pasteText(const QString& S)
{
//std::cerr << "In paste link" << std::endl;
ui->chatTextEdit->insertHtml(S);
}
void ChatWidget::pasteLink() void ChatWidget::pasteLink()
{ {
std::cerr << "In paste link" << std::endl; //std::cerr << "In paste link" << std::endl;
ui->chatTextEdit->insertHtml(RSLinkClipboard::toHtml()); ui->chatTextEdit->insertHtml(RSLinkClipboard::toHtml());
} }
void ChatWidget::pasteOwnCertificateLink() void ChatWidget::pasteOwnCertificateLink()
{ {
std::cerr << "In paste own certificate link" << std::endl; //std::cerr << "In paste own certificate link" << std::endl;
RetroShareLink link ; RetroShareLink link ;
std::string ownId = rsPeers->getOwnId() ; std::string ownId = rsPeers->getOwnId() ;

1
retroshare-gui/src/gui/chat/ChatWidget.h
View file

@ -78,6 +78,7 @@ public:
bool isActive(); bool isActive();
void setDefaultExtraFileFlags(TransferRequestFlags f) ; void setDefaultExtraFileFlags(TransferRequestFlags f) ;
void pasteText(const QString&);
private slots: private slots:
void clearChatHistory(); void clearChatHistory();