diff --git a/applet/contents/ui/DeviceListItem.qml b/applet/contents/ui/DeviceListItem.qml --- a/applet/contents/ui/DeviceListItem.qml +++ b/applet/contents/ui/DeviceListItem.qml @@ -33,13 +33,20 @@ draggable: false label: { - if (currentPort) { - if (onlyone) { + if (currentPort && currentPort.description) { + if (onlyone || !Description) { return currentPort.description; + } else { + return i18nc("label of device items", "%1 (%2)", currentPort.description, Description); } - return i18nc("label of device items", "%1 (%2)", currentPort.description, Description); } - return Description; + if (Description) { + return Description; + } + if (Name) { + return Name; + } + return i18n("Device name not found"); } onCurrentActivePortIndexChanged: { diff --git a/applet/contents/ui/ListItemBase.qml b/applet/contents/ui/ListItemBase.qml --- a/applet/contents/ui/ListItemBase.qml +++ b/applet/contents/ui/ListItemBase.qml @@ -134,7 +134,7 @@ Item { Layout.fillWidth: true - visible: contextMenuButton.visble + visible: contextMenuButton.visible } SmallToolButton { diff --git a/applet/contents/ui/StreamListItem.qml b/applet/contents/ui/StreamListItem.qml --- a/applet/contents/ui/StreamListItem.qml +++ b/applet/contents/ui/StreamListItem.qml @@ -25,7 +25,16 @@ import org.kde.plasma.private.volume 0.1 ListItemBase { - label: Client ? Client.name : Name + label: { + if (Client && Client.name) { + return Client.name; + } + if (Name) { + return Name; + } + return i18n("Stream name not found"); + } + icon: IconName iconUsesPlasmaTheme: false }