diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index ee168e4a3..10b87086c 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -1,276 +1,274 @@ /*************************************************************************** * Copyright (C) 2012 by Peter Penz * * * * Based on KFilePlacesItem from kdelibs: * * Copyright (C) 2007 Kevin Ottens * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "placesitem.h" #include "trash/dolphintrash.h" #include "dolphindebug.h" #include "placesitemsignalhandler.h" #include #include #include PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) : KStandardItem(parent), m_device(), m_access(), m_volume(), m_disc(), m_mtp(), m_signalHandler(nullptr), m_trashDirLister(nullptr), m_bookmark() { m_signalHandler = new PlacesItemSignalHandler(this); setBookmark(bookmark); } PlacesItem::~PlacesItem() { delete m_signalHandler; delete m_trashDirLister; } void PlacesItem::setUrl(const QUrl &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").toUrl() != url) { delete m_trashDirLister; if (url.scheme() == QLatin1String("trash")) { - QObject::connect(&Trash::instance(), &Trash::emptinessChanged, [this](bool isTrashEmpty){ - setIcon(isTrashEmpty ? QStringLiteral("user-trash") : QStringLiteral("user-trash-full")); - }); + QObject::connect(&Trash::instance(), &Trash::emptinessChanged, m_signalHandler.data(), &PlacesItemSignalHandler::onTrashEmptinessChanged); } setDataValue("url", url); } } QUrl PlacesItem::url() const { return dataValue("url").toUrl(); } void PlacesItem::setUdi(const QString& udi) { setDataValue("udi", udi); } QString PlacesItem::udi() const { return dataValue("udi").toString(); } void PlacesItem::setHidden(bool hidden) { setDataValue("isHidden", hidden); } 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); } bool PlacesItem::isSystemItem() const { return dataValue("isSystemItem").toBool(); } Solid::Device PlacesItem::device() const { return m_device; } void PlacesItem::setBookmark(const KBookmark& bookmark) { 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(QStringLiteral("UDI")); if (udi.isEmpty()) { setIcon(bookmark.icon()); setText(i18ndc("kio5", "KFile System Bookmarks", bookmark.text().toUtf8().constData())); setUrl(bookmark.url()); setSystemItem(bookmark.metaDataItem(QStringLiteral("isSystemItem")) == QLatin1String("true")); } else { initializeDevice(udi); } setHidden(bookmark.metaDataItem(QStringLiteral("IsHidden")) == QLatin1String("true")); } KBookmark PlacesItem::bookmark() const { return m_bookmark; } bool PlacesItem::storageSetupNeeded() const { return m_access ? !m_access->isAccessible() : false; } bool PlacesItem::isSearchOrTimelineUrl() const { 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); if (!m_bookmark.isNull()) { updateBookmarkForRole(role); } } void PlacesItem::onDataChanged(const QHash& current, const QHash& previous) { Q_UNUSED(previous); if (!m_bookmark.isNull()) { QHashIterator it(current); while (it.hasNext()) { it.next(); updateBookmarkForRole(it.key()); } } } void PlacesItem::initializeDevice(const QString& udi) { m_device = Solid::Device(udi); if (!m_device.isValid()) { return; } 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); if (m_access) { 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(QUrl(QStringLiteral("audiocd:/?device=%1").arg(device))); } else { setUrl(QUrl(QStringLiteral("audiocd:/"))); } } else if (m_mtp) { setUrl(QUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi()))); } } void PlacesItem::onAccessibilityChanged() { setIconOverlays(m_device.emblems()); setUrl(QUrl::fromLocalFile(m_access->filePath())); } void PlacesItem::updateBookmarkForRole(const QByteArray& role) { Q_ASSERT(!m_bookmark.isNull()); if (role == "iconName") { m_bookmark.setIcon(icon()); } else if (role == "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() != 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(QStringLiteral("UDI"), udi()); } else if (role == "isSystemItem") { m_bookmark.setMetaDataItem(QStringLiteral("isSystemItem"), isSystemItem() ? QStringLiteral("true") : QStringLiteral("false")); } else if (role == "isHidden") { m_bookmark.setMetaDataItem(QStringLiteral("IsHidden"), isHidden() ? QStringLiteral("true") : QStringLiteral("false")); } } 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::currentDateTimeUtc().toTime_t()) + '/' + QString::number(count++) + " (V2)"; } PlacesItemSignalHandler *PlacesItem::signalHandler() const { return m_signalHandler.data(); } diff --git a/src/panels/places/placesitemsignalhandler.cpp b/src/panels/places/placesitemsignalhandler.cpp index c85c8336e..b313f838f 100644 --- a/src/panels/places/placesitemsignalhandler.cpp +++ b/src/panels/places/placesitemsignalhandler.cpp @@ -1,53 +1,60 @@ /*************************************************************************** * Copyright (C) 2012 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "placesitemsignalhandler.h" #include "placesitem.h" PlacesItemSignalHandler::PlacesItemSignalHandler(PlacesItem* item, QObject* parent) : QObject(parent), m_item(item) { } PlacesItemSignalHandler::~PlacesItemSignalHandler() { } void PlacesItemSignalHandler::onAccessibilityChanged() { if (m_item) { m_item->onAccessibilityChanged(); } } void PlacesItemSignalHandler::onTearDownRequested(const QString& udi) { Q_UNUSED(udi) if (m_item) { Solid::StorageAccess *tmp = m_item->device().as(); if (tmp) { QString mountPath = tmp->filePath(); emit tearDownExternallyRequested(mountPath); } } } +void PlacesItemSignalHandler::onTrashEmptinessChanged(bool isTrashEmpty) +{ + if (m_item) { + m_item->setIcon(isTrashEmpty ? QStringLiteral("user-trash") : QStringLiteral("user-trash-full")); + } +} + diff --git a/src/panels/places/placesitemsignalhandler.h b/src/panels/places/placesitemsignalhandler.h index 6158d7180..1d0cf9ccd 100644 --- a/src/panels/places/placesitemsignalhandler.h +++ b/src/panels/places/placesitemsignalhandler.h @@ -1,68 +1,70 @@ /*************************************************************************** * Copyright (C) 2012 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #ifndef PLACESITEMSIGNALHANDLER_H #define PLACESITEMSIGNALHANDLER_H #include class PlacesItem; /** * @brief Helper class for PlacesItem to be able to listen to signals * and performing a corresponding action. * * PlacesItem is derived from KStandardItem, which is no QObject-class * on purpose. To be able to internally listen to signals and performing a * corresponding action, PlacesItemSignalHandler is used. * * E.g. if the PlacesItem wants to react on accessibility-changes of a storage-access, * the signal-handler can be used like this: * * QObject::connect(storageAccess, SIGNAL(accessibilityChanged(bool,QString)), * signalHandler, SLOT(onAccessibilityChanged())); * * * The slot PlacesItemSignalHandler::onAccessibilityChanged() will call * the method PlacesItem::onAccessibilityChanged(). */ class PlacesItemSignalHandler: public QObject { Q_OBJECT public: explicit PlacesItemSignalHandler(PlacesItem* item, QObject* parent = nullptr); ~PlacesItemSignalHandler() override; public slots: /** * Calls PlacesItem::onAccessibilityChanged() */ void onAccessibilityChanged(); void onTearDownRequested(const QString& udi); + void onTrashEmptinessChanged(bool isTrashEmpty); + signals: void tearDownExternallyRequested(const QString& udi); private: PlacesItem* m_item; }; #endif