kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 00:11:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/20.04'

Browse source
This commit is contained in:
Alexander Lohnau 2020-06-23 17:42:06 +02:00
parent f57ee4b64d 37df39b93b
commit d1baf3398e
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/panels/places/placesitem.cpp
View file

@ -37,7 +37,7 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
m_access(), m_access(),
m_volume(), m_volume(),
m_disc(), m_disc(),
m_mtp(), m_player(),
m_signalHandler(nullptr), m_signalHandler(nullptr),
m_bookmark() m_bookmark()
{ {
@ -140,7 +140,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
delete m_access; delete m_access;
delete m_volume; delete m_volume;
delete m_disc; delete m_disc;
delete m_mtp; delete m_player;
const QString udi = bookmark.metaDataItem(QStringLiteral("UDI")); const QString udi = bookmark.metaDataItem(QStringLiteral("UDI"));
if (udi.isEmpty()) { if (udi.isEmpty()) {
@ -207,7 +207,7 @@ void PlacesItem::initializeDevice(const QString& udi)
m_access = m_device.as<Solid::StorageAccess>(); m_access = m_device.as<Solid::StorageAccess>();
m_volume = m_device.as<Solid::StorageVolume>(); m_volume = m_device.as<Solid::StorageVolume>();
m_disc = m_device.as<Solid::OpticalDisc>(); m_disc = m_device.as<Solid::OpticalDisc>();
m_mtp = m_device.as<Solid::PortableMediaPlayer>(); m_player = m_device.as<Solid::PortableMediaPlayer>();
setText(m_device.displayName()); setText(m_device.displayName());
setIcon(m_device.icon()); setIcon(m_device.icon());
@ -228,8 +228,11 @@ void PlacesItem::initializeDevice(const QString& udi)
} else { } else {
setUrl(QUrl(QStringLiteral("audiocd:/"))); setUrl(QUrl(QStringLiteral("audiocd:/")));
} }
} else if (m_mtp) { } else if (m_player) {
setUrl(QUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi()))); const QStringList protocols = m_player->supportedProtocols();
if (!protocols.isEmpty()) {
setUrl(QUrl(QStringLiteral("%1:udi=%2").arg(protocols.first(), m_device.udi())));
}
} }
} }

2
src/panels/places/placesitem.h
View file

@ -106,7 +106,7 @@ private:
QPointer<Solid::StorageAccess> m_access; QPointer<Solid::StorageAccess> m_access;
QPointer<Solid::StorageVolume> m_volume; QPointer<Solid::StorageVolume> m_volume;
QPointer<Solid::OpticalDisc> m_disc; QPointer<Solid::OpticalDisc> m_disc;
QPointer<Solid::PortableMediaPlayer> m_mtp; QPointer<Solid::PortableMediaPlayer> m_player;
QPointer<PlacesItemSignalHandler> m_signalHandler; QPointer<PlacesItemSignalHandler> m_signalHandler;
KBookmark m_bookmark; KBookmark m_bookmark;