X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6e9713c558ad07b0baa2a79ae69328fda7b61a15..6d9f5b21315bf7c9f6b08e32a89346e22c482714:/src/panels/places/placesitemmodel.cpp diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index 358652d4d..95a913e82 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -23,19 +23,25 @@ #include "placesitemmodel.h" +#include "dolphin_generalsettings.h" + #include #include #include -#include #include -#include -#include -#include +#include +#include +#include +#include +#include #include +#include #include "placesitem.h" #include #include +#include #include +#include #include #include @@ -44,37 +50,76 @@ #include #include -#ifdef HAVE_NEPOMUK - #include +#include +#include + +#ifdef HAVE_BALOO + #include + #include #endif +namespace { + // As long as KFilePlacesView from kdelibs is available in parallel, the + // system-bookmarks for "Recently Saved" and "Search For" should be + // shown only inside the Places Panel. This is necessary as the stored + // URLs needs to get translated to a Baloo-search-URL on-the-fly to + // be independent from changes in the Baloo-search-URL-syntax. + // Hence a prefix to the application-name of the stored bookmarks is + // added, which is only read by PlacesItemModel. + const char AppNamePrefix[] = "-places-panel"; +} + PlacesItemModel::PlacesItemModel(QObject* parent) : KStandardItemModel(parent), - m_nepomukRunning(false), + m_fileIndexingEnabled(false), m_hiddenItemsShown(false), m_availableDevices(), m_predicate(), m_bookmarkManager(0), m_systemBookmarks(), m_systemBookmarksIndexes(), - m_hiddenItems(), - m_hiddenItemToRemove(-1) + m_bookmarkedItems(), + m_hiddenItemToRemove(-1), + m_updateBookmarksTimer(0), + m_storageSetupInProgress() { -#ifdef HAVE_NEPOMUK - m_nepomukRunning = (Nepomuk::ResourceManager::instance()->initialized()); +#ifdef HAVE_BALOO + Baloo::IndexerConfig config; + m_fileIndexingEnabled = config.fileIndexingEnabled(); #endif - const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"); + const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kfileplaces/bookmarks.xml"); m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); createSystemBookmarks(); initializeAvailableDevices(); loadBookmarks(); + + const int syncBookmarksTimeout = 100; + + m_updateBookmarksTimer = new QTimer(this); + m_updateBookmarksTimer->setInterval(syncBookmarksTimeout); + m_updateBookmarksTimer->setSingleShot(true); + connect(m_updateBookmarksTimer, &QTimer::timeout, this, &PlacesItemModel::updateBookmarks); + + connect(m_bookmarkManager, &KBookmarkManager::changed, + m_updateBookmarksTimer, static_cast(&QTimer::start)); + connect(m_bookmarkManager, &KBookmarkManager::bookmarksChanged, + m_updateBookmarksTimer, static_cast(&QTimer::start)); } PlacesItemModel::~PlacesItemModel() { - qDeleteAll(m_hiddenItems); - m_hiddenItems.clear(); + saveBookmarks(); + qDeleteAll(m_bookmarkedItems); + m_bookmarkedItems.clear(); +} + +PlacesItem* PlacesItemModel::createPlacesItem(const QString& text, + const QUrl& url, + const QString& iconName) +{ + const KBookmark bookmark = PlacesItem::createBookmark(m_bookmarkManager, text, url, iconName); + return new PlacesItem(bookmark); } PlacesItem* PlacesItemModel::placesItem(int index) const @@ -85,19 +130,19 @@ PlacesItem* PlacesItemModel::placesItem(int index) const int PlacesItemModel::hiddenCount() const { int modelIndex = 0; - int itemCount = 0; - foreach (const PlacesItem* hiddenItem, m_hiddenItems) { - if (hiddenItem) { - ++itemCount; + int hiddenItemCount = 0; + foreach (const PlacesItem* item, m_bookmarkedItems) { + if (item) { + ++hiddenItemCount; } else { if (placesItem(modelIndex)->isHidden()) { - ++itemCount; + ++hiddenItemCount; } ++modelIndex; } } - return itemCount; + return hiddenItemCount; } void PlacesItemModel::setHiddenItemsShown(bool show) @@ -109,31 +154,42 @@ void PlacesItemModel::setHiddenItemsShown(bool show) m_hiddenItemsShown = show; if (show) { - // Move all items that are part of m_hiddenItems to the model. + // Move all items that are part of m_bookmarkedItems to the model. + QList itemsToInsert; + QList insertPos; int modelIndex = 0; - for (int hiddenIndex = 0; hiddenIndex < m_hiddenItems.count(); ++hiddenIndex) { - if (m_hiddenItems[hiddenIndex]) { - PlacesItem* visibleItem = new PlacesItem(*m_hiddenItems[hiddenIndex]); - delete m_hiddenItems[hiddenIndex]; - m_hiddenItems.removeAt(hiddenIndex); - insertItem(modelIndex, visibleItem); - Q_ASSERT(!m_hiddenItems[hiddenIndex]); + for (int i = 0; i < m_bookmarkedItems.count(); ++i) { + if (m_bookmarkedItems[i]) { + itemsToInsert.append(m_bookmarkedItems[i]); + m_bookmarkedItems[i] = 0; + insertPos.append(modelIndex); } ++modelIndex; } + + // Inserting the items will automatically insert an item + // to m_bookmarkedItems in PlacesItemModel::onItemsInserted(). + // The items are temporary saved in itemsToInsert, so + // m_bookmarkedItems can be shrinked now. + m_bookmarkedItems.erase(m_bookmarkedItems.begin(), + m_bookmarkedItems.begin() + itemsToInsert.count()); + + for (int i = 0; i < itemsToInsert.count(); ++i) { + insertItem(insertPos[i], itemsToInsert[i]); + } + + Q_ASSERT(m_bookmarkedItems.count() == count()); } else { // Move all items of the model, where the "isHidden" property is true, to - // m_hiddenItems. - //Q_ASSERT(m_hiddenItems.count() == count()); + // m_bookmarkedItems. + Q_ASSERT(m_bookmarkedItems.count() == count()); for (int i = count() - 1; i >= 0; --i) { - PlacesItem* visibleItem = placesItem(i); - if (visibleItem->isHidden()) { - PlacesItem* hiddenItem = new PlacesItem(*visibleItem); - removeItem(i); - m_hiddenItems.insert(i, hiddenItem); + if (placesItem(i)->isHidden()) { + hideItem(i); } } } + #ifdef PLACESITEMMODEL_DEBUG kDebug() << "Changed visibility of hidden items"; showModelState(); @@ -145,15 +201,19 @@ bool PlacesItemModel::hiddenItemsShown() const return m_hiddenItemsShown; } -int PlacesItemModel::closestItem(const KUrl& url) const +int PlacesItemModel::closestItem(const QUrl& url) const { int foundIndex = -1; int maxLength = 0; for (int i = 0; i < count(); ++i) { - const KUrl itemUrl = placesItem(i)->url(); - if (itemUrl.isParentOf(url)) { - const int length = itemUrl.prettyUrl().length(); + const QUrl itemUrl = placesItem(i)->url(); + if (url == itemUrl) { + // We can't find a closer one, so stop here. + foundIndex = i; + break; + } else if (itemUrl.isParentOf(url)) { + const int length = itemUrl.path().length(); if (length > maxLength) { foundIndex = i; maxLength = length; @@ -164,26 +224,37 @@ int PlacesItemModel::closestItem(const KUrl& url) const return foundIndex; } -QString PlacesItemModel::groupName(const KUrl &url) const +void PlacesItemModel::appendItemToGroup(PlacesItem* item) { - const QString protocol = url.protocol(); + if (!item) { + return; + } - if (protocol.contains(QLatin1String("search"))) { - return searchForGroupName(); + int i = 0; + while (i < count() && placesItem(i)->group() != item->group()) { + ++i; } - if (protocol == QLatin1String("timeline")) { - return recentlyAccessedGroupName(); + bool inserted = false; + while (!inserted && i < count()) { + if (placesItem(i)->group() != item->group()) { + insertItem(i, item); + inserted = true; + } + ++i; } - return placesGroupName(); + if (!inserted) { + appendItem(item); + } } + QAction* PlacesItemModel::ejectAction(int index) const { const PlacesItem* item = placesItem(index); if (item && item->device().is()) { - return new QAction(KIcon("media-eject"), i18nc("@item", "Eject '%1'", item->text()), 0); + return new QAction(QIcon::fromTheme("media-eject"), i18nc("@item", "Eject '%1'", item->text()), 0); } return 0; @@ -232,7 +303,7 @@ QAction* PlacesItemModel::teardownAction(int index) const return new QAction(text, 0); } - return new QAction(KIcon(iconName), text, 0); + return new QAction(QIcon::fromTheme(iconName), text, 0); } void PlacesItemModel::requestEject(int index) @@ -241,11 +312,13 @@ void PlacesItemModel::requestEject(int index) if (item) { Solid::OpticalDrive* drive = item->device().parent().as(); if (drive) { - connect(drive, SIGNAL(ejectDone(Solid::ErrorType,QVariant,QString)), - this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant))); + connect(drive, &Solid::OpticalDrive::ejectDone, + this, &PlacesItemModel::slotStorageTeardownDone); drive->eject(); } else { - + const QString label = item->text(); + const QString message = i18nc("@info", "The device '%1' is not a disk and cannot be ejected.", label); + emit errorMessage(message); } } } @@ -256,46 +329,171 @@ void PlacesItemModel::requestTeardown(int index) if (item) { Solid::StorageAccess* access = item->device().as(); if (access) { - connect(access, SIGNAL(teardownDone(Solid::ErrorType,QVariant,QString)), - this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant))); + connect(access, &Solid::StorageAccess::teardownDone, + this, &PlacesItemModel::slotStorageTeardownDone); access->teardown(); - } else { - const QString label = item->text(); - const QString message = i18nc("@info", "The device '%1' is not a disk and cannot be ejected.", label); - emit errorMessage(message); } } } +bool PlacesItemModel::storageSetupNeeded(int index) const +{ + const PlacesItem* item = placesItem(index); + return item ? item->storageSetupNeeded() : false; +} + +void PlacesItemModel::requestStorageSetup(int index) +{ + const PlacesItem* item = placesItem(index); + if (!item) { + return; + } + + Solid::Device device = item->device(); + const bool setup = device.is() + && !m_storageSetupInProgress.contains(device.as()) + && !device.as()->isAccessible(); + if (setup) { + Solid::StorageAccess* access = device.as(); + + m_storageSetupInProgress[access] = index; + + connect(access, &Solid::StorageAccess::setupDone, + this, &PlacesItemModel::slotStorageSetupDone); + + access->setup(); + } +} + +QMimeData* PlacesItemModel::createMimeData(const KItemSet& indexes) const +{ + QList urls; + QByteArray itemData; + + QDataStream stream(&itemData, QIODevice::WriteOnly); + + foreach (int index, indexes) { + const QUrl itemUrl = placesItem(index)->url(); + if (itemUrl.isValid()) { + urls << itemUrl; + } + stream << index; + } + + QMimeData* mimeData = new QMimeData(); + if (!urls.isEmpty()) { + mimeData->setUrls(urls); + } + mimeData->setData(internalMimeType(), itemData); + + return mimeData; +} -void PlacesItemModel::save() +bool PlacesItemModel::supportsDropping(int index) const { - // TODO: Temporary deactivated until 100 % backward compatibility is provided - // m_bookmarkManager->emitChanged(m_bookmarkManager->root()); + return index >= 0 && index < count(); +} + +void PlacesItemModel::dropMimeDataBefore(int index, const QMimeData* mimeData) +{ + if (mimeData->hasFormat(internalMimeType())) { + // The item has been moved inside the view + QByteArray itemData = mimeData->data(internalMimeType()); + QDataStream stream(&itemData, QIODevice::ReadOnly); + int oldIndex; + stream >> oldIndex; + if (oldIndex == index || oldIndex == index - 1) { + // No moving has been done + return; + } + + PlacesItem* oldItem = placesItem(oldIndex); + if (!oldItem) { + return; + } + + PlacesItem* newItem = new PlacesItem(oldItem->bookmark()); + removeItem(oldIndex); + + if (oldIndex < index) { + --index; + } + + const int dropIndex = groupedDropIndex(index, newItem); + insertItem(dropIndex, newItem); + } else if (mimeData->hasFormat("text/uri-list")) { + // One or more items must be added to the model + const QList urls = KUrlMimeData::urlsFromMimeData(mimeData); + for (int i = urls.count() - 1; i >= 0; --i) { + const QUrl& url = urls[i]; + + QString text = url.fileName(); + if (text.isEmpty()) { + text = url.host(); + } + + if ((url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir()) + || url.scheme() == "trash") { + // Only directories outside the trash are allowed + continue; + } + + PlacesItem* newItem = createPlacesItem(text, url); + const int dropIndex = groupedDropIndex(index, newItem); + insertItem(dropIndex, newItem); + } + } +} + +QUrl PlacesItemModel::convertedUrl(const QUrl& url) +{ + QUrl newUrl = url; + if (url.scheme() == QLatin1String("timeline")) { + newUrl = createTimelineUrl(url); + } else if (url.scheme() == QLatin1String("search")) { + newUrl = createSearchUrl(url); + } + + return newUrl; } void PlacesItemModel::onItemInserted(int index) { + const PlacesItem* insertedItem = placesItem(index); + if (insertedItem) { + // Take care to apply the PlacesItemModel-order of the inserted item + // also to the bookmark-manager. + const KBookmark insertedBookmark = insertedItem->bookmark(); + + const PlacesItem* previousItem = placesItem(index - 1); + KBookmark previousBookmark; + if (previousItem) { + previousBookmark = previousItem->bookmark(); + } + + m_bookmarkManager->root().moveBookmark(insertedBookmark, previousBookmark); + } + if (index == count() - 1) { // The item has been appended as last item to the list. In this // case assure that it is also appended after the hidden items and // not before (like done otherwise). - m_hiddenItems.append(0); - return; - } + m_bookmarkedItems.append(0); + } else { - int modelIndex = -1; - int hiddenIndex = 0; - while (hiddenIndex < m_hiddenItems.count()) { - if (!m_hiddenItems[hiddenIndex]) { - ++modelIndex; - if (modelIndex + 1 == index) { - break; + int modelIndex = -1; + int bookmarkIndex = 0; + while (bookmarkIndex < m_bookmarkedItems.count()) { + if (!m_bookmarkedItems[bookmarkIndex]) { + ++modelIndex; + if (modelIndex + 1 == index) { + break; + } } + ++bookmarkIndex; } - ++hiddenIndex; + m_bookmarkedItems.insert(bookmarkIndex, 0); } - m_hiddenItems.insert(hiddenIndex, 0); #ifdef PLACESITEMMODEL_DEBUG kDebug() << "Inserted item" << index; @@ -303,11 +501,18 @@ void PlacesItemModel::onItemInserted(int index) #endif } -void PlacesItemModel::onItemRemoved(int index) +void PlacesItemModel::onItemRemoved(int index, KStandardItem* removedItem) { - const int removeIndex = hiddenIndex(index); - Q_ASSERT(!m_hiddenItems[removeIndex]); - m_hiddenItems.removeAt(removeIndex); + PlacesItem* placesItem = dynamic_cast(removedItem); + if (placesItem) { + const KBookmark bookmark = placesItem->bookmark(); + m_bookmarkManager->root().deleteBookmark(bookmark); + } + + const int boomarkIndex = bookmarkIndex(index); + Q_ASSERT(!m_bookmarkedItems[boomarkIndex]); + m_bookmarkedItems.removeAt(boomarkIndex); + #ifdef PLACESITEMMODEL_DEBUG kDebug() << "Removed item" << index; showModelState(); @@ -316,14 +521,25 @@ void PlacesItemModel::onItemRemoved(int index) void PlacesItemModel::onItemChanged(int index, const QSet& changedRoles) { - if (changedRoles.contains("isHidden")) { - const PlacesItem* shownItem = placesItem(index); - Q_ASSERT(shownItem); - const bool hide = shownItem->isHidden(); + const PlacesItem* changedItem = placesItem(index); + if (changedItem) { + // Take care to apply the PlacesItemModel-order of the changed item + // also to the bookmark-manager. + const KBookmark insertedBookmark = changedItem->bookmark(); + + const PlacesItem* previousItem = placesItem(index - 1); + KBookmark previousBookmark; + if (previousItem) { + previousBookmark = previousItem->bookmark(); + } - if (!m_hiddenItemsShown && hide) { + m_bookmarkManager->root().moveBookmark(insertedBookmark, previousBookmark); + } + + if (changedRoles.contains("isHidden")) { + if (!m_hiddenItemsShown && changedItem->isHidden()) { m_hiddenItemToRemove = index; - QTimer::singleShot(0, this, SLOT(removeHiddenItem())); + QTimer::singleShot(0, this, SLOT(hideItem())); } } } @@ -331,11 +547,14 @@ void PlacesItemModel::onItemChanged(int index, const QSet& changedRo void PlacesItemModel::slotDeviceAdded(const QString& udi) { const Solid::Device device(udi); - if (m_predicate.matches(device)) { - m_availableDevices << udi; - const KBookmark bookmark = PlacesItem::createDeviceBookmark(m_bookmarkManager, udi); - appendItem(new PlacesItem(bookmark)); + + if (!m_predicate.matches(device)) { + return; } + + m_availableDevices << udi; + const KBookmark bookmark = PlacesItem::createDeviceBookmark(m_bookmarkManager, udi); + appendItem(new PlacesItem(bookmark)); } void PlacesItemModel::slotDeviceRemoved(const QString& udi) @@ -344,21 +563,21 @@ void PlacesItemModel::slotDeviceRemoved(const QString& udi) return; } - for (int i = 0; i < m_hiddenItems.count(); ++i) { - PlacesItem* item = m_hiddenItems[i]; + for (int i = 0; i < m_bookmarkedItems.count(); ++i) { + PlacesItem* item = m_bookmarkedItems[i]; if (item && item->udi() == udi) { - m_hiddenItems.removeAt(i); + m_bookmarkedItems.removeAt(i); delete item; return; } - } + } - for (int i = 0; i < count(); ++i) { - if (placesItem(i)->udi() == udi) { - removeItem(i); - return; - } - } + for (int i = 0; i < count(); ++i) { + if (placesItem(i)->udi() == udi) { + removeItem(i); + return; + } + } } void PlacesItemModel::slotStorageTeardownDone(Solid::ErrorType error, const QVariant& errorData) @@ -368,61 +587,181 @@ void PlacesItemModel::slotStorageTeardownDone(Solid::ErrorType error, const QVar } } -void PlacesItemModel::removeHiddenItem() +void PlacesItemModel::slotStorageSetupDone(Solid::ErrorType error, + const QVariant& errorData, + const QString& udi) { - const PlacesItem* shownItem = placesItem(m_hiddenItemToRemove); - const int newIndex = hiddenIndex(m_hiddenItemToRemove); - if (shownItem && newIndex >= 0) { - PlacesItem* hiddenItem = new PlacesItem(*shownItem); - removeItem(m_hiddenItemToRemove); - m_hiddenItems.insert(newIndex, hiddenItem); + Q_UNUSED(udi); + + const int index = m_storageSetupInProgress.take(sender()); + const PlacesItem* item = placesItem(index); + if (!item) { + return; } + + if (error != Solid::NoError) { + if (errorData.isValid()) { + emit errorMessage(i18nc("@info", "An error occurred while accessing '%1', the system responded: %2", + item->text(), + errorData.toString())); + } else { + emit errorMessage(i18nc("@info", "An error occurred while accessing '%1'", + item->text())); + } + emit storageSetupDone(index, false); + } else { + emit storageSetupDone(index, true); + } +} + +void PlacesItemModel::hideItem() +{ + hideItem(m_hiddenItemToRemove); m_hiddenItemToRemove = -1; } +void PlacesItemModel::updateBookmarks() +{ + // Verify whether new bookmarks have been added or existing + // bookmarks have been changed. + KBookmarkGroup root = m_bookmarkManager->root(); + KBookmark newBookmark = root.first(); + while (!newBookmark.isNull()) { + if (acceptBookmark(newBookmark, m_availableDevices)) { + bool found = false; + int modelIndex = 0; + for (int i = 0; i < m_bookmarkedItems.count(); ++i) { + PlacesItem* item = m_bookmarkedItems[i]; + if (!item) { + item = placesItem(modelIndex); + ++modelIndex; + } + + const KBookmark oldBookmark = item->bookmark(); + if (equalBookmarkIdentifiers(newBookmark, oldBookmark)) { + // The bookmark has been found in the model or as + // a hidden item. The content of the bookmark might + // have been changed, so an update is done. + found = true; + if (newBookmark.metaDataItem("UDI").isEmpty()) { + item->setBookmark(newBookmark); + item->setText(i18nc("KFile System Bookmarks", newBookmark.text().toUtf8().constData())); + } + break; + } + } + + if (!found) { + const QString udi = newBookmark.metaDataItem("UDI"); + + /* + * See Bug 304878 + * Only add a new places item, if the item text is not empty + * and if the device is available. Fixes the strange behaviour - + * add a places item without text in the Places section - when you + * remove a device (e.g. a usb stick) without unmounting. + */ + if (udi.isEmpty() || Solid::Device(udi).isValid()) { + PlacesItem* item = new PlacesItem(newBookmark); + if (item->isHidden() && !m_hiddenItemsShown) { + m_bookmarkedItems.append(item); + } else { + appendItemToGroup(item); + } + } + } + } + + newBookmark = root.next(newBookmark); + } + + // Remove items that are not part of the bookmark-manager anymore + int modelIndex = 0; + for (int i = m_bookmarkedItems.count() - 1; i >= 0; --i) { + PlacesItem* item = m_bookmarkedItems[i]; + const bool itemIsPartOfModel = (item == 0); + if (itemIsPartOfModel) { + item = placesItem(modelIndex); + } + + bool hasBeenRemoved = true; + const KBookmark oldBookmark = item->bookmark(); + KBookmark newBookmark = root.first(); + while (!newBookmark.isNull()) { + if (equalBookmarkIdentifiers(newBookmark, oldBookmark)) { + hasBeenRemoved = false; + break; + } + newBookmark = root.next(newBookmark); + } + + if (hasBeenRemoved) { + if (m_bookmarkedItems[i]) { + delete m_bookmarkedItems[i]; + m_bookmarkedItems.removeAt(i); + } else { + removeItem(modelIndex); + --modelIndex; + } + } + + if (itemIsPartOfModel) { + ++modelIndex; + } + } +} + +void PlacesItemModel::saveBookmarks() +{ + m_bookmarkManager->emitChanged(m_bookmarkManager->root()); +} + void PlacesItemModel::loadBookmarks() { KBookmarkGroup root = m_bookmarkManager->root(); KBookmark bookmark = root.first(); QSet devices = m_availableDevices; - QSet missingSystemBookmarks; + QSet missingSystemBookmarks; foreach (const SystemBookmarkData& data, m_systemBookmarks) { missingSystemBookmarks.insert(data.url); } - // The bookmarks might have a mixed order of "places" and "devices". In - // Dolphin's places panel the devices should always be appended as last - // group, so they are collected as separate lists. + // The bookmarks might have a mixed order of places, devices and search-groups due + // to the compatibility with the KFilePlacesPanel. In Dolphin's places panel the + // items should always be collected in one group so the items are collected first + // in separate lists before inserting them. QList placesItems; + QList recentlySavedItems; + QList searchForItems; QList devicesItems; while (!bookmark.isNull()) { - const QString udi = bookmark.metaDataItem("UDI"); - const KUrl url = bookmark.url(); - const QString appName = bookmark.metaDataItem("OnlyInApp"); - const bool deviceAvailable = devices.remove(udi); - - const bool allowedHere = (appName.isEmpty() || appName == KGlobal::mainComponent().componentName()) - && (m_nepomukRunning || (url.protocol() != QLatin1String("timeline") && - url.protocol() != QLatin1String("search"))); - - if ((udi.isEmpty() && allowedHere) || deviceAvailable) { + if (acceptBookmark(bookmark, devices)) { PlacesItem* item = new PlacesItem(bookmark); - if (deviceAvailable) { + if (item->groupType() == PlacesItem::DevicesType) { + devices.remove(item->udi()); devicesItems.append(item); } else { - placesItems.append(item); - + const QUrl url = bookmark.url(); if (missingSystemBookmarks.contains(url)) { missingSystemBookmarks.remove(url); - // Apply the translated text to the system bookmarks, otherwise an outdated - // translation might be shown. - const int index = m_systemBookmarksIndexes.value(url); - item->setText(m_systemBookmarks[index].text); + // Try to retranslate the text of system bookmarks to have translated + // items when changing the language. In case if the user has applied a custom + // text, the retranslation will fail and the users custom text is still used. + // It is important to use "KFile System Bookmarks" as context (see + // createSystemBookmarks()). + item->setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().constData())); item->setSystemItem(true); - item->setGroup(m_systemBookmarks[index].group); + } + + switch (item->groupType()) { + case PlacesItem::PlacesType: placesItems.append(item); break; + case PlacesItem::RecentlySavedType: recentlySavedItems.append(item); break; + case PlacesItem::SearchForType: searchForItems.append(item); break; + case PlacesItem::DevicesType: + default: Q_ASSERT(false); break; } } } @@ -430,40 +769,42 @@ void PlacesItemModel::loadBookmarks() bookmark = root.next(bookmark); } - addItems(placesItems); - if (!missingSystemBookmarks.isEmpty()) { // The current bookmarks don't contain all system-bookmarks. Add the missing // bookmarks. foreach (const SystemBookmarkData& data, m_systemBookmarks) { if (missingSystemBookmarks.contains(data.url)) { - KBookmark bookmark = PlacesItem::createBookmark(m_bookmarkManager, - data.text, - data.url, - data.icon); - - const QString protocol = data.url.protocol(); - if (protocol == QLatin1String("timeline") || protocol == QLatin1String("search")) { - // As long as the KFilePlacesView from kdelibs is available, the system-bookmarks - // for timeline and search should be a Dolphin-specific setting. - bookmark.setMetaDataItem("OnlyInApp", KGlobal::mainComponent().componentName()); + PlacesItem* item = createSystemPlacesItem(data); + switch (item->groupType()) { + case PlacesItem::PlacesType: placesItems.append(item); break; + case PlacesItem::RecentlySavedType: recentlySavedItems.append(item); break; + case PlacesItem::SearchForType: searchForItems.append(item); break; + case PlacesItem::DevicesType: + default: Q_ASSERT(false); break; } - - PlacesItem* item = new PlacesItem(bookmark); - item->setSystemItem(true); - item->setGroup(data.group); - appendItem(item); } } } - // Create items for devices that have not stored as bookmark yet + // Create items for devices that have not been stored as bookmark yet foreach (const QString& udi, devices) { const KBookmark bookmark = PlacesItem::createDeviceBookmark(m_bookmarkManager, udi); devicesItems.append(new PlacesItem(bookmark)); } - addItems(devicesItems); + QList items; + items.append(placesItems); + items.append(recentlySavedItems); + items.append(searchForItems); + items.append(devicesItems); + + foreach (PlacesItem* item, items) { + if (!m_hiddenItemsShown && item->isHidden()) { + m_bookmarkedItems.append(item); + } else { + appendItem(item); + } + } #ifdef PLACESITEMMODEL_DEBUG kDebug() << "Loaded bookmarks"; @@ -471,15 +812,76 @@ void PlacesItemModel::loadBookmarks() #endif } -void PlacesItemModel::addItems(const QList& items) +bool PlacesItemModel::acceptBookmark(const KBookmark& bookmark, + const QSet& availableDevices) const { - foreach (PlacesItem* item, items) { - if (!m_hiddenItemsShown && item->isHidden()) { - m_hiddenItems.append(item); - } else { - appendItem(item); + const QString udi = bookmark.metaDataItem("UDI"); + const QUrl url = bookmark.url(); + const QString appName = bookmark.metaDataItem("OnlyInApp"); + const bool deviceAvailable = availableDevices.contains(udi); + + const bool allowedHere = (appName.isEmpty() + || appName == KAboutData::applicationData().componentName() + || appName == KAboutData::applicationData().componentName() + AppNamePrefix) + && (m_fileIndexingEnabled || (url.scheme() != QLatin1String("timeline") && + url.scheme() != QLatin1String("search"))); + + return (udi.isEmpty() && allowedHere) || deviceAvailable; +} + +PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& data) +{ + KBookmark bookmark = PlacesItem::createBookmark(m_bookmarkManager, + data.text, + data.url, + data.icon); + + const QString protocol = data.url.scheme(); + if (protocol == QLatin1String("timeline") || protocol == QLatin1String("search")) { + // As long as the KFilePlacesView from kdelibs is available, the system-bookmarks + // for "Recently Saved" and "Search For" should be a setting available only + // in the Places Panel (see description of AppNamePrefix for more details). + const QString appName = KAboutData::applicationData().componentName() + AppNamePrefix; + bookmark.setMetaDataItem("OnlyInApp", appName); + } + + PlacesItem* item = new PlacesItem(bookmark); + item->setSystemItem(true); + + // Create default view-properties for all "Search For" and "Recently Saved" bookmarks + // in case if the user has not already created custom view-properties for a corresponding + // query yet. + const bool createDefaultViewProperties = (item->groupType() == PlacesItem::SearchForType || + item->groupType() == PlacesItem::RecentlySavedType) && + !GeneralSettings::self()->globalViewProps(); + if (createDefaultViewProperties) { + ViewProperties props(convertedUrl(data.url)); + if (!props.exist()) { + const QString path = data.url.path(); + if (path == QLatin1String("/documents")) { + props.setViewMode(DolphinView::DetailsView); + props.setPreviewsShown(false); + props.setVisibleRoles({"text", "path"}); + } else if (path == QLatin1String("/images")) { + props.setViewMode(DolphinView::IconsView); + props.setPreviewsShown(true); + props.setVisibleRoles({"text", "imageSize"}); + } else if (path == QLatin1String("/audio")) { + props.setViewMode(DolphinView::DetailsView); + props.setPreviewsShown(false); + props.setVisibleRoles({"text", "artist", "album"}); + } else if (path == QLatin1String("/videos")) { + props.setViewMode(DolphinView::IconsView); + props.setPreviewsShown(true); + props.setVisibleRoles({"text"}); + } else if (data.url.scheme() == "timeline") { + props.setViewMode(DolphinView::DetailsView); + props.setVisibleRoles({"text", "date"}); + } } } + + return item; } void PlacesItemModel::createSystemBookmarks() @@ -487,62 +889,48 @@ void PlacesItemModel::createSystemBookmarks() Q_ASSERT(m_systemBookmarks.isEmpty()); Q_ASSERT(m_systemBookmarksIndexes.isEmpty()); - const QString placesGroup = placesGroupName(); - const QString recentlyAccessedGroup = recentlyAccessedGroupName(); - const QString searchForGroup = searchForGroupName(); - const QString timeLineIcon = "package_utility_time"; // TODO: Ask the Oxygen team to create - // a custom icon for the timeline-protocol - - m_systemBookmarks.append(SystemBookmarkData(KUrl(KUser().homeDir()), + // Note: The context of the I18N_NOOP2 must be "KFile System Bookmarks". The real + // i18nc call is done after reading the bookmark. The reason why the i18nc call is not + // done here is because otherwise switching the language would not result in retranslating the + // bookmarks. + m_systemBookmarks.append(SystemBookmarkData(QUrl::fromLocalFile(KUser().homeDir()), "user-home", - i18nc("@item", "Home"), - placesGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("remote:/"), + I18N_NOOP2("KFile System Bookmarks", "Home"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl("remote:/"), "network-workgroup", - i18nc("@item", "Network"), - placesGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("/"), + I18N_NOOP2("KFile System Bookmarks", "Network"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl::fromLocalFile("/"), "folder-red", - i18nc("@item", "Root"), - placesGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("trash:/"), + I18N_NOOP2("KFile System Bookmarks", "Root"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl("trash:/"), "user-trash", - i18nc("@item", "Trash"), - placesGroup)); - - if (m_nepomukRunning) { - m_systemBookmarks.append(SystemBookmarkData(KUrl("timeline:/today"), - timeLineIcon, - i18nc("@item Recently Accessed", "Today"), - recentlyAccessedGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("timeline:/yesterday"), - timeLineIcon, - i18nc("@item Recently Accessed", "Yesterday"), - recentlyAccessedGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("timeline:/thismonth"), - timeLineIcon, - i18nc("@item Recently Accessed", "This Month"), - recentlyAccessedGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("timeline:/lastmonth"), - timeLineIcon, - i18nc("@item Recently Accessed", "Last Month"), - recentlyAccessedGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("search:/documents"), + I18N_NOOP2("KFile System Bookmarks", "Trash"))); + + if (m_fileIndexingEnabled) { + m_systemBookmarks.append(SystemBookmarkData(QUrl("timeline:/today"), + "go-jump-today", + I18N_NOOP2("KFile System Bookmarks", "Today"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl("timeline:/yesterday"), + "view-calendar-day", + I18N_NOOP2("KFile System Bookmarks", "Yesterday"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl("timeline:/thismonth"), + "view-calendar-month", + I18N_NOOP2("KFile System Bookmarks", "This Month"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl("timeline:/lastmonth"), + "view-calendar-month", + I18N_NOOP2("KFile System Bookmarks", "Last Month"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/documents"), "folder-txt", - i18nc("@item Commonly Accessed", "Documents"), - searchForGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("search:/images"), + I18N_NOOP2("KFile System Bookmarks", "Documents"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/images"), "folder-image", - i18nc("@item Commonly Accessed", "Images"), - searchForGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("search:/audio"), + I18N_NOOP2("KFile System Bookmarks", "Images"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/audio"), "folder-sound", - i18nc("@item Commonly Accessed", "Audio"), - searchForGroup)); - m_systemBookmarks.append(SystemBookmarkData(KUrl("search:/videos"), + I18N_NOOP2("KFile System Bookmarks", "Audio Files"))); + m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/videos"), "folder-video", - i18nc("@item Commonly Accessed", "Videos"), - searchForGroup)); + I18N_NOOP2("KFile System Bookmarks", "Videos"))); } for (int i = 0; i < m_systemBookmarks.count(); ++i) { @@ -550,78 +938,279 @@ void PlacesItemModel::createSystemBookmarks() } } +void PlacesItemModel::clear() { + m_bookmarkedItems.clear(); + KStandardItemModel::clear(); +} + void PlacesItemModel::initializeAvailableDevices() { - m_predicate = Solid::Predicate::fromString( - "[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]" + QString predicate("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]" " OR " "[ IS StorageAccess AND StorageDrive.driveType == 'Floppy' ]]" " OR " "OpticalDisc.availableContent & 'Audio' ]" " OR " "StorageAccess.ignored == false ]"); + + + if (KProtocolInfo::isKnownProtocol("mtp")) { + predicate.prepend("["); + predicate.append(" OR PortableMediaPlayer.supportedProtocols == 'mtp']"); + } + + m_predicate = Solid::Predicate::fromString(predicate); Q_ASSERT(m_predicate.isValid()); Solid::DeviceNotifier* notifier = Solid::DeviceNotifier::instance(); - connect(notifier, SIGNAL(deviceAdded(QString)), this, SLOT(slotDeviceAdded(QString))); - connect(notifier, SIGNAL(deviceRemoved(QString)), this, SLOT(slotDeviceRemoved(QString))); + connect(notifier, &Solid::DeviceNotifier::deviceAdded, this, &PlacesItemModel::slotDeviceAdded); + connect(notifier, &Solid::DeviceNotifier::deviceRemoved, this, &PlacesItemModel::slotDeviceRemoved); const QList& deviceList = Solid::Device::listFromQuery(m_predicate); - foreach(const Solid::Device& device, deviceList) { + foreach (const Solid::Device& device, deviceList) { m_availableDevices << device.udi(); } } -int PlacesItemModel::hiddenIndex(int index) const +int PlacesItemModel::bookmarkIndex(int index) const { - int hiddenIndex = 0; - int visibleItemIndex = 0; - while (hiddenIndex < m_hiddenItems.count()) { - if (!m_hiddenItems[hiddenIndex]) { - if (visibleItemIndex == index) { + int bookmarkIndex = 0; + int modelIndex = 0; + while (bookmarkIndex < m_bookmarkedItems.count()) { + if (!m_bookmarkedItems[bookmarkIndex]) { + if (modelIndex == index) { break; } - ++visibleItemIndex; + ++modelIndex; } - ++hiddenIndex; + ++bookmarkIndex; } - return hiddenIndex >= m_hiddenItems.count() ? -1 : hiddenIndex; + return bookmarkIndex >= m_bookmarkedItems.count() ? -1 : bookmarkIndex; } -QString PlacesItemModel::placesGroupName() +void PlacesItemModel::hideItem(int index) { - return i18nc("@item", "Places"); + PlacesItem* shownItem = placesItem(index); + if (!shownItem) { + return; + } + + shownItem->setHidden(true); + if (m_hiddenItemsShown) { + // Removing items from the model is not allowed if all hidden + // items should be shown. + return; + } + + const int newIndex = bookmarkIndex(index); + if (newIndex >= 0) { + const KBookmark hiddenBookmark = shownItem->bookmark(); + PlacesItem* hiddenItem = new PlacesItem(hiddenBookmark); + + const PlacesItem* previousItem = placesItem(index - 1); + KBookmark previousBookmark; + if (previousItem) { + previousBookmark = previousItem->bookmark(); + } + + const bool updateBookmark = (m_bookmarkManager->root().indexOf(hiddenBookmark) >= 0); + removeItem(index); + + if (updateBookmark) { + // removeItem() also removed the bookmark from m_bookmarkManager in + // PlacesItemModel::onItemRemoved(). However for hidden items the + // bookmark should still be remembered, so readd it again: + m_bookmarkManager->root().addBookmark(hiddenBookmark); + m_bookmarkManager->root().moveBookmark(hiddenBookmark, previousBookmark); + } + + m_bookmarkedItems.insert(newIndex, hiddenItem); + } +} + +QString PlacesItemModel::internalMimeType() const +{ + return "application/x-dolphinplacesmodel-" + + QString::number((qptrdiff)this); +} + +int PlacesItemModel::groupedDropIndex(int index, const PlacesItem* item) const +{ + Q_ASSERT(item); + + int dropIndex = index; + const PlacesItem::GroupType type = item->groupType(); + + const int itemCount = count(); + if (index < 0) { + dropIndex = itemCount; + } + + // Search nearest previous item with the same group + int previousIndex = -1; + for (int i = dropIndex - 1; i >= 0; --i) { + if (placesItem(i)->groupType() == type) { + previousIndex = i; + break; + } + } + + // Search nearest next item with the same group + int nextIndex = -1; + for (int i = dropIndex; i < count(); ++i) { + if (placesItem(i)->groupType() == type) { + nextIndex = i; + break; + } + } + + // Adjust the drop-index to be inserted to the + // nearest item with the same group. + if (previousIndex >= 0 && nextIndex >= 0) { + dropIndex = (dropIndex - previousIndex < nextIndex - dropIndex) ? + previousIndex + 1 : nextIndex; + } else if (previousIndex >= 0) { + dropIndex = previousIndex + 1; + } else if (nextIndex >= 0) { + dropIndex = nextIndex; + } + + return dropIndex; } -QString PlacesItemModel::recentlyAccessedGroupName() +bool PlacesItemModel::equalBookmarkIdentifiers(const KBookmark& b1, const KBookmark& b2) { - return i18nc("@item", "Recently Accessed"); + const QString udi1 = b1.metaDataItem("UDI"); + const QString udi2 = b2.metaDataItem("UDI"); + if (!udi1.isEmpty() && !udi2.isEmpty()) { + return udi1 == udi2; + } else { + return b1.metaDataItem("ID") == b2.metaDataItem("ID"); + } } -QString PlacesItemModel::searchForGroupName() +QUrl PlacesItemModel::createTimelineUrl(const QUrl& url) { - return i18nc("@item", "Search For"); + // TODO: Clarify with the Baloo-team whether it makes sense + // provide default-timeline-URLs like 'yesterday', 'this month' + // and 'last month'. + QUrl timelineUrl; + + const QString path = url.toDisplayString(QUrl::PreferLocalFile); + if (path.endsWith(QLatin1String("yesterday"))) { + const QDate date = QDate::currentDate().addDays(-1); + const int year = date.year(); + const int month = date.month(); + const int day = date.day(); + timelineUrl = "timeline:/" + timelineDateString(year, month) + + '/' + timelineDateString(year, month, day); + } else if (path.endsWith(QLatin1String("thismonth"))) { + const QDate date = QDate::currentDate(); + timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month()); + } else if (path.endsWith(QLatin1String("lastmonth"))) { + const QDate date = QDate::currentDate().addMonths(-1); + timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month()); + } else { + Q_ASSERT(path.endsWith(QLatin1String("today"))); + timelineUrl= url; + } + + return timelineUrl; } +QString PlacesItemModel::timelineDateString(int year, int month, int day) +{ + QString date = QString::number(year) + '-'; + if (month < 10) { + date += '0'; + } + date += QString::number(month); + + if (day >= 1) { + date += '-'; + if (day < 10) { + date += '0'; + } + date += QString::number(day); + } + + return date; +} + +QUrl PlacesItemModel::createSearchUrl(const QUrl& url) +{ + QUrl searchUrl; + +#ifdef HAVE_BALOO + const QString path = url.toDisplayString(QUrl::PreferLocalFile); + if (path.endsWith(QLatin1String("documents"))) { + searchUrl = searchUrlForType("Document"); + } else if (path.endsWith(QLatin1String("images"))) { + searchUrl = searchUrlForType("Image"); + } else if (path.endsWith(QLatin1String("audio"))) { + searchUrl = searchUrlForType("Audio"); + } else if (path.endsWith(QLatin1String("videos"))) { + searchUrl = searchUrlForType("Video"); + } else { + Q_ASSERT(false); + } +#else + Q_UNUSED(url); +#endif + + return searchUrl; +} + +#ifdef HAVE_BALOO +QUrl PlacesItemModel::searchUrlForType(const QString& type) +{ + Baloo::Query query; + query.addType("File"); + query.addType(type); + + return query.toSearchUrl(); +} +#endif + #ifdef PLACESITEMMODEL_DEBUG void PlacesItemModel::showModelState() { - kDebug() << "hidden-index model-index text"; - int j = 0; - for (int i = 0; i < m_hiddenItems.count(); ++i) { - if (m_hiddenItems[i]) { - kDebug() << i << "(Hidden) " << " " << m_hiddenItems[i]->dataValue("text").toString(); + kDebug() << "================================="; + kDebug() << "Model:"; + kDebug() << "hidden-index model-index text"; + int modelIndex = 0; + for (int i = 0; i < m_bookmarkedItems.count(); ++i) { + if (m_bookmarkedItems[i]) { + kDebug() << i << "(Hidden) " << " " << m_bookmarkedItems[i]->dataValue("text").toString(); } else { - if (item(j)) { - kDebug() << i << " " << j << " " << item(j)->dataValue("text").toString(); + if (item(modelIndex)) { + kDebug() << i << " " << modelIndex << " " << item(modelIndex)->dataValue("text").toString(); } else { - kDebug() << i << " " << j << " " << "(not available yet)"; + kDebug() << i << " " << modelIndex << " " << "(not available yet)"; } - ++j; + ++modelIndex; } } + + kDebug(); + kDebug() << "Bookmarks:"; + + int bookmarkIndex = 0; + KBookmarkGroup root = m_bookmarkManager->root(); + KBookmark bookmark = root.first(); + while (!bookmark.isNull()) { + const QString udi = bookmark.metaDataItem("UDI"); + const QString text = udi.isEmpty() ? bookmark.text() : udi; + if (bookmark.metaDataItem("IsHidden") == QLatin1String("true")) { + kDebug() << bookmarkIndex << "(Hidden)" << text; + } else { + kDebug() << bookmarkIndex << " " << text; + } + + bookmark = root.next(bookmark); + ++bookmarkIndex; + } } #endif -#include "placesitemmodel.moc"