diff options
| author | Aleix Pol <aleixpol@kde.org> | 2015-09-21 15:03:38 (GMT) |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2015-09-21 15:03:38 (GMT) |
| commit | efcec90fc804456898cf1bd1572c0aff7975f50b (patch) | |
| tree | 60750f91936b66ae10596baea62ade113f807162 | |
| parent | ad1d0e7ef020afdbb11aa14be8f9a807f80a77dc (diff) | |
Don't show the upgrade button on upgradeable applications in lists
Following VDG mockups
| -rw-r--r-- | discover/qml/ApplicationsGridDelegate.qml | 1 | ||||
| -rw-r--r-- | discover/qml/ApplicationsList.qml | 1 | ||||
| -rw-r--r-- | discover/qml/InstallApplicationButton.qml | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/discover/qml/ApplicationsGridDelegate.qml b/discover/qml/ApplicationsGridDelegate.qml index 9a16deb..f58ee15 100644 --- a/discover/qml/ApplicationsGridDelegate.qml +++ b/discover/qml/ApplicationsGridDelegate.qml @@ -123,6 +123,7 @@ GridItem { componentTrue: InstallApplicationButton { application: model.application + canUpgrade: false } } } diff --git a/discover/qml/ApplicationsList.qml b/discover/qml/ApplicationsList.qml index 9b9c2a1..260836a 100644 --- a/discover/qml/ApplicationsList.qml +++ b/discover/qml/ApplicationsList.qml @@ -120,6 +120,7 @@ ScrollView { id: installButton anchors.verticalCenter: parent.verticalCenter application: model.application + canUpgrade: false visible: delegateArea.containsMouse } SystemPalette {id: pal} diff --git a/discover/qml/InstallApplicationButton.qml b/discover/qml/InstallApplicationButton.qml index e5a215b..c844168 100644 --- a/discover/qml/InstallApplicationButton.qml +++ b/discover/qml/InstallApplicationButton.qml @@ -7,8 +7,9 @@ ConditionalLoader { id: root property alias application: listener.resource - property alias isActive: listener.isActive + readonly property alias isActive: listener.isActive property Component additionalItem: null + property bool canUpgrade: true TransactionListener { id: listener @@ -51,7 +52,7 @@ ConditionalLoader onClicked: ResourcesModel.installApplication(application) } } - sourceComponent: application.canUpgrade ? updateButton : root.additionalItem + sourceComponent: (root.canUpgrade && application.canUpgrade) ? updateButton : root.additionalItem } } } |