X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=644d008d7cbeff3ac1a01c52a3e235207de7fe83;hp=7a2c477d7a66cfaf79ffa1628f6e9c4d8bdeb913;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=ec2fa6a18bc2231d88603152d44e5a20980681f7 diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp index 7a2c477d..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,186 +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 "buffermodel.h" #include "types.h" -#include "client.h" - -struct LazySizeHint { - LazySizeHint() : size(QSize()), needsUpdate(true) {}; - QSize size; - bool needsUpdate; -}; -NickView::NickView(QWidget *parent) - : QTreeView(parent), - _sizeHint(new LazySizeHint()) +NickView::NickView(QWidget* parent) + : TreeViewTouch(parent) { - setIndentation(10); - setAnimated(true); - header()->hide(); - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setSortingEnabled(true); - sortByColumn(0, Qt::AscendingOrder); - - setContextMenuPolicy(Qt::CustomContextMenu); - - connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), - this, SLOT(showContextMenu(const QPoint&))); - connect(this, SIGNAL(activated( const QModelIndex& )), - this, SLOT(startQuery( const QModelIndex& ))); -} + setIndentation(10); + header()->hide(); + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + setSortingEnabled(true); + sortByColumn(0, Qt::AscendingOrder); -NickView::~NickView() { - delete _sizeHint; - _sizeHint = 0; -} + setContextMenuPolicy(Qt::CustomContextMenu); + setSelectionMode(QAbstractItemView::ExtendedSelection); -void NickView::init() { - if(!model()) - return; + setAnimated(true); - for(int i = 1; i < model()->columnCount(); i++) - setColumnHidden(i, true); + connect(this, &QWidget::customContextMenuRequested, this, &NickView::showContextMenu); - expandAll(); - _sizeHint->needsUpdate = true; +#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 + connect(this, &QAbstractItemView::doubleClicked, this, &NickView::startQuery); +#endif } -void NickView::setModel(QAbstractItemModel *model) { - QTreeView::setModel(model); - init(); -} +void NickView::init() +{ + if (!model()) + return; -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)) - expand(parent); - _sizeHint->needsUpdate = true; -} + for (int i = 1; i < model()->columnCount(); i++) + setColumnHidden(i, true); -void NickView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { - QTreeView::rowsAboutToBeRemoved(parent, start, end); - _sizeHint->needsUpdate = true; + connect(selectionModel(), &QItemSelectionModel::currentChanged, this, &NickView::selectionUpdated); + connect(selectionModel(), &QItemSelectionModel::selectionChanged, this, &NickView::selectionUpdated); } -void NickView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { - QTreeView::dataChanged(topLeft, bottomRight); - _sizeHint->needsUpdate = true; -} +void NickView::setModel(QAbstractItemModel* model_) +{ + if (model()) + disconnect(model(), nullptr, this, nullptr); -QString NickView::nickFromModelIndex(const QModelIndex & index) { - QString nick = index.sibling(index.row(), 0).data().toString(); - return nick; + TreeViewTouch::setModel(model_); + init(); } -BufferInfo NickView::bufferInfoFromModelIndex(const QModelIndex & index) { - BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - return bufferInfo; +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::showContextMenu(const QPoint & pos ) { - QModelIndex index = indexAt(pos); - if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType) return; - - QString nick = nickFromModelIndex(index); - - QMenu nickContextMenu(this); - - QAction *whoisAction = nickContextMenu.addAction(tr("WHOIS")); - QAction *versionAction = nickContextMenu.addAction(tr("VERSION")); - QAction *pingAction = nickContextMenu.addAction(tr("PING")); - - nickContextMenu.addSeparator(); - - QMenu *modeMenu = nickContextMenu.addMenu(tr("Modes")); - QAction *opAction = modeMenu->addAction(tr("Op %1").arg(nick)); - QAction *deOpAction = modeMenu->addAction(tr("Deop %1").arg(nick)); - QAction *voiceAction = modeMenu->addAction(tr("Voice %1").arg(nick)); - QAction *deVoiceAction = modeMenu->addAction(tr("Devoice %1").arg(nick)); - - QMenu *kickBanMenu = nickContextMenu.addMenu(tr("Kick/Ban")); - QAction *kickAction = kickBanMenu->addAction(tr("Kick %1").arg(nick)); - QAction *banAction = kickBanMenu->addAction(tr("Ban %1").arg(nick)); - QAction *kickBanAction = kickBanMenu->addAction(tr("Kickban %1").arg(nick)); - QAction *ignoreAction = nickContextMenu.addAction(tr("Ignore")); - ignoreAction->setEnabled(false); - - nickContextMenu.addSeparator(); +void NickView::setRootIndex(const QModelIndex& index) +{ + QAbstractItemView::setRootIndex(index); + if (index.isValid()) + unanimatedExpandAll(); +} - QAction *queryAction = nickContextMenu.addAction(tr("Query")); - QAction *dccChatAction = nickContextMenu.addAction(tr("DCC-Chat")); - dccChatAction->setEnabled(false); - QAction *sendFileAction = nickContextMenu.addAction(tr("Send file")); - sendFileAction->setEnabled(false); +QModelIndexList NickView::selectedIndexes() const +{ + QModelIndexList indexList = TreeViewTouch::selectedIndexes(); - QAction *action = nickContextMenu.exec(QCursor::pos()); - BufferInfo bufferInfo = bufferInfoFromModelIndex(index); + // make sure the item we clicked on is first + if (indexList.contains(currentIndex())) { + indexList.removeAll(currentIndex()); + indexList.prepend(currentIndex()); + } - if(action == whoisAction) { executeCommand(bufferInfo, QString("/WHOIS %1 %1").arg(nick)); } - else if(action == versionAction) { executeCommand(bufferInfo, QString("/CTCP %1 VERSION").arg(nick)); } - else if(action == pingAction) { executeCommand(bufferInfo, QString("/CTCP %1 PING ").arg(nick)); } + return indexList; +} - else if(action == opAction) { executeCommand(bufferInfo, QString("/OP %1").arg(nick)); } - else if(action == deOpAction) { executeCommand(bufferInfo, QString("/DEOP %1").arg(nick)); } - else if(action == voiceAction) { executeCommand(bufferInfo, QString("/VOICE %1").arg(nick)); } - else if(action == deVoiceAction) { executeCommand(bufferInfo, QString("/DEVOICE %1").arg(nick)); } +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); +} - else if(action == kickAction) { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); } - else if(action == banAction) { executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); } - else if(action == kickBanAction) { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); - executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); } - else if(action == queryAction) { startQuery(index); } +void NickView::showContextMenu(const QPoint& pos) +{ + Q_UNUSED(pos); + QMenu contextMenu(this); + GraphicalUi::contextMenuActionProvider()->addActions(&contextMenu, selectedIndexes()); + contextMenu.exec(QCursor::pos()); } -void NickView::startQuery(const QModelIndex & index) { - QString nick = nickFromModelIndex(index); - bool activated = false; - - if(QSortFilterProxyModel *nickviewFilter = qobject_cast(model())) { - // rootIndex() is the channel, parent() is the corresponding network - QModelIndex networkIndex = rootIndex().parent(); - QModelIndex source_networkIndex = nickviewFilter->mapToSource(networkIndex); - for(int i = 0; i < Client::networkModel()->rowCount(source_networkIndex); i++) { - QModelIndex childIndex = source_networkIndex.child( i, 0); - if(nick.toLower() == childIndex.data().toString().toLower()) { - QModelIndex queryIndex = Client::bufferModel()->mapFromSource(childIndex); - Client::bufferModel()->setCurrentIndex(queryIndex); - activated = true; - } - } - } - if(!activated) { - BufferInfo bufferInfo = bufferInfoFromModelIndex(index); - executeCommand(bufferInfo, QString("/QUERY %1").arg(nick)); - } -} +void NickView::startQuery(const QModelIndex& index) +{ + if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType) + return; -void NickView::executeCommand(const BufferInfo & bufferInfo, const QString & command) { - Client::instance()->userInput(bufferInfo, command); -} + auto* ircUser = qobject_cast(index.data(NetworkModel::IrcUserRole).value()); + NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value(); + if (!ircUser || !networkId.isValid()) + return; -QSize NickView::sizeHint() const { - Q_CHECK_PTR(_sizeHint); - if(_sizeHint->needsUpdate && model()) {; - int columnSize = 0; - for(int i = 0; i < model()->columnCount(); i++) { - if(!isColumnHidden(i)) - columnSize += sizeHintForColumn(i); - } - _sizeHint->size = QSize(columnSize, 50); - _sizeHint->needsUpdate = false; - } - return _sizeHint->size; + Client::bufferModel()->switchToOrStartQuery(networkId, ircUser->nick()); }