1
=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
2
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2016-08-03 15:52:42 +0000
3
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-11-22 09:39:38 +0000
4
@@ -282,13 +282,10 @@
5
282
    // convergence:
282
    // convergence:
6
283
    // 1) enable session indicator
283
    // 1) enable session indicator
7
284
    // 2) enable keyboard indicator
284
    // 2) enable keyboard indicator
8
285
    // 3) on a PC, switch the battery/power indicator to desktop mode,
9
286
    //    can't control brightness for now and phone-on-desktop broken (FIXME)
10
287
    //
285
    //
11
288
    // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
286
    // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
12
289
    if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
287
    if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
15
290
            || new_indicator->identifier() == QStringLiteral("indicator-keyboard")
288
            || new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {
14
291
            || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
16
292
        new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));
289
        new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));
17
293
    } else {
290
    } else {
18
294
        new_indicator->setProfile(m_profile);
291
        new_indicator->setProfile(m_profile);
19
295
292
20
=== added file 'qml/Components/BrightnessControl.qml'
21
--- qml/Components/BrightnessControl.qml	1970-01-01 00:00:00 +0000
22
+++ qml/Components/BrightnessControl.qml	2016-11-22 09:39:38 +0000
23
@@ -0,0 +1,54 @@
24
1
/*
25
2
 * Copyright (C) 2016 Canonical, Ltd.
26
3
 *
27
4
 * This program is free software; you can redistribute it and/or modify
28
5
 * it under the terms of the GNU General Public License as published by
29
6
 * the Free Software Foundation; version 3.
30
7
 *
31
8
 * This program is distributed in the hope that it will be useful,
32
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
33
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
34
11
 * GNU General Public License for more details.
35
12
 *
36
13
 * You should have received a copy of the GNU General Public License
37
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
38
15
 */
39
16
40
17
import QtQuick 2.4
41
18
import Ubuntu.Components 1.3
42
19
import QMenuModel 0.1
43
20
import GlobalShortcut 1.0
44
21
45
22
QtObject {
46
23
    objectName: "brightnessControl"
47
24
48
25
    property GlobalShortcut brightnessUp: GlobalShortcut {
49
26
        shortcut: Qt.Key_MonBrightnessUp
50
27
        onTriggered: stepUp();
51
28
    }
52
29
53
30
    property GlobalShortcut brightnessDown: GlobalShortcut {
54
31
        shortcut: Qt.Key_MonBrightnessDown
55
32
        onTriggered: stepDown();
56
33
    }
57
34
58
35
    function stepUp() {
59
36
        actionGroup.brightness.updateState(MathUtils.clamp(actionGroup.brightness.state + 0.1, 0.01, 1.0));
60
37
    }
61
38
62
39
    function stepDown() {
63
40
        actionGroup.brightness.updateState(MathUtils.clamp(actionGroup.brightness.state - 0.1, 0.01, 1.0));
64
41
    }
65
42
66
43
    property QDBusActionGroup actionGroup: QDBusActionGroup {
67
44
        busType: DBus.SessionBus
68
45
        busName: "com.canonical.indicator.power"
69
46
        objectPath: "/com/canonical/indicator/power"
70
47
71
48
        property variant brightness: action("brightness")
72
49
73
50
        Component.onCompleted: {
74
51
            actionGroup.start();
75
52
        }
76
53
    }
77
54
}
78
0
55
79
=== modified file 'qml/Shell.qml'
80
--- qml/Shell.qml	2016-11-09 15:07:26 +0000
81
+++ qml/Shell.qml	2016-11-22 09:39:38 +0000
82
@@ -786,8 +786,9 @@
83
786
        Behavior on opacity { UbuntuNumberAnimation {} }
786
        Behavior on opacity { UbuntuNumberAnimation {} }
84
787
    }
787
    }
85
788
788
87
789
    // non-visual object
789
    // non-visual objects
88
790
    KeymapSwitcher {}
790
    KeymapSwitcher {}
89
791
    BrightnessControl {}
90
791
792
91
792
    Rectangle {
793
    Rectangle {
92
793
        id: shutdownFadeOutRectangle
794
        id: shutdownFadeOutRectangle
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2016-10-18	Approve on 2016-11-23
Unity8 CI Bot	continuous-integration		Approve on 2016-11-23
Review via email: mp+308695@code.launchpad.net