git.iko.soy/unity8
on xenial help sign in
Merge florian's real_header_splashscreen
b020fe4Florian Boucault
qml/Stages/ApplicationWindow.qml+18−1
compare with xenial
unifiedsplit
@@ -103,7 +103,24 @@ Item {
103 active: false
103 active: false
104 anchors.fill: parent
104 anchors.fill: parent
105 sourceComponent: Component {
105 sourceComponent: Component {
106− Splash { name: d.name; image: d.icon }
106+ Splash {
107+ id: splash
108+ title: d.splashTitle ? d.splashTitle : d.name
109+ image: d.splashImage
110+ showHeader: d.splashShowHeader
111+
112+ Component.onCompleted: {
113+ if (d.splashColor.a == 1.0) {
114+ splash.backgroundColor = d.splashColor
115+ }
116+ if (d.splashColorHeader.a == 1.0) {
117+ splash.headerColor = d.splashColorHeader
118+ }
119+ if (d.splashColorFooter.a == 1.0) {
120+ splash.footerColor = d.splashColorFooter
121+ }
122+ }
123+ }
107 }
124 }
108 }
125 }
109
126
qml/Stages/Dot.qmldeleted−25
@@ -1,25 +0,0 @@
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.0
18−import Ubuntu.Components 0.1
19−
20−Rectangle {
21− radius: width
22− width: units.dp(6)
23− height: width
24− color: UbuntuColors.orange
25−}
qml/Stages/MainViewStyle.qmlnew file+78
@@ -0,0 +1,78 @@
1+/*
2+ * Copyright 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 Lesser 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 Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+import QtQuick 2.0
17+import Ubuntu.Components 1.1
18+
19+// FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
20+Item {
21+ // styling properties
22+ anchors.fill: parent
23+ z: -1
24+ id: mainViewStyle
25+
26+ /*!
27+ The background texture of the main view. The image will be drawn over the background color,
28+ so if it has (semi-)transparent pixels, in those pixels the background color will be visible.
29+ */
30+ property url backgroundSource: "artwork/background_paper.png"
31+ property var theme
32+
33+ Gradient {
34+ id: backgroundGradient
35+ GradientStop { position: 0.0; color: styledItem.headerColor }
36+ GradientStop { position: 0.83; color: styledItem.backgroundColor }
37+ GradientStop { position: 1.0; color: styledItem.footerColor }
38+ }
39+
40+ Rectangle {
41+ id: backgroundColor
42+ anchors.fill: parent
43+ color: styledItem.backgroundColor
44+ gradient: internals.isGradient ? backgroundGradient : null
45+ }
46+
47+ Image {
48+ id: backgroundTexture
49+ anchors.fill: parent
50+ source: mainViewStyle.backgroundSource
51+ fillMode: Image.Tile
52+ asynchronous: true
53+ cache: false
54+ }
55+
56+ QtObject {
57+ id: internals
58+ property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||
59+ styledItem.backgroundColor != styledItem.footerColor
60+ /*
61+ As we don't know the order the property bindings and onXXXChanged signals are evaluated
62+ we should rely only on one property when changing the theme to avoid intermediate
63+ theme changes due to properties being evaluated separately.
64+
65+ Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
66+ */
67+ property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" :
68+ (isGradient ? "SuruGradient" : "SuruDark")
69+ }
70+
71+ // automatically select the appropriate theme depending on the background colors
72+ Binding {
73+ target: theme
74+ property: "name"
75+ value: internals.theme
76+ when: internals.theme !== ""
77+ }
78+}
qml/Stages/PageHeadStyle.qmlnew file+76
@@ -0,0 +1,76 @@
1+/*
2+ * Copyright 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 Lesser 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 Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+import QtQuick 2.2
17+import Ubuntu.Components 1.1
18+import Ubuntu.Components.Styles 1.1 as Style
19+
20+// FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme
21+Style.PageHeadStyle {
22+ id: headerStyle
23+
24+ contentHeight: units.gu(7)
25+ separatorSource: "graphics/PageHeaderBaseDividerLight.sci"
26+ separatorBottomSource: "graphics/PageHeaderBaseDividerBottom.png"
27+ fontWeight: Font.Light
28+ fontSize: "x-large"
29+ textColor: styledItem.config.foregroundColor
30+ textLeftMargin: units.gu(2)
31+
32+ implicitHeight: headerStyle.contentHeight
33+
34+ property var theme
35+
36+ Label {
37+ anchors {
38+ left: parent.left
39+ leftMargin: headerStyle.textLeftMargin
40+ right: parent.right
41+ verticalCenter: parent.verticalCenter
42+ }
43+ LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
44+ text: styledItem.title
45+ font.weight: headerStyle.fontWeight
46+ fontSize: headerStyle.fontSize
47+ color: headerStyle.textColor
48+ elide: Text.ElideRight
49+ }
50+
51+ BorderImage {
52+ id: separator
53+ anchors {
54+ top: parent.bottom
55+ topMargin: separatorBottom.height
56+ left: parent.left
57+ right: parent.right
58+ }
59+ source: headerStyle.separatorSource
60+ height: styledItem.config.sections.model !== undefined ? units.gu(3) : units.gu(2)
61+ asynchronous: true
62+ cache: true
63+ }
64+
65+ Image {
66+ id: separatorBottom
67+ anchors {
68+ top: separator.bottom
69+ left: parent.left
70+ right: parent.right
71+ }
72+ source: headerStyle.separatorBottomSource
73+ asynchronous: true
74+ cache: true
75+ }
76+}
qml/Stages/PhoneStage.qml+2−2
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.2
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Ubuntu.Gestures 0.1
19import Ubuntu.Gestures 0.1
20import Unity.Application 0.1
20import Unity.Application 0.1
@@ -318,7 +318,7 @@ Rectangle {
318 !snapAnimation.running &&
318 !snapAnimation.running &&
319 priv.animateX
319 priv.animateX
320 UbuntuNumberAnimation {
320 UbuntuNumberAnimation {
321− duration: UbuntuAnimation.FastDuration
321+ duration: UbuntuAnimation.BriskDuration
322 onRunningChanged: {
322 onRunningChanged: {
323 if (!running && root.inverseProgress == 0) {
323 if (!running && root.inverseProgress == 0) {
324 spreadView.focusChanging = false;
324 spreadView.focusChanging = false;
qml/Stages/Splash.qml+55−32
@@ -14,50 +14,73 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15*/
15*/
16
16
17−import QtQuick 2.0
17+import QtQuick 2.2
18+import Ubuntu.Components 1.1
18−import Ubuntu.Components 0.1
19+import Ubuntu.Components.Themes 0.1
19import "../Components"
20import "../Components"
20
21
21−Rectangle {
22+StyledItem {
22 id: root
23 id: root
23− color: "black"
24
24
25− property string name: ""
25+ property string title: ""
26− property url image: ""
26+ property string image: ""
27+ property bool showHeader: true
28+ // mimic API of toolkit's MainView component required by MainViewStyle
29+ property color backgroundColor: theme.palette.normal.background
30+ property color headerColor: backgroundColor
31+ property color footerColor: backgroundColor
27
32
28− UbuntuShape {
33+ // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
29− id: iconShape
34+ property var theme: QtObject {
30− anchors.horizontalCenter: parent.horizontalCenter
35+ property string name: "Ambiance"
31− anchors.verticalCenter: parent.verticalCenter
36+ property Palette palette: Qt.createQmlObject("import QtQuick 2.2; import Ubuntu.Components.Themes.%1 1.1; Palette {}".arg(theme.name), root, "dynamicPalette");
32− anchors.verticalCenterOffset: -units.gu(4)
37+ }
33− width: units.gu(8)
38+
34− height: units.gu(7.5)
39+ // FIXME: should instead use future toolkit API:
40+ // style: theme.createStyleComponent("MainViewStyle.qml", root)
41+ style: Component { MainViewStyle {theme: root.theme} }
42+
43+ StyledItem {
44+ id: header
45+ anchors {
46+ left: parent.left
47+ right: parent.right
48+ }
35
49
36− radius: "medium"
50+ visible: root.showHeader
37− borderSource: "none"
38
51
39− image: Image {
52+ // mimic API of toolkit's AppHeader component required by PageHeadStyle
40− id: iconImage
53+ property Item pageStack
41− sourceSize.width: iconShape.width
54+ property Item contents
42− sourceSize.height: iconShape.height
55+ property string title: root.title
43− source: root.image
56+ property var tabsModel
44− fillMode: Image.PreserveAspectCrop
57+ property var config: QtObject {
58+ property color foregroundColor: theme.palette.selected.backgroundText
59+ property var sections
45 }
60 }
61+
62+ // FIXME: should instead use future toolkit API:
63+ // style: theme.createStyleComponent("PageHeadStyle.qml", header)
64+ style: Component { PageHeadStyle {theme: root.theme} }
46 }
65 }
47
66
48− Label {
67+ Image {
49− text: root.name
68+ id: overlaidImage
50− anchors.horizontalCenter: parent.horizontalCenter
69+ anchors.centerIn: parent
51− anchors.top: iconShape.bottom
70+ anchors.verticalCenterOffset: root.showHeader ? header.height / 2 : 0
52− anchors.topMargin: units.gu(2)
71+ sourceSize {
53− fontSize: "large"
72+ width: root.width
73+ height: root.height
74+ }
75+ source: root.image
76+ asynchronous: true
77+ cache: false
54 }
78 }
55
79
56− WaitingDots {
80+ ActivityIndicator {
57− visible: parent.visible
81+ anchors.centerIn: parent
58− anchors.horizontalCenter: parent.horizontalCenter
82+ anchors.verticalCenterOffset: root.showHeader ? header.height / 2 : 0
59− anchors.bottom: parent.bottom
83+ running: overlaidImage.status == Image.Error || overlaidImage.status == Image.Null
60− anchors.bottomMargin: units.gu(12)
61 }
84 }
62
85
63 MouseArea {
86 MouseArea {
qml/Stages/WaitingDots.qmldeleted−76
@@ -1,76 +0,0 @@
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 0.1
19−
20−Item {
21− id: waitingDots
22−
23− // center in parent; waitingDots has no size therefore anchors.centerIn cannot be used
24− x: parent.width / 2
25− y: parent.height / 2
26−
27− property var dots: [dot1, dot2, dot3]
28− property var vertices: [[-units.gu(1), -units.gu(1)],
29− [units.gu(1), -units.gu(1)],
30− [0, units.gu(1)]]
31− property int shift: 0
32−
33− function cycle () {
34− var n = vertices.length;
35− shift = (shift + 1) % n;
36−
37− for (var i = 0; i < n; i++) {
38− dots[i].x = vertices[(i+shift) % n][0];
39− dots[i].y = vertices[(i+shift) % n][1];
40− }
41− }
42−
43− Timer {
44− interval: 800
45− running: waitingDots.visible
46− repeat: true
47− triggeredOnStart: true
48− onTriggered: waitingDots.cycle()
49− }
50−
51−
52− Dot {
53− id: dot1
54− x: vertices[0][0]
55− y: vertices[0][1]
56− Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
57− Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
58− }
59−
60− Dot {
61− id: dot2
62− x: vertices[1][0]
63− y: vertices[1][1]
64− Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
65− Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
66−
67− }
68−
69− Dot {
70− id: dot3
71− x: vertices[2][0]
72− y: vertices[2][1]
73− Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
74− Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
75− }
76−}
qml/Stages/graphics/PageHeaderBaseDividerBottom@18.pngnew file

Binary file not shown.

qml/Stages/graphics/PageHeaderBaseDividerLight@18.pngnew file

Binary file not shown.

qml/Stages/graphics/PageHeaderBaseDividerLight@18.scinew file+5
@@ -0,0 +1,5 @@
1+border.top: 4
2+border.bottom: 0
3+border.left: 0
4+border.right: 0
5+source: PageHeaderBaseDividerLight@18.png
qml/Stages/graphics/background_paper@27.pngnew file

Binary file not shown.