#include "kfileitemmodel.h"
-#include <KDirLister>
#include <KDirModel>
-#include "kfileitemmodelsortalgorithm_p.h"
#include <KGlobalSettings>
#include <KLocale>
#include <KStringHandler>
#include <KDebug>
+#include "private/kfileitemmodelsortalgorithm.h"
+#include "private/kfileitemmodeldirlister.h"
+
+#include <QApplication>
#include <QMimeData>
#include <QTimer>
// #define KFILEITEMMODEL_DEBUG
-KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
- KItemModelBase("name", parent),
- m_dirLister(dirLister),
+KFileItemModel::KFileItemModel(QObject* parent) :
+ KItemModelBase("text", parent),
+ m_dirLister(0),
m_naturalSorting(KGlobalSettings::naturalSorting()),
- m_sortFoldersFirst(true),
+ m_sortDirsFirst(true),
m_sortRole(NameRole),
- m_sortProgressPercent(-1),
+ m_sortingProgressPercent(-1),
m_roles(),
m_caseSensitivity(Qt::CaseInsensitive),
m_itemData(),
m_pendingItemsToInsert(),
m_groups(),
m_expandedParentsCountRoot(UninitializedExpandedParentsCountRoot),
- m_expandedUrls(),
+ m_expandedDirs(),
m_urlsToExpand()
{
+ m_dirLister = new KFileItemModelDirLister(this);
+ m_dirLister->setAutoUpdate(true);
+ m_dirLister->setDelayedMimeTypes(true);
+ m_dirLister->setMainWindow(qApp->activeWindow());
+
+ connect(m_dirLister, SIGNAL(started(KUrl)), this, SIGNAL(directoryLoadingStarted()));
+ connect(m_dirLister, SIGNAL(canceled()), this, SLOT(slotCanceled()));
+ connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted()));
+ connect(m_dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(slotNewItems(KFileItemList)));
+ connect(m_dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SLOT(slotItemsDeleted(KFileItemList)));
+ connect(m_dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)), this, SLOT(slotRefreshItems(QList<QPair<KFileItem,KFileItem> >)));
+ connect(m_dirLister, SIGNAL(clear()), this, SLOT(slotClear()));
+ connect(m_dirLister, SIGNAL(clear(KUrl)), this, SLOT(slotClear(KUrl)));
+ connect(m_dirLister, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString)));
+ connect(m_dirLister, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)));
+ connect(m_dirLister, SIGNAL(redirection(KUrl,KUrl)), this, SIGNAL(directoryRedirection(KUrl,KUrl)));
+
// Apply default roles that should be determined
resetRoles();
m_requestRole[NameRole] = true;
m_requestRole[IsDirRole] = true;
- m_roles.insert("name");
+ m_roles.insert("text");
m_roles.insert("isDir");
- Q_ASSERT(dirLister);
-
- connect(dirLister, SIGNAL(canceled()), this, SLOT(slotCanceled()));
- 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(dirLister, SIGNAL(clear()), this, SLOT(slotClear()));
- connect(dirLister, SIGNAL(clear(KUrl)), this, SLOT(slotClear(KUrl)));
-
// For slow KIO-slaves like used for searching it makes sense to show results periodically even
// before the completed() or canceled() signal has been emitted.
m_maximumUpdateIntervalTimer = new QTimer(this);
m_itemData.clear();
}
+void KFileItemModel::loadDirectory(const KUrl& url)
+{
+ m_dirLister->openUrl(url);
+}
+
+void KFileItemModel::refreshDirectory(const KUrl& url)
+{
+ m_dirLister->openUrl(url, KDirLister::Reload);
+}
+
+KUrl KFileItemModel::directory() const
+{
+ return m_dirLister->url();
+}
+
+void KFileItemModel::cancelDirectoryLoading()
+{
+ m_dirLister->stop();
+}
+
int KFileItemModel::count() const
{
return m_itemData.count();
return true;
}
-void KFileItemModel::setSortFoldersFirst(bool foldersFirst)
+void KFileItemModel::setSortDirectoriesFirst(bool dirsFirst)
{
- if (foldersFirst != m_sortFoldersFirst) {
- m_sortFoldersFirst = foldersFirst;
+ if (dirsFirst != m_sortDirsFirst) {
+ m_sortDirsFirst = dirsFirst;
resortAllItems();
}
}
-bool KFileItemModel::sortFoldersFirst() const
+bool KFileItemModel::sortDirectoriesFirst() const
{
- return m_sortFoldersFirst;
+ return m_sortDirsFirst;
}
void KFileItemModel::setShowHiddenFiles(bool show)
{
- KDirLister* dirLister = m_dirLister.data();
- if (dirLister) {
- dirLister->setShowingDotFiles(show);
- dirLister->emitChanges();
- if (show) {
- slotCompleted();
- }
+ m_dirLister->setShowingDotFiles(show);
+ m_dirLister->emitChanges();
+ if (show) {
+ slotCompleted();
}
}
bool KFileItemModel::showHiddenFiles() const
{
- const KDirLister* dirLister = m_dirLister.data();
- return dirLister ? dirLister->showingDotFiles() : false;
+ return m_dirLister->showingDotFiles();
}
-void KFileItemModel::setShowFoldersOnly(bool enabled)
+void KFileItemModel::setShowDirectoriesOnly(bool enabled)
{
- KDirLister* dirLister = m_dirLister.data();
- if (dirLister) {
- dirLister->setDirOnlyMode(enabled);
- }
+ m_dirLister->setDirOnlyMode(enabled);
}
-bool KFileItemModel::showFoldersOnly() const
+bool KFileItemModel::showDirectoriesOnly() const
{
- KDirLister* dirLister = m_dirLister.data();
- return dirLister ? dirLister->dirOnlyMode() : false;
+ return m_dirLister->dirOnlyMode();
}
QMimeData* KFileItemModel::createMimeData(const QSet<int>& indexes) const
{
startFromIndex = qMax(0, startFromIndex);
for (int i = startFromIndex; i < count(); ++i) {
- if (data(i)["name"].toString().startsWith(text, Qt::CaseInsensitive)) {
+ if (data(i)["text"].toString().startsWith(text, Qt::CaseInsensitive)) {
return i;
}
}
for (int i = 0; i < startFromIndex; ++i) {
- if (data(i)["name"].toString().startsWith(text, Qt::CaseInsensitive)) {
+ if (data(i)["text"].toString().startsWith(text, Qt::CaseInsensitive)) {
return i;
}
}
KFileItem KFileItemModel::rootItem() const
{
- const KDirLister* dirLister = m_dirLister.data();
- if (dirLister) {
- return dirLister->rootItem();
- }
- return KFileItem();
+ return m_dirLister->rootItem();
}
void KFileItemModel::clear()
return false;
}
- KDirLister* dirLister = m_dirLister.data();
const KUrl url = m_itemData.at(index)->item.url();
if (expanded) {
- m_expandedUrls.insert(url);
-
- if (dirLister) {
- dirLister->openUrl(url, KDirLister::Keep);
- return true;
- }
+ m_expandedDirs.insert(url);
+ m_dirLister->openUrl(url, KDirLister::Keep);
} else {
- m_expandedUrls.remove(url);
+ m_expandedDirs.remove(url);
+ m_dirLister->stop(url);
- if (dirLister) {
- dirLister->stop(url);
- }
KFileItemList itemsToRemove;
const int expandedParentsCount = data(index)["expandedParentsCount"].toInt();
++index;
}
removeItems(itemsToRemove);
- return true;
}
- return false;
+ return true;
}
bool KFileItemModel::isExpanded(int index) const
return 0;
}
-QSet<KUrl> KFileItemModel::expandedUrls() const
+QSet<KUrl> KFileItemModel::expandedDirectories() const
{
- return m_expandedUrls;
+ return m_expandedDirs;
}
-void KFileItemModel::restoreExpandedUrls(const QSet<KUrl>& urls)
+void KFileItemModel::restoreExpandedDirectories(const QSet<KUrl>& urls)
{
m_urlsToExpand = urls;
}
-void KFileItemModel::expandParentItems(const KUrl& url)
+void KFileItemModel::expandParentDirectories(const KUrl& url)
{
- const KDirLister* dirLister = m_dirLister.data();
- if (!dirLister) {
- return;
- }
-
- const int pos = dirLister->url().path().length();
+ const int pos = m_dirLister->url().path().length();
// 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.
- KUrl urlToExpand = dirLister->url();
+ KUrl urlToExpand = m_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.clear();
}
- emit loadingCompleted();
+ emit directoryLoadingCompleted();
}
void KFileItemModel::slotCanceled()
emit itemsRemoved(KItemRangeList() << KItemRange(0, removedCount));
}
- m_expandedUrls.clear();
+ m_expandedDirs.clear();
}
void KFileItemModel::slotClear(const KUrl& url)
removeItems(expandedItems);
m_expandedParentsCountRoot = UninitializedExpandedParentsCountRoot;
- m_expandedUrls.clear();
+ m_expandedDirs.clear();
}
void KFileItemModel::resetRoles()
}
if (m_requestRole[NameRole]) {
- data.insert("name", item.text());
+ data.insert("text", item.text());
}
if (m_requestRole[SizeRole]) {
}
if (m_requestRole[ExpandedParentsCountRole]) {
- if (m_expandedParentsCountRoot == UninitializedExpandedParentsCountRoot && m_dirLister.data()) {
- const KUrl rootUrl = m_dirLister.data()->url();
+ if (m_expandedParentsCountRoot == UninitializedExpandedParentsCountRoot) {
+ const KUrl rootUrl = m_dirLister->url();
const QString protocol = rootUrl.protocol();
const bool forceExpandedParentsCountRoot = (protocol == QLatin1String("trash") ||
protocol == QLatin1String("nepomuk") ||
}
}
- if (m_sortFoldersFirst || m_sortRole == SizeRole) {
+ if (m_sortDirsFirst || m_sortRole == SizeRole) {
const bool isDirA = a->item.isDir();
const bool isDirB = b->item.isDir();
if (isDirA && !isDirB) {
bool isDirB = true;
const QString subPathB = subPath(b->item, pathB, index, &isDirB);
- if (m_sortFoldersFirst || m_sortRole == SizeRole) {
+ if (m_sortDirsFirst || m_sortRole == SizeRole) {
if (isDirA && !isDirB) {
return (sortOrder() == Qt::AscendingOrder) ? -1 : +1;
} else if (!isDirA && isDirB) {
bool KFileItemModel::useMaximumUpdateInterval() const
{
- const KDirLister* dirLister = m_dirLister.data();
- return dirLister && !dirLister->url().isLocalFile();
+ return !m_dirLister->url().isLocalFile();
}
QList<QPair<int, QVariant> > KFileItemModel::nameRoleGroups() const
continue;
}
- const QString name = m_itemData.at(i)->values.value("name").toString();
+ const QString name = m_itemData.at(i)->values.value("text").toString();
// Use the first character of the name as group indication
QChar newFirstChar = name.at(0).toUpper();
const int itemCount = count();
if (resolvedCount >= itemCount) {
- m_sortProgressPercent = -1;
+ m_sortingProgressPercent = -1;
if (m_resortAllItemsTimer->isActive()) {
m_resortAllItemsTimer->stop();
resortAllItems();
}
- emit sortProgress(100);
+ emit directorySortingProgress(100);
} else if (itemCount > 0) {
resolvedCount = qBound(0, resolvedCount, itemCount);
const int progress = resolvedCount * 100 / itemCount;
- if (m_sortProgressPercent != progress) {
- m_sortProgressPercent = progress;
- emit sortProgress(progress);
+ if (m_sortingProgressPercent != progress) {
+ m_sortingProgressPercent = progress;
+ emit directorySortingProgress(progress);
}
}
}
static const RoleInfoMap rolesInfoMap[] = {
// | role | roleType | role translation | group translation | requires Nepomuk | requires indexer
{ 0, NoRole, 0, 0, 0, 0, false, false },
- { "name", NameRole, I18N_NOOP2_NOSTRIP("@label", "Name"), 0, 0, false, false },
+ { "text", NameRole, I18N_NOOP2_NOSTRIP("@label", "Name"), 0, 0, false, false },
{ "size", SizeRole, I18N_NOOP2_NOSTRIP("@label", "Size"), 0, 0, false, false },
{ "date", DateRole, I18N_NOOP2_NOSTRIP("@label", "Date"), 0, 0, false, false },
{ "type", TypeRole, I18N_NOOP2_NOSTRIP("@label", "Type"), 0, 0, false, false },
projects / dolphin.git / blobdiff