git.iko.soy/unity8
on xenial help sign in
Update headers for Dash and Splash to work properly with the new UI toolkit release.
2db15d1Michał Sawicz
debian/control+4−4
compare with xenial
unifiedsplit
@@ -55,7 +55,7 @@ Build-Depends: cmake,
55 qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
55 qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
56 qtdeclarative5-ubuntu-content1,
56 qtdeclarative5-ubuntu-content1,
57 qtdeclarative5-ubuntu-settings-components (>= 0.7),
57 qtdeclarative5-ubuntu-settings-components (>= 0.7),
58− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
58+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
59 qtdeclarative5-ubuntu-web-plugin,
59 qtdeclarative5-ubuntu-web-plugin,
60 ttf-ubuntu-font-family,
60 ttf-ubuntu-font-family,
61Standards-Version: 3.9.4
61Standards-Version: 3.9.4
@@ -70,7 +70,7 @@ X-Ubuntu-Use-Langpack: yes
70Package: indicators-client
70Package: indicators-client
71Architecture: amd64 armhf i386
71Architecture: amd64 armhf i386
72Depends: qmenumodel-qml (>= 0.2.9),
72Depends: qmenumodel-qml (>= 0.2.9),
73− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
73+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
74 unity8 (= ${binary:Version}),
74 unity8 (= ${binary:Version}),
75 ${misc:Depends},
75 ${misc:Depends},
76 ${shlibs:Depends},
76 ${shlibs:Depends},
@@ -128,7 +128,7 @@ Architecture: all
128Depends: qml-module-qtquick-layouts,
128Depends: qml-module-qtquick-layouts,
129 qtdeclarative5-ubuntu-settings-components (>= 0.7),
129 qtdeclarative5-ubuntu-settings-components (>= 0.7),
130 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
130 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
131− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
131+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
132 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
132 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
133 ubuntu-thumbnailer-impl-0,
133 ubuntu-thumbnailer-impl-0,
134 unity-application-impl-13,
134 unity-application-impl-13,
@@ -158,7 +158,7 @@ Depends: autopilot-qt5 (>= 1.4),
158 python3-fixtures,
158 python3-fixtures,
159 python3-gi,
159 python3-gi,
160 qttestability-autopilot (>= 1.4),
160 qttestability-autopilot (>= 1.4),
161− ubuntu-ui-toolkit-autopilot (>= 1.2.1485+15.04.20150417.1-0ubuntu1),
161+ ubuntu-ui-toolkit-autopilot (>= 1.3.1796),
162 unity-scope-click,
162 unity-scope-click,
163 unity8 (= ${source:Version}),
163 unity8 (= ${source:Version}),
164 unity8-fake-env (= ${source:Version}),
164 unity8-fake-env (= ${source:Version}),
qml/Components/Header.qml+1
@@ -18,6 +18,7 @@ import Ubuntu.Components 1.3
18import Ubuntu.Components.Themes.Ambiance 1.3
18import Ubuntu.Components.Themes.Ambiance 1.3
19
19
20PageHeadStyle {
20PageHeadStyle {
21+ // FIXME: Don't use this but PageHeader from Ubuntu.Components 1.3.
21 id: root
22 id: root
22
23
23 property var styledItem: root
24 property var styledItem: root
qml/Dash/DashPageHeader.qml+4
@@ -170,6 +170,7 @@ Item {
170 anchors { left: parent.left; right: parent.right }
170 anchors { left: parent.left; right: parent.right }
171
171
172 PageHeadStyle {
172 PageHeadStyle {
173+ // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
173 id: searchHeader
174 id: searchHeader
174 anchors { left: parent.left; right: parent.right }
175 anchors { left: parent.left; right: parent.right }
175 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
176 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
@@ -179,6 +180,7 @@ Item {
179 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
180 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
180 property color panelColor: background.topColor
181 property color panelColor: background.topColor
181 panelForegroundColor: config.foregroundColor
182 panelForegroundColor: config.foregroundColor
183+ backgroundColor: "transparent"
182 config: PageHeadConfiguration {
184 config: PageHeadConfiguration {
183 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
185 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
184 backAction: Action {
186 backAction: Action {
@@ -241,6 +243,7 @@ Item {
241 }
243 }
242
244
243 PageHeadStyle {
245 PageHeadStyle {
246+ // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
244 id: header
247 id: header
245 objectName: "innerPageHeader"
248 objectName: "innerPageHeader"
246 anchors { left: parent.left; right: parent.right }
249 anchors { left: parent.left; right: parent.right }
@@ -251,6 +254,7 @@ Item {
251 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
254 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
252 property color panelColor: background.topColor
255 property color panelColor: background.topColor
253 panelForegroundColor: config.foregroundColor
256 panelForegroundColor: config.foregroundColor
257+ backgroundColor: "transparent"
254 config: PageHeadConfiguration {
258 config: PageHeadConfiguration {
255 title: root.title
259 title: root.title
256 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
260 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
qml/Stages/Splash.qml+2
@@ -76,6 +76,7 @@ Item {
76 }
76 }
77
77
78 Ambiance.PageHeadStyle {
78 Ambiance.PageHeadStyle {
79+ // FIXME: Replace PageHeadStyle by PageHeader from Ubuntu.Components 1.3.
79 id: header
80 id: header
80 anchors {
81 anchors {
81 left: parent.left;
82 left: parent.left;
@@ -86,6 +87,7 @@ Item {
86 property color dividerColor: Qt.darker(styledItem.backgroundColor, 1.1)
87 property color dividerColor: Qt.darker(styledItem.backgroundColor, 1.1)
87 property color panelColor: Qt.lighter(styledItem.backgroundColor, 1.1)
88 property color panelColor: Qt.lighter(styledItem.backgroundColor, 1.1)
88 panelForegroundColor: config.foregroundColor
89 panelForegroundColor: config.foregroundColor
90+ backgroundColor: "transparent"
89 config: PageHeadConfiguration {
91 config: PageHeadConfiguration {
90 id: headerConfig
92 id: headerConfig
91 foregroundColor: styledItem.fakeTheme.palette.normal.backgroundText
93 foregroundColor: styledItem.fakeTheme.palette.normal.backgroundText