git.iko.soy/unity8
on xenial help sign in
Use allLabel instead of label for the header (if available)
5110796Albert Astals Cid
qml/Dash/DashNavigation.qml+1−1
compare with xenial
unifiedsplit
@@ -205,7 +205,7 @@ Item {
205 } else {
205 } else {
206 navigationModel.append({"navigationId": currentNavigation.parentNavigationId, "nullifyNavigation": false});
206 navigationModel.append({"navigationId": currentNavigation.parentNavigationId, "nullifyNavigation": false});
207 }
207 }
208− headersModel.append({"headerText": currentNavigation.label,
208+ headersModel.append({"headerText": currentNavigation.allLabel != "" ? currentNavigation.allLabel : currentNavigation.label,
209 "navigationId": currentNavigation.navigationId,
209 "navigationId": currentNavigation.navigationId,
210 "parentNavigationId": currentNavigation.parentNavigationId
210 "parentNavigationId": currentNavigation.parentNavigationId
211 });
211 });
qml/Dash/DashNavigationList.qml+1−1
@@ -65,7 +65,7 @@ Item {
65 anchors.leftMargin: itemsIndent
65 anchors.leftMargin: itemsIndent
66 anchors.right: parent.right
66 anchors.right: parent.right
67
67
68− onClicked: root.enterNavigation(navigationId, label, hasChildren)
68+ onClicked: root.enterNavigation(navigationId, allLabel != "" ? allLabel : label, hasChildren)
69
69
70 Label {
70 Label {
71 anchors {
71 anchors {