From d307f6879d40b0767c01ce1a2b0c11369f81c534 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Mon, 4 Feb 2019 14:07:31 -0700 Subject: [PATCH 1/2] [image wallpaper] Show wallpaper title/filename on grid view delegates Summary: This patch makes the wallpaper chooser grid view delegates show the wallpaper's title (if it has a desktop file) or filename (if it doesn't). Authorship information is shown via a tooltip, if present. Test Plan: {F6587535, size=full} {F6587536, size=full} Reviewers: #vdg, #plasma, broulik Reviewed By: #plasma, broulik Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D18737 --- .../image/imagepackage/contents/ui/WallpaperDelegate.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml b/wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml index 9467f1623..93081c73b 100644 --- a/wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml +++ b/wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml @@ -32,8 +32,10 @@ KCM.GridDelegate { property alias color: backgroundRect.color property bool selected: (wallpapersGrid.currentIndex == index) opacity: model.pendingDeletion ? 0.5 : 1 + + text: model.display - toolTip: model.author.length > 0 ? i18nd("plasma_wallpaper_org.kde.image", "%1 by %2", model.display, model.author) : model.display + toolTip: model.author.length > 0 ? i18nd("plasma_wallpaper_org.kde.image", "By %1", model.author) : "" hoverEnabled: true From 6de5674688ed288925d702b1204368cc692c10eb Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Tue, 5 Feb 2019 07:44:03 -0700 Subject: [PATCH 2/2] Revert string change on stable branch --- wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml b/wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml index 93081c73b..12d22d66f 100644 --- a/wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml +++ b/wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml @@ -35,7 +35,7 @@ KCM.GridDelegate { text: model.display - toolTip: model.author.length > 0 ? i18nd("plasma_wallpaper_org.kde.image", "By %1", model.author) : "" + toolTip: model.author.length > 0 ? i18nd("plasma_wallpaper_org.kde.image", "%1 by %2", model.display, model.author) : "" hoverEnabled: true