diff options
| author | Alex Fiestas <[email protected]> | 2012-10-24 01:21:02 +0200 |
|---|---|---|
| committer | Alex Fiestas <[email protected]> | 2012-10-24 01:22:31 +0200 |
| commit | 996fe25208f9db430daa7d1800c4476929eef0dd (patch) | |
| tree | 19580971b8bfe9a0ece21892e61c0c1e801416bf /src/panels/places/placesitem.cpp | |
| parent | 04dabe84b22aa9db501c2d88b4e6ffa0749598ce (diff) | |
Show MTP devices in case support for it is installed
Basically adds a conditional that in case that mtp kioslave is installed
devices with MTP are added to the predicated.
REVIEW: 106651
(cherry picked from commit a09a23795050be4ad6e2c987614cb28096030cc8)
Diffstat (limited to 'src/panels/places/placesitem.cpp')
| -rw-r--r-- | src/panels/places/placesitem.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index f72f63975..f78c98b76 100644 --- 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() @@ -124,6 +125,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark) delete m_access; delete m_volume; delete m_disc; + delete m_mtp; const QString udi = bookmark.metaDataItem("UDI"); @@ -252,6 +254,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()); @@ -265,6 +268,9 @@ void PlacesItem::initializeDevice(const QString& udi) } 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)); + } else if (m_mtp && m_mtp->supportedProtocols().contains("mtp")) { + setText(m_device.product()); + setUrl(QString("mtp:udi=%1").arg(m_device.udi())); } } |
