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 5723b80a274cce09f9a752d37e101cd9db9adab7..b82e5025600e23624c03024046dc040ae866adcc 100644 (file)
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -25,7 +25,7 @@
 #include <KBookmarkManager>
 #include <KDebug>
 #include <KDirLister>
 #include <KBookmarkManager>
 #include <KDebug>
 #include <KDirLister>

-#include <KIcon>
+#include <QIcon>

 #include <KLocale>
 #include "placesitemsignalhandler.h"
 #include <QDateTime>
 #include <KLocale>
 #include "placesitemsignalhandler.h"
 #include <QDateTime>


@@ -69,8 +69,8 @@ void PlacesItem::setUrl(const KUrl& url)
             m_trashDirLister = new KDirLister();
             m_trashDirLister->setAutoErrorHandlingEnabled(false, 0);
             m_trashDirLister->setDelayedMimeTypes(true);
             m_trashDirLister = new KDirLister();
             m_trashDirLister->setAutoErrorHandlingEnabled(false, 0);
             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);
         }
 


@@ -120,6 +120,10 @@ 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;
     m_bookmark = bookmark;
 
     delete m_access;


@@ -131,7 +135,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     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.text());
+        setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().data()));

         setUrl(bookmark.url());
     } else {
         initializeDevice(udi);
         setUrl(bookmark.url());
     } else {
         initializeDevice(udi);


@@ -140,20 +144,20 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     const GroupType type = groupType();
     if (icon().isEmpty()) {
         switch (type) {
     const GroupType type = groupType();
     if (icon().isEmpty()) {
         switch (type) {

-        case RecentlyAccessedType: setIcon("chronometer"); break;
-        case SearchForType:        setIcon("nepomuk"); break;
+        case RecentlySavedType: setIcon("chronometer"); break;
+        case SearchForType:     setIcon("nepomuk"); break;

         case PlacesType:
         case PlacesType:

-        default:                   setIcon("folder");
+        default:                setIcon("folder");

         }
 
     }
 
     switch (type) {
         }
 
     }
 
     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;
+    case PlacesType:        setGroup(i18nc("@item", "Places")); break;
+    case RecentlySavedType: setGroup(i18nc("@item", "Recently Saved")); 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"));


@@ -169,7 +173,7 @@ PlacesItem::GroupType PlacesItem::groupType() const
     if (udi().isEmpty()) {
         const QString protocol = url().protocol();
         if (protocol == QLatin1String("timeline")) {
     if (udi().isEmpty()) {
         const QString protocol = url().protocol();
         if (protocol == QLatin1String("timeline")) {

-            return RecentlyAccessedType;
+            return RecentlySavedType;

         }
 
         if (protocol.contains(QLatin1String("search"))) {
         }
 
         if (protocol.contains(QLatin1String("search"))) {


@@ -267,11 +271,16 @@ void PlacesItem::initializeDevice(const QString& udi)
 
     if (m_access) {
         setUrl(m_access->filePath());
 
     if (m_access) {
         setUrl(m_access->filePath());

-        QObject::connect(m_access, SIGNAL(accessibilityChanged(bool,QString)),
-                         m_signalHandler, SLOT(onAccessibilityChanged()));
+        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()));
     }
     } else if (m_mtp) {
         setUrl(QString("mtp:udi=%1").arg(m_device.udi()));
     }


@@ -297,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.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 == "udi)") {
     } else if (role == "url") {
         m_bookmark.setUrl(url());
     } else if (role == "udi)") {