X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1426b8d3c785e47fab6312e9d01a21dc265aadb8..b96def1856bfd043ba7dae56368ceed6940bd6c4:/src/panels/places/placesitem.cpp diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 292312d0a..59c2ed733 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include "placesitemstorageaccesslistener.h" +#include +#include +#include "placesitemsignalhandler.h" #include #include @@ -36,36 +36,50 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) : m_access(), m_volume(), m_disc(), - m_accessListener(0), + m_mtp(), + m_signalHandler(0), + m_trashDirLister(0), m_bookmark() { + m_signalHandler = new PlacesItemSignalHandler(this); setBookmark(bookmark); } -PlacesItem::PlacesItem(const PlacesItem& item) : - KStandardItem(item), - m_device(), - m_access(), - m_volume(), - m_disc(), - m_accessListener(0), - m_bookmark() -{ -} - PlacesItem::~PlacesItem() { - delete m_accessListener; + delete m_signalHandler; + delete m_trashDirLister; } -void PlacesItem::setUrl(const KUrl& url) +void PlacesItem::setUrl(const QUrl &url) { - setDataValue("url", url); + // The default check in KStandardItem::setDataValue() + // for equal values does not work with a custom value + // 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.scheme() == 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.data(), static_cast(&KDirLister::completed), + m_signalHandler.data(), &PlacesItemSignalHandler::onTrashDirListerCompleted); + m_trashDirLister->openUrl(url); + } + + setDataValue("url", url); + } } -KUrl PlacesItem::url() const +QUrl PlacesItem::url() const { - return dataValue("url").value(); + return dataValue("url").value(); } void PlacesItem::setUdi(const QString& udi) @@ -81,9 +95,6 @@ QString PlacesItem::udi() const void PlacesItem::setHidden(bool hidden) { setDataValue("isHidden", hidden); - if (!m_bookmark.isNull()) { - m_bookmark.setMetaDataItem("IsHidden", hidden ? "true" : "false"); - } } bool PlacesItem::isHidden() const @@ -108,23 +119,46 @@ Solid::Device PlacesItem::device() const void PlacesItem::setBookmark(const KBookmark& bookmark) { + if (bookmark == m_bookmark) { + return; + } + m_bookmark = bookmark; delete m_access; delete m_volume; delete m_disc; - delete m_accessListener; + delete m_mtp; + const QString udi = bookmark.metaDataItem("UDI"); if (udi.isEmpty()) { setIcon(bookmark.icon()); - setText(bookmark.text()); + setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().constData())); setUrl(bookmark.url()); - setDataValue("address", bookmark.address()); - setGroup(i18nc("@item", "Places")); } 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")); } @@ -133,11 +167,37 @@ KBookmark PlacesItem::bookmark() const return m_bookmark; } +PlacesItem::GroupType PlacesItem::groupType() const +{ + if (udi().isEmpty()) { + const QString protocol = url().scheme(); + 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, - PlacesItem* after) + const QUrl& url, + const QString& iconName) { KBookmarkGroup root = manager->root(); if (root.isNull()) { @@ -145,12 +205,9 @@ KBookmark PlacesItem::createBookmark(KBookmarkManager* manager, } KBookmark bookmark = root.addBookmark(text, url, iconName); + bookmark.setFullText(text); bookmark.setMetaDataItem("ID", generateNewId()); - if (after) { - root.moveBookmark(bookmark, after->bookmark()); - } - return bookmark; } @@ -204,29 +261,42 @@ void PlacesItem::initializeDevice(const QString& udi) m_access = m_device.as(); m_volume = m_device.as(); m_disc = m_device.as(); + m_mtp = m_device.as(); setText(m_device.description()); setIcon(m_device.icon()); setIconOverlays(m_device.emblems()); setUdi(udi); - setGroup(i18nc("@item", "Devices")); if (m_access) { - setUrl(m_access->filePath()); - if (!m_accessListener) { - // The access listener takes care to call PlacesItem::onAccessibilityChanged() - // in case if the accessibility of m_access has been changed. - m_accessListener = new PlacesItemStorageAccessListener(this); - } + setUrl(QUrl::fromLocalFile(m_access->filePath())); + QObject::connect(m_access.data(), SIGNAL(accessibilityChanged(bool,QString)), + m_signalHandler.data(), SLOT(onAccessibilityChanged())); } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) { - const QString device = m_device.as()->device(); - setUrl(QString("audiocd:/?device=%1").arg(device)); + Solid::Block *block = m_device.as(); + if (block) { + const QString device = block->device(); + setUrl(QStringLiteral("audiocd:/?device=%1").arg(device)); + } else { + setUrl(QStringLiteral("audiocd:/")); + } + } else if (m_mtp) { + setUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi())); } } void PlacesItem::onAccessibilityChanged() { setIconOverlays(m_device.emblems()); + setUrl(QUrl::fromLocalFile(m_access->filePath())); +} + +void PlacesItem::onTrashDirListerCompleted() +{ + Q_ASSERT(url().scheme() == QLatin1String("trash")); + + const bool isTrashEmpty = m_trashDirLister->items().isEmpty(); + setIcon(isTrashEmpty ? "user-trash" : "user-trash-full"); } void PlacesItem::updateBookmarkForRole(const QByteArray& role) @@ -235,7 +305,15 @@ void PlacesItem::updateBookmarkForRole(const QByteArray& role) if (role == "iconName") { m_bookmark.setIcon(icon()); } else if (role == "text") { - m_bookmark.setDescription(text()); + // Only store the text in the KBookmark if it is not the translation of + // the current text. This makes sure that the text is re-translated if + // the user chooses another language, or the translation itself changes. + // + // 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())) { + m_bookmark.setFullText(text()); + } } else if (role == "url") { m_bookmark.setUrl(url()); } else if (role == "udi)") { @@ -249,6 +327,11 @@ void PlacesItem::updateBookmarkForRole(const QByteArray& role) QString PlacesItem::generateNewId() { + // The ID-generation must be different as done in KFilePlacesItem from kdelibs + // to prevent identical IDs, because 'count' is of course not shared. We append a + // " (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()) + '/' + QString::number(count++); + return QString::number(QDateTime::currentDateTime().toTime_t()) + + '/' + QString::number(count++) + " (V2)"; }