X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1f02d15f7ec13dd206698f88a92a9949cbfc3470..c81927651a6f50af860b21d1be5c04bb4295b7cc:/src/panels/places/placesitem.cpp diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 173da29c5..16ee5cff4 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -1,5 +1,6 @@ /*************************************************************************** * Copyright (C) 2012 by Peter Penz * + * Copyright (C) 2018 by Elvis Angelaccio * * * * Based on KFilePlacesItem from kdelibs: * * Copyright (C) 2007 Kevin Ottens * @@ -21,14 +22,13 @@ ***************************************************************************/ #include "placesitem.h" +#include "trash/dolphintrash.h" -#include -#include -#include -#include -#include +#include "dolphindebug.h" #include "placesitemsignalhandler.h" -#include + +#include +#include #include PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) : @@ -38,8 +38,7 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) : m_volume(), m_disc(), m_mtp(), - m_signalHandler(0), - m_trashDirLister(0), + m_signalHandler(nullptr), m_bookmark() { m_signalHandler = new PlacesItemSignalHandler(this); @@ -49,38 +48,27 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) : PlacesItem::~PlacesItem() { delete m_signalHandler; - delete m_trashDirLister; } -void PlacesItem::setUrl(const KUrl& url) +void PlacesItem::setUrl(const QUrl &url) { // The default check in KStandardItem::setDataValue() // for equal values does not work with a custom value - // like KUrl. Hence do a manual check to prevent that + // like QUrl. Hence do a manual check to prevent that // setting an equal URL results in an itemsChanged() // signal. - if (dataValue("url").value() != url) { - delete m_trashDirLister; - if (url.protocol() == QLatin1String("trash")) { - // The trash icon must always be updated dependent on whether - // the trash is empty or not. We use a KDirLister that automatically - // watches for changes if the number of items has been changed. - // The update of the icon is handled in onTrashDirListerCompleted(). - m_trashDirLister = new KDirLister(); - m_trashDirLister->setAutoErrorHandlingEnabled(false, 0); - m_trashDirLister->setDelayedMimeTypes(true); - QObject::connect(m_trashDirLister, SIGNAL(completed()), - m_signalHandler, SLOT(onTrashDirListerCompleted())); - m_trashDirLister->openUrl(url); + if (dataValue("url").toUrl() != url) { + if (url.scheme() == QLatin1String("trash")) { + QObject::connect(&Trash::instance(), &Trash::emptinessChanged, m_signalHandler.data(), &PlacesItemSignalHandler::onTrashEmptinessChanged); } setDataValue("url", url); } } -KUrl PlacesItem::url() const +QUrl PlacesItem::url() const { - return dataValue("url").value(); + return dataValue("url").toUrl(); } void PlacesItem::setUdi(const QString& udi) @@ -93,6 +81,16 @@ QString PlacesItem::udi() const return dataValue("udi").toString(); } +void PlacesItem::setApplicationName(const QString &applicationName) +{ + setDataValue("applicationName", applicationName); +} + +QString PlacesItem::applicationName() const +{ + return dataValue("applicationName").toString(); +} + void PlacesItem::setHidden(bool hidden) { setDataValue("isHidden", hidden); @@ -103,6 +101,16 @@ bool PlacesItem::isHidden() const return dataValue("isHidden").toBool(); } +bool PlacesItem::isGroupHidden() const +{ + return dataValue("isGroupHidden").toBool(); +} + +void PlacesItem::setGroupHidden(bool hidden) +{ + setDataValue("isGroupHidden", hidden); +} + void PlacesItem::setSystemItem(bool isSystemItem) { setDataValue("isSystemItem", isSystemItem); @@ -120,47 +128,31 @@ Solid::Device PlacesItem::device() const void PlacesItem::setBookmark(const KBookmark& bookmark) { - if (bookmark == m_bookmark) { - return; - } + const bool bookmarkDataChanged = !(bookmark == m_bookmark); + // bookmark object must be updated to keep in sync with source model m_bookmark = bookmark; + if (!bookmarkDataChanged) { + return; + } + delete m_access; delete m_volume; delete m_disc; delete m_mtp; - - const QString udi = bookmark.metaDataItem("UDI"); + const QString udi = bookmark.metaDataItem(QStringLiteral("UDI")); if (udi.isEmpty()) { setIcon(bookmark.icon()); - setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().data())); + setText(i18ndc("kio5", "KFile System Bookmarks", bookmark.text().toUtf8().constData())); setUrl(bookmark.url()); + setSystemItem(bookmark.metaDataItem(QStringLiteral("isSystemItem")) == QLatin1String("true")); } else { initializeDevice(udi); } - const GroupType type = groupType(); - if (icon().isEmpty()) { - switch (type) { - case RecentlySavedType: setIcon("chronometer"); break; - case SearchForType: setIcon("nepomuk"); break; - case PlacesType: - default: setIcon("folder"); - } - - } - - switch (type) { - case PlacesType: setGroup(i18nc("@item", "Places")); break; - case RecentlySavedType: setGroup(i18nc("@item", "Recently Saved")); break; - case SearchForType: setGroup(i18nc("@item", "Search For")); break; - case DevicesType: setGroup(i18nc("@item", "Devices")); break; - default: Q_ASSERT(false); break; - } - - setHidden(bookmark.metaDataItem("IsHidden") == QLatin1String("true")); + setHidden(bookmark.metaDataItem(QStringLiteral("IsHidden")) == QLatin1String("true")); } KBookmark PlacesItem::bookmark() const @@ -168,70 +160,23 @@ KBookmark PlacesItem::bookmark() const return m_bookmark; } -PlacesItem::GroupType PlacesItem::groupType() const -{ - if (udi().isEmpty()) { - const QString protocol = url().protocol(); - if (protocol == QLatin1String("timeline")) { - return RecentlySavedType; - } - - if (protocol.contains(QLatin1String("search"))) { - return SearchForType; - } - - if (protocol == QLatin1String("bluetooth")) { - return DevicesType; - } - - return PlacesType; - } - - return DevicesType; -} - bool PlacesItem::storageSetupNeeded() const { return m_access ? !m_access->isAccessible() : false; } -KBookmark PlacesItem::createBookmark(KBookmarkManager* manager, - const QString& text, - const KUrl& url, - const QString& iconName) -{ - KBookmarkGroup root = manager->root(); - if (root.isNull()) { - return KBookmark(); - } - - KBookmark bookmark = root.addBookmark(text, url, iconName); - bookmark.setFullText(text); - bookmark.setMetaDataItem("ID", generateNewId()); - - return bookmark; -} - -KBookmark PlacesItem::createDeviceBookmark(KBookmarkManager* manager, - const QString& udi) +bool PlacesItem::isSearchOrTimelineUrl() const { - KBookmarkGroup root = manager->root(); - if (root.isNull()) { - return KBookmark(); - } - - KBookmark bookmark = root.createNewSeparator(); - bookmark.setMetaDataItem("UDI", udi); - bookmark.setMetaDataItem("isSystemItem", "true"); - return bookmark; + const QString urlScheme = url().scheme(); + return (urlScheme.contains("search") || urlScheme.contains("timeline")); } void PlacesItem::onDataValueChanged(const QByteArray& role, const QVariant& current, const QVariant& previous) { - Q_UNUSED(current); - Q_UNUSED(previous); + Q_UNUSED(current) + Q_UNUSED(previous) if (!m_bookmark.isNull()) { updateBookmarkForRole(role); @@ -241,7 +186,7 @@ void PlacesItem::onDataValueChanged(const QByteArray& role, void PlacesItem::onDataChanged(const QHash& current, const QHash& previous) { - Q_UNUSED(previous); + Q_UNUSED(previous) if (!m_bookmark.isNull()) { QHashIterator it(current); @@ -264,40 +209,34 @@ void PlacesItem::initializeDevice(const QString& udi) m_disc = m_device.as(); m_mtp = m_device.as(); - setText(m_device.description()); + setText(m_device.displayName()); setIcon(m_device.icon()); setIconOverlays(m_device.emblems()); setUdi(udi); if (m_access) { - setUrl(m_access->filePath()); - QObject::connect(m_access, SIGNAL(accessibilityChanged(bool,QString)), - m_signalHandler, SLOT(onAccessibilityChanged())); + setUrl(QUrl::fromLocalFile(m_access->filePath())); + QObject::connect(m_access.data(), &Solid::StorageAccess::accessibilityChanged, + m_signalHandler.data(), &PlacesItemSignalHandler::onAccessibilityChanged); + QObject::connect(m_access.data(), &Solid::StorageAccess::teardownRequested, + m_signalHandler.data(), &PlacesItemSignalHandler::onTearDownRequested); } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) { Solid::Block *block = m_device.as(); if (block) { const QString device = block->device(); - setUrl(QString("audiocd:/?device=%1").arg(device)); + setUrl(QUrl(QStringLiteral("audiocd:/?device=%1").arg(device))); } else { - setUrl(QString("audiocd:/")); + setUrl(QUrl(QStringLiteral("audiocd:/"))); } } else if (m_mtp) { - setUrl(QString("mtp:udi=%1").arg(m_device.udi())); + setUrl(QUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi()))); } } void PlacesItem::onAccessibilityChanged() { setIconOverlays(m_device.emblems()); - setUrl(m_access->filePath()); -} - -void PlacesItem::onTrashDirListerCompleted() -{ - Q_ASSERT(url().protocol() == QLatin1String("trash")); - - const bool isTrashEmpty = m_trashDirLister->items().isEmpty(); - setIcon(isTrashEmpty ? "user-trash" : "user-trash-full"); + setUrl(QUrl::fromLocalFile(m_access->filePath())); } void PlacesItem::updateBookmarkForRole(const QByteArray& role) @@ -312,17 +251,19 @@ void PlacesItem::updateBookmarkForRole(const QByteArray& role) // // NOTE: It is important to use "KFile System Bookmarks" as context // (see PlacesItemModel::createSystemBookmarks()). - if (text() != i18nc("KFile System Bookmarks", m_bookmark.text().toUtf8().data())) { + if (text() != i18ndc("kio5", "KFile System Bookmarks", m_bookmark.text().toUtf8().data())) { m_bookmark.setFullText(text()); } } else if (role == "url") { m_bookmark.setUrl(url()); - } else if (role == "udi)") { - m_bookmark.setMetaDataItem("UDI", udi()); + } else if (role == "udi") { + m_bookmark.setMetaDataItem(QStringLiteral("UDI"), udi()); + } else if (role == "applicationName") { + m_bookmark.setMetaDataItem(QStringLiteral("OnlyInApp"), applicationName()); } else if (role == "isSystemItem") { - m_bookmark.setMetaDataItem("isSystemItem", isSystemItem() ? "true" : "false"); + m_bookmark.setMetaDataItem(QStringLiteral("isSystemItem"), isSystemItem() ? QStringLiteral("true") : QStringLiteral("false")); } else if (role == "isHidden") { - m_bookmark.setMetaDataItem("IsHidden", isHidden() ? "true" : "false"); + m_bookmark.setMetaDataItem(QStringLiteral("IsHidden"), isHidden() ? QStringLiteral("true") : QStringLiteral("false")); } } @@ -333,6 +274,11 @@ QString PlacesItem::generateNewId() // " (V2)" to indicate that the ID has been generated by // a new version of the places view. static int count = 0; - return QString::number(QDateTime::currentDateTime().toTime_t()) + + return QString::number(QDateTime::currentDateTimeUtc().toTime_t()) + '/' + QString::number(count++) + " (V2)"; } + +PlacesItemSignalHandler *PlacesItem::signalHandler() const +{ + return m_signalHandler.data(); +}