Move Brightness handling out of the popup dialog so it is accessible from outside

applets/batterymonitor/package/contents/code/logic.js

@@ -213,21 +213,21 @@ function batteryItemToolTip(batteryData, remainingTime) {
     return "";
 }
 
-function updateBrightness(dialogItem, source) {
+function updateBrightness(rootItem, source) {
     if (!source.data["PowerDevil"]) {
         return;
     }
 
     // we don't want passive brightness change send setBrightness call
-    dialogItem.disableBrightnessUpdate = true;
+    rootItem.disableBrightnessUpdate = true;
 
     if (typeof source.data["PowerDevil"]["Screen Brightness"] === 'number') {
-        dialogItem.screenBrightness = source.data["PowerDevil"]["Screen Brightness"];
-        dialogItem.screenBrightnessPercentage = source.data["PowerDevil"]["Screen Brightness"];
+        rootItem.screenBrightness = source.data["PowerDevil"]["Screen Brightness"];
+        rootItem.screenBrightnessPercentage = source.data["PowerDevil"]["Screen Brightness"];
     }
     if (typeof source.data["PowerDevil"]["Keyboard Brightness"] === 'number') {
-        dialogItem.keyboardBrightness = source.data["PowerDevil"]["Keyboard Brightness"];
-        dialogItem.keyboardBrightnessPercentage = source.data["PowerDevil"]["Keyboard Brightness"];
+        rootItem.keyboardBrightness = source.data["PowerDevil"]["Keyboard Brightness"];
+        rootItem.keyboardBrightnessPercentage = source.data["PowerDevil"]["Keyboard Brightness"];
     }
-    dialogItem.disableBrightnessUpdate = false;
+    rootItem.disableBrightnessUpdate = false;
 }

applets/batterymonitor/package/contents/ui/BrightnessItem.qml

@@ -34,8 +34,6 @@ FocusScope {
     property alias value: brightnessSlider.value
     property int percentage: 0
 
-    signal changed(int screenBrightness)
-
     PlasmaCore.IconItem {
         id: brightnessIcon
         width: units.iconSizes.medium
@@ -69,7 +67,6 @@ FocusScope {
         maximumValue: 100
         stepSize: 10
         focus: true
-        onValueChanged: changed(value)
     }
 
     Components.Label {

applets/batterymonitor/package/contents/ui/PopupDialog.qml

@@ -35,15 +35,8 @@ FocusScope {
     property int remainingTime
 
     property bool isBrightnessAvailable
-    property alias screenBrightness: brightnessSlider.value
-    property alias screenBrightnessPercentage: brightnessSlider.percentage
-
     property bool isKeyboardBrightnessAvailable
-    property alias keyboardBrightness: keyboardBrightnessSlider.value
-    property alias keyboardBrightnessPercentage: keyboardBrightnessSlider.percentage
 
-    signal brightnessChanged(int screenBrightness)
-//    signal keyboardBrightnessChanged(int keyboardBrightness)
     signal powermanagementChanged(bool checked)
 
     state: plasmoid.location == PlasmaCore.Types.BottomEdge ? "Bottom" : ""
@@ -108,7 +101,9 @@ FocusScope {
             icon: "video-display-brightness"
             label: i18n("Display Brightness")
             visible: isBrightnessAvailable
-            onChanged: brightnessChanged(value)
+            value: batterymonitor.screenBrightness
+            percentage: batterymonitor.screenBrightnessPercentage
+            onValueChanged: batterymonitor.screenBrightness = value
             KeyNavigation.tab: keyboardBrightnessSlider
             KeyNavigation.backtab: batteryList
             focus: true
@@ -118,8 +113,10 @@ FocusScope {
             id: keyboardBrightnessSlider
             icon: "input-keyboard-brightness"
             label: i18n("Keyboard Brightness")
+            value: batterymonitor.keyboardBrightness
+            percentage: batterymonitor.keyboardBrightnessPercentage
             visible: isKeyboardBrightnessAvailable
-            onChanged: keyboardBrightnessChanged(value)
+            onValueChanged: batterymonitor.keyboardBrightness = value
             KeyNavigation.tab: pmSwitch
             KeyNavigation.backtab: brightnessSlider
         }

applets/batterymonitor/package/contents/ui/batterymonitor.qml

@@ -38,6 +38,32 @@ Item {
     Plasmoid.toolTipSubText: batteries.tooltipSubText
     Plasmoid.icon: batteries.tooltipImage
 
+    property bool disableBrightnessUpdate: false
+
+    property int screenBrightness
+    property int screenBrightnessPercentage
+    property int keyboardBrightness
+    property int keyboardBrightnessPercentage
+
+    onScreenBrightnessChanged: {
+        if (disableBrightnessUpdate) {
+            return;
+        }
+        var service = pmSource.serviceForSource("PowerDevil");
+        var operation = service.operationDescription("setBrightness");
+        operation.brightness = screenBrightness;
+        service.startOperationCall(operation);
+    }
+    onKeyboardBrightnessChanged: {
+        if (disableBrightnessUpdate) {
+            return;
+        }
+        var service = pmSource.serviceForSource("PowerDevil");
+        var operation = service.operationDescription("setKeyboardBrightness");
+        operation.brightness = keyboardBrightness;
+        service.startOperationCall(operation);
+    }
+
     ProcessRunner {
         id: processRunner
     }
@@ -48,6 +74,7 @@ Item {
 
     Component.onCompleted: {
         updateLogic();
+        Logic.updateBrightness(batterymonitor, pmSource);
         plasmoid.removeAction("configure");
         plasmoid.setAction("powerdevilkcm", i18n("&Configure Power Saving..."), "preferences-system-power-management");
     }
@@ -71,6 +98,7 @@ Item {
         onSourceRemoved: {
             disconnectSource(source);
         }
+        onDataChanged: Logic.updateBrightness(batterymonitor, pmSource)
     }
 
     property QtObject batteries: PlasmaCore.SortFilterModel {
@@ -85,7 +113,7 @@ Item {
                 dataSource: pmSource
                 sourceFilter: "Battery[0-9]+"
 
-                onDataChanged: updateLogic(false)
+                onDataChanged: updateLogic()
             }
         }
 
@@ -110,8 +138,6 @@ Item {
         anchors.fill: parent
         focus: true
 
-        property bool disableBrightnessUpdate: false
-
         isBrightnessAvailable: pmSource.data["PowerDevil"]["Screen Brightness Available"] ? true : false
         isKeyboardBrightnessAvailable: pmSource.data["PowerDevil"]["Keyboard Brightness Available"] ? true : false
 
@@ -119,36 +145,6 @@ Item {
 
         pluggedIn: pmSource.data["AC Adapter"] != undefined && pmSource.data["AC Adapter"]["Plugged in"]
 
-        Component.onCompleted: {
-            Logic.updateBrightness(dialogItem, pmSource);
-            dialogItem.forceActiveFocus();
-        }
-
-        Connections {
-            target: pmSource
-            onDataChanged : {
-                Logic.updateBrightness(dialogItem, pmSource);
-            }
-        }
-
-        onBrightnessChanged: {
-            if (disableBrightnessUpdate) {
-                return;
-            }
-            var service = pmSource.serviceForSource("PowerDevil");
-            var operation = service.operationDescription("setBrightness");
-            operation.brightness = screenBrightness;
-            service.startOperationCall(operation);
-        }
-        onKeyboardBrightnessChanged: {
-            if (disableBrightnessUpdate) {
-                return;
-            }
-            var service = pmSource.serviceForSource("PowerDevil");
-            var operation = service.operationDescription("setKeyboardBrightness");
-            operation.brightness = keyboardBrightness;
-            service.startOperationCall(operation);
-        }
         property int cookie1: -1
         property int cookie2: -1
         onPowermanagementChanged: {