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

Sortings restored. Everything is working fine :)

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=744653
This commit is contained in:
Rafael Fernández López 2007-12-04 01:18:17 +00:00
parent f64141a6d1
commit 1e4257b684
1 changed files with 36 additions and 295 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

331
src/dolphinmodel.cpp
View file

@ -236,7 +236,6 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
} }
else if (role == KCategorizedSortFilterProxyModel::CategorySortRole) else if (role == KCategorizedSortFilterProxyModel::CategorySortRole)
{ {
#if 0
QVariant retVariant; QVariant retVariant;
if (!index.isValid()) if (!index.isValid())
@ -249,144 +248,58 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
switch (index.column()) { switch (index.column()) {
case KDirModel::Name: { case KDirModel::Name: {
bool leftFileNameStartsByLetter = false; retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
const QString str(leftFileItem.name().toUpper()); break;
const QChar* currA = str.unicode();
while (!currA->isNull() && !leftFileNameStartsByLetter) {
if (currA->isLetter())
leftFileNameStartsByLetter = true;
else if (currA->isDigit()) {
break;
} else
++currA;
}
bool rightFileNameStartsByLetter = false;
const QString strb(rightFileItem.name().toUpper());
const QChar *currB = strb.unicode();
while (!currB->isNull() && !rightFileNameStartsByLetter) {
if (currB->isLetter())
rightFileNameStartsByLetter = true;
else if (currB->isDigit()) {
break;
} else
++currB;
}
if (!rightFileNameStartsByLetter)
return -1;
if (!leftFileNameStartsByLetter && rightFileNameStartsByLetter)
return 1;
return naturalCompare(*currA, *currB);
} }
case KDirModel::Size: { case KDirModel::Size: {
// If we are sorting by size, show folders first. We will sort them const int fileSize = !item.isNull() ? item.size() : -1;
// correctly later. retVariant = fileSize;
if (leftFileItem.isDir() && !rightFileItem.isDir()) { break;
return -1;
}
if (!leftFileItem.isDir() && rightFileItem.isDir()) {
return 1;
}
if (leftFileItem.isDir() && rightFileItem.isDir()) {
return 0;
}
const int leftFileSize = !leftFileItem.isNull() ? leftFileItem.size() : -1;
const int rightFileSize = !rightFileItem.isNull() ? rightFileItem.size() : -1;
int leftGroup;
int rightGroup;
if (leftFileSize < 5242880) {
leftGroup = 0;
} else if (leftFileSize < 10485760) {
leftGroup = 1;
} else {
leftGroup = 2;
}
if (rightFileSize < 5242880) {
rightGroup = 0;
} else if (rightFileSize < 10485760) {
rightGroup = 1;
} else {
rightGroup = 2;
}
return leftGroup - rightGroup;
} }
case KDirModel::ModifiedTime: { case KDirModel::ModifiedTime:
KDateTime leftTime = leftFileItem.time(KFileItem::ModificationTime); {
KDateTime rightTime = rightFileItem.time(KFileItem::ModificationTime); KDateTime modifiedTime;
modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
modifiedTime = modifiedTime.toLocalZone();
if ((leftTime.date().year() == rightTime.date().year()) && retVariant = modifiedTime.date().year() * 100 + modifiedTime.date().month();
(leftTime.date().month() == rightTime.date().month())) { break;
return 0;
}
if (leftTime > rightTime) {
return 1;
}
return -1;
} }
case KDirModel::Permissions: { case KDirModel::Permissions:
QFileInfo leftFileInfo(leftFileItem.url().pathOrUrl()); {
QFileInfo rightFileInfo(rightFileItem.url().pathOrUrl()); QFileInfo info(item.url().pathOrUrl());
int leftPermissionsPoints = pointsForPermissions(leftFileInfo); retVariant = KDirSortFilterProxyModel::pointsForPermissions(info);
int rightPermissionsPoints = pointsForPermissions(rightFileInfo); break;
return leftPermissionsPoints - rightPermissionsPoints;
} }
case KDirModel::Owner: { case KDirModel::Owner:
return naturalCompare(leftFileItem.user().toLower(), retVariant = item.user();
rightFileItem.user().toLower()); break;
}
case KDirModel::Group: { case KDirModel::Group:
return naturalCompare(leftFileItem.group().toLower(), retVariant = item.group();
rightFileItem.group().toLower()); break;
}
case KDirModel::Type: { case KDirModel::Type:
// If we are sorting by size, show folders first. We will sort them if (item.isDir())
// correctly later. retVariant = QString(); // when sorting we want folders to be placed first
if (leftFileItem.isDir() && !rightFileItem.isDir()) { else
return -1; retVariant = item.mimeComment();
} else if (!leftFileItem.isDir() && rightFileItem.isDir()) { break;
return 1;
}
return naturalCompare(leftFileItem.mimeComment().toLower(),
rightFileItem.mimeComment().toLower());
}
#ifdef HAVE_NEPOMUK #ifdef HAVE_NEPOMUK
case DolphinView::SortByRating: { case DolphinModel::Rating: {
const qint32 leftRating = DolphinModel::ratingForIndex(left); retVariant = ratingForIndex(index);
const qint32 rightRating = DolphinModel::ratingForIndex(right); break;
return leftRating - rightRating;
} }
case DolphinView::SortByTags: { case DolphinModel::Tags: {
const QString leftTags = DolphinModel::tagsForIndex(left); retVariant = tagsForIndex(index).count();
const QString rightTags = DolphinModel::tagsForIndex(right); break;
if (leftTags.isEmpty() && !rightTags.isEmpty())
return 1;
else if (!leftTags.isEmpty() && rightTags.isEmpty())
return -1;
return naturalCompare(DolphinModel::tagsForIndex(left), DolphinModel::tagsForIndex(right)) < 0;
} }
#endif #endif
@ -394,180 +307,8 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
break; break;
} }
#endif
QString retString;
if (!index.isValid()) return retVariant;
{
return retString;
}
const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
KFileItem item = dirModel->itemForIndex(index);
switch (index.column())
{
case KDirModel::Name:
{
// KDirModel checks columns to know to which role are
// we talking about
QModelIndex theIndex = index.model()->index(index.row(),
KDirModel::Name,
index.parent());
if (!theIndex.isValid()) {
return retString;
}
QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
if (data.toString().size())
{
if (!item.isHidden() && data.toString().at(0).isLetter())
retString = data.toString().toUpper().at(0);
else if (item.isHidden() && data.toString().at(0) == '.' &&
data.toString().at(1).isLetter())
retString = data.toString().toUpper().at(1);
else if (item.isHidden() && data.toString().at(0) == '.' &&
!data.toString().at(1).isLetter())
retString = i18nc("@title:group Name", "Others");
else if (item.isHidden() && data.toString().at(0) != '.')
retString = data.toString().toUpper().at(0);
else if (item.isHidden())
retString = data.toString().toUpper().at(0);
else
{
bool validCategory = false;
const QString str(data.toString().toUpper());
const QChar* currA = str.unicode();
while (!currA->isNull() && !validCategory) {
if (currA->isLetter())
validCategory = true;
else if (currA->isDigit())
return i18nc("@title:group", "Others");
else
++currA;
}
if (!validCategory)
retString = i18nc("@title:group Name", "Others");
else
retString = *currA;
}
}
break;
}
case KDirModel::Size: {
const int fileSize = !item.isNull() ? item.size() : -1;
if (!item.isNull() && item.isDir()) {
retString = i18nc("@title:group Size", "Folders");
} else if (fileSize < 5242880) {
retString = i18nc("@title:group Size", "Small");
} else if (fileSize < 10485760) {
retString = i18nc("@title:group Size", "Medium");
} else {
retString = i18nc("@title:group Size", "Big");
}
break;
}
case KDirModel::ModifiedTime:
{
KDateTime modifiedTime;
modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
modifiedTime = modifiedTime.toLocalZone();
retString = modifiedTime.toString(i18nc("Prints out the month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
break;
}
case KDirModel::Permissions:
{
QString user;
QString group;
QString others;
QFileInfo info(item.url().pathOrUrl());
if (info.permission(QFile::ReadUser))
user = i18n("Read, ");
if (info.permission(QFile::WriteUser))
user += i18n("Write, ");
if (info.permission(QFile::ExeUser))
user += i18n("Execute, ");
if (user.isEmpty())
user = i18n("Forbidden");
else
user = user.mid(0, user.count() - 2);
if (info.permission(QFile::ReadGroup))
group = i18n("Read, ");
if (info.permission(QFile::WriteGroup))
group += i18n("Write, ");
if (info.permission(QFile::ExeGroup))
group += i18n("Execute, ");
if (group.isEmpty())
group = i18n("Forbidden");
else
group = group.mid(0, group.count() - 2);
if (info.permission(QFile::ReadOther))
others = i18n("Read, ");
if (info.permission(QFile::WriteOther))
others += i18n("Write, ");
if (info.permission(QFile::ExeOther))
others += i18n("Execute, ");
if (others.isEmpty())
others = i18n("Forbidden");
else
others = others.mid(0, others.count() - 2);
retString = i18nc("This shows files and folders permissions: user, group and others", "(User: %1) (Group: %2) (Others: %3)", user, group, others);
break;
}
case KDirModel::Owner:
retString = item.user();
break;
case KDirModel::Group:
retString = item.group();
break;
case KDirModel::Type:
retString = item.mimeComment();
break;
#ifdef HAVE_NEPOMUK
case DolphinModel::Rating: {
const quint32 rating = ratingForIndex(index);
retString = QString::number(rating);
break;
}
case DolphinModel::Tags: {
retString = tagsForIndex(index);
if (retString.isEmpty())
retString = i18nc("@title:group Tags", "Not yet tagged");
break;
}
#endif
}
return retString;
} }
return KDirModel::data(index, role); return KDirModel::data(index, role);