X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=a8de3bc3896e9b888aec8021bc5ffe96f3aa2b18;hp=5c5862f3b02ff9dc15eaf6d889331fc5a66693a7;hb=016b1a6b6c88dc9d1493199be4e42e85bed6633c;hpb=94c69fd074d45d523e1b45f7f1c6b13207e8074b diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp index 5c5862f3..a8de3bc3 100644 --- a/src/uisupport/nickview.cpp +++ b/src/uisupport/nickview.cpp @@ -25,12 +25,19 @@ #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) + : QTreeView(parent), + _sizeHint(new LazySizeHint()) { setIndentation(10); setAnimated(true); @@ -40,11 +47,15 @@ NickView::NickView(QWidget *parent) setContextMenuPolicy(Qt::CustomContextMenu); - connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), - this, SLOT(showContextMenu(const QPoint&))); + connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), + this, SLOT(showContextMenu(const QPoint&))); + connect(this, SIGNAL(activated( const QModelIndex& )), + this, SLOT(startQuery( const QModelIndex& ))); } NickView::~NickView() { + delete _sizeHint; + _sizeHint = 0; } void NickView::init() { @@ -55,6 +66,7 @@ void NickView::init() { setColumnHidden(i, true); expandAll(); + _sizeHint->needsUpdate = true; } void NickView::setModel(QAbstractItemModel *model) { @@ -62,15 +74,38 @@ void NickView::setModel(QAbstractItemModel *model) { init(); } -void NickView::rowsInserted(const QModelIndex &index, int start, int end) { - QTreeView::rowsInserted(index, start, end); - expandAll(); // FIXME We need to do this more intelligently. Maybe a pimped TreeView? +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; +} + +void NickView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { + QTreeView::rowsAboutToBeRemoved(parent, start, end); + _sizeHint->needsUpdate = true; +} + +void NickView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { + QTreeView::dataChanged(topLeft, bottomRight); + _sizeHint->needsUpdate = true; +} + +QString NickView::nickFromModelIndex(const QModelIndex & index) { + QString nick = index.sibling(index.row(), 0).data().toString(); + return nick; +} + +BufferInfo NickView::bufferInfoFromModelIndex(const QModelIndex & index) { + BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); + return bufferInfo; } void NickView::showContextMenu(const QPoint & pos ) { QModelIndex index = indexAt(pos); - QString username = index.sibling(index.row(), 0).data().toString(); - BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); + if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType) return; + + QString nick = nickFromModelIndex(index); QMenu nickContextMenu(this); @@ -81,14 +116,16 @@ void NickView::showContextMenu(const QPoint & pos ) { nickContextMenu.addSeparator(); QMenu *modeMenu = nickContextMenu.addMenu(tr("Modes")); - QAction *opAction = modeMenu->addAction(tr("Op %1").arg(username)); - QAction *deOpAction = modeMenu->addAction(tr("Deop %1").arg(username)); - QAction *voiceAction = modeMenu->addAction(tr("Voice %1").arg(username)); - QAction *deVoiceAction = modeMenu->addAction(tr("Devoice %1").arg(username)); + 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(username)); - QAction *kickBanAction = kickBanMenu->addAction(tr("Kickban %1").arg(username)); + //TODO: add kick message from network identity (kick reason) + QAction *kickAction = kickBanMenu->addAction(tr("Kick %1").arg(nick)); + QAction *kickBanAction = kickBanMenu->addAction(tr("Kickban %1").arg(nick)); + kickBanMenu->setEnabled(false); QAction *ignoreAction = nickContextMenu.addAction(tr("Ignore")); ignoreAction->setEnabled(false); @@ -100,18 +137,61 @@ void NickView::showContextMenu(const QPoint & pos ) { QAction *sendFileAction = nickContextMenu.addAction(tr("Send file")); sendFileAction->setEnabled(false); - QAction *result = nickContextMenu.exec(QCursor::pos()); + QAction *action = nickContextMenu.exec(QCursor::pos()); + BufferInfo bufferInfo = bufferInfoFromModelIndex(index); + + 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)); } - if(result == whoisAction) { Client::instance()->userInput(bufferInfo, QString("/WHOIS %1 %1").arg(username)); } - else if(result == versionAction) { Client::instance()->userInput(bufferInfo, QString("/CTCP %1 VERSION").arg(username)); } - else if(result == pingAction) { Client::instance()->userInput(bufferInfo, QString("/CTCP %1 PING ").arg(username)); } + 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)); } - else if(result == opAction) { Client::instance()->userInput(bufferInfo, "/OP " + username); } - else if(result == deOpAction) { Client::instance()->userInput(bufferInfo, "/DEOP " + username); } - else if(result == voiceAction) { Client::instance()->userInput(bufferInfo, "/VOICE " + username); } - else if(result == deVoiceAction) { Client::instance()->userInput(bufferInfo, "/DEVOICE " + username); } + else if(action == kickAction) { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); } + else if(action == kickBanAction) { executeCommand(bufferInfo, QString("/KICKBAN %1").arg(nick)); } + else if(action == queryAction) { executeCommand(bufferInfo, QString("/QUERY %1").arg(nick)); } + +} + +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::executeCommand(const BufferInfo & bufferInfo, const QString & command) { + Client::instance()->userInput(bufferInfo, command); +} - else if(result == kickAction) { Client::instance()->userInput(bufferInfo, "/KICK " + username); } - else if(result == kickBanAction) { Client::instance()->userInput(bufferInfo, "/KICKBAN " + username); } - else if(result == queryAction) { Client::instance()->userInput(bufferInfo, "/QUERY " + username); } +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; }