#include <KDirLister>
#include <KDirModel>
+#include <KGlobalSettings>
#include <KLocale>
#include <KStringHandler>
#include <KDebug>
KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
KItemModelBase("name", parent),
m_dirLister(dirLister),
- m_naturalSorting(true),
+ m_naturalSorting(KGlobalSettings::naturalSorting()),
m_sortFoldersFirst(true),
m_sortRole(NameRole),
m_roles(),
Q_ASSERT(dirLister);
connect(dirLister, SIGNAL(canceled()), this, SLOT(slotCanceled()));
- connect(dirLister, SIGNAL(completed()), this, SLOT(slotCompleted()));
+ connect(dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted()));
connect(dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(slotNewItems(KFileItemList)));
connect(dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SLOT(slotItemsDeleted(KFileItemList)));
connect(dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)), this, SLOT(slotRefreshItems(QList<QPair<KFileItem,KFileItem> >)));
connect(m_resortAllItemsTimer, SIGNAL(timeout()), this, SLOT(resortAllItems()));
Q_ASSERT(m_minimumUpdateIntervalTimer->interval() <= m_maximumUpdateIntervalTimer->interval());
+
+ connect(KGlobalSettings::self(), SIGNAL(naturalSortingChanged()), this, SLOT(slotNaturalSortingChanged()));
}
KFileItemModel::~KFileItemModel()
return dirLister ? dirLister->showingDotFiles() : false;
}
+void KFileItemModel::setShowFoldersOnly(bool enabled)
+{
+ KDirLister* dirLister = m_dirLister.data();
+ if (dirLister) {
+ dirLister->setDirOnlyMode(enabled);
+ }
+}
+
+bool KFileItemModel::showFoldersOnly() const
+{
+ KDirLister* dirLister = m_dirLister.data();
+ return dirLister ? dirLister->dirOnlyMode() : false;
+}
+
QMimeData* KFileItemModel::createMimeData(const QSet<int>& indexes) const
{
QMimeData* data = new QMimeData();
bool KFileItemModel::supportsDropping(int index) const
{
const KFileItem item = fileItem(index);
- return item.isNull() ? false : item.isDir();
+ return item.isNull() ? false : item.isDir() || item.isDesktopFile();
}
QString KFileItemModel::roleDescription(const QByteArray& role) const
}
}
+ m_groups.clear();
resetRoles();
QSetIterator<QByteArray> it(roles);
m_urlsToExpand = urls;
}
-void KFileItemModel::setExpanded(const QSet<KUrl>& urls)
+void KFileItemModel::expandParentItems(const KUrl& url)
{
const KDirLister* dirLister = m_dirLister.data();
if (!dirLister) {
return;
}
- const int pos = dirLister->url().url().length();
+ const int pos = dirLister->url().path().length();
- // Assure that each sub-path of the URLs that should be
- // expanded is added to m_urlsToExpand too. KDirLister
+ // Assure that each sub-path of the URL that should be
+ // expanded is added to m_urlsToExpand. KDirLister
// does not care whether the parent-URL has already been
// expanded.
- QSetIterator<KUrl> it1(urls);
- while (it1.hasNext()) {
- const KUrl& url = it1.next();
-
- KUrl urlToExpand = dirLister->url();
- const QStringList subDirs = url.url().mid(pos).split(QDir::separator());
- for (int i = 0; i < subDirs.count(); ++i) {
- urlToExpand.addPath(subDirs.at(i));
- m_urlsToExpand.insert(urlToExpand);
- }
+ KUrl urlToExpand = dirLister->url();
+ const QStringList subDirs = url.path().mid(pos).split(QDir::separator());
+ for (int i = 0; i < subDirs.count() - 1; ++i) {
+ urlToExpand.addPath(subDirs.at(i));
+ m_urlsToExpand.insert(urlToExpand);
}
// KDirLister::open() must called at least once to trigger an initial
}
// Determine the indexes that have been moved
- bool emitItemsMoved = false;
QList<int> movedToIndexes;
movedToIndexes.reserve(itemCount);
for (int i = 0; i < itemCount; i++) {
const int newIndex = m_items.value(oldUrls.at(i).url());
movedToIndexes.append(newIndex);
- if (!emitItemsMoved && newIndex != i) {
- emitItemsMoved = true;
- }
}
- if (emitItemsMoved) {
- emit itemsMoved(KItemRange(0, itemCount), movedToIndexes);
- }
+ // Don't check whether items have really been moved and always emit a
+ // itemsMoved() signal after resorting: In case of grouped items
+ // the groups might change even if the items themselves don't change their
+ // position. Let the receiver of the signal decide whether a check for moved
+ // items makes sense.
+ emit itemsMoved(KItemRange(0, itemCount), movedToIndexes);
#ifdef KFILEITEMMODEL_DEBUG
kDebug() << "[TIME] Resorting of" << itemCount << "items:" << timer.elapsed();
Q_UNUSED(url);
}
+void KFileItemModel::slotNaturalSortingChanged()
+{
+ m_naturalSorting = KGlobalSettings::naturalSorting();
+ resortAllItems();
+}
+
void KFileItemModel::dispatchPendingItemsToInsert()
{
if (!m_pendingItemsToInsert.isEmpty()) {
return rolesHash.value(role, NoRole);
}
+QByteArray KFileItemModel::roleByteArray(Role role) const
+{
+ static const char* const roles[RolesCount] = {
+ 0, // NoRole
+ "name",
+ "size",
+ "date",
+ "permissions",
+ "owner",
+ "group",
+ "type",
+ "destination",
+ "path",
+ "comment",
+ "tags",
+ "rating",
+ "isDir",
+ "isExpanded",
+ "isExpandable",
+ "expansionLevel"
+ };
+ return roles[role];
+}
+
QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item) const
{
// It is important to insert only roles that are fast to retrieve. E.g.
}
if (m_requestRole[PathRole]) {
+ QString path;
if (item.url().protocol() == QLatin1String("trash")) {
- const KIO::UDSEntry udsEntry = item.entry();
- data.insert("path", udsEntry.stringValue(KIO::UDSEntry::UDS_EXTRA));
+ path = item.entry().stringValue(KIO::UDSEntry::UDS_EXTRA);
} else {
- data.insert("path", item.localPath());
+ path = item.localPath();
}
+
+ const int index = path.lastIndexOf(item.text());
+ path = path.mid(0, index - 1);
+ data.insert("path", path);
}
if (m_requestRole[IsExpandedRole]) {
if (forceRootExpansionLevel) {
m_rootExpansionLevel = ForceRootExpansionLevel;
} else {
- const QString rootDir = rootUrl.directory(KUrl::AppendTrailingSlash);
+ const QString rootDir = rootUrl.path(KUrl::AddTrailingSlash);
m_rootExpansionLevel = rootDir.count('/');
- if (m_rootExpansionLevel == 1) {
- // Special case: The root is already reached and no parent is available
- --m_rootExpansionLevel;
- }
}
}
data.insert("expansionLevel", -1);
} else {
const QString dir = item.url().directory(KUrl::AppendTrailingSlash);
- const int level = dir.count('/') - m_rootExpansionLevel - 1;
+ const int level = dir.count('/') - m_rootExpansionLevel;
data.insert("expansionLevel", level);
}
}
case NameRole:
// The name role is handled as default fallback after the switch
break;
-
- case DateRole: {
- const KDateTime dateTimeA = itemA.time(KFileItem::ModificationTime);
- const KDateTime dateTimeB = itemB.time(KFileItem::ModificationTime);
- if (dateTimeA < dateTimeB) {
- result = -1;
- } else if (dateTimeA > dateTimeB) {
- result = +1;
- }
- break;
- }
-
+
case SizeRole: {
if (itemA.isDir()) {
- Q_ASSERT(itemB.isDir()); // see "if (m_sortFoldersFirst || m_sortRole == SizeRole)" above
+ // See "if (m_sortFoldersFirst || m_sortRole == SizeRole)" in KFileItemModel::lessThan():
+ Q_ASSERT(itemB.isDir());
const QVariant valueA = a->values.value("size");
const QVariant valueB = b->values.value("size");
-
- if (valueA.isNull()) {
+ if (valueA.isNull() && valueB.isNull()) {
+ result = 0;
+ } else if (valueA.isNull()) {
result = -1;
} else if (valueB.isNull()) {
result = +1;
} else {
- result = valueA.value<KIO::filesize_t>() - valueB.value<KIO::filesize_t>();
+ result = valueA.toInt() - valueB.toInt();
}
} else {
- Q_ASSERT(!itemB.isDir()); // see "if (m_sortFoldersFirst || m_sortRole == SizeRole)" above
- result = itemA.size() - itemB.size();
+ // See "if (m_sortFoldersFirst || m_sortRole == SizeRole)" in KFileItemModel::lessThan():
+ Q_ASSERT(!itemB.isDir());
+ const KIO::filesize_t sizeA = itemA.size();
+ const KIO::filesize_t sizeB = itemB.size();
+ if (sizeA > sizeB) {
+ result = +1;
+ } else if (sizeA < sizeB) {
+ result = -1;
+ } else {
+ result = 0;
+ }
}
break;
}
- case TypeRole: {
- result = QString::compare(a->values.value("type").toString(),
- b->values.value("type").toString());
+ case DateRole: {
+ const KDateTime dateTimeA = itemA.time(KFileItem::ModificationTime);
+ const KDateTime dateTimeB = itemB.time(KFileItem::ModificationTime);
+ if (dateTimeA < dateTimeB) {
+ result = -1;
+ } else if (dateTimeA > dateTimeB) {
+ result = +1;
+ }
break;
}
-
- case CommentRole: {
- result = QString::compare(a->values.value("comment").toString(),
- b->values.value("comment").toString());
+
+ case RatingRole: {
+ result = a->values.value("rating").toInt() - b->values.value("rating").toInt();
break;
}
-
+
+ case PermissionsRole:
+ case OwnerRole:
+ case GroupRole:
+ case TypeRole:
+ case DestinationRole:
+ case PathRole:
+ case CommentRole:
case TagsRole: {
- result = QString::compare(a->values.value("tags").toString(),
- b->values.value("tags").toString());
+ const QByteArray role = roleByteArray(m_sortRole);
+ result = QString::compare(a->values.value(role).toString(),
+ b->values.value(role).toString());
break;
}
-
- case RatingRole: {
- result = a->values.value("rating").toInt() - b->values.value("rating").toInt();
- break;
- }
-
+
default:
break;
}
// Compare the items of the parents that represent the first
// different path after the common path.
- const KUrl parentUrlA(pathA.left(index) + subPathA);
- const KUrl parentUrlB(pathB.left(index) + subPathB);
+ const QString parentPathA = pathA.left(index) + subPathA;
+ const QString parentPathB = pathB.left(index) + subPathB;
const ItemData* parentA = a;
- while (parentA && parentA->item.url() != parentUrlA) {
+ while (parentA && parentA->item.url().path() != parentPathA) {
parentA = parentA->parent;
}
const ItemData* parentB = b;
- while (parentB && parentB->item.url() != parentUrlB) {
+ while (parentB && parentB->item.url().path() != parentPathB) {
parentB = parentB->parent;
}
const int maxIndex = count() - 1;
QList<QPair<int, QVariant> > groups;
- int groupValue;
+ int groupValue = -1;
for (int i = 0; i <= maxIndex; ++i) {
if (isChildItem(i)) {
continue;
}
- const int newGroupValue = m_itemData.at(i)->values.value("rating").toInt();
+ const int newGroupValue = m_itemData.at(i)->values.value("rating", 0).toInt();
if (newGroupValue != groupValue) {
groupValue = newGroupValue;
groups.append(QPair<int, QVariant>(i, newGroupValue));
const int maxIndex = count() - 1;
QList<QPair<int, QVariant> > groups;
+ bool isFirstGroupValue = true;
QString groupValue;
for (int i = 0; i <= maxIndex; ++i) {
if (isChildItem(i)) {
continue;
}
const QString newGroupValue = m_itemData.at(i)->values.value(role).toString();
- if (newGroupValue != groupValue) {
+ if (newGroupValue != groupValue || isFirstGroupValue) {
groupValue = newGroupValue;
groups.append(QPair<int, QVariant>(i, newGroupValue));
+ isFirstGroupValue = false;
}
}
projects / dolphin.git / blobdiff