Some cleanups in ChatScene in preparation to mouse handling revamp

[quassel.git] / src / qtui / chatmonitorview.cpp

diff --git a/src/qtui/chatmonitorview.cpp b/src/qtui/chatmonitorview.cpp
index 0c40998..d5c3731 100644 (file)
--- a/src/qtui/chatmonitorview.cpp
+++ b/src/qtui/chatmonitorview.cpp
@@ -38,6 +38,7 @@ ChatMonitorView::ChatMonitorView(ChatMonitorFilter *filter, QWidget *parent)
   : ChatView(filter, parent),
     _filter(filter)
 {
+  scene()->setSenderCutoffMode(ChatScene::CutoffLeft);
 }
 
 void ChatMonitorView::contextMenuEvent(QContextMenuEvent *event) {
@@ -47,7 +48,7 @@ void ChatMonitorView::contextMenuEvent(QContextMenuEvent *event) {
   showOwnNicksAction->setCheckable(true);
   showOwnNicksAction->setChecked(_filter->showOwnMessages());
     
-  if(scene()->sectionByScenePos(event->pos()) == ChatLineModel::SenderColumn) {
+  if(scene()->columnByScenePos(event->pos()) == ChatLineModel::SenderColumn) {
     contextMenu.addSeparator();
 
     QAction *showNetworkAction = contextMenu.addAction(tr("Show network name"), this, SLOT(showFieldsChanged(bool)));
@@ -65,7 +66,7 @@ void ChatMonitorView::contextMenuEvent(QContextMenuEvent *event) {
 }
 
 void ChatMonitorView::mouseDoubleClickEvent(QMouseEvent *event) {
-  if(scene()->sectionByScenePos(event->pos()) != ChatLineModel::SenderColumn) {
+  if(scene()->columnByScenePos(event->pos()) != ChatLineModel::SenderColumn) {
     ChatView::mouseDoubleClickEvent(event);
     return;
   }
@@ -81,11 +82,7 @@ void ChatMonitorView::mouseDoubleClickEvent(QMouseEvent *event) {
   if(!bufferId.isValid())
     return;
 
-  QModelIndex bufferIdx = Client::networkModel()->bufferIndex(bufferId);
-  if(!bufferIdx.isValid())
-    return;
-
-  Client::bufferModel()->setCurrentIndex(Client::bufferModel()->mapFromSource(bufferIdx));
+  Client::bufferModel()->switchToBuffer(bufferId);
 }
 
 void ChatMonitorView::showFieldsChanged(bool checked) {