projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Quassel not rejoining newly joined channels
[quassel.git]
/
src
/
uisupport
/
nickview.cpp
diff --git
a/src/uisupport/nickview.cpp
b/src/uisupport/nickview.cpp
index
bfdaf1e
..
6d3f398
100644
(file)
--- a/
src/uisupport/nickview.cpp
+++ b/
src/uisupport/nickview.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-18,6
+18,9
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include "nickview.h"
+
+#include <QApplication>
#include <QHeaderView>
#include <QScrollBar>
#include <QDebug>
#include <QHeaderView>
#include <QScrollBar>
#include <QDebug>
@@
-25,10
+28,11
@@
#include "buffermodel.h"
#include "client.h"
#include "buffermodel.h"
#include "client.h"
+#include "contextmenuactionprovider.h"
+#include "graphicalui.h"
#include "nickview.h"
#include "nickviewfilter.h"
#include "networkmodel.h"
#include "nickview.h"
#include "nickviewfilter.h"
#include "networkmodel.h"
-#include "quasselui.h"
#include "types.h"
class ExpandAllEvent : public QEvent {
#include "types.h"
class ExpandAllEvent : public QEvent {
@@
-65,10
+69,16
@@
void NickView::init() {
for(int i = 1; i < model()->columnCount(); i++)
setColumnHidden(i, true);
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()));
}
}
-void NickView::setModel(QAbstractItemModel *model) {
- QTreeView::setModel(model);
+void NickView::setModel(QAbstractItemModel *model_) {
+ if(model())
+ disconnect(model(), 0, this, 0);
+
+ QTreeView::setModel(model_);
init();
}
init();
}
@@
-85,18
+95,23
@@
void NickView::setRootIndex(const QModelIndex &index) {
QCoreApplication::postEvent(this, new ExpandAllEvent);
}
QCoreApplication::postEvent(this, new ExpandAllEvent);
}
-void NickView::showContextMenu(const QPoint & pos ) {
- QModelIndex index = indexAt(pos);
- if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType)
- return;
+QModelIndexList NickView::selectedIndexes() const {
+ QModelIndexList indexList = QTreeView::selectedIndexes();
- QModelIndexList indexList = selectedIndexes();
// make sure the item we clicked on is first
// make sure the item we clicked on is first
- indexList.removeAll(index);
- indexList.prepend(index);
+ if(indexList.contains(currentIndex())) {
+ indexList.removeAll(currentIndex());
+ indexList.prepend(currentIndex());
+ }
+
+ return indexList;
+}
+
+void NickView::showContextMenu(const QPoint &pos ) {
+ Q_UNUSED(pos);
QMenu contextMenu(this);
QMenu contextMenu(this);
-
Client::mainUi()->actionProvider()->addActions(&contextMenu, indexList
);
+
GraphicalUi::contextMenuActionProvider()->addActions(&contextMenu, selectedIndexes()
);
contextMenu.exec(QCursor::pos());
}
contextMenu.exec(QCursor::pos());
}