Commit 96ad51cd authored by Nate Graham's avatar Nate Graham 🔩

Remove Icons from system tray item tooltips

Summary:
It was decided in T12778 to remove icons from tooltips for panel widgets and system tray
items. This patch implements that for system tray items, and removes the supporting code
from the backend.

Test Plan:
Apply patch
Hover the cursor over system tray items, either in the compat applet or the expanded
representation
No more redundant or inconsistent icons visible

Reviewers: #plasma, davidre, broulik, kmaterka

Reviewed By: kmaterka

Subscribers: plasma-devel

Tags: #plasma

Maniphest Tasks: T12778

Differential Revision: https://phabricator.kde.org/D28631
parent 627920bd
......@@ -28,7 +28,6 @@ PlasmaCore.ToolTipArea {
objectName: "org.kde.desktop-CompactApplet"
anchors.fill: parent
icon: plasmoid.icon
mainText: plasmoid.toolTipMainText
subText: plasmoid.toolTipSubText
location: if (plasmoid.parent && plasmoid.parent.inHiddenLayout && plasmoid.location !== PlasmaCore.Types.LeftEdge) {
......
......@@ -46,7 +46,6 @@ PlasmaCore.ToolTipArea {
/* subclasses need to assign to this tooltip properties
mainText:
subText:
icon:
*/
location: {
......
......@@ -29,7 +29,6 @@ AbstractItem {
itemId: applet ? applet.pluginName : ""
mainText: applet ? applet.toolTipMainText : ""
subText: applet ? applet.toolTipSubText : ""
icon: applet ? applet.icon : ""
mainItem: applet && applet.toolTipItem ? applet.toolTipItem : null
textFormat: applet ? applet.toolTipTextFormat : ""
active: root.activeApplet !== applet
......
......@@ -27,7 +27,6 @@ AbstractItem {
text: model.Title
mainText: model.ToolTipTitle !== "" ? model.ToolTipTitle : model.Title
subText: model.ToolTipSubTitle
icon: model.ToolTipIcon !== "" ? model.ToolTipIcon : model.Icon ? model.Icon : model.IconName
textFormat: Text.AutoText
PlasmaCore.IconItem {
......
......@@ -264,7 +264,6 @@ QHash<int, QByteArray> StatusNotifierModel::roleNames() const
roles.insert(static_cast<int>(Role::Title), QByteArrayLiteral("Title"));
roles.insert(static_cast<int>(Role::TitleChanged), QByteArrayLiteral("TitleChanged"));
roles.insert(static_cast<int>(Role::ToolTipChanged), QByteArrayLiteral("ToolTipChanged"));
roles.insert(static_cast<int>(Role::ToolTipIcon), QByteArrayLiteral("ToolTipIcon"));
roles.insert(static_cast<int>(Role::ToolTipSubTitle), QByteArrayLiteral("ToolTipSubTitle"));
roles.insert(static_cast<int>(Role::ToolTipTitle), QByteArrayLiteral("ToolTipTitle"));
roles.insert(static_cast<int>(Role::WindowId), QByteArrayLiteral("WindowId"));
......@@ -355,7 +354,6 @@ void StatusNotifierModel::dataUpdated(const QString &sourceName, const Plasma::D
updateItemData(dataItem, data, Role::Title);
updateItemData(dataItem, data, Role::TitleChanged);
updateItemData(dataItem, data, Role::ToolTipChanged);
updateItemData(dataItem, data, Role::ToolTipIcon);
updateItemData(dataItem, data, Role::ToolTipSubTitle);
updateItemData(dataItem, data, Role::ToolTipTitle);
updateItemData(dataItem, data, Role::WindowId);
......
......@@ -104,7 +104,6 @@ public:
Title,
TitleChanged,
ToolTipChanged,
ToolTipIcon,
ToolTipSubTitle,
ToolTipTitle,
WindowId
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment