diff --git a/applets/notifications/package/contents/ui/JobItem.qml b/applets/notifications/package/contents/ui/JobItem.qml index a23b7cc2a..2d8a67d6e 100644 --- a/applets/notifications/package/contents/ui/JobItem.qml +++ b/applets/notifications/package/contents/ui/JobItem.qml @@ -1,197 +1,200 @@ /* * Copyright 2019 Kai Uwe Broulik * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 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 14 of version 3 of the license. * * This program 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 General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see */ import QtQuick 2.8 import QtQuick.Window 2.2 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.notificationmanager 1.0 as NotificationManager import org.kde.plasma.private.notifications 2.0 as Notifications ColumnLayout { id: jobItem property int jobState property int jobError property alias percentage: progressBar.value property alias suspendable: suspendButton.visible property alias killable: killButton.visible property bool hovered property QtObject jobDetails // TOOD make an alias on visible if we're not doing an animation property bool showDetails readonly property alias menuOpen: otherFileActionsMenu.visible signal suspendJobClicked signal resumeJobClicked signal killJobClicked signal openUrl(string url) signal fileActionInvoked spacing: 0 RowLayout { id: progressRow Layout.fillWidth: true spacing: units.smallSpacing PlasmaComponents.ProgressBar { id: progressBar Layout.fillWidth: true minimumValue: 0 maximumValue: 100 // TODO do we actually need the window visible check? perhaps I do because it can be in popup or expanded plasmoid indeterminate: visible && Window.window && Window.window.visible && percentage < 1 && jobItem.jobState === NotificationManager.Notifications.JobStateRunning // is this too annoying? && (jobItem.jobDetails.processedBytes === 0 || jobItem.jobDetails.totalBytes === 0) && jobItem.jobDetails.processedFiles === 0 //&& jobItem.jobDetails.processedDirectories === 0 } RowLayout { spacing: 0 PlasmaComponents.ToolButton { id: suspendButton tooltip: i18nc("Pause running job", "Pause") iconSource: "media-playback-pause" onClicked: jobItem.jobState === NotificationManager.Notifications.JobStateSuspended ? jobItem.resumeJobClicked() : jobItem.suspendJobClicked() } PlasmaComponents.ToolButton { id: killButton tooltip: i18nc("Cancel running job", "Cancel") iconSource: "media-playback-stop" onClicked: jobItem.killJobClicked() } PlasmaComponents.ToolButton { id: expandButton Layout.leftMargin: units.smallSpacing iconSource: checked ? "arrow-down" : (LayoutMirroring.enabled ? "arrow-left" : "arrow-right") tooltip: checked ? i18nc("A button tooltip; hides item details", "Hide Details") : i18nc("A button tooltip; expands the item to show details", "Show Details") checkable: true enabled: jobItem.jobDetails && jobItem.jobDetails.hasDetails } } } Loader { Layout.fillWidth: true active: expandButton.checked // Loader doesn't reset its height when unloaded, just hide it altogether visible: active sourceComponent: JobDetails { jobDetails: jobItem.jobDetails } } Flow { // it's a Flow so it can wrap if too long id: jobDoneActions Layout.fillWidth: true spacing: units.smallSpacing // We want the actions to be right-aligned but Flow also reverses // the order of items, so we put them in reverse order layoutDirection: Qt.RightToLeft visible: url && url.toString() !== "" property var url: { if (jobItem.jobState !== NotificationManager.Notifications.JobStateStopped || jobItem.jobError || !jobItem.jobDetails || jobItem.jobDetails.totalFiles <= 0) { return null; } // For a single file show actions for it if (jobItem.jobDetails.totalFiles === 1) { return jobItem.jobDetails.descriptionUrl; } else { return jobItem.jobDetails.destUrl; } } PlasmaComponents.Button { id: otherFileActionsButton + height: Math.max(implicitHeight, openButton.implicitHeight) iconName: "application-menu" tooltip: i18n("More Options...") checkable: true onPressedChanged: { if (pressed) { checked = Qt.binding(function() { return otherFileActionsMenu.visible; }); otherFileActionsMenu.open(-1, -1); } } Notifications.FileMenu { id: otherFileActionsMenu url: jobDoneActions.url || "" visualParent: otherFileActionsButton onActionTriggered: jobItem.fileActionInvoked() } } PlasmaComponents.Button { + id: openButton + height: Math.max(implicitHeight, otherFileActionsButton.implicitHeight) // would be nice to have the file icon here? text: jobItem.jobDetails && jobItem.jobDetails.totalFiles > 1 ? i18n("Open Containing Folder") : i18n("Open") onClicked: jobItem.openUrl(jobDoneActions.url) width: minimumWidth } } states: [ State { when: jobItem.jobState === NotificationManager.Notifications.JobStateSuspended PropertyChanges { target: suspendButton tooltip: i18nc("Resume paused job", "Resume") iconSource: "media-playback-start" } PropertyChanges { target: progressBar enabled: false } }, State { when: jobItem.jobState === NotificationManager.Notifications.JobStateStopped PropertyChanges { target: progressRow visible: false } PropertyChanges { target: expandButton checked: false } } ] }