From 7a67b37e12ae8c1e7b0eea2063e071fda8ba8aee Mon Sep 17 00:00:00 2001
From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 29 Apr 2008 21:25:11 +0000
Subject: [PATCH] Deactivating the nicklist autohide feature as the sizing
 issues basically suck... son: *wink*

---
 src/qtui/mainwin.cpp        |  3 +-
 src/qtui/nicklistwidget.cpp | 74 ++++++++++++++++++++-----------------
 src/qtui/nicklistwidget.h   |  4 +-
 version.inc                 |  2 +-
 4 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 829fa98f..3eda16d5 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -265,7 +265,8 @@ void MainWin::setupNickWidget() {
 
   addDockWidget(Qt::RightDockWidgetArea, nickDock);
   ui.menuViews->addAction(nickDock->toggleViewAction());
-  connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
+  // See NickListDock::NickListDock();
+  // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
 
   // attach the NickListWidget to the BufferModel and the default selection
   nickListWidget->setModel(Client::bufferModel());
diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index ebd1825f..d647b5d8 100644
--- a/src/qtui/nicklistwidget.cpp
+++ b/src/qtui/nicklistwidget.cpp
@@ -69,21 +69,26 @@ 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();
-    }
     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;
 
@@ -163,28 +168,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()));
-  }
+  // 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()));
+//   }
 }
 
-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);
-  }
-}
+// 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);
+//   }
+// }
diff --git a/src/qtui/nicklistwidget.h b/src/qtui/nicklistwidget.h
index 2da05a96..c5e9b8ec 100644
--- a/src/qtui/nicklistwidget.h
+++ b/src/qtui/nicklistwidget.h
@@ -69,9 +69,9 @@ class NickListDock : public QDockWidget {
 
 public:
   NickListDock(const QString &title, QWidget *parent = 0);
-  ~NickListDock();
+  // ~NickListDock();
 
-  virtual bool event(QEvent *event);
+  // virtual bool event(QEvent *event);
 };
 
 #endif
diff --git a/version.inc b/version.inc
index b428019e..fc54420b 100644
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-beta1-pre";
   quasselDate = "2008-04-29";
-  quasselBuild = 796;
+  quasselBuild = 797;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;
-- 
2.20.1