diff --git a/discover/qml/ProgressView.qml b/discover/qml/ProgressView.qml index ddbb422c..ab689b4d 100644 --- a/discover/qml/ProgressView.qml +++ b/discover/qml/ProgressView.qml @@ -1,108 +1,112 @@ import QtQuick 2.1 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 import org.kde.discover 2.0 import org.kde.kirigami 2.0 as Kirigami import "navigation.js" as Navigation Kirigami.AbstractListItem { id: listItem contentItem: ColumnLayout { Label { id: label Layout.fillWidth: true Layout.leftMargin: Kirigami.Units.iconSizes.smallMedium + (LayoutMirroring.enabled ? listItem.rightPadding : listItem.leftPadding) Layout.rightMargin: Layout.leftMargin text: TransactionModel.count ? i18n("Tasks (%1%)", TransactionModel.progress) : i18n("Tasks") } ProgressBar { Layout.fillWidth: true value: TransactionModel.progress/100 } } visible: TransactionModel.count > 0 property Kirigami.OverlaySheet sheetObject: null onClicked: { if (!sheetObject) sheetObject = sheet.createObject() if (!sheetObject.sheetOpen) sheetObject.open() } onVisibleChanged: if (!visible && sheetObject) { sheetObject.close() sheetObject.destroy(100) } readonly property var v3: Component { id: sheet Kirigami.OverlaySheet { - + parent: applicationWindow().overlay + header: Kirigami.Heading { + text: i18n("Tasks") + } contentItem: ListView { + id: tasksView spacing: 0 + implicitWidth: Kirigami.Units.gridUnit * 30 Component { id: listenerComp TransactionListener {} } model: TransactionModel delegate: Kirigami.AbstractListItem { id: del separatorVisible: false hoverEnabled: model.application onClicked: { if (model.application) { Navigation.clearStack() Navigation.openApplication(model.application) } } readonly property QtObject listener: listenerComp.createObject(del, (model.transaction.resource ? {resource: model.transaction.resource} : {transaction: model.transaction})) - ColumnLayout { - width: parent.width + contentItem: ColumnLayout { RowLayout { Layout.fillWidth: true Kirigami.Icon { Layout.fillHeight: true Layout.minimumWidth: height source: model.transaction.icon } Label { Layout.alignment: Qt.AlignVCenter Layout.fillWidth: true elide: Text.ElideRight text: listener.isActive && model.transaction.downloadSpeed>0 ? i18nc("TransactioName - TransactionStatus", "%1 - %2: %3", model.transaction.name, listener.statusText, model.transaction.downloadSpeedString) : listener.isActive ? i18nc("TransactioName - TransactionStatus", "%1 - %2", model.transaction.name, listener.statusText) : model.transaction.name } ToolButton { icon.name: "dialog-cancel" visible: listener.isCancellable onClicked: listener.cancel() } ToolButton { icon.name: "system-run" visible: model.application !== undefined && model.application.isInstalled && !listener.isActive && model.application.canExecute onClicked: { model.application.invokeApplication() model.remove(index) } } } ProgressBar { Layout.fillWidth: true visible: listener.isActive value: listener.progress / 100 } } } } } } }