git.iko.soy/unity8
on xenial help sign in
Move the title setting "up" in the hierarchy
2cd58eeAlbert Astals
qml/Dash/ScopesList.qml+8
compare with xenial
unifiedsplit
@@ -98,7 +98,15 @@ Item {
98 width: root.width
98 width: root.width
99 sourceComponent: ScopesListCategory {
99 sourceComponent: ScopesListCategory {
100 objectName: "scopesListCategory" + categoryId
100 objectName: "scopesListCategory" + categoryId
101+
101 model: results
102 model: results
103+
104+ title: {
105+ if (isFavoritesFeed) return i18n.tr("Home");
106+ else if (isOtherFeed) return i18n.tr("Others");
107+ else return name;
108+ }
109+
102 editMode: root.state == "edit"
110 editMode: root.state == "edit"
103
111
104 isFavoritesFeed: categoryId == "favorites"
112 isFavoritesFeed: categoryId == "favorites"
qml/Dash/ScopesListCategory.qml+1−5
@@ -23,6 +23,7 @@ Item {
23 id: root
23 id: root
24
24
25 property alias model: list.model
25 property alias model: list.model
26+ property alias title: header.text
26 property var scopeStyle
27 property var scopeStyle
27 property bool editMode: false
28 property bool editMode: false
28 property bool isFavoritesFeed: false
29 property bool isFavoritesFeed: false
@@ -41,11 +42,6 @@ Item {
41 id: header
42 id: header
42 width: root.width
43 width: root.width
43 height: units.gu(5)
44 height: units.gu(5)
44− text: {
45− if (isFavoritesFeed) return i18n.tr("Home");
46− else if (isOtherFeed) return i18n.tr("Others");
47− else return name;
48− }
49 color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
45 color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
50 }
46 }
51
47