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 318da539142e84fe0989b023895db03c009a68f5..1729bbd19bb57521a3c21b680d1fed12387572a6 100644 (file)
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -37,6 +37,7 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
     m_access(),
     m_volume(),
     m_disc(),
+    m_mtp(),
     m_signalHandler(0),
     m_trashDirLister(0),
     m_bookmark()
@@ -68,8 +69,8 @@ void PlacesItem::setUrl(const KUrl& url)
             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);
         }
 
@@ -119,17 +120,22 @@ Solid::Device PlacesItem::device() const
 
 void PlacesItem::setBookmark(const KBookmark& bookmark)
 {
+    if (bookmark == m_bookmark) {
+        return;
+    }
+
     m_bookmark = bookmark;
 
     delete m_access;
     delete m_volume;
     delete m_disc;
+    delete m_mtp;
 
 
     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);
@@ -138,7 +144,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     const GroupType type = groupType();
     if (icon().isEmpty()) {
         switch (type) {
-        case RecentlyAccessedType: setIcon("actions/chronometer"); break;
+        case RecentlyAccessedType: setIcon("chronometer"); break;
         case SearchForType:        setIcon("nepomuk"); break;
         case PlacesType:
         default:                   setIcon("folder");
@@ -174,6 +180,10 @@ PlacesItem::GroupType PlacesItem::groupType() const
             return SearchForType;
         }
 
+        if (protocol == QLatin1String("bluetooth")) {
+            return DevicesType;
+        }
+
         return PlacesType;
     }
 
@@ -252,6 +262,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_mtp = m_device.as<Solid::PortableMediaPlayer>();
 
     setText(m_device.description());
     setIcon(m_device.icon());
@@ -260,11 +271,18 @@ void PlacesItem::initializeDevice(const QString& udi)
 
     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) {
-        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()));
     }
 }
 
@@ -288,7 +306,15 @@ void PlacesItem::updateBookmarkForRole(const QByteArray& role)
     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)") {