git.iko.soy/unity8
on xenial help sign in
First attempt at the "stack" of categories
5444515Albert Astals Cid
qml/Dash/DashNavigation.qml+55−9
compare with xenial
unifiedsplit
@@ -44,15 +44,51 @@ Item {
44 : Theme.palette.normal.baseText
44 : Theme.palette.normal.baseText
45 }
45 }
46
46
47− Label {
47+ Column {
48− id: label
48+ id: headersColumn
49 anchors.top: parent.top
49 anchors.top: parent.top
50− anchors.left: parent.left
50+ width: parent.width
51− anchors.margins: units.gu(2)
51+ Repeater {
52− text: root.currentNavigation ? root.currentNavigation.label : ""
52+ model: ListModel {
53+ id: headersModel
54+ // Roles
55+ // headerText: the text to show
56+ // navigationId: the navigation Id that represents
57+ // parentNavigationId: the parent navigation Id
58+ }
59+ delegate: DashNavigationHeader {
60+ height: units.gu(5)
61+ width: parent.width
62+
63+ text: headerText
53− color: d.foregroundColor
64+ foregroundColor: d.foregroundColor
54− elide: Text.ElideRight
65+
55− maximumLineCount: 1
66+ function pop(popsNeeded) {
67+ navigationListView.currentIndex = navigationListView.currentIndex - popsNeeded;
68+ navigationModel.setProperty(navigationListView.currentIndex, "nullifyNavigation", false);
69+ navigationModel.remove(navigationModel.count - popsNeeded, popsNeeded);
70+
71+ popsNeeded = Math.min(headersModel.count, popsNeeded);
72+ // This is effectively deleting ourselves, so needs to be the last thing of the function
73+ headersModel.remove(headersModel.count - popsNeeded, popsNeeded);
74+ }
75+
76+ onBackClicked: {
77+ scope.setNavigationState(parentNavigationId);
78+
79+ var popsNeeded = headersModel.count - index + 1;
80+ pop(popsNeeded);
81+ }
82+
83+ onTextClicked: {
84+ root.leafClicked();
85+ scope.setNavigationState(navigationId);
86+
87+ var popsNeeded = headersModel.count - index;
88+ pop(popsNeeded);
89+ }
90+ }
91+ }
56 }
92 }
57
93
58 ListView {
94 ListView {
@@ -67,7 +103,7 @@ Item {
67 // nullifyNavigation: overrides navigationId to be null
103 // nullifyNavigation: overrides navigationId to be null
68 // This is used to "clear" the delegate when going "right" on the tree
104 // This is used to "clear" the delegate when going "right" on the tree
69 }
105 }
70− anchors.top: label.bottom
106+ anchors.top: headersColumn.bottom
71 property int maxHeight: -1
107 property int maxHeight: -1
72 Component.onCompleted: updateMaxHeight();
108 Component.onCompleted: updateMaxHeight();
73 function updateMaxHeight()
109 function updateMaxHeight()
@@ -109,6 +145,12 @@ Item {
109 if (hasChildren) {
145 if (hasChildren) {
110 isGoingBack = false;
146 isGoingBack = false;
111 navigationModel.append({"navigationId": newNavigationId, "nullifyNavigation": false});
147 navigationModel.append({"navigationId": newNavigationId, "nullifyNavigation": false});
148+ if (navigationModel.count > 2) {
149+ headersModel.append({"headerText": navigation.allLabel != "" ? navigation.allLabel : navigation.label,
150+ "navigationId": navigationId,
151+ "parentNavigationId": navigation.parentNavigationId
152+ });
153+ }
112 navigationListView.currentIndex++;
154 navigationListView.currentIndex++;
113 } else {
155 } else {
114 root.leafClicked();
156 root.leafClicked();
@@ -130,6 +172,10 @@ Item {
130 isGoingBack = true;
172 isGoingBack = true;
131 navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
173 navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
132 navigationListView.currentIndex--;
174 navigationListView.currentIndex--;
175+
176+ if (headersModel.count > 0) {
177+ headersModel.remove(headersModel.count - 1);
178+ }
133 }
179 }
134 onAllNavigationClicked: {
180 onAllNavigationClicked: {
135 root.leafClicked();
181 root.leafClicked();
qml/Dash/DashNavigationHeader.qmlnew file+75
@@ -0,0 +1,75 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.2
18+import Ubuntu.Components 1.1
19+import Ubuntu.Components.ListItems 1.1 as ListItem
20+
21+Row {
22+ id: root
23+
24+ property alias backVisible: backImageItem.visible
25+ property alias foregroundColor: backImage.color
26+ property alias textEnabled: textItem.enabled
27+ property alias text: textLabel.text
28+
29+ readonly property alias backButtonWidth: backImageItem.width
30+
31+ signal backClicked()
32+ signal textClicked()
33+
34+ ListItem.Standard {
35+ id: backImageItem
36+ height: parent.height
37+ width: height
38+ showDivider: false
39+
40+ Icon {
41+ id: backImage
42+ anchors.centerIn: parent
43+ name: "back"
44+ height: units.gu(2)
45+ width: height
46+ }
47+
48+ onClicked: root.backClicked();
49+ }
50+
51+ ListItem.Standard {
52+ id: textItem
53+ objectName: "allButton"
54+ height: parent.height
55+ showDivider: false
56+
57+ Label {
58+ id: textLabel
59+ anchors {
60+ verticalCenter: parent.verticalCenter
61+ left: parent.left
62+ right: parent.right
63+ leftMargin: backImageItem.visible ? 0 : units.gu(2)
64+ rightMargin: units.gu(2)
65+ }
66+ font.bold: true
67+ color: root.foregroundColor
68+ wrapMode: Text.Wrap
69+ maximumLineCount: 2
70+ elide: Text.ElideMiddle
71+ }
72+
73+ onClicked: root.textClicked();
74+ }
75+}
qml/Dash/DashNavigationList.qml+15−57
@@ -54,66 +54,21 @@ Item {
54 id: column
54 id: column
55 width: parent.width
55 width: parent.width
56
56
57− ListItem.Standard {
57+ DashNavigationHeader {
58− id: backButton
58+ id: navigationHeader
59− objectName: "backButton"
60− visible: navigation && !navigation.isRoot || false
61− height: itemHeight
62−
63− onClicked: root.goBackToParentClicked();
64−
65− Icon {
66− id: backImage
67− anchors {
68− verticalCenter: parent.verticalCenter
69− left: parent.left
70− leftMargin: units.gu(2)
71− }
72− name: "back"
73− height: units.gu(2)
74− width: height
75− color: root.foregroundColor
76− }
77
59
78− Label {
79− anchors {
80− verticalCenter: parent.verticalCenter
81− left: backImage.right
82− right: parent.right
83− leftMargin: units.gu(0.5)
84− rightMargin: units.gu(2)
85− }
86− text: navigation ? navigation.parentLabel : ""
87− color: root.foregroundColor
88− wrapMode: Text.Wrap
89− maximumLineCount: 2
90− elide: Text.ElideMiddle
91− }
92− }
93−
94− ListItem.Standard {
95− id: allButton
96− objectName: "allButton"
97− visible: navigation && (!navigation.isRoot || (!navigation.hidden && root.currentNavigation && !root.currentNavigation.isRoot && root.currentNavigation.parentNavigationId == navigation.navigationId)) || false
98 height: itemHeight
60 height: itemHeight
61+ width: parent.width
99
62
100− Label {
63+ foregroundColor: root.foregroundColor
101− anchors {
64+ backVisible: navigation && !navigation.isRoot || false
102− verticalCenter: parent.verticalCenter
65+ textEnabled: navigation &&
103− left: parent.left
66+ (!navigation.isRoot ||
104− right: parent.right
67+ (!navigation.hidden && root.currentNavigation && !root.currentNavigation.isRoot && root.currentNavigation.parentNavigationId == navigation.navigationId)) || false
105− leftMargin: units.gu(2)
106− rightMargin: units.gu(2)
107− }
108− text: navigation ? (navigation.allLabel != "" ? navigation.allLabel : navigation.label) : ""
68+ text: navigation ? (navigation.allLabel != "" ? navigation.allLabel : navigation.label) : ""
109− font.bold: true
110− color: root.foregroundColor
111− wrapMode: Text.Wrap
112− maximumLineCount: 2
113− elide: Text.ElideMiddle
114− }
115
69
70+ onBackClicked: root.goBackToParentClicked();
116− onClicked: root.allNavigationClicked();
71+ onTextClicked: root.allNavigationClicked();
117 }
72 }
118
73
119 Repeater {
74 Repeater {
@@ -124,6 +79,9 @@ Item {
124 height: root.itemHeight
79 height: root.itemHeight
125 showDivider: index != navigation.count - 1
80 showDivider: index != navigation.count - 1
126 selected: isActive
81 selected: isActive
82+ anchors.left: parent.left
83+ anchors.leftMargin: navigationHeader.backVisible ? navigationHeader.backButtonWidth : 0
84+ anchors.right: parent.right
127
85
128 onClicked: root.enterNavigation(navigationId, hasChildren)
86 onClicked: root.enterNavigation(navigationId, hasChildren)
129
87
@@ -131,7 +89,7 @@ Item {
131 anchors {
89 anchors {
132 verticalCenter: parent.verticalCenter
90 verticalCenter: parent.verticalCenter
133 left: parent.left
91 left: parent.left
134− leftMargin: units.gu(2)
92+ leftMargin: navigationHeader.backVisible ? 0 : units.gu(2)
135 right: rightIcon.visible ? rightIcon.left : parent.right
93 right: rightIcon.visible ? rightIcon.left : parent.right
136 rightMargin: rightIcon.visible ? units.gu(0.5) : units.gu(2)
94 rightMargin: rightIcon.visible ? units.gu(0.5) : units.gu(2)
137 }
95 }