kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Assure that directories are always on top, independent from the sort order (-> equal to the behavior in KDE 3).

Browse source 
BUG: 157341

svn path=/trunk/KDE/kdebase/apps/; revision=783853
This commit is contained in:
Peter Penz 2008-03-09 19:53:21 +00:00
parent ae6ffcac0d
commit 1b45574325
2 changed files with 45 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/dolphinsortfilterproxymodel.cpp
View file

@ -97,43 +97,18 @@ bool DolphinSortFilterProxyModel::subSortLessThan(const QModelIndex& left,
const QModelIndex& right) const
{
#ifdef HAVE_NEPOMUK
DolphinModel* dolphinModel = static_cast<DolphinModel*>(sourceModel());
const KFileItem leftFileItem = dolphinModel->itemForIndex(left);
const KFileItem rightFileItem = dolphinModel->itemForIndex(right);
// On our priority, folders go above regular files.
if (leftFileItem.isDir() && !rightFileItem.isDir()) {
return true;
} else if (!leftFileItem.isDir() && rightFileItem.isDir()) {
return false;
}
// Hidden elements go before visible ones, if they both are
// folders or files.
if (leftFileItem.isHidden() && !rightFileItem.isHidden()) {
return true;
} else if (!leftFileItem.isHidden() && rightFileItem.isHidden()) {
return false;
}
switch (left.column()) {
case DolphinView::SortByRating: {
const quint32 leftRating = DolphinModel::ratingForIndex(left);
const quint32 rightRating = DolphinModel::ratingForIndex(right);
if (leftRating == rightRating) {
// On our priority, folders go above regular files.
// This checks are needed (don't think it's the same doing it here
// than above). Here we make dirs citizens of first class because
// we know we are on the same category. On the check we do on the
// top of the method we don't know, so we remove that check when we
// are sorting by rating. (ereslibre)
if (leftFileItem.isDir() && !rightFileItem.isDir()) {
return true;
} else if (!leftFileItem.isDir() && rightFileItem.isDir()) {
return false;
DolphinModel* dolphinModel = static_cast<DolphinModel*>(sourceModel());
const KFileItem leftFileItem = dolphinModel->itemForIndex(left);
const KFileItem rightFileItem = dolphinModel->itemForIndex(right);
bool result;
if (isDirectoryOrHidden(leftFileItem, rightFileItem, result)) {
return result;
}
return sortCaseSensitivity() ?
@ -149,16 +124,12 @@ bool DolphinSortFilterProxyModel::subSortLessThan(const QModelIndex& left,
const QString rightTags = DolphinModel::tagsForIndex(right);
if (leftTags == rightTags) {
// On our priority, folders go above regular files.
// This checks are needed (don't think it's the same doing it here
// than above). Here we make dirs citizens of first class because
// we know we are on the same category. On the check we do on the
// top of the method we don't know, so we remove that check when we
// are sorting by tags. (ereslibre)
if (leftFileItem.isDir() && !rightFileItem.isDir()) {
return true;
} else if (!leftFileItem.isDir() && rightFileItem.isDir()) {
return false;
DolphinModel* dolphinModel = static_cast<DolphinModel*>(sourceModel());
const KFileItem leftFileItem = dolphinModel->itemForIndex(left);
const KFileItem rightFileItem = dolphinModel->itemForIndex(right);
bool result;
if (isDirectoryOrHidden(leftFileItem, rightFileItem, result)) {
return result;
}
return sortCaseSensitivity() ?
@ -171,10 +142,31 @@ bool DolphinSortFilterProxyModel::subSortLessThan(const QModelIndex& left,
default:
break;
}
#endif
return KDirSortFilterProxyModel::subSortLessThan(left, right);
}
bool DolphinSortFilterProxyModel::isDirectoryOrHidden(const KFileItem& left,
const KFileItem& right,
bool& result) const
{
bool isDirectoryOrHidden = true;
const bool isLessThan = (sortOrder() == Qt::AscendingOrder);
if (left.isDir() && !right.isDir()) {
result = isLessThan;
} else if (!left.isDir() && right.isDir()) {
result = !isLessThan;
} else if (left.isHidden() && !right.isHidden()) {
result = isLessThan;
} else if (!left.isHidden() && right.isHidden()) {
result = !isLessThan;
} else {
isDirectoryOrHidden = false;
}
return isDirectoryOrHidden;
}
#include "dolphinsortfilterproxymodel.moc"

11
src/dolphinsortfilterproxymodel.h
View file

@ -79,6 +79,17 @@ protected:
virtual bool subSortLessThan(const QModelIndex& left,
const QModelIndex& right) const;
private:
/**
* Returns true, if the left or right file item is a directory
* or a hidden file. In this case \a result provides the information
* whether \a left is less than \a right. If false is returned,
* the value of \a result is undefined.
*/
bool isDirectoryOrHidden(const KFileItem& left,
const KFileItem& right,
bool& result) const;
private:
DolphinView::Sorting m_sorting:16;
Qt::SortOrder m_sortOrder:16;