/***************************************************************************
- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "util.h"
QHash<QString, UiStyle::FormatType> UiStyle::_formatCodes;
-QString UiStyle::_timestampFormatString;
+QString UiStyle::_timestampFormatString; /// Timestamp format
+bool UiStyle::_showSenderBrackets; /// If true, show brackets around sender names
UiStyle::UiStyle(QObject *parent)
: QObject(parent),
_formatCodes["%DM"] = ModeFlags;
_formatCodes["%DU"] = Url;
- setTimestampFormatString("[hh:mm:ss]");
+ // Initialize fallback defaults
+ // NOTE: If you change this, update qtui/chatviewsettings.h, too. More explanations available
+ // in there.
+ setTimestampFormatString(" hh:mm:ss");
+ enableSenderBrackets(true);
// BufferView / NickView settings
UiStyleSettings s;
return ss;
}
-
+// FIXME The following should trigger a reload/refresh of the chat view.
void UiStyle::setTimestampFormatString(const QString &format)
{
if (_timestampFormatString != format) {
_timestampFormatString = format;
- // FIXME reload
+ }
+}
+
+void UiStyle::enableSenderBrackets(bool enabled)
+{
+ if (_showSenderBrackets != enabled) {
+ _showSenderBrackets = enabled;
}
}
UiStyle::StyledMessage::StyledMessage(const Message &msg)
: Message(msg)
{
- if (type() == Message::Plain)
+ if (type() == Message::Plain || type() == Message::Action)
_senderHash = 0xff;
else
- _senderHash = 0x00; // this means we never compute the hash for msgs that aren't plain
+ _senderHash = 0x00;
+ // This means we never compute the hash for msgs that aren't Plain or Action
}
{
switch (type()) {
case Message::Plain:
- return QString("<%1>").arg(plainSender()); break;
+ if (_showSenderBrackets)
+ return QString("<%1>").arg(plainSender());
+ else
+ return QString("%1").arg(plainSender());
+ break;
case Message::Notice:
return QString("[%1]").arg(plainSender()); break;
case Message::Action: