[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [discover/Plasma/5.10] discover/qml: Don't disable the updates action when there are no updates
From:       Aleix Pol <null () kde ! org>
Date:       2017-08-10 17:31:10
Message-ID: E1dfrIc-0005tJ-Dm () code ! kde ! org
[Download RAW message or body]

Git commit e28b98bb945b1067f64632159c91c2b0113b9c8d by Aleix Pol.
Committed on 10/08/2017 at 17:25.
Pushed by apol into branch 'Plasma/5.10'.

Don't disable the updates action when there are no updates

It's perfectly safe to go in there, it will just show a page saing "no
updates".
Should make this UI a bit more predictable.

BUG: 383294

M  +1    -1    discover/qml/DiscoverDrawer.qml
M  +1    -2    discover/qml/DiscoverWindow.qml

https://commits.kde.org/discover/e28b98bb945b1067f64632159c91c2b0113b9c8d

diff --git a/discover/qml/DiscoverDrawer.qml b/discover/qml/DiscoverDrawer.qml
index e572792f..ae276cdf 100644
--- a/discover/qml/DiscoverDrawer.qml
+++ b/discover/qml/DiscoverDrawer.qml
@@ -126,7 +126,7 @@ Kirigami.GlobalDrawer {
             objectName: "updateButton"
             action: updateAction
 
-            backgroundColor: action.enabled ? "orange" : \
Kirigami.Theme.viewBackgroundColor +            backgroundColor: \
ResourcesModel.updatesCount>0 ? "orange" : Kirigami.Theme.viewBackgroundColor  }
 
         states: [
diff --git a/discover/qml/DiscoverWindow.qml b/discover/qml/DiscoverWindow.qml
index 8542e4ea..0856685b 100644
--- a/discover/qml/DiscoverWindow.qml
+++ b/discover/qml/DiscoverWindow.qml
@@ -60,8 +60,7 @@ Kirigami.ApplicationWindow
     TopLevelPageData {
         id: updateAction
         iconName: enabled ? "update-low" : "update-none"
-        text: !enabled ? (ResourcesModel.isFetching ? i18n("Checking for \
updates...") : i18n("No Updates") ) : i18nc("Update section name", "Update (%1)", \
                ResourcesModel.updatesCount)
-        enabled: ResourcesModel.updatesCount>0
+        text: ResourcesModel.updatesCount<=0 ? (ResourcesModel.isFetching ? \
i18n("Checking for updates...") : i18n("No Updates") ) : i18nc("Update section name", \
"Update (%1)", ResourcesModel.updatesCount)  component: topUpdateComp
         objectName: "update"
         shortcut: "Alt+U"


[prev in list] [next in list] [prev in thread] [next in thread]