setTimestampFormatString("[hh:mm:ss]");
// BufferView / NickView settings
- BufferSettings bufferSettings;
- _showBufferViewIcons = _showNickViewIcons = bufferSettings.showUserStateIcons();
- bufferSettings.notify("ShowUserStateIcons", this, SLOT(showUserStateIconsChanged()));
+ UiStyleSettings s;
+ _showBufferViewIcons = _showNickViewIcons = s.value("ShowItemViewIcons", true).toBool();
+ s.notify("ShowItemViewIcons", this, SLOT(showItemViewIconsChanged()));
loadStyleSheet();
}
qDeleteAll(_metricsCache);
_metricsCache.clear();
_formatCache.clear();
+ _formats.clear();
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));
- _formatCache[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();
/******** ItemView Styling *******/
-void UiStyle::showUserStateIconsChanged() {
- BufferSettings bufferSettings;
- _showBufferViewIcons = _showNickViewIcons = bufferSettings.showUserStateIcons();
+void UiStyle::showItemViewIconsChanged() {
+ UiStyleSettings s;
+ _showBufferViewIcons = _showNickViewIcons = s.value("ShowItemViewIcons").toBool();
}
QVariant UiStyle::bufferViewItemData(const QModelIndex &index, int role) const {
/******** Caching *******/
-QTextCharFormat UiStyle::cachedFormat(quint64 key) const {
- return _formatCache.value(key, QTextCharFormat());
+QTextCharFormat UiStyle::format(quint64 key) const {
+ return _formats.value(key, QTextCharFormat());
}
QTextCharFormat UiStyle::cachedFormat(quint32 formatType, quint32 messageLabel) const {
- return cachedFormat(formatType | ((quint64)messageLabel << 32));
+ return _formatCache.value(formatType | ((quint64)messageLabel << 32), QTextCharFormat());
}
void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) {
quint64 label = (quint64)label_ << 32;
// check if we have exactly this format readily cached already
- QTextCharFormat fmt = cachedFormat(label|ftype);
+ QTextCharFormat fmt = cachedFormat(ftype, label_);
if(fmt.properties().count())
return fmt;
// TODO: allow combinations for mirc formats and colors (each), e.g. setting a special format for "bold and italic"
// or "foreground 01 and background 03"
- if((ftype & 0xfff0)) { // element format
+ if((ftype & 0xfff00)) { // element format
for(quint32 mask = 0x00100; mask <= 0x40000; mask <<= 1) {
if(ftype & mask) {
- mergeSubElementFormat(fmt, mask | 0xff, label);
+ mergeSubElementFormat(fmt, ftype & (mask | 0xff), label);
}
}
}
// URL
if(ftype & Url)
- mergeSubElementFormat(fmt, ftype & Url, label);
+ mergeSubElementFormat(fmt, ftype & (Url | 0x000000ff), label);
}
// Merge a subelement format into an existing message format
void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint64 label) {
quint64 key = ftype | label;
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffff00))); // label + subelement
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffff00))); // label + subelement + nickhash
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype
+ fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffff00))); // label + subelement
+ fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype
+ fmt.merge(format(key & Q_UINT64_C(0xffffffffffffff00))); // label + subelement + nickhash
+ fmt.merge(format(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype
}
UiStyle::FormatType UiStyle::formatType(Message::Type msgType) {
return ErrorMsg;
case Message::DayChange:
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;
}
QString txt = UiStyle::mircToInternal(contents());
QString bufferName = bufferInfo().bufferName();
bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_-
+ const int maxNetsplitNicks = 15;
QString t;
switch(type()) {
//: Day Change Message
t = tr("{Day changed to %1}").arg(timestamp().toString());
break;
+ 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::DayChange:
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());
}
QString nick = nickFromMask(sender()).toLower();
if(!nick.isEmpty()) {
int chopCount = 0;
- while(nick.at(nick.count() - 1 - chopCount) == '_')
+ while(chopCount < nick.size() && nick.at(nick.count() - 1 - chopCount) == '_')
chopCount++;
- nick.chop(chopCount);
+ if(chopCount < nick.size())
+ nick.chop(chopCount);
}
quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size());
return (_senderHash = (hash & 0xf) + 1);
projects / quassel.git / blobdiff