git.iko.soy/unity8
on xenial help sign in
selecting a favorite "works"
cdbceceAlbert Astals
qml/Dash/DashContent.qml+7−2
compare with xenial
unifiedsplit
@@ -98,12 +98,17 @@ Item {
98 anchors.fill: parent
98 anchors.fill: parent
99 scope: scopes ? scopes.getScope("scopesOverview") : null
99 scope: scopes ? scopes.getScope("scopesOverview") : null
100 progress: overviewController.progress
100 progress: overviewController.progress
101+ scopeScale: dashContentListHolder.scale
101− onDone: {
102+ onDone: hide();
103+ onFavoriteSelected: {
104+ dashContentList.currentIndex = index;
105+ hide();
106+ }
107+ function hide() {
102 overviewController.enableAnimation = true;
108 overviewController.enableAnimation = true;
103 overviewController.progress = 0;
109 overviewController.progress = 0;
104 overviewController.accepted = false;
110 overviewController.accepted = false;
105 }
111 }
106− scopeScale: dashContentListHolder.scale
107 }
112 }
108
113
109 Item {
114 Item {
qml/Dash/ScopesOverview.qml+12−1
@@ -25,7 +25,9 @@ Item {
25 property var scope: null
25 property var scope: null
26 property real scopeScale: 1
26 property real scopeScale: 1
27
27
28− signal done
28+ signal done()
29+ signal favoriteSelected(int index)
30+ signal allSelected(var scope)
29
31
30 Image {
32 Image {
31 anchors.fill: parent
33 anchors.fill: parent
@@ -136,6 +138,8 @@ Item {
136 id: middleItems
138 id: middleItems
137 model: scope ? scope.categories : null
139 model: scope ? scope.categories : null
138 delegate: Loader {
140 delegate: Loader {
141+ id: loader
142+
139 height: {
143 height: {
140 if (index == 0) {
144 if (index == 0) {
141 return parent.height;
145 return parent.height;
@@ -197,6 +201,13 @@ Item {
197 item.extraHeight = bottomBar.height;
201 item.extraHeight = bottomBar.height;
198 }
202 }
199 }
203 }
204+
205+ Connections {
206+ target: loader.item
207+ onClicked: {
208+ if (tabBarHolder.currentTab == 0) root.favoriteSelected(index)
209+ }
210+ }
200 }
211 }
201 }
212 }
202
213