Merge lp:~lukas-kde/unity8/brightnessControl into lp:unity8

[Lukáš Tinkl]

Enable brightness (laptop backlight) handling on desktop/laptop PCs

Enable brightness (laptop backlight) handling on desktop/laptop PCs

This merely puts the indicator-power back to phone mode (to display the brightness slider) and introduces 2 global keyboard shortcuts to handle it.

Best way to test is to install silo https://bileto.ubuntu.com/#/ticket/2221 and then:

$ sudo systemctl start repowerd.service

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, needs repowerd from https://code.launchpad.net/~afrantzis/repowerd/+git/repowerd/+merge/311015

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

N/A

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2613
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2528/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3334
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1907
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1907
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1907
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3362
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3214
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3214/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3214
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3214/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3214
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3214/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3214
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3214/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3214
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3214/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3214
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3214/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3214
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3214/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3214
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3214/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3214
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3214/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2528/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

tested, works.

code looks good.

review: Approve

=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2016-08-03 15:52:42 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-11-22 09:39:38 +0000
@@ -282,13 +282,10 @@
     // convergence:
     // 1) enable session indicator
     // 2) enable keyboard indicator
-    // 3) on a PC, switch the battery/power indicator to desktop mode,
-    //    can't control brightness for now and phone-on-desktop broken (FIXME)
     //
     // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
     if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
-            || new_indicator->identifier() == QStringLiteral("indicator-keyboard")
-            || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
+            || new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {
         new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));
     } else {
         new_indicator->setProfile(m_profile);

=== added file 'qml/Components/BrightnessControl.qml'
--- qml/Components/BrightnessControl.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/BrightnessControl.qml	2016-11-22 09:39:38 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import QMenuModel 0.1
+import GlobalShortcut 1.0
+
+QtObject {
+    objectName: "brightnessControl"
+
+    property GlobalShortcut brightnessUp: GlobalShortcut {
+        shortcut: Qt.Key_MonBrightnessUp
+        onTriggered: stepUp();
+    }
+
+    property GlobalShortcut brightnessDown: GlobalShortcut {
+        shortcut: Qt.Key_MonBrightnessDown
+        onTriggered: stepDown();
+    }
+
+    function stepUp() {
+        actionGroup.brightness.updateState(MathUtils.clamp(actionGroup.brightness.state + 0.1, 0.01, 1.0));
+    }
+
+    function stepDown() {
+        actionGroup.brightness.updateState(MathUtils.clamp(actionGroup.brightness.state - 0.1, 0.01, 1.0));
+    }
+
+    property QDBusActionGroup actionGroup: QDBusActionGroup {
+        busType: DBus.SessionBus
+        busName: "com.canonical.indicator.power"
+        objectPath: "/com/canonical/indicator/power"
+
+        property variant brightness: action("brightness")
+
+        Component.onCompleted: {
+            actionGroup.start();
+        }
+    }
+}

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-11-09 15:07:26 +0000
+++ qml/Shell.qml	2016-11-22 09:39:38 +0000
@@ -786,8 +786,9 @@
         Behavior on opacity { UbuntuNumberAnimation {} }
     }
 
-    // non-visual object
+    // non-visual objects
     KeymapSwitcher {}
+    BrightnessControl {}
 
     Rectangle {
         id: shutdownFadeOutRectangle