X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f16fbcba4e9ed3cd48cb2c1a40c01daf1d511f4b..85241a924:/src/panels/places/placesitem.cpp

diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index ff81e8e63..b1f24e401 100644
--- 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) 2018 by Elvis Angelaccio <elvis.angelaccio@kde.org>     *
  *                                                                         *
  *   Based on KFilePlacesItem from kdelibs:                                *
  *   Copyright (C) 2007 Kevin Ottens <ervin@kde.org>                       *
@@ -36,9 +37,8 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
     m_access(),
     m_volume(),
     m_disc(),
-    m_mtp(),
+    m_player(),
     m_signalHandler(nullptr),
-    m_trashDirLister(nullptr),
     m_bookmark()
 {
     m_signalHandler = new PlacesItemSignalHandler(this);
@@ -48,7 +48,6 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
 PlacesItem::~PlacesItem()
 {
     delete m_signalHandler;
-    delete m_trashDirLister;
 }
 
 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) {
-        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);
@@ -85,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);
@@ -134,12 +140,12 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     delete m_access;
     delete m_volume;
     delete m_disc;
-    delete m_mtp;
+    delete m_player;
 
     const QString udi = bookmark.metaDataItem(QStringLiteral("UDI"));
     if (udi.isEmpty()) {
         setIcon(bookmark.icon());
-        setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().constData()));
+        setText(i18ndc("kio5", "KFile System Bookmarks", bookmark.text().toUtf8().constData()));
         setUrl(bookmark.url());
         setSystemItem(bookmark.metaDataItem(QStringLiteral("isSystemItem")) == QLatin1String("true"));
     } else {
@@ -169,8 +175,8 @@ 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);
@@ -180,7 +186,7 @@ void PlacesItem::onDataValueChanged(const QByteArray& role,
 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);
@@ -201,9 +207,9 @@ void PlacesItem::initializeDevice(const QString& udi)
     m_access = m_device.as<Solid::StorageAccess>();
     m_volume = m_device.as<Solid::StorageVolume>();
     m_disc = m_device.as<Solid::OpticalDisc>();
-    m_mtp = m_device.as<Solid::PortableMediaPlayer>();
+    m_player = m_device.as<Solid::PortableMediaPlayer>();
 
-    setText(m_device.description());
+    setText(m_device.displayName());
     setIcon(m_device.icon());
     setIconOverlays(m_device.emblems());
     setUdi(udi);
@@ -222,8 +228,11 @@ void PlacesItem::initializeDevice(const QString& udi)
         } else {
             setUrl(QUrl(QStringLiteral("audiocd:/")));
         }
-    } else if (m_mtp) {
-        setUrl(QUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi())));
+    } else if (m_player) {
+        const QStringList protocols = m_player->supportedProtocols();
+        if (!protocols.isEmpty()) {
+            setUrl(QUrl(QStringLiteral("%1:udi=%2").arg(protocols.first(), m_device.udi())));
+        }
     }
 }
 
@@ -245,13 +254,15 @@ 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(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") {