X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=5adaf73027aac2d079aeb8f9c4c1a0eb97afe6ac;hp=11b40c72b3bde2267a15fc9e73019b017c4f9843;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=f0502bc0352f04ba9146601f802ddeed8a9b907b diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp index 11b40c72..5adaf730 100644 --- a/src/uisupport/nickview.cpp +++ b/src/uisupport/nickview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 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,7 +15,7 @@ * 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 "nickview.h" @@ -35,129 +35,116 @@ #include "networkmodel.h" #include "types.h" -class ExpandAllEvent : public QEvent { -public: - ExpandAllEvent() : QEvent(QEvent::User) {} -}; - NickView::NickView(QWidget *parent) - : QTreeView(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); + setSelectionMode(QAbstractItemView::ExtendedSelection); - setContextMenuPolicy(Qt::CustomContextMenu); - setSelectionMode(QAbstractItemView::ExtendedSelection); + setAnimated(true); - connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(showContextMenu(const QPoint&))); + connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showContextMenu(const QPoint &))); -#if defined Q_WS_QWS || defined Q_WS_X11 - connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(startQuery(QModelIndex))); +#if defined Q_OS_MACOS || defined Q_OS_WIN + // afaik this is better on Mac and Windows + connect(this, SIGNAL(activated(QModelIndex)), SLOT(startQuery(QModelIndex))); #else - // afaik this is better on Mac and Windows - connect(this, SIGNAL(activated(QModelIndex)), SLOT(startQuery(QModelIndex))); + connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(startQuery(QModelIndex))); #endif } -void NickView::init() { - if(!model()) - return; - for(int i = 1; i < model()->columnCount(); i++) - setColumnHidden(i, true); +void NickView::init() +{ + if (!model()) + return; + + for (int i = 1; i < model()->columnCount(); i++) + setColumnHidden(i, true); - connect(selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), SIGNAL(selectionUpdated())); - connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SIGNAL(selectionUpdated())); + connect(selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), SIGNAL(selectionUpdated())); + connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SIGNAL(selectionUpdated())); } -void NickView::setModel(QAbstractItemModel *model_) { - if(model()) - disconnect(model(), 0, this, 0); - 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(); } -QModelIndexList NickView::selectedIndexes() const { - QModelIndexList indexList = QTreeView::selectedIndexes(); - // make sure the item we clicked on is first - if(indexList.contains(currentIndex())) { - indexList.removeAll(currentIndex()); - indexList.prepend(currentIndex()); - } +QModelIndexList NickView::selectedIndexes() const +{ + QModelIndexList indexList = TreeViewTouch::selectedIndexes(); + + // make sure the item we clicked on is first + if (indexList.contains(currentIndex())) { + indexList.removeAll(currentIndex()); + indexList.prepend(currentIndex()); + } - return indexList; + return indexList; } -void NickView::showContextMenu(const QPoint &pos ) { - Q_UNUSED(pos); - QMenu contextMenu(this); - GraphicalUi::contextMenuActionProvider()->addActions(&contextMenu, selectedIndexes()); - contextMenu.exec(QCursor::pos()); +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); } -void NickView::startQuery(const QModelIndex &index) { - if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType) - return; - 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; - - if(!model()) - 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()); }