Merging r732:766 from trunk to branches/0.3.

[quassel.git] / src / qtui / nicklistwidget.cpp

diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index 68a6757..ebd1825 100644 (file)
--- a/src/qtui/nicklistwidget.cpp
+++ b/src/qtui/nicklistwidget.cpp
@@ -28,33 +28,23 @@
 #include "nickviewfilter.h"
 #include "qtuisettings.h"
 
+#include <QAction>
+#include <QDebug>
+#include <QEvent>
+#include <QAbstractButton>
+
 NickListWidget::NickListWidget(QWidget *parent)
-  : AbstractItemView(parent),
-    _showNickListAction(new QAction(tr("Nicks"), this)),
-    _showDockAction(0)
+  : AbstractItemView(parent)
 {
-  _showNickListAction->setCheckable(true);
-  QtUiSettings s;
-  _showNickListAction->setChecked(s.value("ShowNickListAction", QVariant(true)).toBool());
   ui.setupUi(this);
-  connect(_showNickListAction, SIGNAL(toggled(bool)), this, SLOT(showWidget(bool)));
-}
-
-NickListWidget::~NickListWidget() {
-  QtUiSettings s;
-  s.setValue("ShowNickListAction", showNickListAction()->isChecked());
-}
-
-void NickListWidget::setShowDockAction(QAction *action) {
-  _showDockAction = action;
-}
-
-QAction *NickListWidget::showDockAction() const {
-  return _showDockAction;
 }
 
-QAction *NickListWidget::showNickListAction() const {
-  return _showNickListAction;
+QDockWidget *NickListWidget::dock() const {
+  QDockWidget *dock = qobject_cast<QDockWidget *>(parent());
+  if(dock)
+    return dock;
+  else
+    return 0;
 }
 
 void NickListWidget::showWidget(bool visible) {
@@ -62,21 +52,15 @@ void NickListWidget::showWidget(bool visible) {
     return;
 
   QModelIndex currentIndex = selectionModel()->currentIndex();
-  if(currentIndex.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer && showDockAction()) {
-    if(visible  != showDockAction()->isChecked()) {
-      // show or hide
-      showDockAction()->trigger();
-    }
-  }
-}
-
-void NickListWidget::changedVisibility(bool visible) {
-  if(!selectionModel())
-    return;
-
-  QModelIndex currentIndex = selectionModel()->currentIndex();
-  if(currentIndex.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer && !visible) {
-    showNickListAction()->setChecked(false);
+  if(currentIndex.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer) {
+    QDockWidget *dock_ = dock();
+    if(!dock_)
+      return;
+
+    if(visible)
+      dock_->show();
+    else
+      dock_->close();
   }
 }
 
@@ -85,19 +69,19 @@ 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);
-    if(showDockAction() && showDockAction()->isChecked()) {
-      // hide
-      showDockAction()->trigger();
+    QDockWidget *dock_ = dock();
+    if(dock_) {
+      dock_->close();
     }
     return;
   } else {
-    if(showNickListAction()->isChecked())
-      if(showDockAction()&& !showDockAction()->isChecked()) {
-        // show
-        showDockAction()->trigger();
-      }
+    QDockWidget *dock_ = dock();
+    if(dock_ && dock_->toggleViewAction()->isChecked()) {
+      dock_->show();
+    }
   }
 
   if(newBufferId == oldBufferId)
@@ -171,3 +155,36 @@ QSize NickListWidget::sizeHint() const {
   else
     return currentWidget->sizeHint();
 }
+
+
+// ==============================
+//  NickList Dock
+// ==============================
+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());
+}
+
+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);
+  }
+}