Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 18:56:23 -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

8
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View file

@ -24,6 +24,7 @@
#include "PopupChatDialog.h"
#include <gui/RetroShareLink.h>
#include "rshare.h"
#include <QTextCodec>
#include <QTextEdit>
@ -66,6 +67,9 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
/* Create RshareSettings object */
_settings = new RshareSettings();
RshareSettings config;
config.loadWidgetInformation(this);
@ -135,7 +139,7 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
QMenu * toolmenu = new QMenu();
toolmenu->addAction(ui.actionClear_Chat);
toolmenu->addAction(ui.actionSave_Chat_History);
toolmenu->addAction(ui.action_Disable_Emoticons);
//toolmenu->addAction(ui.action_Disable_Emoticons);
ui.pushtoolsButton->setMenu(toolmenu);
@ -303,7 +307,7 @@ void PopupChatDialog::addChatMsg(ChatInfo *ci)
std::cout << "PopupChatDialog:addChatMsg message : " << message.toStdString() << std::endl;
#endif
if(!ui.action_Disable_Emoticons->isChecked())
if (_settings->value(QString::fromUtf8("Emoteicons_PrivatChat"), true).toBool())
{
QHashIterator<QString, QString> i(smileys);
while(i.hasNext())