diff options
| author | ZackaryWelch <welch.zackary@gmail.com> | 2018-01-30 17:10:23 -0500 |
|---|---|---|
| committer | ZackaryWelch <welch.zackary@gmail.com> | 2018-01-30 17:10:23 -0500 |
| commit | 3fbdb21fa39dcd662d9d5b709d1f5909fad0ff88 (patch) | |
| tree | 006e473860705853b54aed6545f61712672ea359 /src-qt5/core/lumina-desktop-unified | |
| parent | Added results text for find widget in lumina-pdf (diff) | |
| parent | Get the Battery notification button put together. (diff) | |
| download | lumina-3fbdb21fa39dcd662d9d5b709d1f5909fad0ff88.tar.gz lumina-3fbdb21fa39dcd662d9d5b709d1f5909fad0ff88.tar.bz2 lumina-3fbdb21fa39dcd662d9d5b709d1f5909fad0ff88.zip | |
Merge branch 'master' of https://github.com/trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/StatusTray.qml | 3 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/status_tray/BatteryButton.qml | 14 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/StatusTray.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/StatusTray.qml index 4552ea39..8f2239b9 100644 --- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/StatusTray.qml +++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/StatusTray.qml @@ -15,7 +15,7 @@ import "./status_tray" as QML Rectangle { property int prefsize: (parent.width < parent.height) ? parent.width : parent.height id: "status_tray" - //color: "transparent" + color: "transparent" Layout.fillHeight: true Layout.fillWidth: true @@ -38,7 +38,6 @@ Rectangle { } //Battery Status QML.BatteryButton{ - id: "batButton" Layout.preferredHeight: status_tray.prefsize Layout.preferredWidth: status_tray.prefsize } diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/status_tray/BatteryButton.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/status_tray/BatteryButton.qml index 0963165d..8ceec2d4 100644 --- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/status_tray/BatteryButton.qml +++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/plugins/status_tray/BatteryButton.qml @@ -5,8 +5,16 @@ // See the LICENSE file for full details //=========================================== import QtQuick 2.2 -import QtQuick.Controls 2 +import QtQuick.Controls 1 -Rectangle{ - color: "red" +import Lumina.Backend.RootDesktopObject 2.0 +import Lumina.Backend.OSInterface 2.0 + +ToolButton{ + property OSInterface os: RootObject.os_interface() + id: "batButton" + iconName: os.icon + tooltip: os.batteryCharge+"%: "+os.batteryRemaining + visible: os.batteryAvailable() + enabled: false } |