Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-16 19:31:02 +01:00
Code Issues Releases Wiki Activity

Sort the device libraries properly

Browse Source
This commit is contained in:
David Sansome 2010-07-04 00:58:01 +00:00
parent 545d28428c
commit 8c26c61b0b
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/mergedproxymodel.cpp
View File

@ -55,10 +55,16 @@ void MergedProxyModel::AddSubModel(const QModelIndex& source_parent,
connect(submodel, SIGNAL(rowsRemoved(QModelIndex,int,int)), connect(submodel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SLOT(RowsRemoved(QModelIndex,int,int))); this, SLOT(RowsRemoved(QModelIndex,int,int)));
QModelIndex proxy_parent = mapFromSource(source_parent);
const int rows = submodel->rowCount();
if (rows)
beginInsertRows(proxy_parent, 0, rows-1);
merge_points_.insert(submodel, source_parent); merge_points_.insert(submodel, source_parent);
QModelIndex proxy_parent = mapFromSource(source_parent); if (rows)
dataChanged(proxy_parent, proxy_parent); endInsertRows();
} }
void MergedProxyModel::RemoveSubModel(const QModelIndex &source_parent) { void MergedProxyModel::RemoveSubModel(const QModelIndex &source_parent) {
@ -91,8 +97,6 @@ void MergedProxyModel::RemoveSubModel(const QModelIndex &source_parent) {
++it; ++it;
} }
} }
reset();
} }
void MergedProxyModel::setSourceModel(QAbstractItemModel* source_model) { void MergedProxyModel::setSourceModel(QAbstractItemModel* source_model) {

34
src/devices/deviceview.cpp
View File

@ -50,19 +50,19 @@ void DeviceView::SetDeviceManager(DeviceManager *manager) {
manager_ = manager; manager_ = manager;
connect(manager_, SIGNAL(DeviceDisconnected(int)), SLOT(DeviceDisconnected(int))); connect(manager_, SIGNAL(DeviceDisconnected(int)), SLOT(DeviceDisconnected(int)));
sort_model_ = new QSortFilterProxyModel(this);
sort_model_->setSourceModel(manager_);
sort_model_->setDynamicSortFilter(true);
sort_model_->sort(0);
merged_model_ = new MergedProxyModel(this); merged_model_ = new MergedProxyModel(this);
merged_model_->setSourceModel(manager_); merged_model_->setSourceModel(sort_model_);
connect(merged_model_, connect(merged_model_,
SIGNAL(SubModelReset(QModelIndex,QAbstractItemModel*)), SIGNAL(SubModelReset(QModelIndex,QAbstractItemModel*)),
SLOT(RecursivelyExpand(QModelIndex))); SLOT(RecursivelyExpand(QModelIndex)));
sort_model_ = new QSortFilterProxyModel(this); setModel(merged_model_);
sort_model_->setSourceModel(merged_model_);
sort_model_->setDynamicSortFilter(true);
sort_model_->sort(0);
setModel(sort_model_);
} }
void DeviceView::contextMenuEvent(QContextMenuEvent* e) { void DeviceView::contextMenuEvent(QContextMenuEvent* e) {
@ -79,22 +79,26 @@ void DeviceView::contextMenuEvent(QContextMenuEvent* e) {
menu_->popup(e->globalPos()); menu_->popup(e->globalPos());
} }
QModelIndex DeviceView::MapToDevice(const QModelIndex &sort_model_index) const { QModelIndex DeviceView::MapToDevice(const QModelIndex& merged_model_index) const {
QModelIndex sort_model_index = merged_model_->mapToSource(merged_model_index);
if (sort_model_index.model() != sort_model_) if (sort_model_index.model() != sort_model_)
return QModelIndex(); return QModelIndex();
QModelIndex index = return sort_model_->mapToSource(sort_model_index);
merged_model_->mapToSource(sort_model_->mapToSource(sort_model_index));
if (index.model() != manager_)
return QModelIndex();
return index;
} }
void DeviceView::Connect() { void DeviceView::Connect() {
QModelIndex device_idx = MapToDevice(menu_index_); QModelIndex device_idx = MapToDevice(menu_index_);
QModelIndex sort_idx = sort_model_->mapFromSource(device_idx);
boost::shared_ptr<ConnectedDevice> device = manager_->Connect(device_idx.row()); boost::shared_ptr<ConnectedDevice> device = manager_->Connect(device_idx.row());
merged_model_->AddSubModel(device_idx, device->model());
QSortFilterProxyModel* sort_model = new QSortFilterProxyModel(device->model());
sort_model->setSourceModel(device->model());
sort_model->setSortRole(LibraryModel::Role_SortText);
sort_model->setDynamicSortFilter(true);
sort_model->sort(0);
merged_model_->AddSubModel(sort_idx, sort_model);
expand(menu_index_); expand(menu_index_);
} }
@ -106,5 +110,5 @@ void DeviceView::Disconnect() {
} }
void DeviceView::DeviceDisconnected(int row) { void DeviceView::DeviceDisconnected(int row) {
merged_model_->RemoveSubModel(manager_->index(row)); merged_model_->RemoveSubModel(sort_model_->mapFromSource(manager_->index(row)));
} }

2
src/devices/deviceview.h
View File

@ -44,7 +44,7 @@ private slots:
void DeviceDisconnected(int row); void DeviceDisconnected(int row);
private: private:
QModelIndex MapToDevice(const QModelIndex& sort_model_index) const; QModelIndex MapToDevice(const QModelIndex& merged_model_index) const;
private: private:
DeviceManager* manager_; DeviceManager* manager_;