projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-statusbar can now be hidden (you can find it in views at the bottom)
[quassel.git]
/
src
/
client
/
buffermodel.cpp
diff --git
a/src/client/buffermodel.cpp
b/src/client/buffermodel.cpp
index
78d3960
..
52d6d54
100644
(file)
--- a/
src/client/buffermodel.cpp
+++ b/
src/client/buffermodel.cpp
@@
-28,13
+28,10
@@
BufferModel::BufferModel(NetworkModel *parent)
: QSortFilterProxyModel(parent),
_selectionModelSynchronizer(this),
BufferModel::BufferModel(NetworkModel *parent)
: QSortFilterProxyModel(parent),
_selectionModelSynchronizer(this),
- _
propertyMapper
(this)
+ _
standardSelectionModel
(this)
{
setSourceModel(parent);
{
setSourceModel(parent);
-
- // initialize the Property Mapper
- _propertyMapper.setModel(this);
- _selectionModelSynchronizer.addRegularSelectionModel(_propertyMapper.selectionModel());
+ _selectionModelSynchronizer.addRegularSelectionModel(standardSelectionModel());
}
BufferModel::~BufferModel() {
}
BufferModel::~BufferModel() {
@@
-42,11
+39,13
@@
BufferModel::~BufferModel() {
bool BufferModel::filterAcceptsRow(int sourceRow, const QModelIndex &parent) const {
Q_UNUSED(sourceRow);
bool BufferModel::filterAcceptsRow(int sourceRow, const QModelIndex &parent) const {
Q_UNUSED(sourceRow);
- //
hide childs of buffers and everything below
- if(
parent.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType
)
- return
fals
e;
- else
+ //
only networks and buffers are allowed
+ if(
!parent.isValid()
)
+ return
tru
e;
+ if(parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
return true;
return true;
+
+ return false;
}
void BufferModel::synchronizeSelectionModel(MappedSelectionModel *selectionModel) {
}
void BufferModel::synchronizeSelectionModel(MappedSelectionModel *selectionModel) {
@@
-61,10
+60,11
@@
void BufferModel::synchronizeView(QAbstractItemView *view) {
view->setSelectionModel(mappedSelectionModel);
}
view->setSelectionModel(mappedSelectionModel);
}
-
void BufferModel::mapProperty(int column, int role, QObject *target, const QByteArray &property
) {
-
_propertyMapper.addMapping(column, role, target, property
);
+
QModelIndex BufferModel::currentIndex(
) {
+
return standardSelectionModel()->currentIndex(
);
}
}
-QModelIndex BufferModel::currentIndex() {
- return propertyMapper()->selectionModel()->currentIndex();
+void BufferModel::setCurrentIndex(const QModelIndex &newCurrent) {
+ _standardSelectionModel.setCurrentIndex(newCurrent, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+ _standardSelectionModel.select(newCurrent, QItemSelectionModel::ClearAndSelect);
}
}