Places: Use Solid::Device::DisplayName for DisplayRole

[dolphin.git] / src / panels / places / placesitem.cpp

diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index ee168e4a309d39e94e45cd12baa1d33d68845c31..16ee5cff4c2dd3d4833f07b0d03ea25925cb8f7a 100644 (file)
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -1,5 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com>             *
 /***************************************************************************
  *   Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com>             *

+ *   Copyright (C) 2018 by Elvis Angelaccio <elvis.angelaccio@kde.org>     *

  *                                                                         *
  *   Based on KFilePlacesItem from kdelibs:                                *
  *   Copyright (C) 2007 Kevin Ottens <ervin@kde.org>                       *
  *                                                                         *
  *   Based on KFilePlacesItem from kdelibs:                                *
  *   Copyright (C) 2007 Kevin Ottens <ervin@kde.org>                       *


@@ -38,7 +39,6 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
     m_disc(),
     m_mtp(),
     m_signalHandler(nullptr),
     m_disc(),
     m_mtp(),
     m_signalHandler(nullptr),

-    m_trashDirLister(nullptr),

     m_bookmark()
 {
     m_signalHandler = new PlacesItemSignalHandler(this);
     m_bookmark()
 {
     m_signalHandler = new PlacesItemSignalHandler(this);


@@ -48,7 +48,6 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
 PlacesItem::~PlacesItem()
 {
     delete m_signalHandler;
 PlacesItem::~PlacesItem()
 {
     delete m_signalHandler;

-    delete m_trashDirLister;

 }
 
 void PlacesItem::setUrl(const QUrl &url)
 }
 
 void PlacesItem::setUrl(const QUrl &url)


@@ -59,11 +58,8 @@ void PlacesItem::setUrl(const QUrl &url)
     // setting an equal URL results in an itemsChanged()
     // signal.
     if (dataValue("url").toUrl() != url) {
     // setting an equal URL results in an itemsChanged()
     // signal.
     if (dataValue("url").toUrl() != url) {

-        delete m_trashDirLister;

         if (url.scheme() == QLatin1String("trash")) {
         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);
         }
 
         setDataValue("url", url);


@@ -85,6 +81,16 @@ QString PlacesItem::udi() const
     return dataValue("udi").toString();
 }
 
     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);
 void PlacesItem::setHidden(bool hidden)
 {
     setDataValue("isHidden", hidden);


@@ -169,8 +175,8 @@ void PlacesItem::onDataValueChanged(const QByteArray& role,
                                     const QVariant& current,
                                     const QVariant& previous)
 {
                                     const QVariant& current,
                                     const QVariant& previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

 
     if (!m_bookmark.isNull()) {
         updateBookmarkForRole(role);
 
     if (!m_bookmark.isNull()) {
         updateBookmarkForRole(role);


@@ -180,7 +186,7 @@ void PlacesItem::onDataValueChanged(const QByteArray& role,
 void PlacesItem::onDataChanged(const QHash<QByteArray, QVariant>& current,
                                const QHash<QByteArray, QVariant>& previous)
 {
 void PlacesItem::onDataChanged(const QHash<QByteArray, QVariant>& current,
                                const QHash<QByteArray, QVariant>& previous)
 {

-    Q_UNUSED(previous);
+    Q_UNUSED(previous)

 
     if (!m_bookmark.isNull()) {
         QHashIterator<QByteArray, QVariant> it(current);
 
     if (!m_bookmark.isNull()) {
         QHashIterator<QByteArray, QVariant> it(current);


@@ -203,7 +209,7 @@ void PlacesItem::initializeDevice(const QString& udi)
     m_disc = m_device.as<Solid::OpticalDisc>();
     m_mtp = m_device.as<Solid::PortableMediaPlayer>();
 
     m_disc = m_device.as<Solid::OpticalDisc>();
     m_mtp = m_device.as<Solid::PortableMediaPlayer>();
 

-    setText(m_device.description());
+    setText(m_device.displayName());

     setIcon(m_device.icon());
     setIconOverlays(m_device.emblems());
     setUdi(udi);
     setIcon(m_device.icon());
     setIconOverlays(m_device.emblems());
     setUdi(udi);


@@ -252,6 +258,8 @@ void PlacesItem::updateBookmarkForRole(const QByteArray& role)
         m_bookmark.setUrl(url());
     } else if (role == "udi") {
         m_bookmark.setMetaDataItem(QStringLiteral("UDI"), udi());
         m_bookmark.setUrl(url());
     } 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(QStringLiteral("isSystemItem"), isSystemItem() ? QStringLiteral("true") : QStringLiteral("false"));
     } else if (role == "isHidden") {
     } else if (role == "isSystemItem") {
         m_bookmark.setMetaDataItem(QStringLiteral("isSystemItem"), isSystemItem() ? QStringLiteral("true") : QStringLiteral("false"));
     } else if (role == "isHidden") {