kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Make the View operate on the QSortFilterProxyModel

Browse Source 
Fix the crashes by using mapToSource and mapSelectionToSource
to map the QModelIndex

svn path=/trunk/playground/utils/dolphin/; revision=616118
This commit is contained in:
Holger Freyther 2006-12-23 18:00:25 +00:00
parent 834b145d21
commit da88d22283
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/dolphinview.cpp
View File

@ -109,7 +109,7 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow,
m_proxyModel = new DolphinSortFilterProxyModel(this);
m_proxyModel->setSourceModel(m_dirModel);
m_iconsView->setModel(m_dirModel); // TODO: using m_proxyModel crashes when clicking on an item
m_iconsView->setModel(m_proxyModel);
KFileItemDelegate* delegate = new KFileItemDelegate(this);
delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType);
@ -478,23 +478,28 @@ bool DolphinView::hasSelection() const
return m_iconsView->selectionModel()->hasSelection();
}
/*
* Our view has a selection, we will map them back to the DirModel
* and then fill the KFileItemList
*/
KFileItemList DolphinView::selectedItems() const
{
QItemSelectionModel* selModel = m_iconsView->selectionModel();
assert(selModel != 0);
assert( m_iconsView && m_iconsView->selectionModel() );
const QItemSelection selection = m_proxyModel->mapSelectionToSource( m_iconsView->selectionModel()->selection() );
KFileItemList itemList;
if (selModel->hasSelection()) {
const QModelIndexList indexList = selModel->selectedIndexes();
QModelIndexList::const_iterator end = indexList.end();
for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
KFileItem* item = m_dirModel->itemForIndex(*it);
if (item != 0) {
itemList.append(item);
}
const QModelIndexList indexList = selection.indexes();
QModelIndexList::const_iterator end = indexList.end();
for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
assert( (*it).isValid() );
KFileItem* item = m_dirModel->itemForIndex(*it);
if (item != 0) {
itemList.append(item);
}
}
return itemList;
}
@ -660,7 +665,7 @@ void DolphinView::loadDirectory(const KUrl& url)
void DolphinView::triggerItem(const QModelIndex& index)
{
KFileItem* item = m_dirModel->itemForIndex(index);
KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
if (item == 0) {
return;
}