Merge remote-tracking branch 'origin/master' into frameworks

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

diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index 1fbc12a7d8461669ee41ab9c0baf8cc6c11e0f2f..1729bbd19bb57521a3c21b680d1fed12387572a6 100644 (file)
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -24,9 +24,10 @@
 
 #include <KBookmarkManager>
 #include <KDebug>
 
 #include <KBookmarkManager>
 #include <KDebug>

+#include <KDirLister>

 #include <KIcon>
 #include <KLocale>
 #include <KIcon>
 #include <KLocale>

-#include "placesitemstorageaccesslistener.h"
+#include "placesitemsignalhandler.h"

 #include <QDateTime>
 #include <Solid/Block>
 
 #include <QDateTime>
 #include <Solid/Block>
 


@@ -36,34 +37,45 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
     m_access(),
     m_volume(),
     m_disc(),
     m_access(),
     m_volume(),
     m_disc(),

-    m_accessListener(0),
+    m_mtp(),
+    m_signalHandler(0),
+    m_trashDirLister(0),

     m_bookmark()
 {
     m_bookmark()
 {

+    m_signalHandler = new PlacesItemSignalHandler(this);

     setBookmark(bookmark);
 }
 
     setBookmark(bookmark);
 }
 

-PlacesItem::PlacesItem(const PlacesItem& item) :
-    KStandardItem(item),
-    m_device(item.m_device),
-    m_access(item.m_access),
-    m_volume(item.m_volume),
-    m_disc(item.m_disc),
-    m_accessListener(0),
-    m_bookmark(item.m_bookmark)
-{
-    if (item.m_accessListener) {
-        m_accessListener = new PlacesItemStorageAccessListener(this);
-    }
-}
-

 PlacesItem::~PlacesItem()
 {
 PlacesItem::~PlacesItem()
 {

-    delete m_accessListener;
+    delete m_signalHandler;
+    delete m_trashDirLister;

 }
 
 void PlacesItem::setUrl(const KUrl& url)
 {
 }
 
 void PlacesItem::setUrl(const KUrl& url)
 {

-    setDataValue("url", 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
+    // setting an equal URL results in an itemsChanged()
+    // signal.
+    if (dataValue("url").value<KUrl>() != 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.data(), static_cast<void(KDirLister::*)()>(&KDirLister::completed),
+                             m_signalHandler.data(), &PlacesItemSignalHandler::onTrashDirListerCompleted);
+            m_trashDirLister->openUrl(url);
+        }
+
+        setDataValue("url", url);
+    }

 }
 
 KUrl PlacesItem::url() const
 }
 
 KUrl PlacesItem::url() const


@@ -84,9 +96,6 @@ QString PlacesItem::udi() const
 void PlacesItem::setHidden(bool hidden)
 {
     setDataValue("isHidden", hidden);
 void PlacesItem::setHidden(bool hidden)
 {
     setDataValue("isHidden", hidden);

-    if (!m_bookmark.isNull()) {
-        m_bookmark.setMetaDataItem("IsHidden", hidden ? "true" : "false");
-    }

 }
 
 bool PlacesItem::isHidden() const
 }
 
 bool PlacesItem::isHidden() const


@@ -111,23 +120,46 @@ Solid::Device PlacesItem::device() const
 
 void PlacesItem::setBookmark(const KBookmark& bookmark)
 {
 
 void PlacesItem::setBookmark(const KBookmark& bookmark)
 {

+    if (bookmark == m_bookmark) {
+        return;
+    }
+

     m_bookmark = bookmark;
 
     delete m_access;
     delete m_volume;
     delete m_disc;
     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());
 
     const QString udi = bookmark.metaDataItem("UDI");
     if (udi.isEmpty()) {
         setIcon(bookmark.icon());

-        setText(bookmark.description());
+        setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().data()));

         setUrl(bookmark.url());
         setUrl(bookmark.url());

-        setDataValue("address", bookmark.address());
-        setGroup(i18nc("@item", "Places"));

     } else {
         initializeDevice(udi);
     }
     } else {
         initializeDevice(udi);
     }

+
+    const GroupType type = groupType();
+    if (icon().isEmpty()) {
+        switch (type) {
+        case RecentlyAccessedType: setIcon("chronometer"); break;
+        case SearchForType:        setIcon("nepomuk"); break;
+        case PlacesType:
+        default:                   setIcon("folder");
+        }
+
+    }
+
+    switch (type) {
+    case PlacesType:           setGroup(i18nc("@item", "Places")); break;
+    case RecentlyAccessedType: setGroup(i18nc("@item", "Recently Accessed")); 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("IsHidden") == QLatin1String("true"));
 }
 


@@ -136,6 +168,33 @@ KBookmark PlacesItem::bookmark() const
     return m_bookmark;
 }
 
     return m_bookmark;
 }
 

+PlacesItem::GroupType PlacesItem::groupType() const
+{
+    if (udi().isEmpty()) {
+        const QString protocol = url().protocol();
+        if (protocol == QLatin1String("timeline")) {
+            return RecentlyAccessedType;
+        }
+
+        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,
 KBookmark PlacesItem::createBookmark(KBookmarkManager* manager,
                                      const QString& text,
                                      const KUrl& url,


@@ -147,7 +206,7 @@ KBookmark PlacesItem::createBookmark(KBookmarkManager* manager,
     }
 
     KBookmark bookmark = root.addBookmark(text, url, iconName);
     }
 
     KBookmark bookmark = root.addBookmark(text, url, iconName);

-    bookmark.setDescription(text);
+    bookmark.setFullText(text);

     bookmark.setMetaDataItem("ID", generateNewId());
 
     return bookmark;
     bookmark.setMetaDataItem("ID", generateNewId());
 
     return bookmark;


@@ -203,29 +262,42 @@ 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_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>();

 
     setText(m_device.description());
     setIcon(m_device.icon());
     setIconOverlays(m_device.emblems());
     setUdi(udi);
 
     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_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);
-        }
+        QObject::connect(m_access.data(), &Solid::StorageAccess::accessibilityChanged,
+                         m_signalHandler.data(), &PlacesItemSignalHandler::onAccessibilityChanged);

     } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) {
     } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) {

-        const QString device = m_device.as<Solid::Block>()->device();
-        setUrl(QString("audiocd:/?device=%1").arg(device));
+        Solid::Block *block = m_device.as<Solid::Block>();
+        if (block) {
+            const QString device = block->device();
+            setUrl(QString("audiocd:/?device=%1").arg(device));
+        } else {
+            setUrl(QString("audiocd:/"));
+        }
+    } else if (m_mtp) {
+        setUrl(QString("mtp:udi=%1").arg(m_device.udi()));

     }
 }
 
 void PlacesItem::onAccessibilityChanged()
 {
     setIconOverlays(m_device.emblems());
     }
 }
 
 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");

 }
 
 void PlacesItem::updateBookmarkForRole(const QByteArray& role)
 }
 
 void PlacesItem::updateBookmarkForRole(const QByteArray& role)


@@ -234,7 +306,15 @@ void PlacesItem::updateBookmarkForRole(const QByteArray& role)
     if (role == "iconName") {
         m_bookmark.setIcon(icon());
     } else if (role == "text") {
     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)") {
     } else if (role == "url") {
         m_bookmark.setUrl(url());
     } else if (role == "udi)") {


@@ -248,6 +328,11 @@ void PlacesItem::updateBookmarkForRole(const QByteArray& role)
 
 QString PlacesItem::generateNewId()
 {
 
 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;
     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)";

 }
 }