{
_monitorBuffer = new Buffer(BufferInfo(), this);
_signalProxy->synchronize(_ircListHelper);
-
+
connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)),
this, SLOT(receiveBacklog(BufferId, const QVariantList &)));
}
connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore()));
connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore()));
- layoutTimer = new QTimer(this);
- layoutTimer->setInterval(0);
- layoutTimer->setSingleShot(false);
- connect(layoutTimer, SIGNAL(timeout()), this, SLOT(layoutMsg()));
-
}
/*** public static methods ***/
_bufferViewManager = 0;
}
+ _messageModel->clear();
_networkModel->clear();
QHash<BufferId, Buffer *>::iterator bufferIter = _buffers.begin();
}
Q_ASSERT(_identities.isEmpty());
- layoutQueue.clear();
- layoutTimer->stop();
}
void Client::setCoreConfiguration(const QVariantMap &settings) {
}
}
-void Client::recvMessage(const Message &msg) {
- //checkForHighlight(msg);
+void Client::recvMessage(const Message &msg_) {
+ Message msg = msg_;
+ checkForHighlight(msg);
_messageModel->insertMessage(msg);
+ buffer(msg.bufferInfo())->updateActivityLevel(msg);
}
void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
}
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
- //checkForHighlight(msg);
//QTime start = QTime::currentTime();
foreach(QVariant v, msgs) {
- _messageModel->insertMessage(v.value<Message>());
+ Message msg = v.value<Message>();
+ checkForHighlight(msg);
+ _messageModel->insertMessage(msg);
+ buffer(msg.bufferInfo())->updateActivityLevel(msg);
}
//qDebug() << "processed" << msgs.count() << "backlog lines in" << start.msecsTo(QTime::currentTime());
}
-void Client::layoutMsg() {
- if(layoutQueue.isEmpty()) {
- layoutTimer->stop();
- return;
- }
-
- Buffer *buffer = layoutQueue.takeFirst();
- if(buffer->layoutMsg()) {
- layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin
+// TODO optimize checkForHighlight
+void Client::checkForHighlight(Message &msg) {
+ if(!((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self)))
return;
- }
-
- if(layoutQueue.isEmpty())
- layoutTimer->stop();
-}
-AbstractUiMsg *Client::layoutMsg(const Message &msg) {
- return instance()->mainUi->layoutMsg(msg);
-}
-
-void Client::checkForHighlight(Message &msg) {
NotificationSettings notificationSettings;
const Network *net = network(msg.bufferInfo().networkId());
if(net && !net->myNick().isEmpty()) {
}
foreach(QString nickname, nickList) {
QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$");
- if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
- && !(msg.flags() & Message::Self)
- && nickRegExp.exactMatch(msg.contents())) {
+ if(nickRegExp.exactMatch(msg.contents())) {
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
} else {
userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(name) + "(\\W.*)?$", caseSensitivity);
}
- if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
- && !(msg.flags() & Message::Self)
- && userRegExp.exactMatch(msg.contents())) {
+ if(userRegExp.exactMatch(msg.contents())) {
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
Buffer *buff = 0;
if(_buffers.contains(bufferId)) {
buff = _buffers.take(bufferId);
- layoutQueue.removeAll(buff);
disconnect(buff, 0, this, 0);
}