Commit bb3a1fc1 authored by Nate Graham's avatar Nate Graham 🔩

[Desktop Toolbox] Use a clearer name when the label is shown

Summary:
When the Desktop Toolbox is dragged out of a corner, its label is shown. Currently this label is not very clear since it consists only of the name of the current activity, which by default is "Default".

This patch introduces three changes:
- When the label is shown, always prepend it with the widget's actual name: "Desktop Toolbox"
- Append the word "Activity" so it's obvious what the preceding string refers to
- Don't show the activity name if it's "Default" since this signifies that the user does not use Activities and would be confused by seeing references to a "Default Activity".

Test Plan:
There are no visible changes to the default appearance; the Desktop Toolbox still has no label when it's in a corner. When dragged out of the corner, here's how it looks with this patch:

When using the Default activity: {F6567804}

When using differently-named activity: {F6567805}

Reviewers: #vdg, #plasma, hein, GB_2

Reviewed By: #vdg, #plasma, hein, GB_2

Subscribers: GB_2, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D18528
parent 2983bb29
......@@ -27,7 +27,7 @@ import org.kde.plasma.plasmoid 2.0
Item {
id: toolBoxButton
property string text: main.Plasmoid.activityName
property string text: main.Plasmoid.activityName == i18n("Default") ? i18n("Desktop Toolbox") : i18n("Desktop Toolbox — %1 Activity", main.Plasmoid.activityName)
property bool isCorner: !buttonMouse.dragging &&
((state == "topleft") || (state == "topright") ||
(state == "bottomright") || (state == "bottomleft"))
......
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