simplifying workaround for missing nickitems... especially getting rid of old workaround

[quassel.git] / src / uisupport / nickview.cpp

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 1a1c4bb..8b15744 100644 (file)
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -20,6 +20,7 @@
 
 #include "nickview.h"
 
+#include <QApplication>
 #include <QHeaderView>
 #include <QScrollBar>
 #include <QDebug>
@@ -33,23 +34,11 @@
 #include "nickviewfilter.h"
 #include "networkmodel.h"
 #include "types.h"
-#include "uisettings.h"
-
-class ExpandAllEvent : public QEvent {
-public:
-  ExpandAllEvent() : QEvent(QEvent::User) {}
-};
 
 NickView::NickView(QWidget *parent)
   : QTreeView(parent)
 {
-  QAbstractItemDelegate *oldDelegate = itemDelegate();
-  NickViewDelegate *newDelegate = new NickViewDelegate(this);
-  setItemDelegate(newDelegate);
-  delete oldDelegate;
-
   setIndentation(10);
-  setAnimated(true);
   header()->hide();
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setSortingEnabled(true);
@@ -58,6 +47,10 @@ NickView::NickView(QWidget *parent)
   setContextMenuPolicy(Qt::CustomContextMenu);
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 
+//   // breaks with Qt 4.8
+//   if(QString("4.8.0") > qVersion()) // FIXME breaks with Qt versions >= 4.10!
+     setAnimated(true);
+
   connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(showContextMenu(const QPoint&)));
 
 #if defined Q_WS_QWS || defined Q_WS_X11
@@ -90,27 +83,39 @@ void NickView::setModel(QAbstractItemModel *model_) {
 void NickView::rowsInserted(const QModelIndex &parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
   if(model()->data(parent, NetworkModel::ItemTypeRole) == NetworkModel::UserCategoryItemType && !isExpanded(parent)) {
-    QCoreApplication::postEvent(this, new ExpandAllEvent);
+    unanimatedExpandAll();
   }
 }
 
 void NickView::setRootIndex(const QModelIndex &index) {
   QAbstractItemView::setRootIndex(index);
   if(index.isValid())
-    QCoreApplication::postEvent(this, new ExpandAllEvent);
+    unanimatedExpandAll();
 }
 
 QModelIndexList NickView::selectedIndexes() const {
   QModelIndexList indexList = QTreeView::selectedIndexes();
 
   // make sure the item we clicked on is first
-  Q_ASSERT(indexList.contains(currentIndex()));
-  indexList.removeAll(currentIndex());
-  indexList.prepend(currentIndex());
+  if(indexList.contains(currentIndex())) {
+    indexList.removeAll(currentIndex());
+    indexList.prepend(currentIndex());
+  }
 
   return indexList;
 }
 
+void NickView::unanimatedExpandAll() {
+  // since of Qt Version 4.8.0 the default expandAll will not properly work if
+  // animations are enabled. Therefore we perform an unanimated expand when a
+  // model is set or a toplevel node is inserted.
+  bool wasAnimated = isAnimated();
+  setAnimated(false);
+  expandAll();
+  setAnimated(wasAnimated);
+}
+
+
 void NickView::showContextMenu(const QPoint &pos ) {
   Q_UNUSED(pos);
 
@@ -128,62 +133,5 @@ void NickView::startQuery(const QModelIndex &index) {
   if(!ircUser || !networkId.isValid())
     return;
 
-  BufferId bufId = Client::networkModel()->bufferId(networkId, ircUser->nick());
-  if(bufId.isValid())
-    Client::bufferModel()->switchToBuffer(bufId);
-  else
-    Client::userInput(index.data(NetworkModel::BufferInfoRole).value<BufferInfo>(), QString("/QUERY %1").arg(ircUser->nick()));
-}
-
-void NickView::customEvent(QEvent *event) {
-  // THIS IS A REPLACEMENT FOR expandAll()
-  /* WARNING: do not call expandAll()!
-   * it fucks up big time in combination with sorting and changing the rootIndex
-   * the following sequence of commands leads to unexpected behavior when inserting new items
-   * setSortingEnabled(true);
-   * setModel();
-   * expandAll();
-   * setRootIndex();
-   */
-  if(event->type() != QEvent::User)
-    return;
-
-  QModelIndex topLevelIdx;
-  for(int i = 0; i < model()->rowCount(rootIndex()); i++) {
-    topLevelIdx = model()->index(i, 0, rootIndex());
-    if(isExpanded(topLevelIdx))
-      continue;
-    else {
-      expand(topLevelIdx);
-      if(i < model()->rowCount(rootIndex()) - 1)
-        QCoreApplication::postEvent(this, new ExpandAllEvent);
-      break;
-    }
-  }
-  event->accept();
-}
-
-
-// ****************************************
-//  NickViewDelgate
-// ****************************************
-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())
-    fgColor = _FgAwayStatus;
-
-  option->palette.setColor(QPalette::Text, fgColor);
+  Client::bufferModel()->switchToOrStartQuery(networkId, ircUser->nick());
 }