X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuistyle.cpp;h=fa8d950322bf678d727d486a88443cccb2004868;hp=a81f929517c65cc9826ae3a6d168b943590dd3f5;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=12d401fe2949ca2c823ea38181361650eaaeae66 diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp index a81f9295..fa8d9503 100644 --- a/src/qtui/qtuistyle.cpp +++ b/src/qtui/qtuistyle.cpp @@ -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 * @@ -18,29 +18,27 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "chatviewsettings.h" #include "qtuistyle.h" #include +#include #include -QtUiStyle::QtUiStyle(QObject *parent) : UiStyle(parent) +#include "chatviewsettings.h" + +QtUiStyle::QtUiStyle(QObject* parent) + : UiStyle(parent) { ChatViewSettings s; - s.notify("UseCustomTimestampFormat", this, SLOT(updateUseCustomTimestampFormat())); - updateUseCustomTimestampFormat(); - s.notify("TimestampFormat", this, SLOT(updateTimestampFormatString())); - updateTimestampFormatString(); - s.notify("ShowSenderBrackets", this, SLOT(updateShowSenderBrackets())); - updateShowSenderBrackets(); + s.initAndNotify("UseCustomTimestampFormat", this, &QtUiStyle::updateUseCustomTimestampFormat); + s.initAndNotify("TimestampFormat", this, &QtUiStyle::updateTimestampFormatString); + s.initAndNotify("SenderPrefixMode", this, &QtUiStyle::updateSenderPrefixDisplay); + s.initAndNotify("ShowSenderBrackets", this, &QtUiStyle::updateShowSenderBrackets); // If no style sheet exists, generate it on first run. initializeSettingsQss(); } - -QtUiStyle::~QtUiStyle() {} - void QtUiStyle::updateUseCustomTimestampFormat() { ChatViewSettings s; @@ -53,13 +51,18 @@ void QtUiStyle::updateTimestampFormatString() setTimestampFormatString(s.timestampFormatString()); } +void QtUiStyle::updateSenderPrefixDisplay() +{ + ChatViewSettings s; + setSenderPrefixDisplay(s.senderPrefixDisplay()); +} + void QtUiStyle::updateShowSenderBrackets() { ChatViewSettings s; enableSenderBrackets(s.showSenderBrackets()); } - void QtUiStyle::initializeSettingsQss() { QFileInfo settingsQss(Quassel::configDirPath() + "settings.qss"); @@ -76,7 +79,7 @@ void QtUiStyle::generateSettingsQss() const { QFile settingsQss(Quassel::configDirPath() + "settings.qss"); - if (!settingsQss.open(QFile::WriteOnly|QFile::Truncate)) { + if (!settingsQss.open(QFile::WriteOnly | QFile::Truncate)) { qWarning() << "Could not open" << settingsQss.fileName() << "for writing!"; return; } @@ -96,34 +99,23 @@ void QtUiStyle::generateSettingsQss() const if (s.value("UseChatViewColors").toBool()) { out << "\n// Custom ChatView Colors\n" - // markerline is special in that it always used to use a gradient, so we keep this behavior even with the new implementation - << "Palette { marker-line: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 " << color("MarkerLine", s) << ", stop: 0.1 transparent); }\n" - << "ChatView { background: " << color("ChatViewBackground", s) << "; }\n\n" - << "ChatLine[label=\"highlight\"] {\n" - << " foreground: " << color("Highlight", s) << ";\n" - << " background: " << color("HighlightBackground", s) << ";\n" - << "}\n\n" - << "ChatLine::timestamp { foreground: " << color("Timestamp", s) << "; }\n\n" - - << msgTypeQss("plain", "ChannelMsg", s) - << msgTypeQss("notice", "ServerMsg", s) - << msgTypeQss("action", "ActionMsg", s) - << msgTypeQss("nick", "CommandMsg", s) - << msgTypeQss("mode", "CommandMsg", s) - << msgTypeQss("join", "CommandMsg", s) - << msgTypeQss("part", "CommandMsg", s) - << msgTypeQss("quit", "CommandMsg", s) - << msgTypeQss("kick", "CommandMsg", s) - << msgTypeQss("kill", "CommandMsg", s) - << msgTypeQss("server", "ServerMsg", s) - << msgTypeQss("info", "ServerMsg", s) - << msgTypeQss("error", "ErrorMsg", s) - << msgTypeQss("daychange", "ServerMsg", s) - << msgTypeQss("topic", "CommandMsg", s) - << msgTypeQss("netsplit-join", "CommandMsg", s) - << msgTypeQss("netsplit-quit", "CommandMsg", s) - << msgTypeQss("invite", "CommandMsg", s) - << "\n"; + // markerline is special in that it always used to use a gradient, so we keep this behavior even with the new implementation + << "Palette { marker-line: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 " << color("MarkerLine", s) + << ", stop: 0.1 transparent); }\n" + << "ChatView { background: " << color("ChatViewBackground", s) << "; }\n\n" + << "ChatLine[label=\"highlight\"] {\n" + << " foreground: " << color("Highlight", s) << ";\n" + << " background: " << color("HighlightBackground", s) << ";\n" + << "}\n\n" + << "ChatLine::timestamp { foreground: " << color("Timestamp", s) << "; }\n\n" + + << msgTypeQss("plain", "ChannelMsg", s) << msgTypeQss("notice", "ServerMsg", s) << msgTypeQss("action", "ActionMsg", s) + << msgTypeQss("nick", "CommandMsg", s) << msgTypeQss("mode", "CommandMsg", s) << msgTypeQss("join", "CommandMsg", s) + << msgTypeQss("part", "CommandMsg", s) << msgTypeQss("quit", "CommandMsg", s) << msgTypeQss("kick", "CommandMsg", s) + << msgTypeQss("kill", "CommandMsg", s) << msgTypeQss("server", "ServerMsg", s) << msgTypeQss("info", "ServerMsg", s) + << msgTypeQss("error", "ErrorMsg", s) << msgTypeQss("daychange", "ServerMsg", s) << msgTypeQss("topic", "CommandMsg", s) + << msgTypeQss("netsplit-join", "CommandMsg", s) << msgTypeQss("netsplit-quit", "CommandMsg", s) + << msgTypeQss("invite", "CommandMsg", s) << "\n"; } if (s.value("UseSenderColors", true).toBool()) { @@ -153,6 +145,16 @@ void QtUiStyle::generateSettingsQss() const out << senderQss(i, "action", true); } + // Only color the nicks in CTCP ACTIONs if sender colors are enabled + if (s.value("UseNickGeneralColors", true).toBool()) { + // For action messages, color the 'sender' column -and- the nick itself + out << "\n// Nickname colors for all messages\n" + << "ChatLine::nick[sender=\"self\"] { foreground: palette(sender-color-self); }\n\n"; + + // Matches qssparser.cpp for any style of message (UiStyle::...) + for (int i = 0; i < defaultSenderColors.count(); i++) + out << nickQss(i); + } } // ItemViews @@ -170,88 +172,89 @@ void QtUiStyle::generateSettingsQss() const if (uiColors.value("UseBufferViewColors").toBool()) { out << "\n// BufferView Colors\n" << "ChatListItem { foreground: " << color("DefaultBuffer", uiColors) << "; }\n" - << chatListItemQss("inactive", "InactiveBuffer", uiColors) - << chatListItemQss("channel-event", "ActiveBuffer", uiColors) - << chatListItemQss("unread-message", "UnreadBuffer", uiColors) - << chatListItemQss("highlighted", "HighlightedBuffer", uiColors); + << chatListItemQss("inactive", "InactiveBuffer", uiColors) << chatListItemQss("channel-event", "ActiveBuffer", uiColors) + << chatListItemQss("unread-message", "UnreadBuffer", uiColors) << chatListItemQss("highlighted", "HighlightedBuffer", uiColors); } if (uiColors.value("UseNickViewColors").toBool()) { out << "\n// NickView Colors\n" << "NickListItem[type=\"category\"] { foreground: " << color("DefaultBuffer", uiColors) << "; }\n" << "NickListItem[type=\"user\"] { foreground: " << color("OnlineNick", uiColors) << "; }\n" - << "NickListItem[type=\"user\", state=\"away\"] { foreground: " << color("AwayNick", uiColors) << "; }\n"; + << R"(NickListItem[type="user", state="away"] { foreground: )" << color("AwayNick", uiColors) << "; }\n"; } settingsQss.close(); } - -QString QtUiStyle::color(const QString &key, UiSettings &settings, const QColor &defaultColor) const +QString QtUiStyle::color(const QString& key, UiSettings& settings, const QColor& defaultColor) const { return settings.value(key, defaultColor).value().name(); } - -QString QtUiStyle::fontDescription(const QFont &font) const +QString QtUiStyle::fontDescription(const QFont& font) const { - QString desc = "font: "; - if (font.italic()) - desc += "italic "; - if (font.bold()) - desc += "bold "; - if (!font.italic() && !font.bold()) - desc += "normal "; - desc += QString("%1pt \"%2\"").arg(font.pointSize()).arg(font.family()); - return desc; + QFont::Style style = font.style(); + int weight = font.weight(); + + return QString("font: %1 %2 %3pt \"%4\"") + .arg(style == QFont::StyleItalic ? "italic" : style == QFont::StyleOblique ? "oblique" : "normal") + .arg(100 * qBound(1, (weight * 8 + 50) / 100, 9)) + .arg(font.pointSize()) + .arg(font.family()); } - -QString QtUiStyle::msgTypeQss(const QString &msgType, const QString &key, UiSettings &settings) const +QString QtUiStyle::msgTypeQss(const QString& msgType, const QString& key, UiSettings& settings) const { return QString("ChatLine#%1 { foreground: %2; }\n").arg(msgType, color(key, settings)); } - -QString QtUiStyle::senderPaletteQss(UiSettings &settings) const +QString QtUiStyle::senderPaletteQss(UiSettings& settings) const { QString result; result += "Palette {\n"; // Generate entries for sender-color-self - result += QString(" sender-color-self: %1;\n") - .arg(color("SenderSelf", settings, defaultSenderColorSelf)); + result += QString(" sender-color-self: %1;\n").arg(color("SenderSelf", settings, defaultSenderColorSelf)); // Generate entries for sender-color-HASH for (int i = 0; i < defaultSenderColors.count(); i++) { QString dez = QString::number(i); - if (dez.length() == 1) dez.prepend('0'); - result += QString(" sender-color-0%1: %2;\n") - .arg(QString::number(i, 16), color("Sender"+dez, settings, defaultSenderColors[i])); + if (dez.length() == 1) + dez.prepend('0'); + result += QString(" sender-color-0%1: %2;\n").arg(QString::number(i, 16), color("Sender" + dez, settings, defaultSenderColors[i])); } result += "}\n\n"; return result; } - -QString QtUiStyle::senderQss(int i, const QString &messageType, bool includeNick) const +QString QtUiStyle::senderQss(int i, const QString& messageType, bool includeNick) const { QString dez = QString::number(i); - if (dez.length() == 1) dez.prepend('0'); + if (dez.length() == 1) + dez.prepend('0'); if (includeNick) { // Include the nickname in the color rules return QString("ChatLine::sender#%1[sender=\"0%2\"] { foreground: palette(sender-color-0%2); }\n" "ChatLine::nick#%1[sender=\"0%2\"] { foreground: palette(sender-color-0%2); }\n") - .arg(messageType, QString::number(i, 16)); - } else { + .arg(messageType, QString::number(i, 16)); + } + else { return QString("ChatLine::sender#%1[sender=\"0%2\"] { foreground: palette(sender-color-0%2); }\n") - .arg(messageType, QString::number(i, 16)); + .arg(messageType, QString::number(i, 16)); } } +QString QtUiStyle::nickQss(int i) const +{ + QString dez = QString::number(i); + if (dez.length() == 1) + dez.prepend('0'); + + return QString("ChatLine::nick[sender=\"0%1\"] { foreground: palette(sender-color-0%1); }\n").arg(QString::number(i, 16)); +} -QString QtUiStyle::chatListItemQss(const QString &state, const QString &key, UiSettings &settings) const +QString QtUiStyle::chatListItemQss(const QString& state, const QString& key, UiSettings& settings) const { return QString("ChatListItem[state=\"%1\"] { foreground: %2; }\n").arg(state, color(key, settings)); }