projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb14502
)
Fixed small bug that prevented topic and own nick to be shown when joining a buffer.
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 16 May 2007 14:24:36 +0000
(14:24 +0000)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 16 May 2007 14:24:36 +0000
(14:24 +0000)
gui/bufferwidget.cpp
patch
|
blob
|
history
diff --git
a/gui/bufferwidget.cpp
b/gui/bufferwidget.cpp
index
d3de053
..
807dacf
100644
(file)
--- a/
gui/bufferwidget.cpp
+++ b/
gui/bufferwidget.cpp
@@
-73,6
+73,8
@@
void BufferWidget::setBuffer(Buffer *buf) {
s->nickTree->headerItem()->setHidden(true);
s->nickTree->setRootIsDecorated(false);
s->page = s->splitter;
s->nickTree->headerItem()->setHidden(true);
s->nickTree->setRootIsDecorated(false);
s->page = s->splitter;
+ s->ownNick = buf->ownNick();
+ s->topic = buf->topic();
updateNickList(s, buf->nickList());
s->splitter->restoreState(s->splitterState);
connect(buf, SIGNAL(nickListChanged(VarMap)), this, SLOT(updateNickList(VarMap)));
updateNickList(s, buf->nickList());
s->splitter->restoreState(s->splitterState);
connect(buf, SIGNAL(nickListChanged(VarMap)), this, SLOT(updateNickList(VarMap)));
@@
-82,6
+84,8
@@
void BufferWidget::setBuffer(Buffer *buf) {
s->splitter = 0; s->nickTree = 0;
s->chatWidget = new ChatWidget(this);
s->page = s->chatWidget;
s->splitter = 0; s->nickTree = 0;
s->chatWidget = new ChatWidget(this);
s->page = s->chatWidget;
+ s->ownNick = buf->ownNick();
+ s->topic = buf->bufferName();
}
s->opsExpanded = Settings::guiValue(QString("BufferStates/%1/%2/opsExpanded").arg(buf->networkName()).arg(buf->bufferName()), true).toBool();
s->voicedExpanded = Settings::guiValue(QString("BufferStates/%1/%2/voicedExpanded").arg(buf->networkName()).arg(buf->bufferName()), true).toBool();
}
s->opsExpanded = Settings::guiValue(QString("BufferStates/%1/%2/opsExpanded").arg(buf->networkName()).arg(buf->bufferName()), true).toBool();
s->voicedExpanded = Settings::guiValue(QString("BufferStates/%1/%2/voicedExpanded").arg(buf->networkName()).arg(buf->bufferName()), true).toBool();
@@
-107,7
+111,7
@@
void BufferWidget::setBuffer(Buffer *buf) {
state->chatWidget->setFocusProxy(ui.inputEdit);
ui.inputEdit->setFocus();
ui.topicEdit->setText(state->topic);
state->chatWidget->setFocusProxy(ui.inputEdit);
ui.inputEdit->setFocus();
ui.topicEdit->setText(state->topic);
- ui.ownNick->clear();
+ ui.ownNick->clear();
// TODO add nick history
ui.ownNick->addItem(state->ownNick);
updateTitle();
}
ui.ownNick->addItem(state->ownNick);
updateTitle();
}