_showWebPreview = defaultSettings.showWebPreview();
defaultSettings.notify("ShowWebPreview", this, SLOT(showWebPreviewChanged()));
+ _showSenderBrackets = defaultSettings.showSenderBrackets();
+ defaultSettings.notify("ShowSenderBrackets", this, SLOT(showSenderBracketsChanged()));
+
+ _useCustomTimestampFormat = defaultSettings.useCustomTimestampFormat();
+ defaultSettings.notify("UseCustomTimestampFormat", this, SLOT(useCustomTimestampFormatChanged()));
+
+ _timestampFormatString = defaultSettings.timestampFormatString();
+ defaultSettings.notify("TimestampFormat", this, SLOT(timestampFormatStringChanged()));
+ updateTimestampHasBrackets();
+
_clickTimer.setInterval(QApplication::doubleClickInterval());
_clickTimer.setSingleShot(true);
connect(&_clickTimer, SIGNAL(timeout()), SLOT(clickTimeout()));
return QString();
}
QString result;
+
for (int l = start; l <= end; l++) {
- if (_selectionMinCol == ChatLineModel::TimestampColumn)
- result += _lines[l]->item(ChatLineModel::TimestampColumn)->data(MessageModel::DisplayRole).toString() + " ";
- if (_selectionMinCol <= ChatLineModel::SenderColumn)
- result += _lines[l]->item(ChatLineModel::SenderColumn)->data(MessageModel::DisplayRole).toString() + " ";
- result += _lines[l]->item(ChatLineModel::ContentsColumn)->data(MessageModel::DisplayRole).toString() + "\n";
+ if (_selectionMinCol == ChatLineModel::TimestampColumn) {
+ ChatItem *item = _lines[l]->item(ChatLineModel::TimestampColumn);
+ if (!_showSenderBrackets && !_timestampHasBrackets) {
+ // Only re-add brackets if the current timestamp format does not include them
+ // -and- sender brackets are disabled. Don't filter on Message::Plain as
+ // timestamp brackets affect all types of messages.
+ // Remove any spaces before and after, otherwise it may look weird.
+ result += QString("[%1] ").arg(item->data(MessageModel::DisplayRole)
+ .toString().trimmed());
+ } else {
+ result += item->data(MessageModel::DisplayRole).toString() + " ";
+ }
+ }
+ 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.
+ result += QString("<%1> ").arg(item->data(MessageModel::DisplayRole)
+ .toString());
+ } else {
+ result += item->data(MessageModel::DisplayRole).toString() + " ";
+ }
+ }
+ result += _lines[l]->item(ChatLineModel::ContentsColumn)
+ ->data(MessageModel::DisplayRole).toString() + "\n";
}
return result;
}
// end of webkit only
// ========================================
+// Local configuration caching
void ChatScene::showWebPreviewChanged()
{
ChatViewSettings settings;
_showWebPreview = settings.showWebPreview();
}
+
+void ChatScene::showSenderBracketsChanged()
+{
+ ChatViewSettings settings;
+ _showSenderBrackets = settings.showSenderBrackets();
+}
+
+void ChatScene::useCustomTimestampFormatChanged()
+{
+ ChatViewSettings settings;
+ _useCustomTimestampFormat = settings.useCustomTimestampFormat();
+ updateTimestampHasBrackets();
+}
+
+void ChatScene::timestampFormatStringChanged()
+{
+ ChatViewSettings settings;
+ _timestampFormatString = settings.timestampFormatString();
+ updateTimestampHasBrackets();
+}
+
+void ChatScene::updateTimestampHasBrackets()
+{
+ // Calculate these parameters only as needed, rather than on-demand
+
+ if (!_useCustomTimestampFormat) {
+ // The default timestamp format string does not have brackets, no need to check.
+ // If UiStyle::updateSystemTimestampFormat() has brackets added, change this, too.
+ _timestampHasBrackets = false;
+ } else {
+ // Does the timestamp format contain brackets? For example:
+ // Classic: "[hh:mm:ss]"
+ // Modern: " hh:mm:ss"
+ //
+ // Match groups of any opening or closing brackets - (), {}, [], <>, (>, {], etc:
+ // ^\s*[({[<].+[)}\]>]\s*$
+ // [...] is a character group containing ...
+ // ^ matches start of string
+ // \s* matches any amount of whitespace
+ // [({[<] matches (, {, [, or <
+ // .+ matches one or more characters
+ // [)}\]>] matches ), }, ], or >, escaping the ]
+ // $ matches end of string
+ // Alternatively, if opening and closing brackets must be in pairs, use this:
+ // (^\s*\(.+\)\s*$)|(^\s*\{.+\}\s*$)|(^\s*\[.+\]\s*$)|(^\s*<.+>\s*$)
+ // Note that '\' must be escaped as '\\'
+ // Helpful interactive website for debugging and explaining: https://regex101.com/
+ const QRegExp regExpMatchBrackets("^\\s*[({[<].+[)}\\]>]\\s*$");
+ _timestampHasBrackets = regExpMatchBrackets.exactMatch(_timestampFormatString);
+ }
+}