X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorview.cpp;h=da61ee7ffce2fbf2de7ac67e433e0069377fa91c;hp=6d5d667935e345098bc9ea60c9af421d519d1be2;hb=983164018267de71e92c025ff81e4f10b8ddc5b0;hpb=3e85aa859e7533ec910f8b2efe4a8abd801d3a47

diff --git a/src/qtui/chatmonitorview.cpp b/src/qtui/chatmonitorview.cpp
index 6d5d6679..da61ee7f 100644
--- a/src/qtui/chatmonitorview.cpp
+++ b/src/qtui/chatmonitorview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,52 +29,64 @@
 #include "chatitem.h"
 #include "chatscene.h"
 #include "client.h"
+#include "iconloader.h"
 #include "networkmodel.h"
 #include "buffermodel.h"
 #include "messagemodel.h"
 #include "qtuisettings.h"
+#include "settingspagedlg.h"
+#include "settingspages/chatmonitorsettingspage.h"
 
 ChatMonitorView::ChatMonitorView(ChatMonitorFilter *filter, QWidget *parent)
   : ChatView(filter, parent),
     _filter(filter)
 {
+  scene()->setSenderCutoffMode(ChatScene::CutoffLeft);
 }
 
-void ChatMonitorView::contextMenuEvent(QContextMenuEvent *event) {
-  if(scene()->sectionByScenePos(event->pos()) != ChatLineModel::SenderColumn)
-    return;
-  
-  int showFields = _filter->showFields();
-
-  QMenu contextMenu(this);
-  QAction *showNetworkAction = contextMenu.addAction(tr("Show network name"), this, SLOT(showFieldsChanged(bool)));
-  showNetworkAction->setCheckable(true);
-  showNetworkAction->setChecked(showFields & ChatMonitorFilter::NetworkField);
-  showNetworkAction->setData(ChatMonitorFilter::NetworkField);
-  
-  QAction *showBufferAction = contextMenu.addAction(tr("Show buffer name"), this, SLOT(showFieldsChanged(bool)));
-  showBufferAction->setCheckable(true);
-  showBufferAction->setChecked(showFields & ChatMonitorFilter::BufferField);
-  showBufferAction->setData(ChatMonitorFilter::BufferField);
-
-  contextMenu.exec(QCursor::pos());
+void ChatMonitorView::addActionsToMenu(QMenu *menu, const QPointF &pos) {
+  ChatView::addActionsToMenu(menu, pos);
+  menu->addSeparator();
+  QAction *showOwnNicksAction = menu->addAction(tr("Show Own Messages"), _filter, SLOT(setShowOwnMessages(bool)));
+  showOwnNicksAction->setCheckable(true);
+  showOwnNicksAction->setChecked(_filter->showOwnMessages());
+
+  if(scene()->columnByScenePos(pos) == ChatLineModel::SenderColumn) {
+    menu->addSeparator();
+
+    QAction *showNetworkAction = menu->addAction(tr("Show Network Name"), this, SLOT(showFieldsChanged(bool)));
+    showNetworkAction->setCheckable(true);
+    showNetworkAction->setChecked(_filter->showFields() & ChatMonitorFilter::NetworkField);
+    showNetworkAction->setData(ChatMonitorFilter::NetworkField);
+
+    QAction *showBufferAction = menu->addAction(tr("Show Buffer Name"), this, SLOT(showFieldsChanged(bool)));
+    showBufferAction->setCheckable(true);
+    showBufferAction->setChecked(_filter->showFields() & ChatMonitorFilter::BufferField);
+    showBufferAction->setData(ChatMonitorFilter::BufferField);
+  }
+
+  menu->addSeparator();
+  menu->addAction(SmallIcon("configure"), tr("Configure..."), this, SLOT(showSettingsPage()));
 }
 
 void ChatMonitorView::mouseDoubleClickEvent(QMouseEvent *event) {
-  if(scene()->sectionByScenePos(event->pos()) != ChatLineModel::SenderColumn)
+  if(scene()->columnByScenePos(event->pos()) != ChatLineModel::SenderColumn) {
+    ChatView::mouseDoubleClickEvent(event);
     return;
+  }
 
-  //ChatItem *chatItem = static_cast<ChatItem *>(itemAt(event->pos()));
   ChatItem *chatItem = dynamic_cast<ChatItem *>(itemAt(event->pos()));
+  if(!chatItem) {
+    event->ignore();
+    return;
+  }
+
+  event->accept();
   BufferId bufferId = chatItem->data(MessageModel::BufferIdRole).value<BufferId>();
   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) {
@@ -85,5 +97,10 @@ void ChatMonitorView::showFieldsChanged(bool checked) {
   if(checked)
     _filter->addShowField(showAction->data().toInt());
   else
-    _filter->removeShowField(showAction->data().toInt());    
+    _filter->removeShowField(showAction->data().toInt());
+}
+
+void ChatMonitorView::showSettingsPage() {
+  SettingsPageDlg dlg(new ChatMonitorSettingsPage(), this);
+  dlg.exec();
 }