mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-13 11:32:48 -04:00
Added action to GroupChats Button Menu for disable/enable Emoticon's, not yet stored
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2371 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e3f2afd031
commit
459c364636
6 changed files with 38 additions and 8 deletions
|
@ -173,6 +173,7 @@ PeersDialog::PeersDialog(QWidget *parent)
|
|||
|
||||
QMenu * grpchatmenu = new QMenu();
|
||||
grpchatmenu->addAction(ui.actionClearChat);
|
||||
grpchatmenu->addAction(ui.actionDisable_Emoticons);
|
||||
ui.menuButton->setMenu(grpchatmenu);
|
||||
|
||||
_underline = false;
|
||||
|
@ -967,6 +968,8 @@ void PeersDialog::insertChat()
|
|||
count ++;
|
||||
}
|
||||
|
||||
if(!ui.actionDisable_Emoticons->isChecked())
|
||||
{
|
||||
QHashIterator<QString, QString> i(smileys);
|
||||
while(i.hasNext())
|
||||
{
|
||||
|
@ -974,6 +977,7 @@ void PeersDialog::insertChat()
|
|||
foreach(QString code, i.key().split("|"))
|
||||
extraTxt.replace(code, "<img src=\"" + i.value() + "\" />");
|
||||
}
|
||||
}
|
||||
|
||||
if ((msgWidget->verticalScrollBar()->maximum() - 30) < msgWidget->verticalScrollBar()->value() ) {
|
||||
msgWidget->append(extraTxt);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue