Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-13 11:32:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Chat Settings

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-05-03 21:17:36 +00:00
parent 73a64c9269
commit 8feeb2adb3
12 changed files with 774 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -174,16 +174,20 @@ PeersDialog::PeersDialog(QWidget *parent)
QString::fromUtf8("blue"));
QStringList him;
historyKeeper.getMessages(him, "", "THIS", 8);
foreach(QString mess, him)
ui.msgText->append(mess);
//setChatInfo(mess, "green");
if (_settings->value(QString::fromUtf8("GroupChat_History"), true).toBool())
{
historyKeeper.getMessages(him, "", "THIS", 8);
foreach(QString mess, him)
ui.msgText->append(mess);
}
//setChatInfo(mess, "green");
QMenu * grpchatmenu = new QMenu();
grpchatmenu->addAction(ui.actionClearChat);
grpchatmenu->addAction(ui.actionSave_History);
grpchatmenu->addAction(ui.actionDisable_Emoticons);
//grpchatmenu->addAction(ui.actionDisable_Emoticons);
ui.menuButton->setMenu(grpchatmenu);
_underline = false;
@ -1007,8 +1011,8 @@ void PeersDialog::insertChat()
count ++;
}
if(!ui.actionDisable_Emoticons->isChecked())
{
if (_settings->value(QString::fromUtf8("Emoteicons_GroupChat"), true).toBool())
{
QHashIterator<QString, QString> i(smileys);
while(i.hasNext())
{
@ -1018,6 +1022,7 @@ void PeersDialog::insertChat()
}
}
if ((msgWidget->verticalScrollBar()->maximum() - 30) < msgWidget->verticalScrollBar()->value() ) {
msgWidget->append(extraTxt);
} else {