1
=== removed file 'plugins/brightness/BrightnessSlider.qml'
2
--- plugins/brightness/BrightnessSlider.qml	2014-08-11 16:13:17 +0000
3
+++ plugins/brightness/BrightnessSlider.qml	1970-01-01 00:00:00 +0000
4
@@ -1,103 +0,0 @@
5
1
/*
6
2
 * This file is part of system-settings
7
3
 *
8
4
 * Copyright (C) 2013-14 Canonical Ltd.
9
5
 *
10
6
 * Contact: Iain Lane <iain.lane@canonical.com>
11
7
 *
12
8
 * This program is free software: you can redistribute it and/or modify it
13
9
 * under the terms of the GNU General Public License version 3, as published
14
10
 * by the Free Software Foundation.
15
11
 *
16
12
 * This program is distributed in the hope that it will be useful, but
17
13
 * WITHOUT ANY WARRANTY; without even the implied warranties of
18
14
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
19
15
 * PURPOSE.  See the GNU General Public License for more details.
20
16
 *
21
17
 * You should have received a copy of the GNU General Public License along
22
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
23
19
 */
24
20
25
21
import Ubuntu.Components 0.1
26
22
import Ubuntu.Components.ListItems 0.1 as ListItem
27
23
import QtQuick 2.0
28
24
import QMenuModel 0.1
29
25
30
26
Column {
31
27
    signal pressed
32
28
    readonly property bool pressed: sliderId.pressed
33
29
34
30
    anchors {
35
31
        left: parent.left
36
32
        right: parent.right
37
33
    }
38
34
39
35
    QDBusActionGroup {
40
36
        id: indicatorPower
41
37
        busType: 1
42
38
        busName: "com.canonical.indicator.power"
43
39
        objectPath: "/com/canonical/indicator/power"
44
40
45
41
        property variant brightness: action("brightness").state
46
42
        onBrightnessChanged: { 
47
43
            sliderId.enabled = brightness != null
48
44
            sliderId.value = sliderId.enabled ? brightness * 100 : 0.0
49
45
        }
50
46
    }
51
47
52
48
    Component.onCompleted: indicatorPower.start()
53
49
54
50
    ListItem.Standard {
55
51
        text: i18n.tr("Display brightness")
56
52
        showDivider: false
57
53
    }
58
54
59
55
    ListItem.Base {
60
56
61
57
        Icon {
62
58
            id: iconLeft
63
59
            anchors.verticalCenter: parent.verticalCenter
64
60
            height: sliderId.height - units.gu(1)
65
61
            name: "torch-off"
66
62
            width: height
67
63
68
64
            MouseArea {
69
65
                anchors.fill: parent
70
66
                onClicked: sliderId.value = 0.0
71
67
            }
72
68
        }
73
69
        Slider {
74
70
            id: sliderId
75
71
            function formatValue(v) {
76
72
                return "%1%".arg(v.toFixed(0))
77
73
            }
78
74
79
75
            anchors {
80
76
                left: iconLeft.right
81
77
                right: iconRight.left
82
78
                leftMargin: units.gu(1)
83
79
                rightMargin: units.gu(1)
84
80
                verticalCenter: parent.verticalCenter
85
81
            }
86
82
            height: parent.height - units.gu(2)
87
83
            minimumValue: 0.0
88
84
            maximumValue: 100.0
89
85
            live: true
90
86
91
87
            onValueChanged: indicatorPower.action('brightness').updateState(value / 100.0)
92
88
        }
93
89
        Icon {
94
90
            id: iconRight
95
91
            anchors.right: parent.right
96
92
            anchors.verticalCenter: parent.verticalCenter
97
93
            height: sliderId.height - units.gu(1)
98
94
            name: "torch-on"
99
95
            width: height
100
96
101
97
            MouseArea {
102
98
                anchors.fill: parent
103
99
                onClicked: sliderId.value = 100.0
104
100
            }
105
101
        }
106
102
    }
107
103
}
108
104
0
109
=== modified file 'plugins/brightness/CMakeLists.txt'
110
--- plugins/brightness/CMakeLists.txt	2014-08-11 16:13:17 +0000
111
+++ plugins/brightness/CMakeLists.txt	2014-10-31 15:08:12 +0000
112
@@ -1,7 +1,6 @@
113
1
add_subdirectory(plugin)
1
add_subdirectory(plugin)
114
2
2
115
3
set(QML_SOURCES
3
set(QML_SOURCES
116
4
    BrightnessSlider.qml
117
5
    PageComponent.qml
4
    PageComponent.qml
118
6
)
5
)
119
7
6
120
8
7
121
=== modified file 'plugins/brightness/PageComponent.qml'
122
--- plugins/brightness/PageComponent.qml	2014-08-12 13:32:30 +0000
123
+++ plugins/brightness/PageComponent.qml	2014-10-31 15:08:12 +0000
124
@@ -24,6 +24,8 @@
125
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 0.1
126
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 0.1 as ListItem
127
26
import Ubuntu.SystemSettings.Brightness 1.0
26
import Ubuntu.SystemSettings.Brightness 1.0
128
27
import Ubuntu.Settings.Menus 0.1 as Menus
129
28
import QMenuModel 0.1
130
27
29
131
28
ItemPage {
30
ItemPage {
132
29
    id: root
31
    id: root
133
@@ -39,7 +41,42 @@
134
39
        anchors.left: parent.left
41
        anchors.left: parent.left
135
40
        anchors.right: parent.right
42
        anchors.right: parent.right
136
41
43
138
42
        BrightnessSlider {}
44
        QDBusActionGroup {
139
45
            id: indicatorPower
140
46
            busType: 1
141
47
            busName: "com.canonical.indicator.power"
142
48
            objectPath: "/com/canonical/indicator/power"
143
49
144
50
            property variant brightness: action("brightness")
145
51
146
52
            Component.onCompleted: start()
147
53
        }
148
54
149
55
        Binding {
150
56
            target: sliderMenu
151
57
            property: "value"
152
58
            value: sliderMenu.enabled ? indicatorPower.action("brightness").state * 100 : 0.0
153
59
        }
154
60
155
61
        ListItem.Standard {
156
62
            text: i18n.tr("Display brightness")
157
63
            showDivider: false
158
64
        }
159
65
160
66
        /* Use the SliderMenu component instead of the Slider to avoid binding 
161
67
           issues on valueChanged until LP: #1388094 is fixed.
162
68
        */
163
69
        Menus.SliderMenu {
164
70
            id: sliderMenu
165
71
            objectName: "sliderMenu"
166
72
            enabled: indicatorPower.action("brightness").state != null
167
73
            live: true
168
74
            minimumValue: 0.0
169
75
            maximumValue: 100.0
170
76
            minIcon: "image://theme/display-brightness-min"
171
77
            maxIcon: "image://theme/display-brightness-max"
172
78
            onUpdated: indicatorPower.action("brightness").updateState(value / 100.0)
173
79
        }
174
43
80
175
44
        Binding {
81
        Binding {
176
45
            target: autoAdjustCheck
82
            target: autoAdjustCheck
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-10-31
Sebastien Bacher (community)		2014-10-30	Approve on 2014-10-31
Review via email: mp+240131@code.launchpad.net