projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version.inc for release
[quassel.git]
/
src
/
uisupport
/
abstractbuffercontainer.cpp
diff --git
a/src/uisupport/abstractbuffercontainer.cpp
b/src/uisupport/abstractbuffercontainer.cpp
index
a12b031
..
8b89e8c
100644
(file)
--- a/
src/uisupport/abstractbuffercontainer.cpp
+++ b/
src/uisupport/abstractbuffercontainer.cpp
@@
-19,7
+19,6
@@
***************************************************************************/
#include "abstractbuffercontainer.h"
***************************************************************************/
#include "abstractbuffercontainer.h"
-#include "buffer.h"
#include "client.h"
#include "networkmodel.h"
#include "client.h"
#include "networkmodel.h"
@@
-32,7
+31,6
@@
AbstractBufferContainer::AbstractBufferContainer(QWidget *parent)
AbstractBufferContainer::~AbstractBufferContainer() {
}
AbstractBufferContainer::~AbstractBufferContainer() {
}
-
void AbstractBufferContainer::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
Q_ASSERT(model());
if(!parent.isValid()) {
void AbstractBufferContainer::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
Q_ASSERT(model());
if(!parent.isValid()) {
@@
-60,7
+58,6
@@
void AbstractBufferContainer::rowsAboutToBeRemoved(const QModelIndex &parent, in
}
void AbstractBufferContainer::removeBuffer(BufferId bufferId) {
}
void AbstractBufferContainer::removeBuffer(BufferId bufferId) {
- if(Client::buffer(bufferId)) Client::buffer(bufferId)->setVisible(false);
if(!_chatViews.contains(bufferId))
return;
if(!_chatViews.contains(bufferId))
return;
@@
-78,26
+75,23
@@
void AbstractBufferContainer::currentChanged(const QModelIndex ¤t, const Q
}
void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) {
}
void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) {
- AbstractChatView *chatView = 0;
- Buffer *prevBuffer = Client::buffer(currentBuffer());
- if(prevBuffer) prevBuffer->setVisible(false);
+ BufferId prevBufferId = currentBuffer();
+ if(prevBufferId.isValid() && _chatViews.contains(prevBufferId)) {
+ Client::setBufferLastSeenMsg(prevBufferId, _chatViews[prevBufferId]->lastMsgId());
+ }
- Buffer *buf;
- if(!bufferId.isValid() || !(buf = Client::buffer(bufferId))) {
- if(bufferId.isValid())
- qWarning() << "AbstractBufferContainer::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
+ if(!bufferId.isValid()) {
_currentBuffer = 0;
showChatView(0);
return;
}
_currentBuffer = 0;
showChatView(0);
return;
}
- if(_chatViews.contains(bufferId)) {
- chatView = _chatViews[bufferId];
- } else {
- chatView = createChatView(bufferId);
- _chatViews[bufferId] = chatView;
- }
+
+ if(!_chatViews.contains(bufferId))
+ _chatViews[bufferId] = createChatView(bufferId);
+
_currentBuffer = bufferId;
showChatView(bufferId);
_currentBuffer = bufferId;
showChatView(bufferId);
- buf->setVisible(true);
+ Client::networkModel()->setBufferActivity(bufferId, BufferInfo::NoActivity);
+ // Client::setBufferLastSeenMsg(bufferId, _chatViews[bufferId]->lastMsgId());
setFocus();
}
setFocus();
}