X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=d1308fd4feeaf6c4daa68ef67a26c4a7dc255dcb;hp=030c1ac145314d02bb1b01d1f6565709fb821f60;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=5f13dd167785d830a851b134863dce231ec450dd diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h index 030c1ac1..d1308fd4 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-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,16 +18,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef UISTYLE_H_ -#define UISTYLE_H_ +#pragma once +#include "uisupport-export.h" + +#include +#include + +#include #include #include #include #include +#include #include #include -#include #include #include "bufferinfo.h" @@ -35,15 +40,14 @@ #include "networkmodel.h" #include "settings.h" -class UiStyle : public QObject +class UISUPPORT_EXPORT UiStyle : public QObject { Q_OBJECT + Q_ENUMS(SenderPrefixModes) public: - UiStyle(QObject *parent = 0); - virtual ~UiStyle(); - - typedef QList > FormatList; + UiStyle(QObject* parent = nullptr); + ~UiStyle() override; //! 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 @@ -52,7 +56,8 @@ 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, @@ -80,7 +85,7 @@ public: Bold = 0x00000100, Italic = 0x00000200, Underline = 0x00000400, - Reverse = 0x00000800, + Strikethrough = 0x00000800, // Individual parts of a message Timestamp = 0x00001000, @@ -94,18 +99,25 @@ public: // URL is special, we want that to take precedence over the rest... Url = 0x00080000 - // mIRC Colors - we assume those to be present only in plain contents - // foreground: 0x0.400000 - // background: 0x.0800000 + // mIRC Colors - we assume those to be present only in plain contents + // foreground: 0x0.400000 + // background: 0x.0800000 }; - enum MessageLabel { - OwnMsg = 0x00000001, - Highlight = 0x00000002, - Selected = 0x00000004 // must be last! + enum class MessageLabel : quint32 + { + None = 0x00000000, + OwnMsg = 0x00000001, + Highlight = 0x00000002, + Selected = 0x00000004, + Hovered = 0x00000008, + Last = Hovered }; - enum ItemFormatType { + enum class ItemFormatType : quint32 + { + None = 0x00000000, + BufferViewItem = 0x00000001, NickViewItem = 0x00000002, @@ -119,10 +131,19 @@ public: ActiveBuffer = 0x00002000, UnreadBuffer = 0x00004000, HighlightedBuffer = 0x00008000, - UserAway = 0x00010000 + UserAway = 0x00010000, + + Invalid = 0xffffffff + }; + + enum class FormatProperty + { + AllowForegroundOverride = QTextFormat::UserProperty, + AllowBackgroundOverride }; - 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 @@ -148,12 +169,32 @@ public: SenderColor0d, SenderColor0e, SenderColor0f, - NumRoles // must be last! + NumRoles // must be last! + }; + + /// Display of sender prefix modes + enum class SenderPrefixMode + { + 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; + QColor background; }; - struct StyledString { + using FormatList = std::vector>; + + struct StyledString + { QString plainText; - FormatList formatList; // starting pos, ftypes + FormatList formatList; // starting pos, ftypes }; class StyledMessage; @@ -167,23 +208,23 @@ public: * @see ../qtui/settingspages/chatviewsettingspage.ui * @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 + 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 }; // Explicitly declare QList type for defaultSenderColors, otherwise error C2797 // "list initialization inside member initializer list" will occur in Windows builds with Visual @@ -201,8 +242,8 @@ public: const QColor defaultSenderColorSelf = QColor(0, 0, 0); static FormatType formatType(Message::Type msgType); - static StyledString styleString(const QString &string, quint32 baseFormat = Base); - static QString mircToInternal(const QString &); + static StyledString styleString(const QString& string, FormatType baseFormat = FormatType::Base); + static QString mircToInternal(const QString&); /** * Gets if a custom timestamp format is used. @@ -231,16 +272,16 @@ 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; } + inline const QBrush& brush(ColorRole role) const { return _uiStylePalette.at((int)role); } + inline void setBrush(ColorRole role, const QBrush& brush) { _uiStylePalette[(int)role] = brush; } - QVariant bufferViewItemData(const QModelIndex &networkModelIndex, int role) const; - QVariant nickViewItemData(const QModelIndex &networkModelIndex, int role) const; + QVariant bufferViewItemData(const QModelIndex& networkModelIndex, int role) const; + QVariant nickViewItemData(const QModelIndex& networkModelIndex, int role) const; public slots: void reload(); @@ -250,22 +291,23 @@ signals: protected: void loadStyleSheet(); - QString loadStyleSheet(const QString &name, bool shouldExist = false); + 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 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 FormatType formatType(const QString& code); static QString formatCode(FormatType); /** * Cache the system locale timestamp format string * - * Based on whether or not AM/PM designators are used in the QLocale::system().timeFormat(), - * this extends the system locale timestamp format string to include seconds. + * Based on whether or not AM/PM designators are used in the QLocale.timeFormat(), this extends + * the application locale timestamp format string to include seconds. * * @see UiStyle::systemTimestampFormatString() */ @@ -283,7 +325,13 @@ protected: * * @param[in] format Timestamp format string */ - static void setTimestampFormatString(const QString &format); + static void setTimestampFormatString(const QString& format); + /** + * Updates the local setting cache of how to display sender prefix modes + * + * @param[in] mode Display format for sender prefix modes + */ + static void setSenderPrefixDisplay(UiStyle::SenderPrefixMode mode); /** * Updates the local setting cache of whether or not to show sender brackets @@ -292,24 +340,25 @@ protected: */ static void enableSenderBrackets(bool enabled); - QVariant itemData(int role, const QTextCharFormat &format) const; + QVariant itemData(int role, const QTextCharFormat& format) const; private slots: - void allowMircColorsChanged(const QVariant &); - void showItemViewIconsChanged(const QVariant &); + void allowMircColorsChanged(const QVariant&); + void showItemViewIconsChanged(const QVariant&); private: QVector _uiStylePalette; QBrush _markerLineBrush; QHash _formats; - mutable QHash _formatCache; - mutable QHash _metricsCache; - QHash _listItemFormats; + mutable QHash _formatCache; + 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 _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; @@ -325,20 +374,19 @@ private: bool _allowMircColors; }; - -class UiStyle::StyledMessage : public Message +class UISUPPORT_EXPORT UiStyle::StyledMessage : public Message { Q_DECLARE_TR_FUNCTIONS(UiStyle::StyledMessage) public: - explicit StyledMessage(const Message &message); + explicit StyledMessage(const Message& message); QString decoratedTimestamp() const; - QString plainSender() const; //!< Nickname (no decorations) for Plain and Notice, empty else + QString plainSender() const; //!< Nickname (no decorations) for Plain and Notice, empty else QString decoratedSender() const; - const QString &plainContents() const; + const QString& plainContents() const; - const FormatList &contentsFormatList() const; + const FormatList& contentsFormatList() const; quint8 senderHash() const; @@ -350,10 +398,36 @@ private: mutable quint8 _senderHash; }; +uint qHash(UiStyle::ItemFormatType key, uint seed); -QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList); -QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList); +// ---- Operators for dealing with enums ---------------------------------------------------------- -Q_DECLARE_METATYPE(UiStyle::FormatList) +UISUPPORT_EXPORT UiStyle::FormatType operator|(UiStyle::FormatType lhs, UiStyle::FormatType rhs); +UISUPPORT_EXPORT UiStyle::FormatType& operator|=(UiStyle::FormatType& lhs, UiStyle::FormatType rhs); +UISUPPORT_EXPORT UiStyle::FormatType operator|(UiStyle::FormatType lhs, quint32 rhs); +UISUPPORT_EXPORT UiStyle::FormatType& operator|=(UiStyle::FormatType& lhs, quint32 rhs); +UISUPPORT_EXPORT UiStyle::FormatType operator&(UiStyle::FormatType lhs, UiStyle::FormatType rhs); +UISUPPORT_EXPORT UiStyle::FormatType& operator&=(UiStyle::FormatType& lhs, UiStyle::FormatType rhs); +UISUPPORT_EXPORT UiStyle::FormatType operator&(UiStyle::FormatType lhs, quint32 rhs); +UISUPPORT_EXPORT UiStyle::FormatType& operator&=(UiStyle::FormatType& lhs, quint32 rhs); +UISUPPORT_EXPORT UiStyle::FormatType& operator^=(UiStyle::FormatType& lhs, UiStyle::FormatType rhs); -#endif +UISUPPORT_EXPORT UiStyle::MessageLabel operator|(UiStyle::MessageLabel lhs, UiStyle::MessageLabel rhs); +UISUPPORT_EXPORT UiStyle::MessageLabel& operator|=(UiStyle::MessageLabel& lhs, UiStyle::MessageLabel rhs); +UISUPPORT_EXPORT UiStyle::MessageLabel operator&(UiStyle::MessageLabel lhs, quint32 rhs); +UISUPPORT_EXPORT UiStyle::MessageLabel& operator&=(UiStyle::MessageLabel& lhs, UiStyle::MessageLabel rhs); + +// Shifts the label into the upper half of the return value +UISUPPORT_EXPORT quint64 operator|(UiStyle::FormatType lhs, UiStyle::MessageLabel rhs); + +UISUPPORT_EXPORT UiStyle::ItemFormatType operator|(UiStyle::ItemFormatType lhs, UiStyle::ItemFormatType rhs); +UISUPPORT_EXPORT 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) +Q_DECLARE_METATYPE(UiStyle::MessageLabel) +Q_DECLARE_METATYPE(UiStyle::SenderPrefixMode)