// BufferView / NickView settings
UiStyleSettings s;
_showBufferViewIcons = _showNickViewIcons = s.value("ShowItemViewIcons", true).toBool();
- s.notify("ShowItemViewIcons", this, SLOT(showItemViewIconsChanged()));
+ s.notify("ShowItemViewIcons", this, SLOT(showItemViewIconsChanged(QVariant)));
+
+ _allowMircColors = s.value("AllowMircColors", true).toBool();
+ s.notify("AllowMircColors", this, SLOT(allowMircColorsChanged(QVariant)));
loadStyleSheet();
}
UiStyleSettings s;
QString styleSheet;
- styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("default.qss"));
+ styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("stylesheets/default.qss"));
styleSheet += loadStyleSheet("file:///" + Quassel::configDirPath() + "settings.qss");
if(s.value("UseCustomStyleSheet", false).toBool())
styleSheet += loadStyleSheet("file:///" + s.value("CustomStyleSheetPath").toString(), true);
QssParser parser;
parser.processStyleSheet(styleSheet);
QApplication::setPalette(parser.palette());
- _uiStylePalette = parser.uiStylePalette();
- QTextCharFormat baseFmt = parser.formats().value(Base);
- foreach(quint64 fmtType, parser.formats().keys()) {
- QTextCharFormat fmt = baseFmt;
- fmt.merge(parser.formats().value(fmtType));
- _formats[fmtType] = fmt;
- }
+ _uiStylePalette = parser.uiStylePalette();
+ _formats = parser.formats();
_listItemFormats = parser.listItemFormats();
- qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application
+ styleSheet = styleSheet.trimmed();
+ if(!styleSheet.isEmpty())
+ qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application
}
emit changed();
}
}
+void UiStyle::allowMircColorsChanged(const QVariant &v) {
+ _allowMircColors = v.toBool();
+ emit changed();
+}
+
/******** ItemView Styling *******/
-void UiStyle::showItemViewIconsChanged() {
- UiStyleSettings s;
- _showBufferViewIcons = _showNickViewIcons = s.value("ShowItemViewIcons").toBool();
+void UiStyle::showItemViewIconsChanged(const QVariant &v) {
+ _showBufferViewIcons = _showNickViewIcons = v.toBool();
}
QVariant UiStyle::bufferViewItemData(const QModelIndex &index, int role) const {
// Now we handle color codes
// We assume that those can't be combined with subelement and message types.
- if(ftype & 0x00400000)
- mergeSubElementFormat(fmt, ftype & 0x0f400000, label); // foreground
- if(ftype & 0x00800000)
- mergeSubElementFormat(fmt, ftype & 0xf0800000, label); // background
- if((ftype & 0x00c00000) == 0x00c00000)
- mergeSubElementFormat(fmt, ftype & 0xffc00000, label); // combination
+ if(_allowMircColors) {
+ if(ftype & 0x00400000)
+ mergeSubElementFormat(fmt, ftype & 0x0f400000, label); // foreground
+ if(ftype & 0x00800000)
+ mergeSubElementFormat(fmt, ftype & 0xf0800000, label); // background
+ if((ftype & 0x00c00000) == 0x00c00000)
+ mergeSubElementFormat(fmt, ftype & 0xffc00000, label); // combination
+ }
// URL
if(ftype & Url)
- mergeSubElementFormat(fmt, ftype & Url, label);
+ mergeSubElementFormat(fmt, ftype & (Url | 0x000000ff), label);
}
// Merge a subelement format into an existing message format
return DayChangeMsg;
case Message::Topic:
return TopicMsg;
+ case Message::NetsplitJoin:
+ return NetsplitJoinMsg;
+ case Message::NetsplitQuit:
+ return NetsplitQuitMsg;
}
//Q_ASSERT(false); // we need to handle all message types
qWarning() << Q_FUNC_INFO << "Unknown message type:" << msgType;
color &= 0x0f;
if(s[pos+3] == 'f') {
curfmt &= 0xf0ffffff;
- curfmt |= (color << 24) | 0x00400000;
+ curfmt |= (quint32)(color << 24) | 0x00400000;
} else {
curfmt &= 0x0fffffff;
- curfmt |= (color << 28) | 0x00800000;
+ curfmt |= (quint32)(color << 28) | 0x00800000;
}
length = 6;
}
if(s[pos+1] == 'D') code += s[pos+2];
FormatType ftype = formatType(code);
if(ftype == Invalid) {
+ pos++;
qWarning() << (QString("Invalid format code in string: %1").arg(s));
continue;
}
QString UiStyle::mircToInternal(const QString &mirc_) {
QString mirc = mirc_;
mirc.replace('%', "%%"); // escape % just to be sure
+ mirc.replace('\t', " "); // tabs break layout, also this is italics in Konversation
mirc.replace('\x02', "%B");
mirc.replace('\x0f', "%O");
mirc.replace('\x12', "%R");
QString txt = UiStyle::mircToInternal(contents());
QString bufferName = bufferInfo().bufferName();
bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_-
+ host.replace('%', "%%"); // hostnames too...
+ user.replace('%', "%%"); // and the username...
+ nick.replace('%', "%%"); // ... and then there's totally RFC-violating servers like justin.tv m(
+ const int maxNetsplitNicks = 15;
QString t;
switch(type()) {
case Message::Topic:
//: Topic Message
t = tr("%1").arg(txt); break;
+ case Message::NetsplitJoin: {
+ QStringList users = txt.split("#:#");
+ QStringList servers = users.takeLast().split(" ");
+
+ for(int i = 0; i < users.count() && i < maxNetsplitNicks; i++)
+ users[i] = nickFromMask(users.at(i));
+
+ t = tr("Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: ").arg(servers.at(0),servers.at(1));
+ if(users.count() <= maxNetsplitNicks)
+ t.append(QString("%DN%1%DN").arg(users.join(", ")));
+ else
+ t.append(tr("%DN%1%DN (%2 more)").arg(static_cast<QStringList>(users.mid(0, maxNetsplitNicks)).join(", ")).arg(users.count() - maxNetsplitNicks));
+ }
+ break;
+ case Message::NetsplitQuit: {
+ QStringList users = txt.split("#:#");
+ QStringList servers = users.takeLast().split(" ");
+
+ for(int i = 0; i < users.count() && i < maxNetsplitNicks; i++)
+ users[i] = nickFromMask(users.at(i));
+
+ t = tr("Netsplit between %DH%1%DH and %DH%2%DH. Users quit: ").arg(servers.at(0),servers.at(1));
+
+ if(users.count() <= maxNetsplitNicks)
+ t.append(QString("%DN%1%DN").arg(users.join(", ")));
+ else
+ t.append(tr("%DN%1%DN (%2 more)").arg(static_cast<QStringList>(users.mid(0, maxNetsplitNicks)).join(", ")).arg(users.count() - maxNetsplitNicks));
+ }
+ break;
default:
t = tr("[%1]").arg(txt);
}
return tr("-"); break;
case Message::Topic:
return tr("*"); break;
+ case Message::NetsplitJoin:
+ return tr("=>"); break;
+ case Message::NetsplitQuit:
+ return tr("<="); break;
default:
return tr("%1").arg(plainSender());
}