X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=6b883d9a9b149c981d955e2ee6ef967eab7a574d;hp=71bee86ca1c6ce78c354dd3614f6bf58bd78a395;hb=d6111192cd2aad81a2f31497ff5ba51147fb5319;hpb=662054e37e36bd5c69e814b5f9ae467598001203

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 71bee86c..6b883d9a 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -30,15 +30,13 @@
 #include "types.h"
 #include "client.h"
 
-struct LazySizeHint {
-  LazySizeHint() : size(QSize()), needsUpdate(true) {};
-  QSize size;
-  bool needsUpdate;
+class ExpandAllEvent : public QEvent {
+public:
+  ExpandAllEvent() : QEvent(QEvent::User) {}
 };
 
 NickView::NickView(QWidget *parent)
-  : QTreeView(parent),
-    _sizeHint(new LazySizeHint())
+  : QTreeView(parent)
 {
   setIndentation(10);
   setAnimated(true);
@@ -55,20 +53,12 @@ NickView::NickView(QWidget *parent)
           this, SLOT(startQuery( const QModelIndex& )));
 }
 
-NickView::~NickView() {
-  delete _sizeHint;
-  _sizeHint = 0;
-}
-
 void NickView::init() {
   if(!model())
     return;
 
   for(int i = 1; i < model()->columnCount(); i++)
     setColumnHidden(i, true);
-
-  expandAll();
-  _sizeHint->needsUpdate = true;
 }
 
 void NickView::setModel(QAbstractItemModel *model) {
@@ -78,19 +68,15 @@ 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))
-    expand(parent);
-  _sizeHint->needsUpdate = true;
-}
-
-void NickView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
-  QTreeView::rowsAboutToBeRemoved(parent, start, end);
-  _sizeHint->needsUpdate = true;
+  if(model()->data(parent, NetworkModel::ItemTypeRole) == NetworkModel::UserCategoryItemType && !isExpanded(parent)) {
+    QCoreApplication::postEvent(this, new ExpandAllEvent);
+  }
 }
 
-void NickView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
-  QTreeView::dataChanged(topLeft, bottomRight);
-  _sizeHint->needsUpdate = true;
+void NickView::setRootIndex(const QModelIndex &index) {
+  QAbstractItemView::setRootIndex(index);
+  if(index.isValid())
+    QCoreApplication::postEvent(this, new ExpandAllEvent);
 }
 
 QString NickView::nickFromModelIndex(const QModelIndex & index) {
@@ -124,10 +110,9 @@ void NickView::showContextMenu(const QPoint & pos ) {
   QAction *deVoiceAction = modeMenu->addAction(tr("Devoice %1").arg(nick));
 
   QMenu *kickBanMenu = nickContextMenu.addMenu(tr("Kick/Ban"));
-  //TODO: add kick message from network identity (kick reason)
   QAction *kickAction = kickBanMenu->addAction(tr("Kick %1").arg(nick));
+  QAction *banAction = kickBanMenu->addAction(tr("Ban %1").arg(nick));
   QAction *kickBanAction = kickBanMenu->addAction(tr("Kickban %1").arg(nick));
-  kickBanMenu->setEnabled(false);
   QAction *ignoreAction = nickContextMenu.addAction(tr("Ignore"));
   ignoreAction->setEnabled(false);
 
@@ -152,8 +137,10 @@ void NickView::showContextMenu(const QPoint & pos ) {
   else if(action == deVoiceAction)  { executeCommand(bufferInfo, QString("/DEVOICE %1").arg(nick)); }
 
   else if(action == kickAction)     { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); }
-  else if(action == kickBanAction)  { executeCommand(bufferInfo, QString("/KICKBAN %1").arg(nick)); }
-  else if(action == queryAction)    { executeCommand(bufferInfo, QString("/QUERY %1").arg(nick)); }
+  else if(action == banAction)      { executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); }
+  else if(action == kickBanAction)  { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); 
+                                      executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); }
+  else if(action == queryAction)    { startQuery(index); }
 
 }
 
@@ -184,16 +171,30 @@ void NickView::executeCommand(const BufferInfo & bufferInfo, const QString & com
   Client::instance()->userInput(bufferInfo, command);
 }
 
-QSize NickView::sizeHint() const {
-  Q_CHECK_PTR(_sizeHint);
-  if(_sizeHint->needsUpdate && model()) {;
-    int columnSize = 0;
-    for(int i = 0; i < model()->columnCount(); i++) {
-      if(!isColumnHidden(i))
-	columnSize += sizeHintForColumn(i);
+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;
     }
-    _sizeHint->size = QSize(columnSize, 50);
-    _sizeHint->needsUpdate = false;
   }
-  return _sizeHint->size;
+  event->accept();
 }