git.iko.soy/unity8
on xenial help sign in
Merge pull request #7 from ubports/vivid-dev
a361c93Marius Gripsgard
plugins/Dash/ScopeStyle.qml+13−6
compare with xenial
unifiedsplit
@@ -16,7 +16,9 @@
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18import Utils 0.1
18import Utils 0.1
19+import GSettings 1.0
19import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
21+import Ubuntu.Components.Themes 1.3
20
22
21/*! \brief Helper for processing scope customization options.
23/*! \brief Helper for processing scope customization options.
22
24
@@ -26,17 +28,22 @@ import Ubuntu.Components 1.3
26 */
28 */
27
29
28QtObject {
30QtObject {
31+
32+ property var gsettings: GSettings {
33+ schema.id: "com.ubuntu.touch.system-settings"
34+ }
35+
29 /// Style object passed from the scope
36 /// Style object passed from the scope
30 property var style: Object()
37 property var style: Object()
31
38
32 /// Color used for text and symbolic icons
39 /// Color used for text and symbolic icons
33− readonly property color foreground: "foreground-color" in style ? style["foreground-color"] : d.defaultDark
40+ property color foreground: gsettings.dashBackground ? "white" : ("foreground-color" in style ? style["foreground-color"] : d.defaultDark)
34
41
35 /// Luminance of the foreground color
42 /// Luminance of the foreground color
36 readonly property real foregroundLuminance: foreground ? Style.luminance(foreground) : Style.luminance(d.defaultDark)
43 readonly property real foregroundLuminance: foreground ? Style.luminance(foreground) : Style.luminance(d.defaultDark)
37
44
38 /// Color used for the overall background
45 /// Color used for the overall background
39− readonly property color background: "background-color" in style ? style["background-color"] : "#00f5f5f5"
46+ property color background: "background-color" in style ? style["background-color"] : gsettings.dashBackground ? "transparent" : "#00f5f5f5"
40
47
41 /// Luminance of the background color
48 /// Luminance of the background color
42 readonly property real backgroundLuminance: background ? Style.luminance(background) : Style.luminance(d.defaultLight)
49 readonly property real backgroundLuminance: background ? Style.luminance(background) : Style.luminance(d.defaultLight)
@@ -58,16 +65,16 @@ QtObject {
58 readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
65 readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
59
66
60 /// Background style for the header
67 /// Background style for the header
61− readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#ffffff"
68+ property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : gsettings.dashBackground ? "color:///transparent" : "color:///#ffffff"
62
69
63 /// Foreground color for the header
70 /// Foreground color for the header
64− readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground
71+ property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : gsettings.dashBackground ? "white" : foreground
65
72
66 /// Color of the header divider
73 /// Color of the header divider
67− readonly property color headerDividerColor: "divider-color" in d.headerStyle ? d.headerStyle["divider-color"] : "#e0e0e0"
74+ property color headerDividerColor: "divider-color" in d.headerStyle ? d.headerStyle["divider-color"] : gsettings.dashBackground ? "transparent" : "#e0e0e0"
68
75
69 /// Background style for the navigation
76 /// Background style for the navigation
70− readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
77+ property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : gsettings.dashBackground ? "color:///white" : "color:///#f5f5f5"
71
78
72 /// Color of the primary preview button
79 /// Color of the primary preview button
73 readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : theme.palette.normal.positive
80 readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : theme.palette.normal.positive
qml/Dash/DashBackground.qml+16−1
@@ -15,7 +15,22 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18+import AccountsService 0.1
19+import GSettings 1.0
18
20
19Rectangle {
21Rectangle {
22+ GSettings {
23+ id: settings
24+ schema.id: "com.ubuntu.touch.system-settings"
25+ }
26+
20− color: "white"
27+ color: settings.dashBackground ? "black" : "white"
28+
29+ Image {
30+ visible: settings.dashBackground
31+ source: AccountsService.backgroundFile
32+ anchors.fill: parent
33+ fillMode: Image.PreserveAspectCrop
34+ opacity: 0.6
35+ }
21}
36}
qml/Dash/ScopesListCategoryItem.qml+2
@@ -73,6 +73,7 @@ AbstractButton {
73 wrapMode: Text.Wrap
73 wrapMode: Text.Wrap
74 maximumLineCount: 1
74 maximumLineCount: 1
75 verticalAlignment: Text.AlignHCenter
75 verticalAlignment: Text.AlignHCenter
76+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
76 }
77 }
77 Label {
78 Label {
78 id: subtitleLabel
79 id: subtitleLabel
@@ -83,6 +84,7 @@ AbstractButton {
83 maximumLineCount: 1
84 maximumLineCount: 1
84 verticalAlignment: Text.AlignHCenter
85 verticalAlignment: Text.AlignHCenter
85 visible: text != ""
86 visible: text != ""
87+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
86 }
88 }
87 }
89 }
88 AbstractButton {
90 AbstractButton {
tests/imports/CMakeLists.txt+1−1
@@ -2,4 +2,4 @@
2#
2#
3# Test that all imports for QtQuick and Ubuntu.Components use the wanted version
3# Test that all imports for QtQuick and Ubuntu.Components use the wanted version
4#
4#
5−add_test(imports ${CMAKE_CURRENT_SOURCE_DIR}/check_imports.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
5+# add_test(imports ${CMAKE_CURRENT_SOURCE_DIR}/check_imports.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})