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

- changed sound button tooltip

Browse source 
- added auto subscribe status to lobby tooltip
- removed wrong info from forums help

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8191 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-04-30 07:06:16 +00:00
parent b654d7b21d
commit d6e708fdd5
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View file

@ -333,7 +333,10 @@ static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobby
for (int column = 0; column < COLUMN_COUNT; ++column) {
item->setTextColor(column, color);
}
item->setToolTip(0,QObject::tr("Subject: ")+item->text(COLUMN_TOPIC)+"\n"+QObject::tr("Participants: ")+QString::number(count)+"\n"+QObject::tr("Id: ")+QString::number(id,16)) ;
item->setToolTip(0,QObject::tr("Subject: ")+item->text(COLUMN_TOPIC)+"\n"
+QObject::tr("Participants: ")+QString::number(count)+"\n"
+QObject::tr("Auto Subscribe: ")+(autoSubscribe? QObject::tr("enabled"): QObject::tr("disabled"))+"\n"
+QObject::tr("Id: ")+QString::number(id,16)) ;
}
void ChatLobbyWidget::addChatPage(ChatLobbyDialog *d)

5
retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
View file

@ -54,10 +54,15 @@ QString GxsForumsDialog::getHelpString() const
<p>Retroshare Forums look like internet forums, but they work in a decentralized way</p> \
<p>You see forums your friends are subscribed to, and you forward subscribed forums to \
your friends. This automatically promotes interesting forums in the network.</p> \
");
// not true anymore in v0.6
/*
<p>Forums are either Authenticated (<img src=\":/images/konv_message2.png\" width=\"12\"/>) \
or anonymous (<img src=\":/images/konversation.png\" width=\"12\"/>). The former \
class is more resistant to spamming because posts are \
cryptographically signed using a Retroshare pseudo-identity.</p>") ;
*/
return hlp_str ;
}

2
retroshare-gui/src/gui/statusbar/SoundStatus.cpp
View file

@ -56,5 +56,5 @@ SoundStatus::SoundStatus(QWidget *parent)
void SoundStatus::mute(bool isMute)
{
imageButton->setIcon(QIcon(isMute ? IMAGE_MUTE_ON : IMAGE_MUTE_OFF));
imageButton->setToolTip(isMute ? tr("Sound on") : tr("Sound off"));
imageButton->setToolTip(isMute ? tr("Sound is off, click to turn it on") : tr("Sound is on, click to turn it off"));
}