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

Add buttons to send message in plain text and without EmoteIcon.

Browse source
This commit is contained in:
Phenom 2016-01-27 20:27:44 +01:00
parent 56e079739c
commit ddbcd2150c
15 changed files with 221 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

15
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -99,6 +99,10 @@ ChatWidget::ChatWidget(QWidget *parent) :
ui->addFileButton->setIconSize(iconSize);
ui->pushtoolsButton->setFixedSize(buttonSize);
ui->pushtoolsButton->setIconSize(iconSize);
ui->sendAsPlainTextButton->setFixedSize(buttonSize);
ui->sendAsPlainTextButton->setIconSize(iconSize);
ui->noEmbedButton->setFixedSize(buttonSize);
ui->noEmbedButton->setIconSize(iconSize);
ui->notifyButton->setFixedSize(buttonSize);
ui->notifyButton->setIconSize(iconSize);
ui->markButton->setFixedSize(buttonSize);
@ -191,6 +195,7 @@ ChatWidget::ChatWidget(QWidget *parent) :
menu->addAction(ui->actionSaveChatHistory);
menu->addAction(ui->actionMessageHistory);
ui->pushtoolsButton->setMenu(menu);
ui->sendAsPlainTextButton->setChecked(Settings->getChatSendAsPlainTextByDef());
ui->textBrowser->installEventFilter(this);
ui->textBrowser->viewport()->installEventFilter(this);
@ -899,7 +904,8 @@ void ChatWidget::addChatMsg(bool incoming, const QString &name, const RsGxsId gx
// embed smileys ?
if (Settings->valueFromGroup(QString("Chat"), QString::fromUtf8("Emoteicons_PrivatChat"), true).toBool()) {
formatTextFlag |= RSHTML_FORMATTEXT_EMBED_SMILEYS;
if (!message.contains("NoEmbed=\"true\""))
formatTextFlag |= RSHTML_FORMATTEXT_EMBED_SMILEYS;
}
// Always fix colors
@ -1134,7 +1140,12 @@ void ChatWidget::sendChat()
}
QString text;
RsHtml::optimizeHtml(chatWidget, text);
if (ui->sendAsPlainTextButton->isChecked()){
text = chatWidget->toPlainText();
text.replace(QChar(-4),"");//Char used when image on text.
} else {
RsHtml::optimizeHtml(chatWidget, text, (ui->noEmbedButton->isChecked() ? RSHTML_FORMATTEXT_NO_EMBED : 0));
}
std::string msg = text.toUtf8().constData();
if (msg.empty()) {