X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=086af0aa211dfc8a2aa90667cfe0c6e2ba3ed51f;hp=51d5ddf55c7203168bed936a4f4851f46afb470d;hb=ed955f89251b8bae600080fb79fd033843979cfa;hpb=01e673b540fd0cf2e6442b490616340ee08f0e34

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 51d5ddf5..086af0aa 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -35,11 +35,12 @@
 #include "buffersettings.h"
 #include "buffersyncer.h"
 #include "client.h"
+#include "contextmenuactionprovider.h"
+#include "graphicalui.h"
 #include "iconloader.h"
 #include "network.h"
 #include "networkmodel.h"
-#include "networkmodelactionprovider.h"
-#include "quasselui.h"
+#include "contextmenuactionprovider.h"
 #include "uisettings.h"
 
 /*****************************************
@@ -59,6 +60,10 @@ BufferView::BufferView(QWidget *parent)
   BufferViewDelegate *tristateDelegate = new BufferViewDelegate(this);
   setItemDelegate(tristateDelegate);
   delete oldDelegate;
+
+  UiStyleSettings s("QtUiStyle/Fonts"); // li'l dirty here, but fonts are stored in QtUiStyle :/
+  s.notify("BufferView", this, SLOT(setCustomFont(QVariant)));
+  setCustomFont(s.value("BufferView", QFont()));
 }
 
 void BufferView::init() {
@@ -81,9 +86,11 @@ void BufferView::init() {
 
   // activated() fails on X11 and Qtopia at least
 #if defined Q_WS_QWS || defined Q_WS_X11
+  disconnect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
   connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex)));
 #else
   // afaik this is better on Mac and Windows
+  disconnect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
   connect(this, SIGNAL(activated(QModelIndex)), SLOT(joinChannel(QModelIndex)));
 #endif
 }
@@ -115,6 +122,7 @@ void BufferView::setModel(QAbstractItemModel *model) {
     header()->addAction(showSection);
   }
 
+  connect(model, SIGNAL(layoutChanged()), this, SLOT(on_layoutChanged()));
 }
 
 void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) {
@@ -187,6 +195,13 @@ void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
   }
 }
 
+void BufferView::setCustomFont(const QVariant &v) {
+  QFont font = v.value<QFont>();
+  if(font.family().isEmpty())
+    font = QApplication::font();
+  setFont(font);
+}
+
 void BufferView::joinChannel(const QModelIndex &index) {
   BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
 
@@ -269,17 +284,21 @@ void BufferView::removeSelectedBuffers(bool permanently) {
   }
 }
 
-void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
+void BufferView::rowsInserted(const QModelIndex &parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
 
   // ensure that newly inserted network nodes are expanded per default
   if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
     return;
 
-  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemActiveRole) == true) {
-    // without updating the parent the expand will have no effect... Qt Bug?
-    update(parent);
-    expand(parent);
+  setExpandedState(parent);
+}
+
+void BufferView::on_layoutChanged() {
+  int numNets = model()->rowCount(QModelIndex());
+  for(int row = 0; row < numNets; row++) {
+    QModelIndex networkIdx = model()->index(row, 0, QModelIndex());
+    setExpandedState(networkIdx);
   }
 }
 
@@ -298,7 +317,6 @@ void BufferView::on_configChanged() {
     if(!networkId.isValid())
       continue;
 
-    update(networkIdx);
     setExpandedState(networkIdx);
   }
 
@@ -306,8 +324,6 @@ void BufferView::on_configChanged() {
     // update selection to current one
     Client::bufferModel()->synchronizeView(this);
   }
-
-  return;
 }
 
 void BufferView::storeExpandedState(const QModelIndex &networkIdx) {
@@ -339,9 +355,11 @@ void BufferView::setExpandedState(const QModelIndex &networkIdx) {
       expandNetwork = (bool)(oldState & WasExpanded);
   }
 
-  storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
-  if(expandNetwork != isExpanded(networkIdx))
+  if(expandNetwork != isExpanded(networkIdx)) {
+    update(networkIdx);
     setExpanded(networkIdx, expandNetwork);
+  }
+  storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
 }
 
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
@@ -386,7 +404,7 @@ void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index)
   indexList.removeAll(index);
   indexList.prepend(index);
 
-  Client::mainUi()->actionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
+  GraphicalUi::contextMenuActionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
 }
 
 void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index) {
@@ -403,12 +421,12 @@ void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index)
 }
 
 void BufferView::menuActionTriggered(QAction *result) {
-  NetworkModelActionProvider::ActionType type = (NetworkModelActionProvider::ActionType)result->data().toInt();
+  ContextMenuActionProvider::ActionType type = (ContextMenuActionProvider::ActionType)result->data().toInt();
   switch(type) {
-    case NetworkModelActionProvider::HideBufferTemporarily:
+    case ContextMenuActionProvider::HideBufferTemporarily:
       removeSelectedBuffers();
       break;
-    case NetworkModelActionProvider::HideBufferPermanently:
+    case ContextMenuActionProvider::HideBufferPermanently:
       removeSelectedBuffers(true);
       break;
     default:
@@ -464,10 +482,47 @@ QSize BufferView::sizeHint() const {
 // ****************************************
 //  BufferViewDelgate
 // ****************************************
+class ColorsChangedEvent : public QEvent {
+public:
+  ColorsChangedEvent() : QEvent(QEvent::User) {};
+};
+
 BufferViewDelegate::BufferViewDelegate(QObject *parent)
-  : QStyledItemDelegate(parent)
+  : QStyledItemDelegate(parent),
+    _updateColors(false)
 {
+  loadColors();
+
+  UiSettings s("QtUiStyle/Colors");
+  s.notify("inactiveActivityFG", this, SLOT(colorsChanged()));
+  s.notify("noActivityFG", this, SLOT(colorsChanged()));
+  s.notify("highlightActivityFG", this, SLOT(colorsChanged()));
+  s.notify("newMessageActivityFG", this, SLOT(colorsChanged()));
+  s.notify("otherActivityFG", this, SLOT(colorsChanged()));
+}
+
+void BufferViewDelegate::colorsChanged() {
+  // avoid mutliple unneded reloads of all colors
+  if(_updateColors)
+    return;
+  _updateColors = true;
+  QCoreApplication::postEvent(this, new ColorsChangedEvent());
+}
+
+void BufferViewDelegate::customEvent(QEvent *event) {
+  if(event->type() != QEvent::User)
+    return;
+
+  loadColors();
+  _updateColors = false;
+
+  event->accept();
+}
+
+void BufferViewDelegate::loadColors() {
   UiSettings s("QtUiStyle/Colors");
+  _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value<QColor>();
+  _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value<QColor>();
   _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value<QColor>();
   _FgColorNewMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))).value<QColor>();
   _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value<QColor>();
@@ -507,24 +562,23 @@ bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, c
 void BufferViewDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const {
   QStyledItemDelegate::initStyleOption(option, index);
 
+  if(!index.isValid())
+    return;
+
   BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
 
+  QColor fgColor = _FgColorNoActivity;
   if(activity & BufferInfo::Highlight) {
-    option->palette.setColor(QPalette::Text, _FgColorHighlightActivity);
-    return;
-  }
-  if(activity & BufferInfo::NewMessage) {
-    option->palette.setColor(QPalette::Text, _FgColorNewMessageActivity);
-    return;
-  }
-  if(activity & BufferInfo::OtherActivity) {
-    option->palette.setColor(QPalette::Text, _FgColorOtherActivity);
-    return;
+    fgColor = _FgColorHighlightActivity;
+  } else if(activity & BufferInfo::NewMessage) {
+    fgColor = _FgColorNewMessageActivity;
+  } else if(activity & BufferInfo::OtherActivity) {
+    fgColor = _FgColorOtherActivity;
+  } else if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) {
+    fgColor = _FgColorInactiveActivity;
   }
 
-  if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) {
-    option->palette.setColor(QPalette::Text, QPalette().color(QPalette::Dark));
-  }
+  option->palette.setColor(QPalette::Text, fgColor);
 }