1
=== modified file 'qml/Components/Lockscreen.qml'
2
--- qml/Components/Lockscreen.qml	2014-10-30 21:42:44 +0000
3
+++ qml/Components/Lockscreen.qml	2014-11-12 11:52:42 +0000
4
@@ -56,6 +56,9 @@
5
56
    property int maxPinLength: -1
56
    property int maxPinLength: -1
6
57
57
7
58
    property url background: ""
58
    property url background: ""
8
59
    // Use this to put a black overlay above the background
9
60
    // 0: normal background, 1: black background
10
61
    property real darkenBackground: 0
11
59
62
12
60
    readonly property string passphrase: (pinPadLoader.item && pinPadLoader.item.passphrase) ? pinPadLoader.item.passphrase : ""
63
    readonly property string passphrase: (pinPadLoader.item && pinPadLoader.item.passphrase) ? pinPadLoader.item.passphrase : ""
13
61
64
14
@@ -100,10 +103,22 @@
15
100
        anchors {
103
        anchors {
16
101
            fill: parent
104
            fill: parent
17
102
        }
105
        }
18
106
        // Limit how much memory we'll reserve for this image
19
107
        sourceSize.height: height
20
108
        sourceSize.width: width
21
103
        source: root.required ? root.background : ""
109
        source: root.required ? root.background : ""
22
104
        fillMode: Image.PreserveAspectCrop
110
        fillMode: Image.PreserveAspectCrop
23
105
    }
111
    }
24
106
112
25
113
    // This is to
26
114
    // a) align it with the greeter and
27
115
    // b) keep the white fonts readable on bright backgrounds
28
116
    Rectangle {
29
117
        anchors.fill: parent
30
118
        color: "black"
31
119
        opacity: root.darkenBackground
32
120
    }
33
121
34
107
    MouseArea {
122
    MouseArea {
35
108
        anchors.fill: root
123
        anchors.fill: root
36
109
        onClicked: {
124
        onClicked: {
37
110
125
38
=== modified file 'qml/Greeter/Greeter.qml'
39
--- qml/Greeter/Greeter.qml	2014-11-04 11:19:52 +0000
40
+++ qml/Greeter/Greeter.qml	2014-11-12 11:52:42 +0000
41
@@ -25,7 +25,7 @@
42
25
    enabled: shown
25
    enabled: shown
43
26
    created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
26
    created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
44
27
27
46
28
    property url defaultBackground
28
    property url background
47
29
    property bool loadContent: required
29
    property bool loadContent: required
48
30
30
49
31
    // 1 when fully shown and 0 when fully hidden
31
    // 1 when fully shown and 0 when fully hidden
50
32
32
51
=== modified file 'qml/Greeter/GreeterContent.qml'
52
--- qml/Greeter/GreeterContent.qml	2014-10-01 13:22:00 +0000
53
+++ qml/Greeter/GreeterContent.qml	2014-11-12 11:52:42 +0000
54
@@ -48,9 +48,6 @@
55
48
        color: "black"
48
        color: "black"
56
49
    }
49
    }
57
50
50
58
51
    property url backgroundValue: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : greeter.defaultBackground
59
52
    onBackgroundValueChanged: background.source = backgroundValue
60
53
61
54
    CrossFadeImage {
51
    CrossFadeImage {
62
55
        id: background
52
        id: background
63
56
        objectName: "greeterBackground"
53
        objectName: "greeterBackground"
64
@@ -62,21 +59,7 @@
65
62
        // Limit how much memory we'll reserve for this image
59
        // Limit how much memory we'll reserve for this image
66
63
        sourceSize.height: height
60
        sourceSize.height: height
67
64
        sourceSize.width: width
61
        sourceSize.width: width
83
65
    }
62
        source: greeter.background
69
66
70
67
    // See Shell.qml's backgroundSettings treatment for why we need a separate
71
68
    // Image, but it boils down to avoiding binding loop detection.
72
69
    Image {
73
70
        source: background.source
74
71
        height: 0
75
72
        width: 0
76
73
        sourceSize.height: 0
77
74
        sourceSize.width: 0
78
75
        onStatusChanged: {
79
76
            if (status == Image.Error && source != greeter.defaultBackground) {
80
77
                background.source = greeter.defaultBackground
81
78
            }
82
79
        }
84
80
    }
63
    }
85
81
64
86
82
    Rectangle {
65
    Rectangle {
87
83
66
88
=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
89
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-11-05 15:23:43 +0000
90
+++ qml/Notifications/NotificationMenuItemFactory.qml	2014-11-12 11:52:42 +0000
91
@@ -145,6 +145,7 @@
92
145
            errorText: errorAction.valid ? errorAction.state : ""
145
            errorText: errorAction.valid ? errorAction.state : ""
93
146
            retryText: notification.body
146
            retryText: notification.body
94
147
            background: shell.background
147
            background: shell.background
95
148
            darkenBackground: 0.4
96
148
149
97
149
            onEntered: {
150
            onEntered: {
98
150
                menuModel.changeState(menuIndex, passphrase);
151
                menuModel.changeState(menuIndex, passphrase);
99
151
152
100
=== modified file 'qml/Shell.qml'
101
--- qml/Shell.qml	2014-11-07 14:30:42 +0000
102
+++ qml/Shell.qml	2014-11-12 11:52:42 +0000
103
@@ -51,7 +51,8 @@
104
51
51
105
52
    property real edgeSize: units.gu(2)
52
    property real edgeSize: units.gu(2)
106
53
    property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg")
53
    property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg")
108
54
    property url background
54
    property url background: asImageTester.status == Image.Ready ? asImageTester.source
109
55
                             : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
110
55
    readonly property real panelHeight: panel.panelHeight
56
    readonly property real panelHeight: panel.panelHeight
111
56
57
112
57
    readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
58
    readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
113
@@ -98,6 +99,31 @@
114
98
        shell.activateApplication(app);
99
        shell.activateApplication(app);
115
99
    }
100
    }
116
100
101
117
102
    // This is a dummy image to detect if the custom AS set wallpaper loads successfully.
118
103
    Image {
119
104
        id: asImageTester
120
105
        source: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : ""
121
106
        height: 0
122
107
        width: 0
123
108
        sourceSize.height: 0
124
109
        sourceSize.width: 0
125
110
    }
126
111
127
112
    GSettings {
128
113
        id: backgroundSettings
129
114
        schema.id: "org.gnome.desktop.background"
130
115
    }
131
116
132
117
    // This is a dummy image to detect if the custom GSettings set wallpaper loads successfully.
133
118
    Image {
134
119
        id: gsImageTester
135
120
        source: backgroundSettings.pictureUri != undefined && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : ""
136
121
        height: 0
137
122
        width: 0
138
123
        sourceSize.height: 0
139
124
        sourceSize.width: 0
140
125
    }
141
126
142
101
    Binding {
127
    Binding {
143
102
        target: LauncherModel
128
        target: LauncherModel
144
103
        property: "applicationManager"
129
        property: "applicationManager"
145
@@ -114,15 +140,6 @@
146
114
        }
140
        }
147
115
    }
141
    }
148
116
142
149
117
    GSettings {
150
118
        id: backgroundSettings
151
119
        schema.id: "org.gnome.desktop.background"
152
120
    }
153
121
    property url gSettingsPicture: backgroundSettings.pictureUri != undefined && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : shell.defaultBackground
154
122
    onGSettingsPictureChanged: {
155
123
        shell.background = gSettingsPicture
156
124
    }
157
125
158
126
    VolumeControl {
143
    VolumeControl {
159
127
        id: volumeControl
144
        id: volumeControl
160
128
    }
145
    }
161
@@ -328,6 +345,7 @@
162
328
        width: parent.width
345
        width: parent.width
163
329
        height: parent.height - panel.panelHeight
346
        height: parent.height - panel.panelHeight
164
330
        background: shell.background
347
        background: shell.background
165
348
        darkenBackground: 0.4
166
331
        alphaNumeric: AccountsService.passwordDisplayHint === AccountsService.Keyboard
349
        alphaNumeric: AccountsService.passwordDisplayHint === AccountsService.Keyboard
167
332
        minPinLength: 4
350
        minPinLength: 4
168
333
        maxPinLength: 4
351
        maxPinLength: 4
169
@@ -523,7 +541,7 @@
170
523
541
171
524
            locked: shell.locked
542
            locked: shell.locked
172
525
543
174
526
            defaultBackground: shell.background
544
            background: shell.background
175
527
545
176
528
            width: parent.width
546
            width: parent.width
177
529
            height: parent.height
547
            height: parent.height
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-11-17
Michael Terry		2014-11-07	Approve on 2014-11-12
Olga Kemmet (community)	design		Approve on 2014-11-11
Review via email: mp+241067@code.launchpad.net