diff --git a/src/qtquick/qml/private/entrygriddelegates/BigPreviewDelegate.qml b/src/qtquick/qml/private/entrygriddelegates/BigPreviewDelegate.qml index 8eaee43c..fdb1a42c 100644 --- a/src/qtquick/qml/private/entrygriddelegates/BigPreviewDelegate.qml +++ b/src/qtquick/qml/private/entrygriddelegates/BigPreviewDelegate.qml @@ -1,187 +1,188 @@ /* * Copyright (C) 2019 Dan Leinir Turthra Jensen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ import QtQuick 2.11 import QtQuick.Controls 2.11 as QtControls import QtQuick.Layouts 1.11 as QtLayouts import QtGraphicalEffects 1.11 as QtEffects import org.kde.kirigami 2.12 as Kirigami import org.kde.newstuff 1.62 as NewStuff import ".." as Private Private.GridTileDelegate { id: component actionsAnchors.topMargin: bigPreview.height + Kirigami.Units.smallSpacing * 2 function showDetails() { pageStack.push(detailsPage, { newStuffModel: GridView.view.model, index: model.index, name: model.name, author: model.author, previews: model.previews, shortSummary: model.shortSummary, summary: model.summary, homepage: model.homepage, donationLink: model.donationLink, status: model.status, commentsCount: model.numberOfComments, rating: model.rating, downloadCount: model.downloadCount, downloadLinks: model.downloadLinks, providerId: model.providerId }); } actions: [ Kirigami.Action { text: root.useLabel iconName: "dialog-ok-apply" onTriggered: { model.adopt(model.index); } enabled: (model.status == NewStuff.ItemsModel.InstalledStatus || model.status == NewStuff.ItemsModel.UpdateableStatus) && newStuffEngine.hasAdoptionCommand visible: enabled }, Kirigami.Action { text: model.downloadLinks.length === 1 ? i18ndc("knewstuff5", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff5", "Show installation options, where there is more than one downloadable item", "Install..."); iconName: "install" onTriggered: { if (model.downloadLinks.length === 1) { newStuffModel.installItem(model.index, NewStuff.ItemsModel.FirstLinkId); } else { downloadItemsSheet.downloadLinks = model.downloadLinks; downloadItemsSheet.entryId = model.index; downloadItemsSheet.open(); } } enabled: model.status == NewStuff.ItemsModel.DownloadableStatus || model.status == NewStuff.ItemsModel.DeletedStatus; visible: enabled; }, Kirigami.Action { text: i18ndc("knewstuff5", "Request updating of this item", "Update"); iconName: "update" onTriggered: { newStuffModel.updateItem(model.index); } enabled: model.status == NewStuff.ItemsModel.UpdateableStatus; visible: enabled; }, Kirigami.Action { text: root.uninstallLabel iconName: "uninstall" onTriggered: { newStuffModel.uninstallItem(model.index); } enabled: model.status == NewStuff.ItemsModel.InstalledStatus visible: enabled; } ] thumbnailAvailable: model.previewsSmall.length > 0 tile: Item { anchors { fill: parent margins: Kirigami.Units.smallSpacing } QtLayouts.ColumnLayout { anchors.fill: parent; Item { QtLayouts.Layout.fillWidth: true QtLayouts.Layout.minimumHeight: width / 1.8 QtLayouts.Layout.maximumHeight: width / 1.8 Kirigami.ShadowedRectangle { anchors.centerIn: bigPreview; width: Math.min(bigPreview.paintedWidth, bigPreview.width); height: Math.min(bigPreview.paintedHeight, bigPreview.height); Kirigami.Theme.colorSet: Kirigami.Theme.View shadow.size: 10 shadow.color: Qt.rgba(0, 0, 0, 0.3) } Image { id: bigPreview asynchronous: true; fillMode: Image.PreserveAspectCrop; source: thumbnailAvailable ? model.previews[0] : ""; anchors.fill: parent } Kirigami.Icon { id: updateAvailableBadge; opacity: (model.status == NewStuff.ItemsModel.UpdateableStatus) ? 1 : 0; Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration; } } anchors { top: parent.top; left: parent.left; margins: -Kirigami.Units.smallSpacing; } height: Kirigami.Units.iconSizes.medium; width: height; source: "package-installed-outdated"; } Kirigami.Icon { id: installedBadge; opacity: (model.status == NewStuff.ItemsModel.InstalledStatus) ? 1 : 0; Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration; } } anchors { top: parent.top; left: parent.left; } height: Kirigami.Units.iconSizes.medium; width: height; source: "package-installed-updated"; } } Private.Rating { QtLayouts.Layout.fillWidth: true rating: model.rating / 10 } Kirigami.Heading { QtLayouts.Layout.fillWidth: true level: 5 elide: Text.ElideRight text: i18ndc("knewstuff5", "The number of times the item has been downloaded", "%1 downloads", model.downloadCount) } Kirigami.Heading { QtLayouts.Layout.fillWidth: true elide: Text.ElideRight level: 3 text: model.name } Kirigami.Heading { QtLayouts.Layout.fillWidth: true elide: Text.ElideRight level: 4 textFormat: Text.StyledText text: i18ndc("knewstuff5", "Subheading for the tile view, located immediately underneath the name of the item", "By %1", model.author.name) } QtControls.Label { QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillHeight: true wrapMode: Text.Wrap text: model.shortSummary.length > 0 ? model.shortSummary : model.summary elide: Text.ElideRight + clip: true // We are dealing with content over which we have very little control. Sometimes that means being a bit abrupt. } } FeedbackOverlay { anchors.fill: parent newStuffModel: component.GridView.view.model } MouseArea { anchors.fill: parent; cursorShape: Qt.PointingHandCursor; onClicked: component.showDetails(); } } } diff --git a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml index 81cad672..f39dcddb 100644 --- a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml +++ b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml @@ -1,210 +1,211 @@ /* * Copyright (C) 2019 Dan Leinir Turthra Jensen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ import QtQuick 2.11 import QtQuick.Controls 2.11 as QtControls import QtQuick.Layouts 1.11 as QtLayouts import QtGraphicalEffects 1.11 as QtEffects import org.kde.kirigami 2.12 as Kirigami import org.kde.newstuff 1.62 as NewStuff import ".." as Private Private.GridTileDelegate { id: component property string useLabel property string uninstallLabel function showDetails() { pageStack.push(detailsPage, { newStuffModel: GridView.view.model, index: model.index, name: model.name, author: model.author, previews: model.previews, shortSummary: model.shortSummary, summary: model.summary, homepage: model.homepage, donationLink: model.donationLink, status: model.status, commentsCount: model.numberOfComments, rating: model.rating, downloadCount: model.downloadCount, downloadLinks: model.downloadLinks, providerId: model.providerId }); } actions: [ Kirigami.Action { text: component.useLabel iconName: "dialog-ok-apply" onTriggered: { model.adopt(model.index); } enabled: (model.status == NewStuff.ItemsModel.InstalledStatus || model.status == NewStuff.ItemsModel.UpdateableStatus) && newStuffEngine.hasAdoptionCommand visible: enabled }, Kirigami.Action { text: model.downloadLinks.length === 1 ? i18ndc("knewstuff5", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff5", "Show installation options, where there is more than one downloadable item", "Install..."); iconName: "install" onTriggered: { if (model.downloadLinks.length === 1) { newStuffModel.installItem(model.index, NewStuff.ItemsModel.FirstLinkId); } else { downloadItemsSheet.downloadLinks = model.downloadLinks; downloadItemsSheet.entryId = model.index; downloadItemsSheet.open(); } } enabled: model.status == NewStuff.ItemsModel.DownloadableStatus || model.status == NewStuff.ItemsModel.DeletedStatus; visible: enabled; }, Kirigami.Action { text: i18ndc("knewstuff5", "Request updating of this item", "Update"); iconName: "update" onTriggered: { newStuffModel.updateItem(model.index); } enabled: model.status == NewStuff.ItemsModel.UpdateableStatus; visible: enabled; }, Kirigami.Action { text: component.uninstallLabel iconName: "uninstall" onTriggered: { newStuffModel.uninstallItem(model.index); } enabled: model.status == NewStuff.ItemsModel.InstalledStatus visible: enabled; }, Kirigami.Action { text: i18ndc("knewstuff5", "Show a page with details for this item", "Details...") iconName: "documentinfo" onTriggered: { component.showDetails(); } } ] thumbnailAvailable: model.previewsSmall.length > 0 tile: Item { anchors { fill: parent margins: Kirigami.Units.smallSpacing } QtLayouts.GridLayout { anchors.fill: parent; columns: 2 QtLayouts.ColumnLayout { QtLayouts.Layout.minimumWidth: view.implicitCellWidth / 5 QtLayouts.Layout.maximumWidth: view.implicitCellWidth / 5 Item { QtLayouts.Layout.fillWidth: true QtLayouts.Layout.minimumHeight: width QtLayouts.Layout.maximumHeight: width Kirigami.ShadowedRectangle { anchors.centerIn: tilePreview; width: Math.min(tilePreview.paintedWidth, tilePreview.width); height: Math.min(tilePreview.paintedHeight, tilePreview.height); Kirigami.Theme.colorSet: Kirigami.Theme.View shadow.size: Kirigami.Units.largeSpacing shadow.color: Qt.rgba(0, 0, 0, 0.3) } Image { id: tilePreview asynchronous: true; fillMode: Image.PreserveAspectFit; source: thumbnailAvailable ? model.previewsSmall[0] : ""; anchors { fill: parent margins: Kirigami.Units.smallSpacing } verticalAlignment: Image.AlignTop } Kirigami.Icon { id: updateAvailableBadge; opacity: (model.status == NewStuff.ItemsModel.UpdateableStatus) ? 1 : 0; Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration; } } anchors { top: parent.top; left: parent.left; margins: -Kirigami.Units.smallSpacing; } height: Kirigami.Units.iconSizes.smallMedium; width: height; source: "package-installed-outdated"; } Kirigami.Icon { id: installedBadge; opacity: (model.status == NewStuff.ItemsModel.InstalledStatus) ? 1 : 0; Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration; } } anchors { top: parent.top; left: parent.left; margins: -Kirigami.Units.smallSpacing; } height: Kirigami.Units.iconSizes.smallMedium; width: height; source: "package-installed-updated"; } } Item { QtLayouts.Layout.fillHeight: true } } QtLayouts.ColumnLayout { QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillHeight: true Kirigami.Heading { QtLayouts.Layout.fillWidth: true elide: Text.ElideRight level: 3 text: model.name } Kirigami.Heading { QtLayouts.Layout.fillWidth: true elide: Text.ElideRight level: 4 textFormat: Text.StyledText text: i18ndc("knewstuff5", "Subheading for the tile view, located immediately underneath the name of the item", "By %1", model.author.name) } QtControls.Label { QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillHeight: true wrapMode: Text.Wrap text: model.shortSummary.length > 0 ? model.shortSummary : model.summary elide: Text.ElideRight + clip: true // We are dealing with content over which we have very little control. Sometimes that means being a bit abrupt. } } Private.Rating { QtLayouts.Layout.fillWidth: true rating: model.rating / 10 } Kirigami.Heading { QtLayouts.Layout.fillWidth: true level: 5 elide: Text.ElideRight text: i18ndc("knewstuff5", "The number of times the item has been downloaded", "%1 downloads", model.downloadCount) } } FeedbackOverlay { anchors.fill: parent newStuffModel: component.GridView.view.model } MouseArea { anchors.fill: parent; cursorShape: Qt.PointingHandCursor; onClicked: component.showDetails(); } } }