X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fnicklistwidget.cpp;h=d647b5d8675891a0ae26ac55983506d9e1a63a6a;hp=d6916f99a96729ed759f3af324bc316f14a68ed7;hb=87fd2da996b379382b871eb2da0c40e5c46bbbef;hpb=4e0445e459c690cfa6013c5ad574e94f9214827b diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp index d6916f99..d647b5d8 100644 --- a/src/qtui/nicklistwidget.cpp +++ b/src/qtui/nicklistwidget.cpp @@ -28,7 +28,10 @@ #include "nickviewfilter.h" #include "qtuisettings.h" -#include +#include +#include +#include +#include NickListWidget::NickListWidget(QWidget *parent) : AbstractItemView(parent) @@ -66,21 +69,26 @@ void NickListWidget::currentChanged(const QModelIndex ¤t, const QModelInde BufferId newBufferId = current.data(NetworkModel::BufferIdRole).value(); BufferId oldBufferId = previous.data(NetworkModel::BufferIdRole).value(); - 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; @@ -152,3 +160,39 @@ QSize NickListWidget::sizeHint() const { else return currentWidget->sizeHint(); } + + +// ============================== +// NickList Dock +// ============================== +NickListDock::NickListDock(const QString &title, QWidget *parent) + : QDockWidget(title, parent) +{ + // 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()) { +// 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); +// } +// }