Merge branch 'Plasma/5.8' into Plasma/5.9

9 years ago · 4bcc60637c
parent 567b884d3e 4d3760c8aa
commit 4bcc60637c
2 changed files with 3 additions and 0 deletions
--- a/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
+++ b/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
@ -195,6 +195,7 @@ Item {
                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                    elide: Text.ElideRight
                    text: root.track ? root.track : i18n("No media playing")
                    textFormat: Text.PlainText
                }
                PlasmaExtras.Heading {
@ -208,6 +209,7 @@ Item {
                    elide: Text.ElideRight
                    text: root.artist || ""
                    textFormat: Text.PlainText
                }
                PlasmaExtras.Heading {
--- a/applets/mediacontroller/contents/ui/main.qml
+++ b/applets/mediacontroller/contents/ui/main.qml
@ -63,6 +63,7 @@ Item {
    Plasmoid.icon: albumArt ? albumArt : "media-playback-start"
    Plasmoid.toolTipMainText: i18n("No media playing")
    Plasmoid.toolTipSubText: ""
    Plasmoid.toolTipTextFormat: Text.PlainText
    Plasmoid.status: PlasmaCore.Types.ActiveStatus
    Plasmoid.onContextualActionsAboutToShow: {