Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1310 from PhenomRetroShare/Fix_DisableCMarkButton

Browse Source 
Disable CMark Button on ChatWidget if not defined.
This commit is contained in:
csoler 2018-08-03 18:32:59 +02:00 committed by GitHub
commit 4a961a8762
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -191,7 +191,9 @@ ChatWidget::ChatWidget(QWidget *parent)
fontmenu->addAction(ui->actionResetFont); fontmenu->addAction(ui->actionResetFont);
fontmenu->addAction(ui->actionNoEmbed); fontmenu->addAction(ui->actionNoEmbed);
fontmenu->addAction(ui->actionSendAsPlainText); fontmenu->addAction(ui->actionSendAsPlainText);
#ifdef USE_CMARK
fontmenu->addAction(ui->actionSend_as_CommonMark); fontmenu->addAction(ui->actionSend_as_CommonMark);
#endif
QMenu *menu = new QMenu(); QMenu *menu = new QMenu();
menu->addAction(ui->actionClearChatHistory); menu->addAction(ui->actionClearChatHistory);
@ -205,9 +207,11 @@ ChatWidget::ChatWidget(QWidget *parent)
ui->chatTextEdit->setOnlyPlainText(ui->actionSendAsPlainText->isChecked()); ui->chatTextEdit->setOnlyPlainText(ui->actionSendAsPlainText->isChecked());
connect(ui->actionSendAsPlainText, SIGNAL(toggled(bool)), ui->chatTextEdit, SLOT(setOnlyPlainText(bool)) ); connect(ui->actionSendAsPlainText, SIGNAL(toggled(bool)), ui->chatTextEdit, SLOT(setOnlyPlainText(bool)) );
#ifdef USE_CMARK
connect(ui->actionSend_as_CommonMark, SIGNAL(toggled(bool)), this, SLOT(setUseCMark(bool)) ); connect(ui->actionSend_as_CommonMark, SIGNAL(toggled(bool)), this, SLOT(setUseCMark(bool)) );
ui->cmPreview->setVisible(false);
connect(ui->chatTextEdit, SIGNAL(textChanged()), this, SLOT(updateCMPreview()) ); connect(ui->chatTextEdit, SIGNAL(textChanged()), this, SLOT(updateCMPreview()) );
#endif
ui->cmPreview->setVisible(false);
ui->textBrowser->resetImagesStatus(Settings->getChatLoadEmbeddedImages()); ui->textBrowser->resetImagesStatus(Settings->getChatLoadEmbeddedImages());
ui->textBrowser->installEventFilter(this); ui->textBrowser->installEventFilter(this);
@ -983,10 +987,12 @@ void ChatWidget::addChatMsg(bool incoming, const QString &name, const RsGxsId gx
formatTextFlag |= RSHTML_FORMATTEXT_EMBED_SMILEYS; formatTextFlag |= RSHTML_FORMATTEXT_EMBED_SMILEYS;
} }
#ifdef USE_CMARK
//Use CommonMark //Use CommonMark
if (message.contains("CMark=\"true\"")) { if (message.contains("CMark=\"true\"")) {
formatTextFlag |= RSHTML_FORMATTEXT_USE_CMARK; formatTextFlag |= RSHTML_FORMATTEXT_USE_CMARK;
} }
#endif
// Always fix colors // Always fix colors
formatTextFlag |= RSHTML_FORMATTEXT_FIX_COLORS; formatTextFlag |= RSHTML_FORMATTEXT_FIX_COLORS;