_filter(filter)
{
scene()->setSenderCutoffMode(ChatScene::CutoffLeft);
+ // The normal message prefixes get replaced by the network and buffer name. Re-add brackets for
+ // all message types.
+ scene()->setAlwaysBracketSender(true);
connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
}
_markerLineValid(false),
_markerLineJumpPending(false),
_cutoffMode(CutoffRight),
+ _alwaysBracketSender(false),
_selectingItem(0),
_selectionStart(-1),
_isSelecting(false),
}
if (_selectionMinCol <= ChatLineModel::SenderColumn) {
ChatItem *item = _lines[l]->item(ChatLineModel::SenderColumn);
- if (!_showSenderBrackets && item->chatLine()->msgType() == Message::Plain) {
- // Copying to plain-text. Only re-add the sender brackets if they're normally
- // hidden.
+ if (!_showSenderBrackets && (_alwaysBracketSender
+ || item->chatLine()->msgType() == Message::Plain)) {
+ // Copying to plain-text. Re-add the sender brackets if they're normally hidden
+ // for...
+ // * Plain messages
+ // * All messages in the Chat Monitor
+ //
+ // The Chat Monitor sets alwaysBracketSender() to true.
result += QString("<%1> ").arg(item->data(MessageModel::DisplayRole)
.toString());
} else {
inline CutoffMode senderCutoffMode() const { return _cutoffMode; }
inline void setSenderCutoffMode(CutoffMode mode) { _cutoffMode = mode; }
+ /**
+ * Gets whether to re-add hidden brackets around sender for all message types
+ *
+ * Used within the Chat Monitor as the normal message prefixes are overridden.
+ *
+ * @return Whether to re-add hidden brackets around sender for all message types
+ */
+ inline bool alwaysBracketSender() const { return _alwaysBracketSender; }
+ /**
+ * Sets whether to re-add hidden brackets around sender for all message types
+ *
+ * @see ChatScene::alwaysBracketSender()
+ *
+ * @param brackets Sets whether to re-add hidden brackets around sender for all message types
+ */
+ inline void setAlwaysBracketSender(bool alwaysBracket) { _alwaysBracketSender = alwaysBracket; }
+
QString selection() const;
bool hasSelection() const;
bool hasGlobalSelection() const;
qreal _firstColHandlePos, _secondColHandlePos;
int _defaultFirstColHandlePos, _defaultSecondColHandlePos;
CutoffMode _cutoffMode;
+ /// Whether to re-add hidden brackets around sender for all message types
+ bool _alwaysBracketSender;
ChatItem *_selectingItem;
int _selectionStartCol, _selectionMinCol;