projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
d'oh - i meant appearance->general
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
1c4b446
..
7d4aeff
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-23,6
+23,7
@@
#include "bufferinfo.h"
#include "buffersyncer.h"
#include "clientbacklogmanager.h"
#include "bufferinfo.h"
#include "buffersyncer.h"
#include "clientbacklogmanager.h"
+#include "bufferviewmanager.h"
#include "global.h"
#include "identity.h"
#include "ircchannel.h"
#include "global.h"
#include "identity.h"
#include "ircchannel.h"
@@
-66,6
+67,7
@@
Client::Client(QObject *parent)
_bufferModel(0),
_bufferSyncer(0),
_backlogManager(new ClientBacklogManager(this)),
_bufferModel(0),
_bufferSyncer(0),
_backlogManager(new ClientBacklogManager(this)),
+ _bufferViewManager(0),
_connectedToCore(false),
_syncedToCore(false)
{
_connectedToCore(false),
_syncedToCore(false)
{
@@
-307,6
+309,9
@@
void Client::setSyncedToCore() {
// attach backlog manager
signalProxy()->synchronize(backlogManager());
// attach backlog manager
signalProxy()->synchronize(backlogManager());
+
+ // create a new BufferViewManager
+ _bufferViewManager = new BufferViewManager(signalProxy(), this);
_syncedToCore = true;
emit connected();
_syncedToCore = true;
emit connected();
@@
-332,6
+337,12
@@
void Client::disconnectFromCore() {
_bufferSyncer->deleteLater();
_bufferSyncer = 0;
}
_bufferSyncer->deleteLater();
_bufferSyncer = 0;
}
+
+ if(_bufferViewManager) {
+ _bufferViewManager->deleteLater();
+ _bufferViewManager = 0;
+ }
+
_networkModel->clear();
QHash<BufferId, Buffer *>::iterator bufferIter = _buffers.begin();
_networkModel->clear();
QHash<BufferId, Buffer *>::iterator bufferIter = _buffers.begin();
@@
-498,6
+509,7
@@
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
Message msg;
while(msgIter != msgIterEnd) {
msg = (*msgIter).value<Message>();
Message msg;
while(msgIter != msgIterEnd) {
msg = (*msgIter).value<Message>();
+ checkForHighlight(msg);
buffer_->prependMsg(msg);
msgIter++;
}
buffer_->prependMsg(msg);
msgIter++;
}