/***************************************************************************
- * Copyright (C) 2005-09 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 *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+
+#include <vector>
+
#include <QApplication>
+#include <QIcon>
+#include "buffersettings.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(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"))
+{
+ // register FormatList if that hasn't happened yet
+ // FIXME I don't think this actually avoids double registration... then again... does it hurt?
+ if (QVariant::nameToType("UiStyle::FormatList") == QVariant::Invalid) {
+ qRegisterMetaType<FormatList>("UiStyle::FormatList");
+ qRegisterMetaTypeStreamOperators<FormatList>("UiStyle::FormatList");
+ Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid);
+ }
+
+ _uiStylePalette = QVector<QBrush>(static_cast<int>(ColorRole::NumRoles), QBrush());
+
+ // Now initialize the mapping between FormatCodes and FormatTypes...
+ _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;
+ _showBufferViewIcons = _showNickViewIcons = s.value("ShowItemViewIcons", true).toBool();
+ s.notify("ShowItemViewIcons", this, SLOT(showItemViewIconsChanged(QVariant)));
+
+ _allowMircColors = s.value("AllowMircColors", true).toBool();
+ s.notify("AllowMircColors", this, SLOT(allowMircColorsChanged(QVariant)));
+
+ loadStyleSheet();
+}
+
+
+UiStyle::~UiStyle()
+{
+ qDeleteAll(_metricsCache);
+}
+
+
+void UiStyle::reload()
+{
+ loadStyleSheet();
+}
+
+
+void UiStyle::loadStyleSheet()
+{
+ qDeleteAll(_metricsCache);
+ _metricsCache.clear();
+ _formatCache.clear();
+ _formats.clear();
+
+ 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()) {
+ 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);
-UiStyle::UiStyle(QObject *parent) : QObject(parent) {
- // register FormatList if that hasn't happened yet
- // FIXME I don't think this actually avoids double registration... then again... does it hurt?
- if(QVariant::nameToType("UiStyle::FormatList") == QVariant::Invalid) {
- qRegisterMetaType<FormatList>("UiStyle::FormatList");
- qRegisterMetaTypeStreamOperators<FormatList>("UiStyle::FormatList");
- Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid);
- }
+ if (!styleSheet.isEmpty()) {
+ QssParser parser;
+ parser.processStyleSheet(styleSheet);
+ QApplication::setPalette(parser.palette());
- // Now initialize the mapping between FormatCodes and FormatTypes...
- _formatCodes["%O"] = None;
- _formatCodes["%B"] = Bold;
- _formatCodes["%S"] = Italic;
- _formatCodes["%U"] = Underline;
- _formatCodes["%R"] = Reverse;
+ _uiStylePalette = parser.uiStylePalette();
+ _formats = parser.formats();
+ _listItemFormats = parser.listItemFormats();
- _formatCodes["%DN"] = Nick;
- _formatCodes["%DH"] = Hostmask;
- _formatCodes["%DC"] = ChannelName;
- _formatCodes["%DM"] = ModeFlags;
- _formatCodes["%DU"] = Url;
+ styleSheet = styleSheet.trimmed();
+ if (!styleSheet.isEmpty())
+ qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application
+ }
+
+ emit changed();
+}
- setTimestampFormatString("[hh:mm:ss]");
- loadStyleSheet();
+QString UiStyle::loadStyleSheet(const QString &styleSheet, bool shouldExist)
+{
+ QString ss = styleSheet;
+ if (ss.startsWith("file:///")) {
+ ss.remove(0, 8);
+ if (ss.isEmpty())
+ return QString();
+
+ QFile file(ss);
+ if (file.open(QFile::ReadOnly)) {
+ QTextStream stream(&file);
+ ss = stream.readAll();
+ file.close();
+ }
+ else {
+ if (shouldExist)
+ qWarning() << "Could not open stylesheet file:" << file.fileName();
+ return QString();
+ }
+ }
+ return ss;
}
-UiStyle::~UiStyle() {
- qDeleteAll(_metricsCache);
+
+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::reload() {
- loadStyleSheet();
+void UiStyle::setTimestampFormatString(const QString &format)
+{
+ if (_timestampFormatString != format) {
+ _timestampFormatString = format;
+ }
}
-void UiStyle::loadStyleSheet() {
- qDeleteAll(_metricsCache);
- _metricsCache.clear();
- _formatCache.clear();
+void UiStyle::enableSenderPrefixes(bool enabled)
+{
+ if (_showSenderPrefixes != enabled) {
+ _showSenderPrefixes = enabled;
+ }
+}
- UiStyleSettings s;
+void UiStyle::enableSenderBrackets(bool enabled)
+{
+ if (_showSenderBrackets != enabled) {
+ _showSenderBrackets = enabled;
+ }
+}
- QString styleSheet;
- styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("default.qss"));
- styleSheet += loadStyleSheet("file:///" + Quassel::configDirPath() + "settings.qss");
- if(s.value("UseCustomStyleSheet", false).toBool())
- styleSheet += loadStyleSheet("file:///" + s.value("CustomStyleSheetPath").toString(), true);
- styleSheet += loadStyleSheet("file:///" + Quassel::optionValue("qss"), true);
- if(styleSheet.isEmpty())
- return;
+void UiStyle::allowMircColorsChanged(const QVariant &v)
+{
+ _allowMircColors = v.toBool();
+ emit changed();
+}
- QssParser parser;
- parser.processStyleSheet(styleSheet);
- QApplication::setPalette(parser.palette());
- _formatCache = parser.formats();
- qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application
+/******** ItemView Styling *******/
- emit changed();
+void UiStyle::showItemViewIconsChanged(const QVariant &v)
+{
+ _showBufferViewIcons = _showNickViewIcons = v.toBool();
}
-QString UiStyle::loadStyleSheet(const QString &styleSheet, bool shouldExist) {
- QString ss = styleSheet;
- if(ss.startsWith("file:///")) {
- ss.remove(0, 8);
- if(ss.isEmpty())
- return QString();
- QFile file(ss);
- if(file.open(QFile::ReadOnly)) {
- QTextStream stream(&file);
- ss = stream.readAll();
- file.close();
- } else {
- if(shouldExist)
- qWarning() << "Could not open stylesheet file:" << file.fileName();
- return QString();
+QVariant UiStyle::bufferViewItemData(const QModelIndex &index, int role) const
+{
+ BufferInfo::Type type = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).toInt();
+ bool isActive = index.data(NetworkModel::ItemActiveRole).toBool();
+
+ if (role == Qt::DecorationRole) {
+ if (!_showBufferViewIcons)
+ return QVariant();
+
+ switch (type) {
+ case BufferInfo::ChannelBuffer:
+ if (isActive)
+ return _channelJoinedIcon;
+ else
+ return _channelPartedIcon;
+ case BufferInfo::QueryBuffer:
+ if (!isActive)
+ return _userOfflineIcon;
+ if (index.data(NetworkModel::UserAwayRole).toBool())
+ return _userAwayIcon;
+ else
+ return _userOnlineIcon;
+ default:
+ return QVariant();
+ }
+ }
+
+ ItemFormatType fmtType = ItemFormatType::BufferViewItem;
+ switch (type) {
+ case BufferInfo::StatusBuffer:
+ fmtType |= ItemFormatType::NetworkItem;
+ break;
+ case BufferInfo::ChannelBuffer:
+ fmtType |= ItemFormatType::ChannelBufferItem;
+ break;
+ case BufferInfo::QueryBuffer:
+ fmtType |= ItemFormatType::QueryBufferItem;
+ break;
+ default:
+ return QVariant();
+ }
+
+ 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(ItemFormatType::BufferViewItem | ItemFormatType::HighlightedBuffer));
+ fmt.merge(_listItemFormats.value(fmtType | ItemFormatType::HighlightedBuffer));
+ }
+ else if (activity & BufferInfo::NewMessage) {
+ fmt.merge(_listItemFormats.value(ItemFormatType::BufferViewItem | ItemFormatType::UnreadBuffer));
+ fmt.merge(_listItemFormats.value(fmtType | ItemFormatType::UnreadBuffer));
}
- }
- return ss;
+ else if (activity & BufferInfo::OtherActivity) {
+ fmt.merge(_listItemFormats.value(ItemFormatType::BufferViewItem | ItemFormatType::ActiveBuffer));
+ fmt.merge(_listItemFormats.value(fmtType | ItemFormatType::ActiveBuffer));
+ }
+ else if (!isActive) {
+ 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(ItemFormatType::BufferViewItem | ItemFormatType::UserAway));
+ fmt.merge(_listItemFormats.value(fmtType | ItemFormatType::UserAway));
+ }
+
+ return itemData(role, fmt);
}
-void UiStyle::setTimestampFormatString(const QString &format) {
- if(_timestampFormatString != format) {
- _timestampFormatString = format;
- // FIXME reload
- }
+
+QVariant UiStyle::nickViewItemData(const QModelIndex &index, int role) const
+{
+ NetworkModel::ItemType type = (NetworkModel::ItemType)index.data(NetworkModel::ItemTypeRole).toInt();
+
+ if (role == Qt::DecorationRole) {
+ if (!_showNickViewIcons)
+ return QVariant();
+
+ switch (type) {
+ case NetworkModel::UserCategoryItemType:
+ {
+ int categoryId = index.data(TreeModel::SortRole).toInt();
+ if (categoryId <= _opIconLimit)
+ return _categoryOpIcon;
+ if (categoryId <= _voiceIconLimit)
+ return _categoryVoiceIcon;
+ return _userOnlineIcon;
+ }
+ case NetworkModel::IrcUserItemType:
+ if (index.data(NetworkModel::ItemActiveRole).toBool())
+ return _userOnlineIcon;
+ else
+ return _userAwayIcon;
+ default:
+ return QVariant();
+ }
+ }
+
+ QTextCharFormat fmt = _listItemFormats.value(ItemFormatType::NickViewItem);
+
+ switch (type) {
+ case NetworkModel::IrcUserItemType:
+ fmt.merge(_listItemFormats.value(ItemFormatType::NickViewItem | ItemFormatType::IrcUserItem));
+ if (!index.data(NetworkModel::ItemActiveRole).toBool()) {
+ 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(ItemFormatType::NickViewItem | ItemFormatType::UserCategoryItem));
+ break;
+ default:
+ return QVariant();
+ }
+
+ return itemData(role, fmt);
+}
+
+
+QVariant UiStyle::itemData(int role, const QTextCharFormat &format) const
+{
+ switch (role) {
+ case Qt::FontRole:
+ return format.font();
+ case Qt::ForegroundRole:
+ return format.property(QTextFormat::ForegroundBrush);
+ case Qt::BackgroundRole:
+ return format.property(QTextFormat::BackgroundBrush);
+ default:
+ return QVariant();
+ }
}
+
/******** Caching *******/
-QTextCharFormat UiStyle::cachedFormat(quint64 key) const {
- return _formatCache.value(key, QTextCharFormat());
+QTextCharFormat UiStyle::format(quint64 key) const
+{
+ return _formats.value(key, QTextCharFormat());
}
-QTextCharFormat UiStyle::cachedFormat(quint32 formatType, quint32 messageLabel) const {
- return cachedFormat(formatType | ((quint64)messageLabel << 32));
+
+QTextCharFormat UiStyle::cachedFormat(FormatType formatType, MessageLabel messageLabel) const
+{
+ return _formatCache.value(formatType | messageLabel, QTextCharFormat());
}
-void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) {
- _formatCache[formatType | ((quint64)messageLabel << 32)] = format;
+
+void UiStyle::setCachedFormat(const QTextCharFormat &format, FormatType formatType, MessageLabel messageLabel) const
+{
+ _formatCache[formatType | messageLabel] = format;
}
-QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) {
- // QFontMetricsF is not assignable, so we need to store pointers :/
- quint64 key = ftype | ((quint64)label << 32);
- if(_metricsCache.contains(key))
- return _metricsCache.value(key);
+QFontMetricsF *UiStyle::fontMetrics(FormatType ftype, MessageLabel label) const
+{
+ // QFontMetricsF is not assignable, so we need to store pointers :/
+ quint64 key = ftype | label;
+
+ if (_metricsCache.contains(key))
+ return _metricsCache.value(key);
- return (_metricsCache[key] = new QFontMetricsF(format(ftype, label).font()));
+ return (_metricsCache[key] = new QFontMetricsF(format(ftype, label).font()));
}
+
/******** Generate formats ********/
// 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_) {
- if(ftype == Invalid)
- return QTextCharFormat();
+QTextCharFormat UiStyle::format(FormatType ftype, MessageLabel label) const
+{
+ if (ftype == FormatType::Invalid)
+ return {};
- quint64 label = (quint64)label_ << 32;
+ // check if we have exactly this format readily cached already
+ QTextCharFormat fmt = cachedFormat(ftype, label);
+ if (fmt.properties().count())
+ return fmt;
- // check if we have exactly this format readily cached already
- QTextCharFormat fmt = cachedFormat(label|ftype);
- if(fmt.properties().count())
- return fmt;
+ mergeFormat(fmt, ftype, label & 0xffff0000); // keep nickhash in label
- mergeFormat(fmt, ftype, label & Q_UINT64_C(0xffff000000000000));
-
- 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_);
- return fmt;
+ setCachedFormat(fmt, ftype, label);
+ return fmt;
}
-void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) {
- mergeSubElementFormat(fmt, ftype & 0x000f, 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 & 0xfff0)) { // element format
- for(quint32 mask = 0x0010; mask <= 0x2000; mask <<= 1) {
- if(ftype & mask) {
- mergeSubElementFormat(fmt, mask | 0x0f, label);
- }
+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) != FormatType::Base) { // element format
+ for (quint32 mask = 0x00100; mask <= 0x40000; mask <<= 1) {
+ 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(ftype & 0x00400000)
- mergeSubElementFormat(fmt, ftype & 0x0f400000, label); // foreground
- if(ftype & 0x00800000)
- mergeSubElementFormat(fmt, ftype & 0xf0800000, label); // background
- if((ftype & 0x00c00000) == 0x00c00000)
- mergeSubElementFormat(fmt, ftype & 0xffc00000, label); // combination
+ // Now we handle color codes
+ // We assume that those can't be combined with subelement and message types.
+ if (_allowMircColors) {
+ if ((ftype & 0x00400000) != FormatType::Base)
+ mergeSubElementFormat(fmt, ftype & 0x0f400000, label); // foreground
+ if ((ftype & 0x00800000) != FormatType::Base)
+ mergeSubElementFormat(fmt, ftype & 0xf0800000, label); // background
+ if ((ftype & 0x00c00000) == static_cast<FormatType>(0x00c00000))
+ mergeSubElementFormat(fmt, ftype & 0xffc00000, label); // combination
+ }
- // URL
- if(ftype & Url)
- mergeSubElementFormat(fmt, ftype & Url, label);
+ // URL
+ 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) {
- quint64 key = ftype | label;
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000fffffffffff0))); // label + subelement
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xfffffffffffffff0))); // label + subelement + nickhash
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype
+void UiStyle::mergeSubElementFormat(QTextCharFormat &fmt, FormatType ftype, MessageLabel label) const
+{
+ quint64 key = ftype | label;
+ 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
}
-UiStyle::FormatType UiStyle::formatType(Message::Type msgType) {
- switch(msgType) {
+
+UiStyle::FormatType UiStyle::formatType(Message::Type 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;
- }
- //Q_ASSERT(false); // we need to handle all message types
- qWarning() << Q_FUNC_INFO << "Unknown message type:" << msgType;
- return ErrorMsg;
+ return FormatType::DayChangeMsg;
+ case Message::Topic:
+ return FormatType::TopicMsg;
+ case Message::NetsplitJoin:
+ return FormatType::NetsplitJoinMsg;
+ case Message::NetsplitQuit:
+ return FormatType::NetsplitQuitMsg;
+ case Message::Invite:
+ return FormatType::InviteMsg;
+ }
+ //Q_ASSERT(false); // we need to handle all message types
+ qWarning() << Q_FUNC_INFO << "Unknown message type:" << msgType;
+ return FormatType::ErrorMsg;
}
-UiStyle::FormatType UiStyle::formatType(const QString & code) {
- if(_formatCodes.contains(code)) return _formatCodes.value(code);
- return Invalid;
+
+UiStyle::FormatType UiStyle::formatType(const QString &code)
+{
+ if (_formatCodes.contains(code))
+ return _formatCodes.value(code);
+ return FormatType::Invalid;
}
-QString UiStyle::formatCode(FormatType ftype) {
- return _formatCodes.key(ftype);
+
+QString UiStyle::formatCode(FormatType ftype)
+{
+ return _formatCodes.key(ftype);
}
-QList<QTextLayout::FormatRange> UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, quint32 messageLabel) {
- 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);
- range.start = formatList.at(i).first;
- if(i > 0) formatRanges.last().length = range.start - formatRanges.last().start;
- formatRanges.append(range);
- }
- if(i > 0) formatRanges.last().length = textLength - formatRanges.last().start;
- return formatRanges;
+
+QList<QTextLayout::FormatRange> UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, MessageLabel messageLabel) const
+{
+ QList<QTextLayout::FormatRange> formatRanges;
+ QTextLayout::FormatRange range;
+ 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;
+ formatRanges.append(range);
+ }
+ 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) {
- QString s = s_;
- if(s.length() > 65535) {
- qWarning() << QString("String too long to be styled: %1").arg(s);
- return StyledString();
- }
- StyledString result;
- result.formatList.append(qMakePair((quint16)0, baseFormat));
- quint32 curfmt = baseFormat;
- int pos = 0; quint16 length = 0;
- for(;;) {
- pos = s.indexOf('%', pos);
- if(pos < 0) break;
- if(s[pos+1] == '%') { // escaped %, we just remove one and continue
- s.remove(pos, 1);
- pos++;
- continue;
- }
- if(s[pos+1] == 'D' && s[pos+2] == 'c') { // color code
- if(s[pos+3] == '-') { // color off
- curfmt &= 0x003fffff;
- length = 4;
- } else {
- int color = 10 * s[pos+4].digitValue() + s[pos+5].digitValue();
- //TODO: use 99 as transparent color (re mirc color "standard")
- color &= 0x0f;
- if(s[pos+3] == 'f') {
- curfmt &= 0xf0ffffff;
- curfmt |= (color << 24) | 0x00400000;
+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);
+ result.plainText = s;
+ return result;
+ }
+
+ FormatType curfmt = baseFormat;
+
+ int pos = 0; quint16 length = 0;
+ for (;;) {
+ pos = s.indexOf('%', pos);
+ if (pos < 0) break;
+ if (s[pos+1] == '%') { // escaped %, we just remove one and continue
+ s.remove(pos, 1);
+ pos++;
+ continue;
+ }
+ if (s[pos+1] == 'D' && s[pos+2] == 'c') { // color code
+ if (s[pos+3] == '-') { // color off
+ curfmt &= 0x003fffff;
+ length = 4;
+ }
+ else {
+ int color = 10 * s[pos+4].digitValue() + s[pos+5].digitValue();
+ //TODO: use 99 as transparent color (re mirc color "standard")
+ color &= 0x0f;
+ if (s[pos+3] == 'f') {
+ curfmt &= 0xf0ffffff;
+ curfmt |= (quint32)(color << 24) | 0x00400000;
+ }
+ else {
+ curfmt &= 0x0fffffff;
+ curfmt |= (quint32)(color << 28) | 0x00800000;
+ }
+ length = 6;
+ }
+ }
+ else if (s[pos+1] == 'O') { // reset formatting
+ curfmt &= 0x000000ff; // we keep message type-specific formatting
+ length = 2;
+ }
+ else if (s[pos+1] == 'R') { // reverse
+ // TODO: implement reverse formatting
+
+ length = 2;
+ }
+ else { // all others are toggles
+ QString code = QString("%") + s[pos+1];
+ if (s[pos+1] == 'D') code += s[pos+2];
+ FormatType ftype = formatType(code);
+ if (ftype == FormatType::Invalid) {
+ pos++;
+ qWarning() << (QString("Invalid format code in string: %1").arg(s));
+ continue;
+ }
+ curfmt ^= ftype;
+ length = code.length();
+ }
+ s.remove(pos, length);
+ if (pos == result.formatList.back().first)
+ result.formatList.back().second.type = curfmt;
+ else
+ result.formatList.emplace_back(std::make_pair(pos, Format{curfmt}));
+ }
+ result.plainText = s;
+ return result;
+}
+
+
+QString UiStyle::mircToInternal(const QString &mirc_)
+{
+ QString mirc;
+ mirc.reserve(mirc_.size());
+ foreach (const QChar &c, mirc_) {
+ if ((c < '\x20' || c == '\x7f') && c != '\x03') {
+ switch (c.unicode()) {
+ case '\x02':
+ mirc += "%B";
+ break;
+ case '\x0f':
+ mirc += "%O";
+ break;
+ case '\x09':
+ mirc += " ";
+ break;
+ case '\x12':
+ case '\x16':
+ mirc += "%R";
+ break;
+ case '\x1d':
+ mirc += "%S";
+ break;
+ case '\x1f':
+ mirc += "%U";
+ break;
+ case '\x7f':
+ mirc += QChar(0x2421);
+ break;
+ default:
+ mirc += QChar(0x2400 + c.unicode());
+ }
} else {
- curfmt &= 0x0fffffff;
- curfmt |= (color << 28) | 0x00800000;
+ if (c == '%')
+ mirc += c;
+ mirc += c;
+ }
+ }
+
+ // Now we bring the color codes (\x03) in a sane format that can be parsed more easily later.
+ // %Dcfxx is foreground, %Dcbxx is background color, where xx is a 2 digit dec number denoting the color code.
+ // %Dc- turns color off.
+ // Note: We use the "mirc standard" as described in <http://www.mirc.co.uk/help/color.txt>.
+ // This means that we don't accept something like \x03,5 (even though others, like WeeChat, do).
+ int pos = 0;
+ for (;;) {
+ pos = mirc.indexOf('\x03', pos);
+ if (pos < 0) break; // no more mirc color codes
+ QString ins, num;
+ int l = mirc.length();
+ int i = pos + 1;
+ // check for fg color
+ if (i < l && mirc[i].isDigit()) {
+ num = mirc[i++];
+ if (i < l && mirc[i].isDigit()) num.append(mirc[i++]);
+ else num.prepend('0');
+ ins = QString("%Dcf%1").arg(num);
+
+ if (i+1 < l && mirc[i] == ',' && mirc[i+1].isDigit()) {
+ i++;
+ num = mirc[i++];
+ if (i < l && mirc[i].isDigit()) num.append(mirc[i++]);
+ else num.prepend('0');
+ ins += QString("%Dcb%1").arg(num);
+ }
+ }
+ else {
+ ins = "%Dc-";
}
- length = 6;
- }
- } else if(s[pos+1] == 'O') { // reset formatting
- curfmt &= 0x0000000f; // we keep message type-specific formatting
- length = 2;
- } else if(s[pos+1] == 'R') { // reverse
- // TODO: implement reverse formatting
-
- length = 2;
- } else { // all others are toggles
- QString code = QString("%") + s[pos+1];
- if(s[pos+1] == 'D') code += s[pos+2];
- FormatType ftype = formatType(code);
- if(ftype == Invalid) {
- qWarning() << (QString("Invalid format code in string: %1").arg(s));
- continue;
- }
- curfmt ^= ftype;
- length = code.length();
- }
- s.remove(pos, length);
- if(pos == result.formatList.last().first)
- result.formatList.last().second = curfmt;
- else
- result.formatList.append(qMakePair((quint16)pos, curfmt));
- }
- result.plainText = s;
- return result;
-}
-
-QString UiStyle::mircToInternal(const QString &mirc_) {
- QString mirc = mirc_;
- mirc.replace('%', "%%"); // escape % just to be sure
- mirc.replace('\x02', "%B");
- mirc.replace('\x0f', "%O");
- mirc.replace('\x12', "%R");
- mirc.replace('\x16', "%R");
- mirc.replace('\x1d', "%S");
- mirc.replace('\x1f', "%U");
-
- // Now we bring the color codes (\x03) in a sane format that can be parsed more easily later.
- // %Dcfxx is foreground, %Dcbxx is background color, where xx is a 2 digit dec number denoting the color code.
- // %Dc- turns color off.
- // Note: We use the "mirc standard" as described in <http://www.mirc.co.uk/help/color.txt>.
- // This means that we don't accept something like \x03,5 (even though others, like WeeChat, do).
- int pos = 0;
- for(;;) {
- pos = mirc.indexOf('\x03', pos);
- if(pos < 0) break; // no more mirc color codes
- QString ins, num;
- int l = mirc.length();
- int i = pos + 1;
- // check for fg color
- if(i < l && mirc[i].isDigit()) {
- num = mirc[i++];
- if(i < l && mirc[i].isDigit()) num.append(mirc[i++]);
- else num.prepend('0');
- ins = QString("%Dcf%1").arg(num);
-
- if(i+1 < l && mirc[i] == ',' && mirc[i+1].isDigit()) {
- i++;
- num = mirc[i++];
- if(i < l && mirc[i].isDigit()) num.append(mirc[i++]);
- else num.prepend('0');
- ins += QString("%Dcb%1").arg(num);
- }
+ mirc.replace(pos, i-pos, ins);
+ }
+ return mirc;
+}
+
+
+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 {
- ins = "%Dc-";
+ return systemTimestampFormatString();
}
- mirc.replace(pos, i-pos, ins);
- }
- return mirc;
}
+
/***********************************************************************************/
UiStyle::StyledMessage::StyledMessage(const Message &msg)
- : 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;
+ }
}
-void UiStyle::StyledMessage::style() const {
- QString user = userFromMask(sender());
- QString host = hostFromMask(sender());
- QString nick = nickFromMask(sender());
- QString txt = UiStyle::mircToInternal(contents());
- QString bufferName = bufferInfo().bufferName();
- bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_-
- QString t;
- switch(type()) {
+void UiStyle::StyledMessage::style() const
+{
+ QString user = userFromMask(sender());
+ QString host = hostFromMask(sender());
+ QString nick = nickFromMask(sender());
+ QString txt = UiStyle::mircToInternal(contents());
+ QString bufferName = bufferInfo().bufferName();
+ bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_-
+ host.replace('%', "%%"); // hostnames too...
+ user.replace('%', "%%"); // and the username...
+ nick.replace('%', "%%"); // ... and then there's totally RFC-violating servers like justin.tv m(
+ const int maxNetsplitNicks = 15;
+
+ 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);
- break;
+ t = QString("%DN%1%DN %2").arg(nick).arg(txt);
+ break;
case Message::Nick:
- //: Nick Message
- if(nick == contents()) t = tr("You are now known as %DN%1%DN").arg(txt);
- else t = tr("%DN%1%DN is now known as %DN%2%DN").arg(nick, txt);
- break;
+ //: Nick Message
+ if (nick == contents()) t = tr("You are now known as %DN%1%DN").arg(txt);
+ else t = tr("%DN%1%DN is now known as %DN%2%DN").arg(nick, txt);
+ break;
case Message::Mode:
- //: Mode Message
- if(nick.isEmpty()) t = tr("User mode: %DM%1%DM").arg(txt);
- else t = tr("Mode %DM%1%DM by %DN%2%DN").arg(txt, nick);
- break;
+ //: Mode Message
+ if (nick.isEmpty()) t = tr("User mode: %DM%1%DM").arg(txt);
+ else t = tr("Mode %DM%1%DM by %DN%2%DN").arg(txt, nick);
+ break;
case Message::Join:
- //: Join Message
- t = tr("%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC").arg(nick, user, host, bufferName); break;
+ //: Join Message
+ t = tr("%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC").arg(nick, user, host, bufferName); break;
case Message::Part:
- //: Part Message
- t = tr("%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC").arg(nick, user, host, bufferName);
- if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
- break;
+ //: Part Message
+ t = tr("%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC").arg(nick, user, host, bufferName);
+ if (!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
+ break;
case Message::Quit:
- //: Quit Message
- t = tr("%DN%1%DN %DH(%2@%3)%DH has quit").arg(nick, user, host);
- if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
- break;
- case Message::Kick: {
+ //: Quit Message
+ t = tr("%DN%1%DN %DH(%2@%3)%DH has quit").arg(nick, user, host);
+ if (!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
+ break;
+ case Message::Kick:
+ {
QString victim = txt.section(" ", 0, 0);
QString kickmsg = txt.section(" ", 1);
//: Kick Message
t = tr("%DN%1%DN has kicked %DN%2%DN from %DC%3%DC").arg(nick).arg(victim).arg(bufferName);
- if(!kickmsg.isEmpty()) t = QString("%1 (%2)").arg(t).arg(kickmsg);
- }
- break;
+ if (!kickmsg.isEmpty()) t = QString("%1 (%2)").arg(t).arg(kickmsg);
+ }
+ break;
//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
- t = tr("{Day changed to %1}").arg(timestamp().toString());
- break;
+ {
+ //: Day Change Message
+ t = tr("{Day changed to %1}").arg(timestamp().date().toString(Qt::DefaultLocaleLongDate));
+ }
+ break;
+ case Message::Topic:
+ t = QString("%1").arg(txt); break;
+ case Message::NetsplitJoin:
+ {
+ QStringList users = txt.split("#:#");
+ QStringList servers = users.takeLast().split(" ");
+
+ for (int i = 0; i < users.count() && i < maxNetsplitNicks; i++)
+ users[i] = nickFromMask(users.at(i));
+
+ t = tr("Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: ").arg(servers.at(0), servers.at(1));
+ if (users.count() <= maxNetsplitNicks)
+ t.append(QString("%DN%1%DN").arg(users.join(", ")));
+ else
+ t.append(tr("%DN%1%DN (%2 more)").arg(static_cast<QStringList>(users.mid(0, maxNetsplitNicks)).join(", ")).arg(users.count() - maxNetsplitNicks));
+ }
+ break;
+ case Message::NetsplitQuit:
+ {
+ QStringList users = txt.split("#:#");
+ QStringList servers = users.takeLast().split(" ");
+
+ for (int i = 0; i < users.count() && i < maxNetsplitNicks; i++)
+ users[i] = nickFromMask(users.at(i));
+
+ t = tr("Netsplit between %DH%1%DH and %DH%2%DH. Users quit: ").arg(servers.at(0), servers.at(1));
+
+ if (users.count() <= maxNetsplitNicks)
+ t.append(QString("%DN%1%DN").arg(users.join(", ")));
+ else
+ t.append(tr("%DN%1%DN (%2 more)").arg(static_cast<QStringList>(users.mid(0, maxNetsplitNicks)).join(", ")).arg(users.count() - maxNetsplitNicks));
+ }
+ break;
+ case Message::Invite:
+ t = QString("%1").arg(txt); break;
default:
- t = tr("[%1]").arg(txt);
- }
- _contents = UiStyle::styleString(t, UiStyle::formatType(type()));
+ t = QString("[%1]").arg(txt);
+ }
+ _contents = UiStyle::styleString(t, UiStyle::formatType(type()));
}
-const QString &UiStyle::StyledMessage::plainContents() const {
- if(_contents.plainText.isNull())
- style();
- return _contents.plainText;
+const QString &UiStyle::StyledMessage::plainContents() const
+{
+ if (_contents.plainText.isNull())
+ style();
+
+ return _contents.plainText;
}
-const UiStyle::FormatList &UiStyle::StyledMessage::contentsFormatList() const {
- if(_contents.plainText.isNull())
- style();
- return _contents.formatList;
+const UiStyle::FormatList &UiStyle::StyledMessage::contentsFormatList() const
+{
+ if (_contents.plainText.isNull())
+ style();
+
+ return _contents.formatList;
}
-QString UiStyle::StyledMessage::decoratedTimestamp() const {
- return timestamp().toLocalTime().toString(UiStyle::timestampFormatString());
+
+QString UiStyle::StyledMessage::decoratedTimestamp() const
+{
+ return timestamp().toLocalTime().toString(UiStyle::timestampFormatString());
}
-QString UiStyle::StyledMessage::plainSender() const {
- switch(type()) {
+
+QString UiStyle::StyledMessage::plainSender() const
+{
+ switch (type()) {
case Message::Plain:
case Message::Notice:
- return nickFromMask(sender());
+ return nickFromMask(sender());
default:
- return QString();
- }
+ return QString();
+ }
}
-QString UiStyle::StyledMessage::decoratedSender() const {
- switch(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;
-<<<<<<< HEAD
- case Message::Topic:
- case Message::Server:
- return tr("*"); break;
- case Message::Error:
- return tr("*"); break;
-=======
+ return QString("[%1%2]").arg(_senderPrefixes, plainSender());
case Message::Action:
- return tr("-*-"); break;
+ return "-*-";
case Message::Nick:
- return tr("<->"); break;
+ return "<->";
case Message::Mode:
- return tr("***"); break;
->>>>>>> Handle all message types properly in UiStyle; eliminate msgtype format codes
+ return "***";
case Message::Join:
- return tr("-->"); break;
+ return "-->";
case Message::Part:
- return tr("<--"); break;
+ return "<--";
case Message::Quit:
- return tr("<--"); break;
+ return "<--";
case Message::Kick:
- return tr("<-*"); break;
+ return "<-*";
case Message::Kill:
- return tr("<-x"); break;
+ return "<-x";
case Message::Server:
- return tr("*"); break;
+ return "*";
case Message::Info:
- return tr("*"); break;
+ return "*";
case Message::Error:
- return tr("*"); break;
+ return "*";
case Message::DayChange:
- return tr("-"); break;
- default:
- return tr("%1").arg(plainSender());
- }
+ return "-";
+ case Message::Topic:
+ return "*";
+ case Message::NetsplitJoin:
+ return "=>";
+ case Message::NetsplitQuit:
+ return "<=";
+ case Message::Invite:
+ return "->";
+ }
+
+ return QString("%1%2").arg(_senderPrefixes, plainSender());
}
-UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
- switch(type()) {
- case Message::Plain:
- // To produce random like but stable nick colorings some sort of hashing should work best.
- // In this case we just use the qt function qChecksum which produces a
- // CRC16 hash. This should be fast and 16 bits are more than enough.
- {
- QString nick = nickFromMask(sender()).toLower();
- if(!nick.isEmpty()) {
- int chopCount = 0;
- while(nick[nick.count() - 1 - chopCount] == '_') {
+
+// FIXME hardcoded to 16 sender hashes
+quint8 UiStyle::StyledMessage::senderHash() const
+{
+ if (_senderHash != 0xff)
+ return _senderHash;
+
+ 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) == '_')
chopCount++;
- }
- nick.chop(chopCount);
- }
- quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size());
- return (UiStyle::FormatType)((((hash % 12) + 1) << 24) + 0x200); // FIXME: amount of sender colors hardwired
- }
- case Message::Notice:
- return UiStyle::NoticeMsg; break;
- case Message::Topic:
- case Message::Server:
- return UiStyle::ServerMsg; break;
- case Message::Error:
- return UiStyle::ErrorMsg; break;
- case Message::Join:
- return UiStyle::JoinMsg; break;
- case Message::Part:
- return UiStyle::PartMsg; break;
- case Message::Quit:
- return UiStyle::QuitMsg; break;
- case Message::Kick:
- return UiStyle::KickMsg; break;
- case Message::Nick:
- return UiStyle::NickMsg; break;
- case Message::Mode:
- return UiStyle::ModeMsg; break;
- case Message::Action:
- return UiStyle::ActionMsg; break;
- default:
- return UiStyle::ErrorMsg;
- }
+ if (chopCount < nick.size())
+ nick.chop(chopCount);
+ }
+ quint16 hash = qChecksum(nick.toLatin1().data(), nick.toLatin1().size());
+ return (_senderHash = (hash & 0xf) + 1);
}
-// FIXME hardcoded to 16 sender hashes
-quint8 UiStyle::StyledMessage::senderHash() const {
- if(_senderHash != 0xff)
- return _senderHash;
+/***********************************************************************************/
+
+#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
- QString nick = nickFromMask(sender()).toLower();
- if(!nick.isEmpty()) {
- int chopCount = 0;
- while(nick.at(nick.count() - 1 - chopCount) == '_')
- chopCount++;
- nick.chop(chopCount);
- }
- quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size());
- return (_senderHash = (hash & 0xf) + 1);
+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();
- UiStyle::FormatList::const_iterator it = formatList.begin();
- while(it != formatList.end()) {
- out << (*it).first << (*it).second;
- ++it;
- }
- return out;
-}
-
-QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList) {
- quint16 cnt;
- in >> cnt;
- for(quint16 i = 0; i < cnt; i++) {
- quint16 pos; quint32 ftype;
- in >> pos >> ftype;
- formatList.append(qMakePair((quint16)pos, ftype));
- }
- return in;
+QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList)
+{
+ out << static_cast<quint16>(formatList.size());
+ UiStyle::FormatList::const_iterator it = formatList.begin();
+ while (it != formatList.end()) {
+ out << it->first << static_cast<quint32>(it->second.type);
+ ++it;
+ }
+ return out;
+}
+
+
+QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList)
+{
+ quint16 cnt;
+ in >> cnt;
+ for (quint16 i = 0; i < cnt; i++) {
+ quint16 pos; quint32 ftype;
+ in >> pos >> ftype;
+ formatList.emplace_back(std::make_pair(quint16{pos}, UiStyle::Format{static_cast<UiStyle::FormatType>(ftype)}));
+ }
+ return in;
}
projects / quassel.git / blobdiff