X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=28ba40546973366102107800e0c413dfd429a50a;hp=0b4589a18b6ab3f12fd10dccab24618bc0e33985;hb=e6f810169117c836c22ae1146e469e61dec95f6f;hpb=27fe4e6f46547c45d19fa39c175fa2104a5feb28 diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h index 0b4589a1..28ba4054 100644 --- a/src/uisupport/uistyle.h +++ b/src/uisupport/uistyle.h @@ -18,9 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef UISTYLE_H_ -#define UISTYLE_H_ +#pragma once +#include +#include + +#include #include #include #include @@ -43,8 +46,6 @@ public: UiStyle(QObject *parent = 0); virtual ~UiStyle(); - typedef QList > FormatList; - //! This enumerates the possible formats a text element may have. */ /** These formats are ordered on increasing importance, in cases where a given property is specified * by multiple active formats. @@ -52,7 +53,7 @@ public: * methods in this class (in particular mergedFormat())! * Also, we _do_ rely on certain properties of these values in styleString() and friends! */ - enum FormatType { + enum class FormatType : quint32 { Base = 0x00000000, Invalid = 0xffffffff, @@ -99,13 +100,16 @@ public: // background: 0x.0800000 }; - enum MessageLabel { + enum class MessageLabel : quint32 { + None = 0x00000000, OwnMsg = 0x00000001, Highlight = 0x00000002, Selected = 0x00000004 // must be last! }; - enum ItemFormatType { + enum class ItemFormatType : quint32 { + None = 0x00000000, + BufferViewItem = 0x00000001, NickViewItem = 0x00000002, @@ -119,14 +123,48 @@ public: ActiveBuffer = 0x00002000, UnreadBuffer = 0x00004000, HighlightedBuffer = 0x00008000, - UserAway = 0x00010000 + UserAway = 0x00010000, + + Invalid = 0xffffffff }; - enum ColorRole { + enum class ColorRole { MarkerLine, + // Sender colors (16 + self) + // These aren't used directly to avoid having storing all of the sender color options in the + // rendering routine of each item. Also, I couldn't figure out how to do that. + // It would be nice to have the UseSenderColors preference also toggle sender colors set by + // themes, so hopefully this can be extended in the future. + // Furthermore, using this palette directly would mean separate sets of colors couldn't be + // used for different message types. + SenderColorSelf, + SenderColor00, + SenderColor01, + SenderColor02, + SenderColor03, + SenderColor04, + SenderColor05, + SenderColor06, + SenderColor07, + SenderColor08, + SenderColor09, + SenderColor0a, + SenderColor0b, + SenderColor0c, + SenderColor0d, + SenderColor0e, + SenderColor0f, NumRoles // must be last! }; + struct Format { + FormatType type; + QColor foreground; + QColor background; + }; + + using FormatList = std::vector>; + struct StyledString { QString plainText; FormatList formatList; // starting pos, ftypes @@ -138,27 +176,28 @@ public: * List of default sender colors * * In order from 1 - 16, matching the Sender## format in the settings file. - * Don't change the length or values of the colors without updating the UI, too. + * Don't change the length or values of the colors without updating the UI and color roles, too. * * @see ../qtui/settingspages/chatviewsettingspage.ui + * @see UiStyle::ColorRole */ const QList defaultSenderColors = QList { - QColor(233, 13, 127), /// Sender00 - QColor(142, 85, 233), /// Sender01 - QColor(179, 14, 14), /// Sender02 - QColor(23, 179, 57), /// Sender03 - QColor(88, 175, 179), /// Sender04 - QColor(157, 84, 179), /// Sender05 - QColor(179, 151, 117), /// Sender06 - QColor(49, 118, 179), /// Sender07 - QColor(233, 13, 127), /// Sender08 - QColor(142, 85, 233), /// Sender09 - QColor(179, 14, 14), /// Sender10 - QColor(23, 179, 57), /// Sender11 - QColor(88, 175, 179), /// Sender12 - QColor(157, 84, 179), /// Sender13 - QColor(179, 151, 117), /// Sender14 - QColor(49, 118, 179), /// 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 @@ -176,7 +215,7 @@ public: const QColor defaultSenderColorSelf = QColor(0, 0, 0); static FormatType formatType(Message::Type msgType); - static StyledString styleString(const QString &string, quint32 baseFormat = Base); + static StyledString styleString(const QString &string, FormatType baseFormat = FormatType::Base); static QString mircToInternal(const QString &); /** @@ -206,10 +245,10 @@ public: */ static QString timestampFormatString(); - QTextCharFormat format(quint32 formatType, quint32 messageLabel) const; - QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel) const; + QTextCharFormat format(const Format &format, MessageLabel messageLabel) const; + QFontMetricsF *fontMetrics(FormatType formatType, MessageLabel messageLabel) const; - QList toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel) const; + QList toTextLayoutList(const FormatList &, int textLength, MessageLabel messageLabel) const; inline const QBrush &brush(ColorRole role) const { return _uiStylePalette.at((int)role); } inline void setBrush(ColorRole role, const QBrush &brush) { _uiStylePalette[(int)role] = brush; } @@ -228,10 +267,10 @@ protected: QString loadStyleSheet(const QString &name, bool shouldExist = false); QTextCharFormat format(quint64 key) const; - QTextCharFormat cachedFormat(quint32 formatType, quint32 messageLabel) const; - void setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) const; - void mergeFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel) const; - void mergeSubElementFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel) 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; static FormatType formatType(const QString &code); static QString formatCode(FormatType); @@ -259,6 +298,12 @@ protected: * @param[in] format Timestamp format string */ static void setTimestampFormatString(const QString &format); + /** + * Updates the local setting cache of whether or not to show sender prefixmodes + * + * @param[in] enabled If true, sender prefixmodes are enabled, otherwise false. + */ + static void enableSenderPrefixes(bool enabled); /** * Updates the local setting cache of whether or not to show sender brackets @@ -277,13 +322,14 @@ private: QVector _uiStylePalette; QBrush _markerLineBrush; QHash _formats; - mutable QHash _formatCache; + mutable QHash _formatCache; mutable QHash _metricsCache; - QHash _listItemFormats; + 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 QIcon _channelJoinedIcon; @@ -325,10 +371,39 @@ private: mutable quint8 _senderHash; }; +#if QT_VERSION < 0x050000 +uint qHash(UiStyle::ItemFormatType key); +#else +uint qHash(UiStyle::ItemFormatType key, uint seed); +#endif + +// ---- Operators for dealing with enums ---------------------------------------------------------- + +UiStyle::FormatType operator|(UiStyle::FormatType lhs, UiStyle::FormatType rhs); +UiStyle::FormatType& operator|=(UiStyle::FormatType &lhs, UiStyle::FormatType rhs); +UiStyle::FormatType operator|(UiStyle::FormatType lhs, quint32 rhs); +UiStyle::FormatType& operator|=(UiStyle::FormatType &lhs, quint32 rhs); +UiStyle::FormatType operator&(UiStyle::FormatType lhs, UiStyle::FormatType rhs); +UiStyle::FormatType& operator&=(UiStyle::FormatType &lhs, UiStyle::FormatType rhs); +UiStyle::FormatType operator&(UiStyle::FormatType lhs, quint32 rhs); +UiStyle::FormatType& operator&=(UiStyle::FormatType &lhs, quint32 rhs); +UiStyle::FormatType& operator^=(UiStyle::FormatType &lhs, UiStyle::FormatType rhs); + +UiStyle::MessageLabel operator|(UiStyle::MessageLabel lhs, UiStyle::MessageLabel rhs); +UiStyle::MessageLabel& operator|=(UiStyle::MessageLabel &lhs, UiStyle::MessageLabel rhs); +UiStyle::MessageLabel operator&(UiStyle::MessageLabel lhs, quint32 rhs); +UiStyle::MessageLabel& operator&=(UiStyle::MessageLabel &lhs, UiStyle::MessageLabel rhs); + +// Shifts the label into the upper half of the return value +quint64 operator|(UiStyle::FormatType lhs, UiStyle::MessageLabel rhs); + +UiStyle::ItemFormatType operator|(UiStyle::ItemFormatType lhs, UiStyle::ItemFormatType rhs); +UiStyle::ItemFormatType& operator|=(UiStyle::ItemFormatType &lhs, UiStyle::ItemFormatType rhs); + +// ---- Allow for FormatList in QVariant ---------------------------------------------------------- QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList); QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList); Q_DECLARE_METATYPE(UiStyle::FormatList) - -#endif +Q_DECLARE_METATYPE(UiStyle::MessageLabel)