git.iko.soy/unity8
on xenial help sign in
Add the preview list
ed1a5d2Albert Astals
qml/Dash/PreviewListView.qml+2−2
compare with xenial
unifiedsplit
@@ -90,7 +90,7 @@ Item {
90 height: previewListView.height
90 height: previewListView.height
91 width: previewListView.width
91 width: previewListView.width
92
92
93− readonly property bool ready: preview.previewModel.loaded
93+ readonly property bool ready: preview.previewModel && preview.previewModel.loaded
94
94
95 Previews.Preview {
95 Previews.Preview {
96 id: preview
96 id: preview
@@ -110,7 +110,7 @@ Item {
110 id: processingMouseArea
110 id: processingMouseArea
111 objectName: "processingMouseArea"
111 objectName: "processingMouseArea"
112 anchors.fill: parent
112 anchors.fill: parent
113− enabled: !preview.previewModel.loaded || preview.previewModel.processingAction
113+ enabled: preview.previewModel && (!preview.previewModel.loaded || preview.previewModel.processingAction)
114
114
115 ActivityIndicator {
115 ActivityIndicator {
116 anchors.centerIn: parent
116 anchors.centerIn: parent
qml/Dash/ScopesOverview.qml+200−174
@@ -24,6 +24,10 @@ Item {
24 property real progress: 0
24 property real progress: 0
25 property var scope: null
25 property var scope: null
26 property real scopeScale: 1
26 property real scopeScale: 1
27+ property QtObject scopeStyle: QtObject {
28+ property string headerLogo: ""
29+ property color foreground: "white"
30+ }
27
31
28 signal done()
32 signal done()
29 signal favoriteSelected(int index)
33 signal favoriteSelected(int index)
@@ -39,218 +43,240 @@ Item {
39 }
43 }
40
44
41 Item {
45 Item {
42− id: topBar
46+ id: scopesOverviewContent
47+ x: previewListView.open ? -width : 0
48+ Behavior on x { UbuntuNumberAnimation { } }
43 width: parent.width
49 width: parent.width
44− height: childrenRect.height
50+ height: parent.height
45
51
52+ Item {
53+ id: topBar
54+ width: parent.width
55+ height: childrenRect.height
56+
46− y: {
57+ y: {
47− if (root.progress < 0.5) {
58+ if (root.progress < 0.5) {
48− return -height;
59+ return -height;
49− } else {
60+ } else {
50− return -height + (root.progress - 0.5) * height * 2;
61+ return -height + (root.progress - 0.5) * height * 2;
62+ }
51 }
63 }
52− }
53
64
54− PageHeader {
65+ PageHeader {
55− id: pageHeader
66+ id: pageHeader
56− width: parent.width
67+ width: parent.width
57− clip: true
68+ clip: true
58− title: i18n.tr("Manage Dash")
69+ title: i18n.tr("Manage Dash")
59− scopeStyle: QtObject {
70+ scopeStyle: root.scopeStyle
60− property string headerLogo: ""
71+ showSignatureLine: false
61− property color foreground: "white"
72+ searchEntryEnabled: true
73+ // searchInProgress: scope ? scope.searchInProgress : false
62 }
74 }
63− showSignatureLine: false
64− searchEntryEnabled: true
65−// searchInProgress: scope ? scope.searchInProgress : false
66− }
67
75
68− Item {
76+ Item {
69− id: tabBarHolder
77+ id: tabBarHolder
70
78
71− property int currentTab: 0
79+ property int currentTab: 0
72
80
73− anchors {
81+ anchors {
74− left: parent.left
82+ left: parent.left
75− right: parent.right
83+ right: parent.right
76− top: pageHeader.bottom
84+ top: pageHeader.bottom
77− margins: units.gu(2)
85+ margins: units.gu(2)
78− }
86+ }
79− height: units.gu(4)
87+ height: units.gu(4)
80
88
81− AbstractButton {
89+ AbstractButton {
82− id: tab1
90+ id: tab1
83− height: parent.height
91+ height: parent.height
84− width: parent.width / 2
92+ width: parent.width / 2
85− Rectangle {
93+ Rectangle {
86− anchors.fill: parent
94+ anchors.fill: parent
87− color: tabBarHolder.currentTab == 0 ? "white" : "transparent"
95+ color: tabBarHolder.currentTab == 0 ? "white" : "transparent"
88− radius: units.dp(10)
96+ radius: units.dp(10)
97+ }
98+ Label {
99+ anchors.centerIn: parent
100+ text: i18n.tr("Favourites")
101+ color: tabBarHolder.currentTab == 0 ? "black" : "white"
102+ }
103+ onClicked: tabBarHolder.currentTab = 0
89 }
104 }
105+ AbstractButton {
106+ id: tab2
107+ x: width
108+ height: parent.height
109+ width: parent.width / 2
110+ Rectangle {
111+ anchors.fill: parent
112+ color: tabBarHolder.currentTab == 1 ? "white" : "transparent"
113+ radius: units.dp(10)
114+ }
90− Label {
115+ Label {
91− anchors.centerIn: parent
116+ anchors.centerIn: parent
92− text: i18n.tr("Favourites")
117+ text: i18n.tr("All")
93− color: tabBarHolder.currentTab == 0 ? "black" : "white"
118+ color: tabBarHolder.currentTab == 1 ? "black" : "white"
119+ }
120+ onClicked: tabBarHolder.currentTab = 1
121+ }
122+ Rectangle {
123+ id: centerPiece
124+ width: units.dp(10)
125+ height: parent.height
126+ color: "white"
127+ x: tabBarHolder.currentTab == 1 ? tab2.x : tab2.x - width
94 }
128 }
95− onClicked: tabBarHolder.currentTab = 0
96− }
97− AbstractButton {
98− id: tab2
99− x: width
100− height: parent.height
101− width: parent.width / 2
102 Rectangle {
129 Rectangle {
130+ id: border
103 anchors.fill: parent
131 anchors.fill: parent
104− color: tabBarHolder.currentTab == 1 ? "white" : "transparent"
105 radius: units.dp(10)
132 radius: units.dp(10)
133+ color: "transparent"
134+ border.color: centerPiece.color
135+ border.width: units.dp(1)
106 }
136 }
107− Label {
108− anchors.centerIn: parent
109− text: i18n.tr("All")
110− color: tabBarHolder.currentTab == 1 ? "black" : "white"
111− }
112− onClicked: tabBarHolder.currentTab = 1
113− }
114− Rectangle {
115− id: centerPiece
116− width: units.dp(10)
117− height: parent.height
118− color: "white"
119− x: tabBarHolder.currentTab == 1 ? tab2.x : tab2.x - width
120− }
121− Rectangle {
122− id: border
123− anchors.fill: parent
124− radius: units.dp(10)
125− color: "transparent"
126− border.color: centerPiece.color
127− border.width: units.dp(1)
128 }
137 }
129 }
138 }
130− }
131
139
132− Repeater {
140+ Repeater {
133− id: middleItems
141+ id: middleItems
134− model: scope ? scope.categories : null
142+ model: scope ? scope.categories : null
135− delegate: Loader {
143+ delegate: Loader {
136− id: loader
144+ id: loader
137
145
138− height: {
146+ height: {
139− if (index == 0) {
147+ if (index == 0) {
140− return parent.height;
148+ return parent.height;
141− } else {
149+ } else {
142− return parent.height - topBar.height - units.gu(2)
150+ return parent.height - topBar.height - units.gu(2)
151+ }
143 }
152 }
144− }
145− width: {
153+ width: {
146− if (index == 0) {
154+ if (index == 0) {
147− return parent.width / scopeScale
155+ return parent.width / scopeScale
148− } else {
156+ } else {
149− return parent.width
157+ return parent.width
158+ }
150 }
159 }
151− }
152− x: {
160+ x: {
153− if (index == 0) {
161+ if (index == 0) {
154− return (root.width - width) / 2;
162+ return (root.width - width) / 2;
155− } else {
163+ } else {
156− return 0;
164+ return 0;
165+ }
166+ }
167+ anchors {
168+ bottom: parent.bottom
157 }
169 }
158− }
159− anchors {
160− bottom: parent.bottom
161− }
162
170
163− scale: index == 0 ? scopeScale : 1
171+ scale: index == 0 ? scopeScale : 1
164
172
165− opacity: tabBarHolder.currentTab == index ? 1 : 0
173+ opacity: tabBarHolder.currentTab == index ? 1 : 0
166− Behavior on opacity { UbuntuNumberAnimation { } }
174+ Behavior on opacity { UbuntuNumberAnimation { } }
167− enabled: opacity == 1
175+ enabled: opacity == 1
168
176
169− clip: index == 1
177+ clip: index == 1
170
178
171− CardTool {
179+ CardTool {
172− id: cardTool
180+ id: cardTool
173− objectName: "cardTool"
181+ objectName: "cardTool"
174− count: results.count
182+ count: results.count
175− template: model.renderer
183+ template: model.renderer
176− components: model.components
184+ components: model.components
177− viewWidth: parent.width
185+ viewWidth: parent.width
178− }
186+ }
179
187
180− source: {
188+ source: {
181− if (index == 0) return "ScopesOverviewFavourites.qml";
189+ if (index == 0) return "ScopesOverviewFavourites.qml";
182− else if (index == 1) return "ScopesOverviewAll.qml";
190+ else if (index == 1) return "ScopesOverviewAll.qml";
183− else {
191+ else {
184− console.log("WARNING: ScopesOverview scope is not supposed to have more than 2 categories");
192+ console.log("WARNING: ScopesOverview scope is not supposed to have more than 2 categories");
185− return "";
193+ return "";
194+ }
186 }
195 }
187− }
188
196
189− onLoaded: {
197+ onLoaded: {
190− item.model = Qt.binding(function() { return results })
198+ item.model = Qt.binding(function() { return results })
191− item.cardTool = cardTool;
199+ item.cardTool = cardTool;
192− if (index == 0) {
200+ if (index == 0) {
193− item.scopeWidth = root.width;
201+ item.scopeWidth = root.width;
194− item.scopeHeight = root.height;
202+ item.scopeHeight = root.height;
195− } else if (index == 1) {
203+ } else if (index == 1) {
196− item.extraHeight = bottomBar.height;
204+ item.extraHeight = bottomBar.height;
205+ }
197 }
206 }
198− }
199
207
200− Connections {
208+ Connections {
201− target: loader.item
209+ target: loader.item
202− onClicked: {
210+ onClicked: {
203− if (tabBarHolder.currentTab == 0) {
211+ if (tabBarHolder.currentTab == 0) {
204− root.favoriteSelected(index)
212+ root.favoriteSelected(index)
205− } else {
213+ } else {
206− // This will result in an openScope
214+ // This will result in an openScope
207− // that we handle in Dash.qml
215+ // that we handle in Dash.qml
208− scope.activate(result)
216+ scope.activate(result)
217+ }
209 }
218 }
219+ onPressAndHold: {
220+ previewListView.model = target.model;
221+ previewListView.currentIndex = -1
222+ previewListView.currentIndex = index;
223+ previewListView.open = true
224+ }
210− }
225+ }
211 }
226 }
212 }
227 }
213− }
214
228
215− Rectangle {
229+ Rectangle {
216− id: bottomBar
230+ id: bottomBar
217− color: "black"
231+ color: "black"
218− height: units.gu(6)
232+ height: units.gu(6)
219− width: parent.width
233+ width: parent.width
220− opacity: 0.4
234+ opacity: 0.4
221− y: {
235+ y: {
222− if (root.progress < 0.5) {
236+ if (root.progress < 0.5) {
223− return parent.height;
237+ return parent.height;
224− } else {
238+ } else {
225− return parent.height - (root.progress - 0.5) * height * 2;
239+ return parent.height - (root.progress - 0.5) * height * 2;
240+ }
226 }
241 }
227− }
228
242
229− AbstractButton {
243+ AbstractButton {
230− width: Math.max(label.width + units.gu(2), units.gu(10))
244+ width: Math.max(label.width + units.gu(2), units.gu(10))
231− height: units.gu(4)
245+ height: units.gu(4)
232− anchors {
246+ anchors {
233− left: parent.left
247+ left: parent.left
234− leftMargin: units.gu(2)
248+ leftMargin: units.gu(2)
235− verticalCenter: parent.verticalCenter
249+ verticalCenter: parent.verticalCenter
236− }
250+ }
237− Rectangle {
251+ Rectangle {
238− anchors.fill: parent
252+ anchors.fill: parent
239− border.color: "white"
253+ border.color: "white"
240− border.width: units.dp(1)
254+ border.width: units.dp(1)
241− radius: units.dp(10)
255+ radius: units.dp(10)
242− color: parent.pressed ? "gray" : "transparent"
256+ color: parent.pressed ? "gray" : "transparent"
243− }
257+ }
244− Label {
258+ Label {
245− id: label
259+ id: label
246− anchors.centerIn: parent
260+ anchors.centerIn: parent
247− text: i18n.tr("Done")
261+ text: i18n.tr("Done")
248− color: parent.pressed ? "black" : "white"
262+ color: parent.pressed ? "black" : "white"
249− }
263+ }
250− onClicked: {
264+ onClicked: {
251− root.done();
265+ root.done();
252− tabBarHolder.currentTab = 0;
266+ tabBarHolder.currentTab = 0;
267+ }
253 }
268 }
254 }
269 }
255 }
270 }
271+
272+ PreviewListView {
273+ id: previewListView
274+ objectName: "scopesOverviewPreviewListView"
275+ scope: root.scope
276+ scopeStyle: root.scopeStyle
277+ visible: x != width
278+ width: parent.width
279+ height: parent.height
280+ anchors.left: scopesOverviewContent.right
281+ }
256}
282}
qml/Dash/ScopesOverviewAll.qml+3−1
@@ -15,6 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18+import Ubuntu.Components 0.1
18
19
19Flickable {
20Flickable {
20 id: root
21 id: root
@@ -25,6 +26,7 @@ Flickable {
25 property real extraHeight: 0
26 property real extraHeight: 0
26
27
27 signal clicked(int index, var result)
28 signal clicked(int index, var result)
29+ signal pressAndHold(int index)
28
30
29 contentHeight: cardFilterGrid.height + extraHeight
31 contentHeight: cardFilterGrid.height + extraHeight
30 contentWidth: cardFilterGrid.width
32 contentWidth: cardFilterGrid.width
@@ -41,7 +43,7 @@ Flickable {
41 root.clicked(index, result);
43 root.clicked(index, result);
42 }
44 }
43 onPressAndHold: {
45 onPressAndHold: {
44− console.log("onPressAndHold TODO");
46+ root.pressAndHold(index);
45 }
47 }
46 }
48 }
47}
49}
qml/Dash/ScopesOverviewFavourites.qml+1
@@ -20,6 +20,7 @@ ListView {
20 id: root
20 id: root
21
21
22 signal clicked(int index, var result)
22 signal clicked(int index, var result)
23+ signal pressAndHold(int index)
23
24
24 property var cardTool: null
25 property var cardTool: null
25 property real scopeHeight: 0
26 property real scopeHeight: 0