X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=6ea9fa8cea910eadc0d75d67a3d5d2f12c1d3471;hp=28ba40546973366102107800e0c413dfd429a50a;hb=670e7d401aae1196c0a24c59f96d267a8eb9d1bb;hpb=e6f810169117c836c22ae1146e469e61dec95f6f diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h index 28ba4054..6ea9fa8c 100644 --- a/src/uisupport/uistyle.h +++ b/src/uisupport/uistyle.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -41,6 +41,7 @@ class UiStyle : public QObject { Q_OBJECT + Q_ENUMS(SenderPrefixModes) public: UiStyle(QObject *parent = 0); @@ -81,7 +82,7 @@ public: Bold = 0x00000100, Italic = 0x00000200, Underline = 0x00000400, - Reverse = 0x00000800, + Strikethrough = 0x00000800, // Individual parts of a message Timestamp = 0x00001000, @@ -104,7 +105,9 @@ public: None = 0x00000000, OwnMsg = 0x00000001, Highlight = 0x00000002, - Selected = 0x00000004 // must be last! + Selected = 0x00000004, + Hovered = 0x00000008, + Last = Hovered }; enum class ItemFormatType : quint32 { @@ -128,6 +131,11 @@ public: Invalid = 0xffffffff }; + enum class FormatProperty { + AllowForegroundOverride = QTextFormat::UserProperty, + AllowBackgroundOverride + }; + enum class ColorRole { MarkerLine, // Sender colors (16 + self) @@ -157,6 +165,19 @@ public: NumRoles // must be last! }; + /// Display of sender prefix modes +#if QT_VERSION >= 0x050000 + enum class SenderPrefixMode { +#else + enum SenderPrefixMode { +#endif + NoModes = 0, ///< Hide sender modes + HighestMode = 1, ///< Show the highest active sender mode + AllModes = 2 ///< Show all active sender modes + }; + // Do not change SenderPrefixMode numbering without also adjusting + // ChatViewSettingsPage::initSenderPrefixComboBox() and chatviewsettingspage.ui "defaultValue" + struct Format { FormatType type; QColor foreground; @@ -182,22 +203,22 @@ public: * @see UiStyle::ColorRole */ const QList defaultSenderColors = QList { - QColor(204, 0, 0), /// Sender00 - QColor( 0, 108, 173), /// Sender01 - QColor( 77, 153, 0), /// Sender02 - QColor(102, 0, 204), /// Sender03 - QColor(166, 125, 0), /// Sender04 - QColor( 0, 153, 39), /// Sender05 - QColor( 0, 48, 192), /// Sender06 - QColor(204, 0, 154), /// Sender07 - QColor(185, 70, 0), /// Sender08 - QColor(134, 153, 0), /// Sender09 - QColor( 20, 153, 0), /// Sender10 - QColor( 0, 153, 96), /// Sender11 - QColor( 0, 108, 173), /// Sender12 - QColor( 0, 153, 204), /// Sender13 - QColor(179, 0, 204), /// Sender14 - QColor(204, 0, 77), /// Sender15 + QColor(204, 0, 0), ///< Sender00 + QColor( 0, 108, 173), ///< Sender01 + QColor( 77, 153, 0), ///< Sender02 + QColor(102, 0, 204), ///< Sender03 + QColor(166, 125, 0), ///< Sender04 + QColor( 0, 153, 39), ///< Sender05 + QColor( 0, 48, 192), ///< Sender06 + QColor(204, 0, 154), ///< Sender07 + QColor(185, 70, 0), ///< Sender08 + QColor(134, 153, 0), ///< Sender09 + QColor( 20, 153, 0), ///< Sender10 + QColor( 0, 153, 96), ///< Sender11 + QColor( 0, 108, 173), ///< Sender12 + QColor( 0, 153, 204), ///< Sender13 + QColor(179, 0, 204), ///< Sender14 + QColor(204, 0, 77), ///< Sender15 }; // Explicitly declare QList type for defaultSenderColors, otherwise error C2797 // "list initialization inside member initializer list" will occur in Windows builds with Visual @@ -266,11 +287,12 @@ protected: void loadStyleSheet(); QString loadStyleSheet(const QString &name, bool shouldExist = false); - QTextCharFormat format(quint64 key) const; + QTextCharFormat parsedFormat(quint64 key) const; QTextCharFormat cachedFormat(const Format &format, MessageLabel messageLabel) const; void setCachedFormat(const QTextCharFormat &charFormat, const Format &format, MessageLabel messageLabel) const; void mergeFormat(QTextCharFormat &charFormat, const Format &format, MessageLabel messageLabel) const; void mergeSubElementFormat(QTextCharFormat &charFormat, FormatType formatType, MessageLabel messageLabel) const; + void mergeColors(QTextCharFormat &charFormat, const Format &format, MessageLabel messageLabel) const; static FormatType formatType(const QString &code); static QString formatCode(FormatType); @@ -299,11 +321,11 @@ protected: */ static void setTimestampFormatString(const QString &format); /** - * Updates the local setting cache of whether or not to show sender prefixmodes + * Updates the local setting cache of how to display sender prefix modes * - * @param[in] enabled If true, sender prefixmodes are enabled, otherwise false. + * @param[in] mode Display format for sender prefix modes */ - static void enableSenderPrefixes(bool enabled); + static void setSenderPrefixDisplay(UiStyle::SenderPrefixMode mode); /** * Updates the local setting cache of whether or not to show sender brackets @@ -326,11 +348,11 @@ private: mutable QHash _metricsCache; QHash _listItemFormats; static QHash _formatCodes; - static bool _useCustomTimestampFormat; /// If true, use the custom timestamp format - static QString _systemTimestampFormatString; /// Cached copy of system locale timestamp format - static QString _timestampFormatString; /// Timestamp format string - static bool _showSenderPrefixes; /// If true, show prefixmodes before sender names - static bool _showSenderBrackets; /// If true, show brackets around sender names + static bool _useCustomTimestampFormat; ///< If true, use the custom timestamp format + static QString _systemTimestampFormatString; ///< Cached copy of system locale timestamp format + static QString _timestampFormatString; ///< Timestamp format string + static UiStyle::SenderPrefixMode _senderPrefixDisplay; ///< Prefix mode display before sender + static bool _showSenderBrackets; ///< If true, show brackets around sender names QIcon _channelJoinedIcon; QIcon _channelPartedIcon; @@ -407,3 +429,4 @@ QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList); Q_DECLARE_METATYPE(UiStyle::FormatList) Q_DECLARE_METATYPE(UiStyle::MessageLabel) +Q_DECLARE_METATYPE(UiStyle::SenderPrefixMode)