X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=1a1c4bbaf9b966ee6732fb8dd11f487b109478cd;hp=dd7d1af53ae3c8adebf530428916e91994f717e0;hb=32a1f050b3292478f3b130c16ad66f22e6eb25c8;hpb=a5aa42bfbd30790c2063cc88b5949519b5b0c4a4

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index dd7d1af5..1a1c4bba 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -27,10 +27,13 @@
 
 #include "buffermodel.h"
 #include "client.h"
+#include "contextmenuactionprovider.h"
+#include "graphicalui.h"
+#include "nickview.h"
 #include "nickviewfilter.h"
 #include "networkmodel.h"
-#include "quasselui.h"
 #include "types.h"
+#include "uisettings.h"
 
 class ExpandAllEvent : public QEvent {
 public:
@@ -45,7 +48,6 @@ NickView::NickView(QWidget *parent)
   setItemDelegate(newDelegate);
   delete oldDelegate;
 
-  
   setIndentation(10);
   setAnimated(true);
   header()->hide();
@@ -72,10 +74,16 @@ void NickView::init() {
 
   for(int i = 1; i < model()->columnCount(); i++)
     setColumnHidden(i, true);
+
+  connect(selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), SIGNAL(selectionUpdated()));
+  connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SIGNAL(selectionUpdated()));
 }
 
-void NickView::setModel(QAbstractItemModel *model) {
-  QTreeView::setModel(model);
+void NickView::setModel(QAbstractItemModel *model_) {
+  if(model())
+    disconnect(model(), 0, this, 0);
+
+  QTreeView::setModel(model_);
   init();
 }
 
@@ -92,18 +100,22 @@ void NickView::setRootIndex(const QModelIndex &index) {
     QCoreApplication::postEvent(this, new ExpandAllEvent);
 }
 
-void NickView::showContextMenu(const QPoint & pos ) {
-  QModelIndex index = indexAt(pos);
-  if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType)
-    return;
+QModelIndexList NickView::selectedIndexes() const {
+  QModelIndexList indexList = QTreeView::selectedIndexes();
 
-  QModelIndexList indexList = selectedIndexes();
   // make sure the item we clicked on is first
-  indexList.removeAll(index);
-  indexList.prepend(index);
+  Q_ASSERT(indexList.contains(currentIndex()));
+  indexList.removeAll(currentIndex());
+  indexList.prepend(currentIndex());
+
+  return indexList;
+}
+
+void NickView::showContextMenu(const QPoint &pos ) {
+  Q_UNUSED(pos);
 
   QMenu contextMenu(this);
-  Client::mainUi()->actionProvider()->addActions(&contextMenu, indexList);
+  GraphicalUi::contextMenuActionProvider()->addActions(&contextMenu, selectedIndexes());
   contextMenu.exec(QCursor::pos());
 }
 
@@ -158,11 +170,20 @@ void NickView::customEvent(QEvent *event) {
 NickViewDelegate::NickViewDelegate(QObject *parent)
   : QStyledItemDelegate(parent)
 {
+  UiSettings s("QtUiStyle/Colors");
+  _FgOnlineStatus = s.value("onlineStatusFG", QVariant(QColor(Qt::black))).value<QColor>();
+  _FgAwayStatus = s.value("awayStatusFG", QVariant(QColor(Qt::gray))).value<QColor>();
 }
 
 void NickViewDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const {
   QStyledItemDelegate::initStyleOption(option, index);
 
+  if(!index.isValid())
+    return;
+
+  QColor fgColor = _FgOnlineStatus;
   if(!index.data(NetworkModel::ItemActiveRole).toBool())
-    option->palette.setColor(QPalette::Text, option->palette.color(QPalette::Dark));
+    fgColor = _FgAwayStatus;
+
+  option->palette.setColor(QPalette::Text, fgColor);
 }