kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Assure that the categorized sorting is applied correctly to the proxy model if the view does not support the categorization feature (currently only the icons view supports this). Take care that switching between e. g. the icons-view and the details-view does not change the stored categorized sorting. Thanks to Rafael for the initial patch!

Browse source 
CCMAIL: ereslibre@gmail.com

svn path=/trunk/KDE/kdebase/apps/; revision=717300
This commit is contained in:
Peter Penz 2007-09-26 15:26:30 +00:00
parent 3713f1991a
commit 34a19e156e
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/dolphinview.cpp
View file

@ -168,6 +168,17 @@ void DolphinView::setMode(Mode mode)
props.setViewMode(m_mode); props.setViewMode(m_mode);
createView(); createView();
// Not all view modes support categorized sorting. Adjust the sorting model
// if changing the view mode results in a change of the categorized sorting
// capabilities.
const bool categorized = props.categorizedSorting() && supportsCategorizedSorting();
if (categorized != categorizedSorting()) {
m_proxyModel->setCategorizedModel(categorized);
m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
emit categorizedSortingChanged();
}
startDirLister(viewPropsUrl); startDirLister(viewPropsUrl);
emit modeChanged(); emit modeChanged();
@ -222,17 +233,9 @@ void DolphinView::setCategorizedSorting(bool categorized)
return; return;
} }
if (!categorized && !supportsCategorizedSorting()) // setCategorizedSorting(true) may only get invoked
{ // if the view supports categorized sorting
m_proxyModel->setCategorizedModel(categorized); Q_ASSERT(!categorized || supportsCategorizedSorting());
m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
emit categorizedSortingChanged();
return;
}
Q_ASSERT(m_iconsView != 0);
ViewProperties props(viewPropertiesUrl()); ViewProperties props(viewPropertiesUrl());
props.setCategorizedSorting(categorized); props.setCategorizedSorting(categorized);
@ -615,9 +618,10 @@ void DolphinView::applyViewProperties(const KUrl& url)
emit showHiddenFilesChanged(); emit showHiddenFilesChanged();
} }
const bool categorized = props.categorizedSorting(); const bool categorized = props.categorizedSorting() && supportsCategorizedSorting();
if (categorized != categorizedSorting()) { if (categorized != categorizedSorting()) {
m_proxyModel->setCategorizedModel(categorized); m_proxyModel->setCategorizedModel(categorized);
m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
emit categorizedSortingChanged(); emit categorizedSortingChanged();
} }
@ -812,19 +816,11 @@ void DolphinView::createView()
case DetailsView: case DetailsView:
m_detailsView = new DolphinDetailsView(this, m_controller); m_detailsView = new DolphinDetailsView(this, m_controller);
view = m_detailsView; view = m_detailsView;
// categorized sorting is not supported yet for the details
// view, even if the view properties indicate this
setCategorizedSorting(false);
break; break;
case ColumnView: case ColumnView:
m_columnView = new DolphinColumnView(this, m_controller); m_columnView = new DolphinColumnView(this, m_controller);
view = m_columnView; view = m_columnView;
// categorized sorting is not supported yet for the column
// view, even if the view properties indicate this
setCategorizedSorting(false);
break; break;
} }