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

- moved the chat setting to the section [Chat]

Browse source 
- cleaned some comments of the settings classes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2940 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-05-18 18:02:51 +00:00
parent 3e968b68c3
commit a8c4b3b107
7 changed files with 23 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,24 +51,6 @@
#include <time.h>
#include <sys/stat.h>
#include <QTextCodec>
#include <QTextEdit>
#include <QTextCursor>
#include <QTextList>
#include <QTextStream>
#include <QTextDocumentFragment>
#include <QContextMenuEvent>
#include <QMenu>
#include <QCursor>
#include <QPoint>
#include <QPixmap>
#include <QMessageBox>
#include <QHeaderView>
#include <QtGui/QKeyEvent>
#include <QHashIterator>
#include <QDesktopServices>
#include <QSound>
/* Images for context menu icons */
@ -167,17 +149,16 @@ PeersDialog::PeersDialog(QWidget *parent)
pxm.fill(_currentColor);
ui.colorChatButton->setIcon(pxm);
RshareSettings settings;
RSettings settings(QString("Chat"));
mCurrentFont.fromString(settings.value(QString::fromUtf8("ChatScreenFont")).toString());
ui.lineEdit->setFont(mCurrentFont);
setChatInfo(tr("Welcome to RetroShare's group chat."),
QString::fromUtf8("blue"));
QStringList him;
setChatInfo(tr("Welcome to RetroShare's group chat."), QString::fromUtf8("blue"));
if (settings.value(QString::fromUtf8("GroupChat_History"), true).toBool())
{
QStringList him;
historyKeeper.getMessages(him, "", "THIS", 8);
foreach(QString mess, him)
ui.msgText->append(mess);
@ -1034,8 +1015,10 @@ void PeersDialog::insertChat()
RsChat::embedHtml(doc, body, defEmbedAhref);
// embed smileys
settings.beginGroup("Chat");
if (settings.value(QString::fromUtf8("Emoteicons_GroupChat"), true).toBool())
RsChat::embedHtml(doc, body, defEmbedImg);
settings.endGroup();
msgContents = doc.toString(-1); // -1 removes any annoying carriage return misinterpreted by QTextEdit
extraTxt += msgContents;
@ -1305,7 +1288,9 @@ void PeersDialog::setFont()
ui.lineEdit->setFont(mCurrentFont);
ui.lineEdit->setTextColor(_currentColor);
RshareSettings settings;
settings.beginGroup("Chat");
settings.setValue(QString::fromUtf8("ChatScreenFont"), mCurrentFont.toString());
settings.endGroup();
ui.lineEdit->setFocus();