pool/kf6-knewstuff
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1157638 from KDE:Frameworks

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1157638
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kf6-knewstuff?expand=0&rev=2
This commit is contained in:
Ana Guerrero
2024-03-14 16:42:59 +00:00
committed by Git OBS Bridge
parent 80b176b700 e256c3e439
commit bbb50b5265
3 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
0001-Fix-link-list-dialog-for-installation-button.patch Normal file
View File

@@ -0,0 +1,42 @@
From 49f2037ac22fcb430fadd5d7b29bd8af234573a4 Mon Sep 17 00:00:00 2001
From: Akseli Lahtinen <akselmo@akselmo.dev>
Date: Thu, 7 Mar 2024 16:01:44 +0000
Subject: [PATCH] Fix link list dialog for installation button
In gridview, installation buttons showed "Install..." for every item,
even if the item had only single download link. This fixes it
by showing correct button.
The problem was using `entry` directly instead of `model`.
BUG: 482349
FIXED-IN: 6.1
---
.../qml/private/entrygriddelegates/TileDelegate.qml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml
index 2fdee68b..36224abe 100644
--- a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml
+++ b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml
@@ -40,13 +40,13 @@ Private.GridTileDelegate {
visible: enabled
},
Kirigami.Action {
- text: entry.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…");
+ text: model.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…");
icon.name: "install"
onTriggered: {
- if (entry.downloadLinks.length === 1) {
- newStuffEngine.install(entry.entry, NewStuff.ItemsModel.FirstLinkId);
+ if (model.downloadLinks.length === 1) {
+ newStuffEngine.install(entry, NewStuff.ItemsModel.FirstLinkId);
} else {
- downloadItemsSheet.downloadLinks = entry.downloadLinks;
+ downloadItemsSheet.downloadLinks = model.downloadLinks;
downloadItemsSheet.entry = entry;
downloadItemsSheet.open();
}
--
2.44.0

6
kf6-knewstuff.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 13 08:33:07 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Add upstream fix (kde#482349):
* 0001-Fix-link-list-dialog-for-installation-button.patch
-------------------------------------------------------------------
Wed Feb 21 19:28:02 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>

2
kf6-knewstuff.spec
View File

@@ -35,6 +35,8 @@ Source: %{rname}-%{version}.tar.xz
Source1: %{rname}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-Fix-link-list-dialog-for-installation-button.patch
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: kf6-extra-cmake-modules >= %{_kf6_bugfix_version}