projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Quassel no longer gets a nervous breakdown when you select too many buffers - fixes...
[quassel.git]
/
src
/
uisupport
/
bufferview.cpp
diff --git
a/src/uisupport/bufferview.cpp
b/src/uisupport/bufferview.cpp
index
888086c
..
aa349f6
100644
(file)
--- a/
src/uisupport/bufferview.cpp
+++ b/
src/uisupport/bufferview.cpp
@@
-36,7
+36,6
@@
#include "buffersyncer.h"
#include "client.h"
#include "iconloader.h"
#include "buffersyncer.h"
#include "client.h"
#include "iconloader.h"
-#include "mappedselectionmodel.h"
#include "network.h"
#include "networkmodel.h"
#include "networkmodelactionprovider.h"
#include "network.h"
#include "networkmodel.h"
#include "networkmodelactionprovider.h"
@@
-100,7
+99,7
@@
void BufferView::init() {
header()->setContextMenuPolicy(Qt::ActionsContextMenu);
hideColumn(1);
hideColumn(2);
header()->setContextMenuPolicy(Qt::ActionsContextMenu);
hideColumn(1);
hideColumn(2);
- setIndentation(
5
);
+ setIndentation(
10
);
expandAll();
setAnimated(true);
expandAll();
setAnimated(true);
@@
-201,14
+200,17
@@
void BufferView::setConfig(BufferViewConfig *config) {
connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &)));
setRootIndexForNetworkId(config->networkId());
} else {
connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &)));
setRootIndexForNetworkId(config->networkId());
} else {
+ setIndentation(10);
setRootIndex(QModelIndex());
}
}
void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
if(!networkId.isValid() || !model()) {
setRootIndex(QModelIndex());
}
}
void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
if(!networkId.isValid() || !model()) {
+ setIndentation(10);
setRootIndex(QModelIndex());
} else {
setRootIndex(QModelIndex());
} else {
+ setIndentation(5);
int networkCount = model()->rowCount();
QModelIndex child;
for(int i = 0; i < networkCount; i++) {
int networkCount = model()->rowCount();
QModelIndex child;
for(int i = 0; i < networkCount; i++) {
@@
-344,13
+346,12
@@
void BufferView::on_configChanged() {
collapse(networkIdx);
}
collapse(networkIdx);
}
- // update selection to current one
- MappedSelectionModel *mappedSelectionModel = qobject_cast<MappedSelectionModel *>(selectionModel());
- if(!config() || !mappedSelectionModel)
- return;
+ if(config()) {
+ // update selection to current one
+ Client::bufferModel()->synchronizeView(this);
+ }
- mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current);
- mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+ return;
}
void BufferView::on_collapse(const QModelIndex &index) {
}
void BufferView::on_collapse(const QModelIndex &index) {
@@
-496,14
+497,6
@@
BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent)
connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &)));
}
connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &)));
}
-BufferViewDock::BufferViewDock(QWidget *parent)
- : QDockWidget(tr("All Buffers"), parent)
-{
- setObjectName("BufferViewDock--1");
- toggleViewAction()->setData((int)-1);
- setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
-}
-
void BufferViewDock::bufferViewRenamed(const QString &newName) {
setWindowTitle(newName);
toggleViewAction()->setText(newName);
void BufferViewDock::bufferViewRenamed(const QString &newName) {
setWindowTitle(newName);
toggleViewAction()->setText(newName);