X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fnicklistwidget.cpp;h=d2ef8e87488014e5aed61bb54408d1db443f7513;hp=ebd1825faebca2440566541f4ce6a0f8ccf05205;hb=d37bdc91c5474603e1417c2cd9c40c02e1ad5ee6;hpb=db199a3d46e34a02e8a66046fd44bf53a988cdf8

diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index ebd1825f..d2ef8e87 100644
--- a/src/qtui/nicklistwidget.cpp
+++ b/src/qtui/nicklistwidget.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  *
@@ -20,7 +20,6 @@
 
 #include "nicklistwidget.h"
 
-#include "buffer.h"
 #include "nickview.h"
 #include "client.h"
 #include "networkmodel.h"
@@ -47,6 +46,19 @@ QDockWidget *NickListWidget::dock() const {
     return 0;
 }
 
+void NickListWidget::hideEvent(QHideEvent *event) {
+  emit nickSelectionChanged(QModelIndexList());
+  AbstractItemView::hideEvent(event);
+}
+
+void NickListWidget::showEvent(QShowEvent *event) {
+  NickView *view = qobject_cast<NickView *>(ui.stackedWidget->currentWidget());
+  if(view)
+    emit nickSelectionChanged(view->selectedIndexes());
+
+  AbstractItemView::showEvent(event);
+}
+
 void NickListWidget::showWidget(bool visible) {
   if(!selectionModel())
     return;
@@ -69,37 +81,56 @@ void NickListWidget::currentChanged(const QModelIndex &current, const QModelInde
   BufferId newBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
   BufferId oldBufferId = previous.data(NetworkModel::BufferIdRole).value<BufferId>();
 
-
   if(bufferType != BufferInfo::ChannelBuffer) {
     ui.stackedWidget->setCurrentWidget(ui.emptyPage);
-    QDockWidget *dock_ = dock();
-    if(dock_) {
-      dock_->close();
-    }
+    emit nickSelectionChanged(QModelIndexList());
     return;
-  } else {
-    QDockWidget *dock_ = dock();
-    if(dock_ && dock_->toggleViewAction()->isChecked()) {
-      dock_->show();
-    }
   }
 
+  // See NickListDock::NickListDock() below
+//   if(bufferType != BufferInfo::ChannelBuffer) {
+//     ui.stackedWidget->setCurrentWidget(ui.emptyPage);
+//     QDockWidget *dock_ = dock();
+//     if(dock_) {
+//       dock_->close();
+//     }
+//     return;
+//   } else {
+//     QDockWidget *dock_ = dock();
+//     if(dock_ && dock_->toggleViewAction()->isChecked()) {
+//       dock_->show();
+//     }
+//   }
+
   if(newBufferId == oldBufferId)
     return;
 
+  NickView *view;
   if(nickViews.contains(newBufferId)) {
-    ui.stackedWidget->setCurrentWidget(nickViews.value(newBufferId));
+    view = nickViews.value(newBufferId);
+    ui.stackedWidget->setCurrentWidget(view);
   } else {
-    NickView *view = new NickView(this);
+    view = new NickView(this);
     NickViewFilter *filter = new NickViewFilter(newBufferId, Client::networkModel());
     view->setModel(filter);
     QModelIndex source_current = Client::bufferModel()->mapToSource(current);
     view->setRootIndex(filter->mapFromSource(source_current));
-    view->expandAll();
     nickViews[newBufferId] = view;
     ui.stackedWidget->addWidget(view);
     ui.stackedWidget->setCurrentWidget(view);
+    connect(view, SIGNAL(selectionUpdated()), SLOT(nickSelectionChanged()));
+  }
+  emit nickSelectionChanged(view->selectedIndexes());
+}
+
+void NickListWidget::nickSelectionChanged() {
+  NickView *view = qobject_cast<NickView *>(sender());
+  Q_ASSERT(view);
+  if(view != ui.stackedWidget->currentWidget()) {
+    qDebug() << "Nick selection of hidden view changed!";
+    return;
   }
+  emit nickSelectionChanged(view->selectedIndexes());
 }
 
 void NickListWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
@@ -163,28 +194,31 @@ QSize NickListWidget::sizeHint() const {
 NickListDock::NickListDock(const QString &title, QWidget *parent)
   : QDockWidget(title, parent)
 {
-  QAction *toggleView = toggleViewAction();
-  disconnect(toggleView, SIGNAL(triggered(bool)), this, 0);
-  toggleView->setChecked(QtUiSettings().value("ShowNickList", QVariant(true)).toBool());
-
-  // reconnecting the closebuttons clicked signal to the action
-  foreach(QAbstractButton *button, findChildren<QAbstractButton *>()) {
-    if(disconnect(button, SIGNAL(clicked()), this, SLOT(close())))
-      connect(button, SIGNAL(clicked()), toggleView, SLOT(trigger()));
-  }
-}
-
-NickListDock::~NickListDock() {
-  QtUiSettings().setValue("ShowNickList", toggleViewAction()->isChecked());
+  // THIS STUFF IS NEEDED FOR NICKLIST AUTOHIDE... 
+  // AS THIS BRINGS LOTS OF FUCKUPS WITH IT IT'S DEACTIVATED FOR NOW...
+  
+//   QAction *toggleView = toggleViewAction();
+//   disconnect(toggleView, SIGNAL(triggered(bool)), this, 0);
+//   toggleView->setChecked(QtUiSettings().value("ShowNickList", QVariant(true)).toBool());
+
+//   // reconnecting the closebuttons clicked signal to the action
+//   foreach(QAbstractButton *button, findChildren<QAbstractButton *>()) {
+//     if(disconnect(button, SIGNAL(clicked()), this, SLOT(close())))
+//       connect(button, SIGNAL(clicked()), toggleView, SLOT(trigger()));
+//   }
 }
 
-bool NickListDock::event(QEvent *event) {
-  switch (event->type()) {
-  case QEvent::Hide:
-  case QEvent::Show:
-    emit visibilityChanged(event->type() == QEvent::Show);
-    return QWidget::event(event);
-  default:
-    return QDockWidget::event(event);
-  }
-}
+// NickListDock::~NickListDock() {
+//   QtUiSettings().setValue("ShowNickList", toggleViewAction()->isChecked());
+// }
+
+// bool NickListDock::event(QEvent *event) {
+//   switch (event->type()) {
+//   case QEvent::Hide:
+//   case QEvent::Show:
+//     emit visibilityChanged(event->type() == QEvent::Show);
+//     return QWidget::event(event);
+//   default:
+//     return QDockWidget::event(event);
+//   }
+// }