Merge branch 'Applications/17.12'

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

diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index 7a5daff8ea2c12d4fc7fa8db69e383659d59b58f..3c6023ba80797ecd24a5b4318dacab03c3a545e1 100644 (file)
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -23,10 +23,9 @@
 #include "placesitem.h"
 
 #include <KBookmarkManager>
 #include "placesitem.h"
 
 #include <KBookmarkManager>

-#include <KDebug>
+#include "dolphindebug.h"

 #include <KDirLister>
 #include <KDirLister>

-#include <KIcon>
-#include <KLocale>
+#include <KLocalizedString>

 #include "placesitemsignalhandler.h"
 #include <QDateTime>
 #include <Solid/Block>
 #include "placesitemsignalhandler.h"
 #include <QDateTime>
 #include <Solid/Block>


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

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

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


@@ -51,25 +51,25 @@ PlacesItem::~PlacesItem()
     delete m_trashDirLister;
 }
 
     delete m_trashDirLister;
 }
 

-void PlacesItem::setUrl(const KUrl& url)
+void PlacesItem::setUrl(const QUrl &url)

 {
     // The default check in KStandardItem::setDataValue()
     // for equal values does not work with a custom value
 {
     // 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
+    // like QUrl. Hence do a manual check to prevent that

     // setting an equal URL results in an itemsChanged()
     // signal.
     // setting an equal URL results in an itemsChanged()
     // signal.

-    if (dataValue("url").value<KUrl>() != url) {
+    if (dataValue("url").toUrl() != url) {

         delete m_trashDirLister;
         delete m_trashDirLister;

-        if (url.protocol() == QLatin1String("trash")) {
+        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();
             // 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->setAutoErrorHandlingEnabled(false, nullptr);

             m_trashDirLister->setDelayedMimeTypes(true);
             m_trashDirLister->setDelayedMimeTypes(true);

-            QObject::connect(m_trashDirLister, SIGNAL(completed()),
-                             m_signalHandler, SLOT(onTrashDirListerCompleted()));
+            QObject::connect(m_trashDirLister.data(), static_cast<void(KDirLister::*)()>(&KDirLister::completed),
+                             m_signalHandler.data(), &PlacesItemSignalHandler::onTrashDirListerCompleted);

             m_trashDirLister->openUrl(url);
         }
 
             m_trashDirLister->openUrl(url);
         }
 


@@ -77,9 +77,9 @@ void PlacesItem::setUrl(const KUrl& url)
     }
 }
 
     }
 }
 

-KUrl PlacesItem::url() const
+QUrl PlacesItem::url() const

 {
 {

-    return dataValue("url").value<KUrl>();
+    return dataValue("url").toUrl();

 }
 
 void PlacesItem::setUdi(const QString& udi)
 }
 
 void PlacesItem::setUdi(const QString& udi)


@@ -102,6 +102,16 @@ bool PlacesItem::isHidden() const
     return dataValue("isHidden").toBool();
 }
 
     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);
 void PlacesItem::setSystemItem(bool isSystemItem)
 {
     setDataValue("isSystemItem", isSystemItem);


@@ -119,30 +129,31 @@ Solid::Device PlacesItem::device() const
 
 void PlacesItem::setBookmark(const KBookmark& bookmark)
 {
 
 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;
 
     m_bookmark = bookmark;
 

+    if (!bookmarkDataChanged) {
+        return;
+    }
+

     delete m_access;
     delete m_volume;
     delete m_disc;
     delete m_access;
     delete m_volume;
     delete m_disc;

+    delete m_mtp;

 
 

-    const QString udi = bookmark.metaDataItem("UDI");
+    const QString udi = bookmark.metaDataItem(QStringLiteral("UDI"));

     if (udi.isEmpty()) {
         setIcon(bookmark.icon());
     if (udi.isEmpty()) {
         setIcon(bookmark.icon());

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

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

+        setSystemItem(bookmark.metaDataItem(QStringLiteral("isSystemItem")) == QLatin1String("true"));

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

-    switch (groupType()) {
-    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(QStringLiteral("IsHidden")) == QLatin1String("true"));

 }
 
 KBookmark PlacesItem::bookmark() const
 }
 
 KBookmark PlacesItem::bookmark() const


@@ -150,53 +161,15 @@ KBookmark PlacesItem::bookmark() const
     return m_bookmark;
 }
 
     return m_bookmark;
 }
 

-PlacesItem::GroupType PlacesItem::groupType() const
+bool PlacesItem::storageSetupNeeded() const

 {
 {

-    if (udi().isEmpty()) {
-        const QString protocol = url().protocol();
-        if (protocol == QLatin1String("timeline")) {
-            return RecentlyAccessedType;
-        }
-
-        if (protocol == QLatin1String("search")) {
-            return SearchForType;
-        }
-
-        return PlacesType;
-    }
-
-    return DevicesType;
+    return m_access ? !m_access->isAccessible() : false;

 }
 
 }
 

-KBookmark PlacesItem::createBookmark(KBookmarkManager* manager,
-                                     const QString& text,
-                                     const KUrl& url,
-                                     const QString& iconName)
+bool PlacesItem::isSearchOrTimelineUrl() const

 {
 {

-    KBookmarkGroup root = manager->root();
-    if (root.isNull()) {
-        return KBookmark();
-    }
-
-    KBookmark bookmark = root.addBookmark(text, url, iconName);
-    bookmark.setFullText(text);
-    bookmark.setMetaDataItem("ID", generateNewId());
-
-    return bookmark;
-}
-
-KBookmark PlacesItem::createDeviceBookmark(KBookmarkManager* manager,
-                                           const QString& udi)
-{
-    KBookmarkGroup root = manager->root();
-    if (root.isNull()) {
-        return KBookmark();
-    }
-
-    KBookmark bookmark = root.createNewSeparator();
-    bookmark.setMetaDataItem("UDI", udi);
-    bookmark.setMetaDataItem("isSystemItem", "true");
-    return bookmark;
+    const QString urlScheme = url().scheme();
+    return (urlScheme.contains("search") || urlScheme.contains("timeline"));

 }
 
 void PlacesItem::onDataValueChanged(const QByteArray& role,
 }
 
 void PlacesItem::onDataValueChanged(const QByteArray& role,


@@ -235,6 +208,7 @@ 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());
 
     setText(m_device.description());
     setIcon(m_device.icon());


@@ -242,26 +216,36 @@ void PlacesItem::initializeDevice(const QString& udi)
     setUdi(udi);
 
     if (m_access) {
     setUdi(udi);
 
     if (m_access) {

-        setUrl(m_access->filePath());
-        QObject::connect(m_access, SIGNAL(accessibilityChanged(bool,QString)),
-                         m_signalHandler, SLOT(onAccessibilityChanged()));
+        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) {
     } 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(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());
     }
 }
 
 void PlacesItem::onAccessibilityChanged()
 {
     setIconOverlays(m_device.emblems());

+    setUrl(QUrl::fromLocalFile(m_access->filePath()));

 }
 
 void PlacesItem::onTrashDirListerCompleted()
 {
 }
 
 void PlacesItem::onTrashDirListerCompleted()
 {

-    Q_ASSERT(url().protocol() == QLatin1String("trash"));
+    Q_ASSERT(url().scheme() == QLatin1String("trash"));

 
     const bool isTrashEmpty = m_trashDirLister->items().isEmpty();
 
     const bool isTrashEmpty = m_trashDirLister->items().isEmpty();

-    setIcon(isTrashEmpty ? "user-trash" : "user-trash-full");
+    setIcon(isTrashEmpty ? QStringLiteral("user-trash") : QStringLiteral("user-trash-full"));

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


@@ -270,15 +254,23 @@ 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.setFullText(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 == "url") {
         m_bookmark.setUrl(url());

-    } else if (role == "udi)") {
-        m_bookmark.setMetaDataItem("UDI", udi());
+    } else if (role == "udi") {
+        m_bookmark.setMetaDataItem(QStringLiteral("UDI"), udi());

     } else if (role == "isSystemItem") {
     } else if (role == "isSystemItem") {

-        m_bookmark.setMetaDataItem("isSystemItem", isSystemItem() ? "true" : "false");
+        m_bookmark.setMetaDataItem(QStringLiteral("isSystemItem"), isSystemItem() ? QStringLiteral("true") : QStringLiteral("false"));

     } else if (role == "isHidden") {
     } else if (role == "isHidden") {

-        m_bookmark.setMetaDataItem("IsHidden", isHidden() ? "true" : "false");
+        m_bookmark.setMetaDataItem(QStringLiteral("IsHidden"), isHidden() ? QStringLiteral("true") : QStringLiteral("false"));

     }
 }
 
     }
 }
 


@@ -289,6 +281,11 @@ QString PlacesItem::generateNewId()
     // " (V2)" to indicate that the ID has been generated by
     // a new version of the places view.
     static int count = 0;
     // " (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()) +
+    return QString::number(QDateTime::currentDateTimeUtc().toTime_t()) +

             '/' + QString::number(count++) + " (V2)";
 }
             '/' + QString::number(count++) + " (V2)";
 }

+
+PlacesItemSignalHandler *PlacesItem::signalHandler() const
+{
+    return m_signalHandler.data();
+}