X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=3b9e079b85b50cd76f4ace915efdf7881dc28208;hp=975c79df82bd37edd28cec97f86a95637b822fc7;hb=0ba56e60f400621ddc291669dc2c03a8e461c224;hpb=40601ae070413b727a68e35e5b8c619176c661b1 diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 975c79df..3b9e079b 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 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 * @@ -19,9 +19,9 @@ ***************************************************************************/ #include +#include #include "buffersettings.h" -#include "iconloader.h" #include "qssparser.h" #include "quassel.h" #include "uistyle.h" @@ -29,17 +29,21 @@ #include "util.h" QHash 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")) { @@ -66,7 +70,13 @@ UiStyle::UiStyle(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. + setUseCustomTimestampFormat(false); + setTimestampFormatString(" hh:mm:ss"); + enableSenderPrefixes(false); + enableSenderBrackets(true); // BufferView / NickView settings UiStyleSettings s; @@ -104,8 +114,22 @@ void UiStyle::loadStyleSheet() 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()) { @@ -150,11 +174,69 @@ QString UiStyle::loadStyleSheet(const QString &styleSheet, bool shouldExist) } +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; } } @@ -638,14 +720,52 @@ QString UiStyle::mircToInternal(const QString &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 { + 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; + } } @@ -665,14 +785,11 @@ void UiStyle::StyledMessage::style() const 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 @@ -709,14 +826,11 @@ void UiStyle::StyledMessage::style() const //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 @@ -724,8 +838,7 @@ void UiStyle::StyledMessage::style() const } 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("#:#"); @@ -758,10 +871,9 @@ void UiStyle::StyledMessage::style() const } 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())); } @@ -805,11 +917,20 @@ QString UiStyle::StyledMessage::plainSender() const 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()); + break; case Message::Notice: - return tr("[%1]").arg(plainSender()); break; + return QString("[%1%2]").arg(_senderPrefixes, plainSender()); break; case Message::Action: return "-*-"; break; case Message::Nick: @@ -843,7 +964,7 @@ QString UiStyle::StyledMessage::decoratedSender() const case Message::Invite: return "->"; break; default: - return QString("%1").arg(plainSender()); + return QString("%1%2").arg(_senderPrefixes, plainSender()); } } @@ -854,7 +975,19 @@ quint8 UiStyle::StyledMessage::senderHash() const 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) == '_')