X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=644d008d7cbeff3ac1a01c52a3e235207de7fe83;hp=ad13a2fb90cd7cee62fb2f0ae87e7a52883dd23f;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=f1823aad7ce73a2dd17807ed4dfde552be7ae769 diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp index ad13a2fb..644d008d 100644 --- a/src/uisupport/nickview.cpp +++ b/src/uisupport/nickview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,125 +15,128 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include +#include "nickview.h" + +#include #include +#include #include +#include #include "buffermodel.h" #include "client.h" +#include "contextmenuactionprovider.h" +#include "graphicalui.h" +#include "networkmodel.h" #include "nickview.h" #include "nickviewfilter.h" -#include "networkmodel.h" -#include "quasselui.h" #include "types.h" -class ExpandAllEvent : public QEvent { -public: - ExpandAllEvent() : QEvent(QEvent::User) {} -}; - -NickView::NickView(QWidget *parent) - : QTreeView(parent) +NickView::NickView(QWidget* parent) + : TreeViewTouch(parent) { - setIndentation(10); - setAnimated(true); - header()->hide(); - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setSortingEnabled(true); - sortByColumn(0, Qt::AscendingOrder); + setIndentation(10); + header()->hide(); + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + setSortingEnabled(true); + sortByColumn(0, Qt::AscendingOrder); - setContextMenuPolicy(Qt::CustomContextMenu); + setContextMenuPolicy(Qt::CustomContextMenu); + setSelectionMode(QAbstractItemView::ExtendedSelection); - connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(showContextMenu(const QPoint&))); + setAnimated(true); -#if defined Q_WS_QWS or defined Q_WS_X11 - connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(startQuery(QModelIndex))); + connect(this, &QWidget::customContextMenuRequested, this, &NickView::showContextMenu); + +#if defined Q_OS_MACOS || defined Q_OS_WIN + // afaik this is better on Mac and Windows + connect(this, &QAbstractItemView::activated, this, &NickView::startQuery); #else - // afaik this is better on Mac and Windows - connect(this, SIGNAL(activated(QModelIndex)), SLOT(startQuery(QModelIndex))); + connect(this, &QAbstractItemView::doubleClicked, this, &NickView::startQuery); #endif } -void NickView::init() { - if(!model()) - return; +void NickView::init() +{ + if (!model()) + return; - for(int i = 1; i < model()->columnCount(); i++) - setColumnHidden(i, true); + for (int i = 1; i < model()->columnCount(); i++) + setColumnHidden(i, true); + + connect(selectionModel(), &QItemSelectionModel::currentChanged, this, &NickView::selectionUpdated); + connect(selectionModel(), &QItemSelectionModel::selectionChanged, this, &NickView::selectionUpdated); } -void NickView::setModel(QAbstractItemModel *model) { - QTreeView::setModel(model); - init(); +void NickView::setModel(QAbstractItemModel* model_) +{ + if (model()) + disconnect(model(), nullptr, this, nullptr); + + TreeViewTouch::setModel(model_); + init(); } -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)) { - QCoreApplication::postEvent(this, new ExpandAllEvent); - } +void NickView::rowsInserted(const QModelIndex& parent, int start, int end) +{ + TreeViewTouch::rowsInserted(parent, start, end); + if (model()->data(parent, NetworkModel::ItemTypeRole) == NetworkModel::UserCategoryItemType && !isExpanded(parent)) { + unanimatedExpandAll(); + } } -void NickView::setRootIndex(const QModelIndex &index) { - QAbstractItemView::setRootIndex(index); - if(index.isValid()) - QCoreApplication::postEvent(this, new ExpandAllEvent); +void NickView::setRootIndex(const QModelIndex& index) +{ + QAbstractItemView::setRootIndex(index); + if (index.isValid()) + unanimatedExpandAll(); } -void NickView::showContextMenu(const QPoint & pos ) { - QModelIndex index = indexAt(pos); - if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType) - return; +QModelIndexList NickView::selectedIndexes() const +{ + QModelIndexList indexList = TreeViewTouch::selectedIndexes(); - QMenu contextMenu(this); - Client::mainUi()->actionProvider()->addActions(&contextMenu, index); - contextMenu.exec(QCursor::pos()); + // make sure the item we clicked on is first + if (indexList.contains(currentIndex())) { + indexList.removeAll(currentIndex()); + indexList.prepend(currentIndex()); + } + + return indexList; } -void NickView::startQuery(const QModelIndex &index) { - if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType) - return; +void NickView::unanimatedExpandAll() +{ + // since of Qt Version 4.8.0 the default expandAll will not properly work if + // animations are enabled. Therefore we perform an unanimated expand when a + // model is set or a toplevel node is inserted. + bool wasAnimated = isAnimated(); + setAnimated(false); + expandAll(); + setAnimated(wasAnimated); +} - IrcUser *ircUser = qobject_cast(index.data(NetworkModel::IrcUserRole).value()); - NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value(); - if(!ircUser || !networkId.isValid()) - return; +void NickView::showContextMenu(const QPoint& pos) +{ + Q_UNUSED(pos); - BufferId bufId = Client::networkModel()->bufferId(networkId, ircUser->nick()); - if(bufId.isValid()) - Client::bufferModel()->switchToBuffer(bufId); - else - Client::userInput(index.data(NetworkModel::BufferInfoRole).value(), QString("/QUERY %1").arg(ircUser->nick())); + QMenu contextMenu(this); + GraphicalUi::contextMenuActionProvider()->addActions(&contextMenu, selectedIndexes()); + contextMenu.exec(QCursor::pos()); } -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; - } - } - event->accept(); +void NickView::startQuery(const QModelIndex& index) +{ + if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType) + return; + + auto* ircUser = qobject_cast(index.data(NetworkModel::IrcUserRole).value()); + NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value(); + if (!ircUser || !networkId.isValid()) + return; + + Client::bufferModel()->switchToOrStartQuery(networkId, ircUser->nick()); }