[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] plasma/generic/applets/batterymonitor/contents: Always display the actual brightness
From:       Kai Uwe Broulik <kde () privat ! broulik ! de>
Date:       2013-07-08 14:56:15
Message-ID: E1UwCrP-0001bq-6N () scm ! kde ! org
[Download RAW message or body]

Git commit b4f7cbd177b7468ec6421849a8a429be2fa36338 by Kai Uwe Broulik.
Committed on 08/07/2013 at 14:55.
Pushed by broulik into branch 'master'.

Always display the actual brightness percentage
Thanks to Nikita Skovoroda for this patch!

REVIEW: 111437

M  +2    -0    plasma/generic/applets/batterymonitor/contents/code/logic.js
M  +2    -1    plasma/generic/applets/batterymonitor/contents/ui/BrightnessItem.qml
M  +2    -0    plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml

http://commits.kde.org/kde-workspace/b4f7cbd177b7468ec6421849a8a429be2fa36338

diff --git a/plasma/generic/applets/batterymonitor/contents/code/logic.js \
b/plasma/generic/applets/batterymonitor/contents/code/logic.js index 226db61..def21e5 \
                100644
--- a/plasma/generic/applets/batterymonitor/contents/code/logic.js
+++ b/plasma/generic/applets/batterymonitor/contents/code/logic.js
@@ -200,9 +200,11 @@ function updateBrightness(source) {
     dialogItem.disableBrightnessUpdate = true;
     if (typeof source.data["PowerDevil"]["Screen Brightness"] === 'number') {
         dialogItem.screenBrightness = source.data["PowerDevil"]["Screen \
Brightness"]; +        dialogItem.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"];  }
     dialogItem.disableBrightnessUpdate = false;
 }
diff --git a/plasma/generic/applets/batterymonitor/contents/ui/BrightnessItem.qml \
b/plasma/generic/applets/batterymonitor/contents/ui/BrightnessItem.qml index \
                34c596c..06d7148 100644
--- a/plasma/generic/applets/batterymonitor/contents/ui/BrightnessItem.qml
+++ b/plasma/generic/applets/batterymonitor/contents/ui/BrightnessItem.qml
@@ -32,6 +32,7 @@ Item {
     property alias icon: brightnessIcon.icon
     property alias label: brightnessLabel.text
     property alias value: brightnessSlider.value
+    property int percentage: 0
 
     signal changed(int screenBrightness)
 
@@ -83,7 +84,7 @@ Item {
             verticalCenter: brightnessSlider.verticalCenter
         }
         height: paintedHeight
-        text: i18nc("Placeholder is brightness percentage", "%1%", \
brightnessSlider.value) +        text: i18nc("Placeholder is brightness percentage", \
"%1%", percentage)  }
 }
 
diff --git a/plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml \
b/plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml index \
                e571e61..edada37 100644
--- a/plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml
+++ b/plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml
@@ -38,9 +38,11 @@ Item {
 
     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)


[prev in list] [next in list] [prev in thread] [next in thread]