projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce extra Palette roles for UiStyle
[quassel.git]
/
src
/
uisupport
/
uistyle.cpp
diff --git
a/src/uisupport/uistyle.cpp
b/src/uisupport/uistyle.cpp
index
3ab08f4
..
ce39d2d
100644
(file)
--- a/
src/uisupport/uistyle.cpp
+++ b/
src/uisupport/uistyle.cpp
@@
-37,6
+37,8
@@
UiStyle::UiStyle(QObject *parent) : QObject(parent) {
Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid);
}
Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid);
}
+ _uiStylePalette = QVector<QBrush>(NumRoles, QBrush());
+
// Now initialize the mapping between FormatCodes and FormatTypes...
_formatCodes["%O"] = Base;
_formatCodes["%B"] = Bold;
// Now initialize the mapping between FormatCodes and FormatTypes...
_formatCodes["%O"] = Base;
_formatCodes["%B"] = Bold;
@@
-81,7
+83,7
@@
void UiStyle::loadStyleSheet() {
QssParser parser;
parser.processStyleSheet(styleSheet);
QApplication::setPalette(parser.palette());
QssParser parser;
parser.processStyleSheet(styleSheet);
QApplication::setPalette(parser.palette());
- _
markerLineBrush = parser.markerLineBrush
();
+ _
uiStylePalette = parser.uiStylePalette
();
QTextCharFormat baseFmt = parser.formats().value(Base);
foreach(quint64 fmtType, parser.formats().keys()) {
QTextCharFormat baseFmt = parser.formats().value(Base);
foreach(quint64 fmtType, parser.formats().keys()) {