/***************************************************************************
- * Copyright (C) 2005-2013 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 *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include <vector>
+
#include <QApplication>
+#include <QIcon>
#include "buffersettings.h"
-#include "iconloader.h"
#include "qssparser.h"
#include "quassel.h"
#include "uistyle.h"
#include "util.h"
QHash<QString, UiStyle::FormatType> UiStyle::_formatCodes;
-QString UiStyle::_timestampFormatString;
+bool UiStyle::_useCustomTimestampFormat; /// If true, use the custom timestamp format
+QString UiStyle::_timestampFormatString; /// Timestamp format
+QString UiStyle::_systemTimestampFormatString; /// Cached copy of system locale timestamp format
+bool UiStyle::_showSenderPrefixes; /// If true, show prefixmodes before sender names
+bool UiStyle::_showSenderBrackets; /// If true, show brackets around sender names
UiStyle::UiStyle(QObject *parent)
: QObject(parent),
- _channelJoinedIcon(SmallIcon("irc-channel-active")),
- _channelPartedIcon(SmallIcon("irc-channel-inactive")),
- _userOfflineIcon(SmallIcon("im-user-offline")),
- _userOnlineIcon(SmallIcon("im-user")),
- _userAwayIcon(SmallIcon("im-user-away")),
- _categoryOpIcon(SmallIcon("irc-operator")),
- _categoryVoiceIcon(SmallIcon("irc-voice")),
+ _channelJoinedIcon(QIcon::fromTheme("irc-channel-joined", QIcon(":/icons/irc-channel-joined.png"))),
+ _channelPartedIcon(QIcon::fromTheme("irc-channel-parted", QIcon(":/icons/irc-channel-parted.png"))),
+ _userOfflineIcon(QIcon::fromTheme("im-user-offline", QIcon::fromTheme("user-offline", QIcon(":/icons/im-user-offline.png")))),
+ _userOnlineIcon(QIcon::fromTheme("im-user", QIcon::fromTheme("user-available", QIcon(":/icons/im-user.png")))), // im-user-* are non-standard oxygen extensions
+ _userAwayIcon(QIcon::fromTheme("im-user-away", QIcon::fromTheme("user-away", QIcon(":/icons/im-user-away.png")))),
+ _categoryOpIcon(QIcon::fromTheme("irc-operator")),
+ _categoryVoiceIcon(QIcon::fromTheme("irc-voice")),
_opIconLimit(UserCategoryItem::categoryFromModes("o")),
_voiceIconLimit(UserCategoryItem::categoryFromModes("v"))
{
Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid);
}
- _uiStylePalette = QVector<QBrush>(NumRoles, QBrush());
+ _uiStylePalette = QVector<QBrush>(static_cast<int>(ColorRole::NumRoles), QBrush());
// Now initialize the mapping between FormatCodes and FormatTypes...
- _formatCodes["%O"] = Base;
- _formatCodes["%B"] = Bold;
- _formatCodes["%S"] = Italic;
- _formatCodes["%U"] = Underline;
- _formatCodes["%R"] = Reverse;
-
- _formatCodes["%DN"] = Nick;
- _formatCodes["%DH"] = Hostmask;
- _formatCodes["%DC"] = ChannelName;
- _formatCodes["%DM"] = ModeFlags;
- _formatCodes["%DU"] = Url;
-
- setTimestampFormatString("[hh:mm:ss]");
+ _formatCodes["%O"] = FormatType::Base;
+ _formatCodes["%B"] = FormatType::Bold;
+ _formatCodes["%S"] = FormatType::Italic;
+ _formatCodes["%U"] = FormatType::Underline;
+ _formatCodes["%R"] = FormatType::Reverse;
+
+ _formatCodes["%DN"] = FormatType::Nick;
+ _formatCodes["%DH"] = FormatType::Hostmask;
+ _formatCodes["%DC"] = FormatType::ChannelName;
+ _formatCodes["%DM"] = FormatType::ModeFlags;
+ _formatCodes["%DU"] = FormatType::Url;
+
+ // Initialize fallback defaults
+ // NOTE: If you change this, update qtui/chatviewsettings.h, too. More explanations available
+ // in there.
+ setUseCustomTimestampFormat(false);
+ setTimestampFormatString(" hh:mm:ss");
+ enableSenderPrefixes(false);
+ enableSenderBrackets(true);
// BufferView / NickView settings
UiStyleSettings s;
QString styleSheet;
styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("stylesheets/default.qss"));
styleSheet += loadStyleSheet("file:///" + Quassel::configDirPath() + "settings.qss");
- if (s.value("UseCustomStyleSheet", false).toBool())
- styleSheet += loadStyleSheet("file:///" + s.value("CustomStyleSheetPath").toString(), true);
+ if (s.value("UseCustomStyleSheet", false).toBool()) {
+ QString customSheetPath(s.value("CustomStyleSheetPath").toString());
+ QString customSheet = loadStyleSheet("file:///" + customSheetPath, true);
+ if (customSheet.isEmpty()) {
+ // MIGRATION: changed default install path for data from /usr/share/apps to /usr/share
+ if (customSheetPath.startsWith("/usr/share/apps/quassel")) {
+ customSheetPath.replace(QRegExp("^/usr/share/apps"), "/usr/share");
+ customSheet = loadStyleSheet("file:///" + customSheetPath, true);
+ if (!customSheet.isEmpty()) {
+ s.setValue("CustomStyleSheetPath", customSheetPath);
+ qDebug() << "Custom stylesheet path migrated to" << customSheetPath;
+ }
+ }
+ }
+ styleSheet += customSheet;
+ }
styleSheet += loadStyleSheet("file:///" + Quassel::optionValue("qss"), true);
if (!styleSheet.isEmpty()) {
}
+void UiStyle::updateSystemTimestampFormat()
+{
+ // Does the system locale use AM/PM designators? For example:
+ // AM/PM: h:mm AP
+ // AM/PM: hh:mm a
+ // 24-hour: h:mm
+ // 24-hour: hh:mm ADD things
+ // For timestamp format, see https://doc.qt.io/qt-5/qdatetime.html#toString
+ // This won't update if the system locale is changed while Quassel is running. If need be,
+ // Quassel could hook into notifications of changing system locale to update this.
+ //
+ // Match any AP or A designation if on a word boundary, including underscores.
+ // .*(\b|_)(A|AP)(\b|_).*
+ // .* Match any number of characters
+ // \b Match a word boundary, i.e. "AAA.BBB", "." is matched
+ // _ Match the literal character '_' (not considered a word boundary)
+ // (X|Y) Match either X or Y, exactly
+ //
+ // Note that '\' must be escaped as '\\'
+ // QRegExp does not support (?> ...), so it's replaced with standard matching, (...)
+ // Helpful interactive website for debugging and explaining: https://regex101.com/
+ const QRegExp regExpMatchAMPM(".*(\\b|_)(A|AP)(\\b|_).*", Qt::CaseInsensitive);
+
+ if (regExpMatchAMPM.exactMatch(QLocale::system().timeFormat(QLocale::ShortFormat))) {
+ // AM/PM style used
+ _systemTimestampFormatString = " h:mm:ss ap";
+ } else {
+ // 24-hour style used
+ _systemTimestampFormatString = " hh:mm:ss";
+ }
+ // Include a space to give the timestamp a small bit of padding between the border of the chat
+ // buffer window and the numbers. Helps with readability.
+ // If you change this to include brackets, e.g. "[hh:mm:ss]", also update
+ // ChatScene::updateTimestampHasBrackets() to true or false as needed!
+}
+
+
+// FIXME The following should trigger a reload/refresh of the chat view.
+void UiStyle::setUseCustomTimestampFormat(bool enabled)
+{
+ if (_useCustomTimestampFormat != enabled) {
+ _useCustomTimestampFormat = enabled;
+ }
+}
+
void UiStyle::setTimestampFormatString(const QString &format)
{
if (_timestampFormatString != format) {
_timestampFormatString = format;
- // FIXME reload
+ }
+}
+
+void UiStyle::enableSenderPrefixes(bool enabled)
+{
+ if (_showSenderPrefixes != enabled) {
+ _showSenderPrefixes = enabled;
+ }
+}
+
+void UiStyle::enableSenderBrackets(bool enabled)
+{
+ if (_showSenderBrackets != enabled) {
+ _showSenderBrackets = enabled;
}
}
}
}
- quint32 fmtType = BufferViewItem;
+ ItemFormatType fmtType = ItemFormatType::BufferViewItem;
switch (type) {
case BufferInfo::StatusBuffer:
- fmtType |= NetworkItem;
+ fmtType |= ItemFormatType::NetworkItem;
break;
case BufferInfo::ChannelBuffer:
- fmtType |= ChannelBufferItem;
+ fmtType |= ItemFormatType::ChannelBufferItem;
break;
case BufferInfo::QueryBuffer:
- fmtType |= QueryBufferItem;
+ fmtType |= ItemFormatType::QueryBufferItem;
break;
default:
return QVariant();
}
- QTextCharFormat fmt = _listItemFormats.value(BufferViewItem);
+ QTextCharFormat fmt = _listItemFormats.value(ItemFormatType::BufferViewItem);
fmt.merge(_listItemFormats.value(fmtType));
BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
if (activity & BufferInfo::Highlight) {
- fmt.merge(_listItemFormats.value(BufferViewItem | HighlightedBuffer));
- fmt.merge(_listItemFormats.value(fmtType | HighlightedBuffer));
+ fmt.merge(_listItemFormats.value(ItemFormatType::BufferViewItem | ItemFormatType::HighlightedBuffer));
+ fmt.merge(_listItemFormats.value(fmtType | ItemFormatType::HighlightedBuffer));
}
else if (activity & BufferInfo::NewMessage) {
- fmt.merge(_listItemFormats.value(BufferViewItem | UnreadBuffer));
- fmt.merge(_listItemFormats.value(fmtType | UnreadBuffer));
+ fmt.merge(_listItemFormats.value(ItemFormatType::BufferViewItem | ItemFormatType::UnreadBuffer));
+ fmt.merge(_listItemFormats.value(fmtType | ItemFormatType::UnreadBuffer));
}
else if (activity & BufferInfo::OtherActivity) {
- fmt.merge(_listItemFormats.value(BufferViewItem | ActiveBuffer));
- fmt.merge(_listItemFormats.value(fmtType | ActiveBuffer));
+ fmt.merge(_listItemFormats.value(ItemFormatType::BufferViewItem | ItemFormatType::ActiveBuffer));
+ fmt.merge(_listItemFormats.value(fmtType | ItemFormatType::ActiveBuffer));
}
else if (!isActive) {
- fmt.merge(_listItemFormats.value(BufferViewItem | InactiveBuffer));
- fmt.merge(_listItemFormats.value(fmtType | InactiveBuffer));
+ fmt.merge(_listItemFormats.value(ItemFormatType::BufferViewItem | ItemFormatType::InactiveBuffer));
+ fmt.merge(_listItemFormats.value(fmtType | ItemFormatType::InactiveBuffer));
}
else if (index.data(NetworkModel::UserAwayRole).toBool()) {
- fmt.merge(_listItemFormats.value(BufferViewItem | UserAway));
- fmt.merge(_listItemFormats.value(fmtType | UserAway));
+ fmt.merge(_listItemFormats.value(ItemFormatType::BufferViewItem | ItemFormatType::UserAway));
+ fmt.merge(_listItemFormats.value(fmtType | ItemFormatType::UserAway));
}
return itemData(role, fmt);
}
}
- QTextCharFormat fmt = _listItemFormats.value(NickViewItem);
+ QTextCharFormat fmt = _listItemFormats.value(ItemFormatType::NickViewItem);
switch (type) {
case NetworkModel::IrcUserItemType:
- fmt.merge(_listItemFormats.value(NickViewItem | IrcUserItem));
+ fmt.merge(_listItemFormats.value(ItemFormatType::NickViewItem | ItemFormatType::IrcUserItem));
if (!index.data(NetworkModel::ItemActiveRole).toBool()) {
- fmt.merge(_listItemFormats.value(NickViewItem | UserAway));
- fmt.merge(_listItemFormats.value(NickViewItem | IrcUserItem | UserAway));
+ fmt.merge(_listItemFormats.value(ItemFormatType::NickViewItem | ItemFormatType::UserAway));
+ fmt.merge(_listItemFormats.value(ItemFormatType::NickViewItem | ItemFormatType::IrcUserItem | ItemFormatType::UserAway));
}
break;
case NetworkModel::UserCategoryItemType:
- fmt.merge(_listItemFormats.value(NickViewItem | UserCategoryItem));
+ fmt.merge(_listItemFormats.value(ItemFormatType::NickViewItem | ItemFormatType::UserCategoryItem));
break;
default:
return QVariant();
}
-QTextCharFormat UiStyle::cachedFormat(quint32 formatType, quint32 messageLabel) const
+QTextCharFormat UiStyle::cachedFormat(FormatType formatType, MessageLabel messageLabel) const
{
- return _formatCache.value(formatType | ((quint64)messageLabel << 32), QTextCharFormat());
+ return _formatCache.value(formatType | messageLabel, QTextCharFormat());
}
-void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) const
+void UiStyle::setCachedFormat(const QTextCharFormat &format, FormatType formatType, MessageLabel messageLabel) const
{
- _formatCache[formatType | ((quint64)messageLabel << 32)] = format;
+ _formatCache[formatType | messageLabel] = format;
}
-QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) const
+QFontMetricsF *UiStyle::fontMetrics(FormatType ftype, MessageLabel label) const
{
// QFontMetricsF is not assignable, so we need to store pointers :/
- quint64 key = ftype | ((quint64)label << 32);
+ quint64 key = ftype | label;
if (_metricsCache.contains(key))
return _metricsCache.value(key);
// NOTE: This and the following functions are intimately tied to the values in FormatType. Don't change this
// until you _really_ know what you do!
-QTextCharFormat UiStyle::format(quint32 ftype, quint32 label_) const
+QTextCharFormat UiStyle::format(FormatType ftype, MessageLabel label) const
{
- if (ftype == Invalid)
- return QTextCharFormat();
-
- quint64 label = (quint64)label_ << 32;
+ if (ftype == FormatType::Invalid)
+ return {};
// check if we have exactly this format readily cached already
- QTextCharFormat fmt = cachedFormat(ftype, label_);
+ QTextCharFormat fmt = cachedFormat(ftype, label);
if (fmt.properties().count())
return fmt;
- mergeFormat(fmt, ftype, label & Q_UINT64_C(0xffff000000000000));
+ mergeFormat(fmt, ftype, label & 0xffff0000); // keep nickhash in label
- for (quint64 mask = Q_UINT64_C(0x0000000100000000); mask <= (quint64)Selected << 32; mask <<= 1) {
- if (label & mask)
- mergeFormat(fmt, ftype, mask | Q_UINT64_C(0xffff000000000000));
+ for (quint32 mask = 0x00000001; mask <= static_cast<quint32>(MessageLabel::Selected); mask <<= 1) {
+ if (static_cast<quint32>(label) & mask)
+ mergeFormat(fmt, ftype, label & (mask | 0xffff0000));
}
- setCachedFormat(fmt, ftype, label_);
+ setCachedFormat(fmt, ftype, label);
return fmt;
}
-void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) const
+void UiStyle::mergeFormat(QTextCharFormat &fmt, FormatType ftype, MessageLabel label) const
{
mergeSubElementFormat(fmt, ftype & 0x00ff, label);
// TODO: allow combinations for mirc formats and colors (each), e.g. setting a special format for "bold and italic"
// or "foreground 01 and background 03"
- if ((ftype & 0xfff00)) { // element format
+ if ((ftype & 0xfff00) != FormatType::Base) { // element format
for (quint32 mask = 0x00100; mask <= 0x40000; mask <<= 1) {
- if (ftype & mask) {
+ if ((ftype & mask) != FormatType::Base) {
mergeSubElementFormat(fmt, ftype & (mask | 0xff), label);
}
}
// Now we handle color codes
// We assume that those can't be combined with subelement and message types.
if (_allowMircColors) {
- if (ftype & 0x00400000)
+ if ((ftype & 0x00400000) != FormatType::Base)
mergeSubElementFormat(fmt, ftype & 0x0f400000, label); // foreground
- if (ftype & 0x00800000)
+ if ((ftype & 0x00800000) != FormatType::Base)
mergeSubElementFormat(fmt, ftype & 0xf0800000, label); // background
- if ((ftype & 0x00c00000) == 0x00c00000)
+ if ((ftype & 0x00c00000) == static_cast<FormatType>(0x00c00000))
mergeSubElementFormat(fmt, ftype & 0xffc00000, label); // combination
}
// URL
- if (ftype & Url)
- mergeSubElementFormat(fmt, ftype & (Url | 0x000000ff), label);
+ if ((ftype & FormatType::Url) != FormatType::Base)
+ mergeSubElementFormat(fmt, ftype & (FormatType::Url | static_cast<FormatType>(0x000000ff)), label);
}
// Merge a subelement format into an existing message format
-void UiStyle::mergeSubElementFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) const
+void UiStyle::mergeSubElementFormat(QTextCharFormat &fmt, FormatType ftype, MessageLabel label) const
{
quint64 key = ftype | label;
- fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffff00))); // label + subelement
- fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype
- fmt.merge(format(key & Q_UINT64_C(0xffffffffffffff00))); // label + subelement + nickhash
- fmt.merge(format(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype
+ fmt.merge(format(key & 0x0000ffffffffff00ull)); // label + subelement
+ fmt.merge(format(key & 0x0000ffffffffffffull)); // label + subelement + msgtype
+ fmt.merge(format(key & 0xffffffffffffff00ull)); // label + subelement + nickhash
+ fmt.merge(format(key & 0xffffffffffffffffull)); // label + subelement + nickhash + msgtype
}
{
switch (msgType) {
case Message::Plain:
- return PlainMsg;
+ return FormatType::PlainMsg;
case Message::Notice:
- return NoticeMsg;
+ return FormatType::NoticeMsg;
case Message::Action:
- return ActionMsg;
+ return FormatType::ActionMsg;
case Message::Nick:
- return NickMsg;
+ return FormatType::NickMsg;
case Message::Mode:
- return ModeMsg;
+ return FormatType::ModeMsg;
case Message::Join:
- return JoinMsg;
+ return FormatType::JoinMsg;
case Message::Part:
- return PartMsg;
+ return FormatType::PartMsg;
case Message::Quit:
- return QuitMsg;
+ return FormatType::QuitMsg;
case Message::Kick:
- return KickMsg;
+ return FormatType::KickMsg;
case Message::Kill:
- return KillMsg;
+ return FormatType::KillMsg;
case Message::Server:
- return ServerMsg;
+ return FormatType::ServerMsg;
case Message::Info:
- return InfoMsg;
+ return FormatType::InfoMsg;
case Message::Error:
- return ErrorMsg;
+ return FormatType::ErrorMsg;
case Message::DayChange:
- return DayChangeMsg;
+ return FormatType::DayChangeMsg;
case Message::Topic:
- return TopicMsg;
+ return FormatType::TopicMsg;
case Message::NetsplitJoin:
- return NetsplitJoinMsg;
+ return FormatType::NetsplitJoinMsg;
case Message::NetsplitQuit:
- return NetsplitQuitMsg;
+ return FormatType::NetsplitQuitMsg;
case Message::Invite:
- return InviteMsg;
+ return FormatType::InviteMsg;
}
//Q_ASSERT(false); // we need to handle all message types
qWarning() << Q_FUNC_INFO << "Unknown message type:" << msgType;
- return ErrorMsg;
+ return FormatType::ErrorMsg;
}
UiStyle::FormatType UiStyle::formatType(const QString &code)
{
- if (_formatCodes.contains(code)) return _formatCodes.value(code);
- return Invalid;
+ if (_formatCodes.contains(code))
+ return _formatCodes.value(code);
+ return FormatType::Invalid;
}
}
-QList<QTextLayout::FormatRange> UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, quint32 messageLabel) const
+QList<QTextLayout::FormatRange> UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, MessageLabel messageLabel) const
{
QList<QTextLayout::FormatRange> formatRanges;
QTextLayout::FormatRange range;
- int i = 0;
- for (i = 0; i < formatList.count(); i++) {
- range.format = format(formatList.at(i).second, messageLabel);
+ size_t i = 0;
+ for (i = 0; i < formatList.size(); i++) {
+ range.format = format(formatList.at(i).second.type, messageLabel);
range.start = formatList.at(i).first;
- if (i > 0) formatRanges.last().length = range.start - formatRanges.last().start;
+ if (i > 0)
+ formatRanges.last().length = range.start - formatRanges.last().start;
formatRanges.append(range);
}
- if (i > 0) formatRanges.last().length = textLength - formatRanges.last().start;
+ if (i > 0)
+ formatRanges.last().length = textLength - formatRanges.last().start;
return formatRanges;
}
// This method expects a well-formatted string, there is no error checking!
// Since we create those ourselves, we should be pretty safe that nobody does something crappy here.
-UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat)
+UiStyle::StyledString UiStyle::styleString(const QString &s_, FormatType baseFormat)
{
QString s = s_;
+ StyledString result;
+ result.formatList.emplace_back(std::make_pair(quint16{0}, Format{baseFormat}));
+
if (s.length() > 65535) {
+ // We use quint16 for indexes
qWarning() << QString("String too long to be styled: %1").arg(s);
- return StyledString();
+ result.plainText = s;
+ return result;
}
- StyledString result;
- result.formatList.append(qMakePair((quint16)0, baseFormat));
- quint32 curfmt = baseFormat;
+
+ FormatType curfmt = baseFormat;
+
int pos = 0; quint16 length = 0;
for (;;) {
pos = s.indexOf('%', pos);
QString code = QString("%") + s[pos+1];
if (s[pos+1] == 'D') code += s[pos+2];
FormatType ftype = formatType(code);
- if (ftype == Invalid) {
+ if (ftype == FormatType::Invalid) {
pos++;
qWarning() << (QString("Invalid format code in string: %1").arg(s));
continue;
length = code.length();
}
s.remove(pos, length);
- if (pos == result.formatList.last().first)
- result.formatList.last().second = curfmt;
+ if (pos == result.formatList.back().first)
+ result.formatList.back().second.type = curfmt;
else
- result.formatList.append(qMakePair((quint16)pos, curfmt));
+ result.formatList.emplace_back(std::make_pair(pos, Format{curfmt}));
}
result.plainText = s;
return result;
case '\x0f':
mirc += "%O";
break;
+ case '\x09':
+ mirc += " ";
+ break;
case '\x12':
case '\x16':
mirc += "%R";
mirc += QChar(0x2400 + c.unicode());
}
} else {
- if (c == '\t') {
- mirc += " ";
- continue;
- }
if (c == '%')
mirc += c;
mirc += c;
}
+QString UiStyle::systemTimestampFormatString()
+{
+ if (_systemTimestampFormatString.isEmpty()) {
+ // Calculate and cache the system timestamp format string
+ updateSystemTimestampFormat();
+ }
+ return _systemTimestampFormatString;
+}
+
+
+QString UiStyle::timestampFormatString()
+{
+ if (useCustomTimestampFormat()) {
+ return _timestampFormatString;
+ } else {
+ return systemTimestampFormatString();
+ }
+}
+
+
/***********************************************************************************/
UiStyle::StyledMessage::StyledMessage(const Message &msg)
: Message(msg)
{
- if (type() == Message::Plain)
- _senderHash = 0xff;
- else
- _senderHash = 0x00; // this means we never compute the hash for msgs that aren't plain
+ switch (type()) {
+ // Don't compute the sender hash for message types without a nickname embedded
+ case Message::Server:
+ case Message::Info:
+ case Message::Error:
+ case Message::DayChange:
+ case Message::Topic:
+ case Message::Invite:
+ // Don't compute the sender hash for messages with multiple nicks
+ // Fixing this without breaking themes would be.. complex.
+ case Message::NetsplitJoin:
+ case Message::NetsplitQuit:
+ case Message::Kick:
+ // Don't compute the sender hash for message types that are not yet completed elsewhere
+ case Message::Kill:
+ _senderHash = 0x00;
+ break;
+ default:
+ // Compute the sender hash for all other message types
+ _senderHash = 0xff;
+ break;
+ }
}
QString t;
switch (type()) {
case Message::Plain:
- //: Plain Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::Notice:
- //: Notice Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::Action:
- //: Action Message
- t = tr("%DN%1%DN %2").arg(nick).arg(txt);
+ t = QString("%DN%1%DN %2").arg(nick).arg(txt);
break;
case Message::Nick:
//: Nick Message
//case Message::Kill: FIXME
case Message::Server:
- //: Server Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::Info:
- //: Info Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::Error:
- //: Error Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::DayChange:
{
//: Day Change Message
}
break;
case Message::Topic:
- //: Topic Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
case Message::NetsplitJoin:
{
QStringList users = txt.split("#:#");
}
break;
case Message::Invite:
- //: Invite Message
- t = tr("%1").arg(txt); break;
+ t = QString("%1").arg(txt); break;
default:
- t = tr("[%1]").arg(txt);
+ t = QString("[%1]").arg(txt);
}
_contents = UiStyle::styleString(t, UiStyle::formatType(type()));
}
QString UiStyle::StyledMessage::decoratedSender() const
{
+ QString _senderPrefixes;
+ if (_showSenderPrefixes) {
+ _senderPrefixes = senderPrefixes();
+ }
+
switch (type()) {
case Message::Plain:
- return tr("<%1>").arg(plainSender()); break;
+ if (_showSenderBrackets)
+ return QString("<%1%2>").arg(_senderPrefixes, plainSender());
+ else
+ return QString("%1%2").arg(_senderPrefixes, plainSender());
case Message::Notice:
- return tr("[%1]").arg(plainSender()); break;
+ return QString("[%1%2]").arg(_senderPrefixes, plainSender());
case Message::Action:
- return "-*-"; break;
+ return "-*-";
case Message::Nick:
- return "<->"; break;
+ return "<->";
case Message::Mode:
- return "***"; break;
+ return "***";
case Message::Join:
- return "-->"; break;
+ return "-->";
case Message::Part:
- return "<--"; break;
+ return "<--";
case Message::Quit:
- return "<--"; break;
+ return "<--";
case Message::Kick:
- return "<-*"; break;
+ return "<-*";
case Message::Kill:
- return "<-x"; break;
+ return "<-x";
case Message::Server:
- return "*"; break;
+ return "*";
case Message::Info:
- return "*"; break;
+ return "*";
case Message::Error:
- return "*"; break;
+ return "*";
case Message::DayChange:
- return "-"; break;
+ return "-";
case Message::Topic:
- return "*"; break;
+ return "*";
case Message::NetsplitJoin:
- return "=>"; break;
+ return "=>";
case Message::NetsplitQuit:
- return "<="; break;
+ return "<=";
case Message::Invite:
- return "->"; break;
- default:
- return QString("%1").arg(plainSender());
+ return "->";
}
+
+ return QString("%1%2").arg(_senderPrefixes, plainSender());
}
if (_senderHash != 0xff)
return _senderHash;
- QString nick = nickFromMask(sender()).toLower();
+ QString nick;
+
+ // HACK: Until multiple nicknames with different colors can be solved in the theming engine,
+ // for /nick change notifications, use the color of the new nickname (if possible), not the old
+ // nickname.
+ if (type() == Message::Nick) {
+ // New nickname is given as contents. Change to that.
+ nick = stripFormatCodes(contents()).toLower();
+ } else {
+ // Just use the sender directly
+ nick = nickFromMask(sender()).toLower();
+ }
+
if (!nick.isEmpty()) {
int chopCount = 0;
while (chopCount < nick.size() && nick.at(nick.count() - 1 - chopCount) == '_')
if (chopCount < nick.size())
nick.chop(chopCount);
}
- quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size());
+ quint16 hash = qChecksum(nick.toLatin1().data(), nick.toLatin1().size());
return (_senderHash = (hash & 0xf) + 1);
}
+/***********************************************************************************/
+
+#if QT_VERSION < 0x050000
+uint qHash(UiStyle::ItemFormatType key)
+{
+ return qHash(static_cast<quint32>(key));
+}
+
+#else
+
+uint qHash(UiStyle::ItemFormatType key, uint seed)
+{
+ return qHash(static_cast<quint32>(key), seed);
+}
+#endif
+
+UiStyle::FormatType operator|(UiStyle::FormatType lhs, UiStyle::FormatType rhs)
+{
+ return static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) | static_cast<quint32>(rhs));
+}
+
+UiStyle::FormatType& operator|=(UiStyle::FormatType& lhs, UiStyle::FormatType rhs)
+{
+ lhs = static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) | static_cast<quint32>(rhs));
+ return lhs;
+}
+
+
+UiStyle::FormatType operator|(UiStyle::FormatType lhs, quint32 rhs)
+{
+ return static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) | rhs);
+}
+
+
+UiStyle::FormatType& operator|=(UiStyle::FormatType &lhs, quint32 rhs)
+{
+ lhs = static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) | rhs);
+ return lhs;
+}
+
+
+UiStyle::FormatType operator&(UiStyle::FormatType lhs, UiStyle::FormatType rhs)
+{
+ return static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) & static_cast<quint32>(rhs));
+}
+
+
+UiStyle::FormatType& operator&=(UiStyle::FormatType &lhs, UiStyle::FormatType rhs)
+{
+ lhs = static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) & static_cast<quint32>(rhs));
+ return lhs;
+}
+
+
+UiStyle::FormatType operator&(UiStyle::FormatType lhs, quint32 rhs)
+{
+ return static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) & rhs);
+}
+
+
+UiStyle::FormatType& operator&=(UiStyle::FormatType &lhs, quint32 rhs)
+{
+ lhs = static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) & rhs);
+ return lhs;
+}
+
+
+UiStyle::FormatType& operator^=(UiStyle::FormatType &lhs, UiStyle::FormatType rhs)
+{
+ lhs = static_cast<UiStyle::FormatType>(static_cast<quint32>(lhs) ^ static_cast<quint32>(rhs));
+ return lhs;
+}
+
+
+UiStyle::MessageLabel operator|(UiStyle::MessageLabel lhs, UiStyle::MessageLabel rhs)
+{
+ return static_cast<UiStyle::MessageLabel>(static_cast<quint32>(lhs) | static_cast<quint32>(rhs));
+}
+
+
+UiStyle::MessageLabel& operator|=(UiStyle::MessageLabel &lhs, UiStyle::MessageLabel rhs)
+{
+ lhs = static_cast<UiStyle::MessageLabel>(static_cast<quint32>(lhs) | static_cast<quint32>(rhs));
+ return lhs;
+}
+
+
+UiStyle::MessageLabel operator&(UiStyle::MessageLabel lhs, quint32 rhs)
+{
+ return static_cast<UiStyle::MessageLabel>(static_cast<quint32>(lhs) & rhs);
+}
+
+
+UiStyle::MessageLabel& operator&=(UiStyle::MessageLabel &lhs, UiStyle::MessageLabel rhs)
+{
+ lhs = static_cast<UiStyle::MessageLabel>(static_cast<quint32>(lhs) & static_cast<quint32>(rhs));
+ return lhs;
+}
+
+
+quint64 operator|(UiStyle::FormatType lhs, UiStyle::MessageLabel rhs)
+{
+ return static_cast<quint64>(lhs) | (static_cast<quint64>(rhs) << 32ull);
+}
+
+
+UiStyle::ItemFormatType operator|(UiStyle::ItemFormatType lhs, UiStyle::ItemFormatType rhs)
+{
+ return static_cast<UiStyle::ItemFormatType>(static_cast<quint32>(lhs) | static_cast<quint32>(rhs));
+}
+
+
+UiStyle::ItemFormatType& operator|=(UiStyle::ItemFormatType &lhs, UiStyle::ItemFormatType rhs)
+{
+ lhs = static_cast<UiStyle::ItemFormatType>(static_cast<quint32>(lhs) | static_cast<quint32>(rhs));
+ return lhs;
+}
/***********************************************************************************/
QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList)
{
- out << formatList.count();
+ out << static_cast<quint16>(formatList.size());
UiStyle::FormatList::const_iterator it = formatList.begin();
while (it != formatList.end()) {
- out << (*it).first << (*it).second;
+ out << it->first << static_cast<quint32>(it->second.type);
++it;
}
return out;
for (quint16 i = 0; i < cnt; i++) {
quint16 pos; quint32 ftype;
in >> pos >> ftype;
- formatList.append(qMakePair((quint16)pos, ftype));
+ formatList.emplace_back(std::make_pair(quint16{pos}, UiStyle::Format{static_cast<UiStyle::FormatType>(ftype)}));
}
return in;
}
projects / quassel.git / blobdiff