Moved and renamed the function Bar_getBatteryStatus
... to ResourceMonitor_getBatteryStatus
This commit is contained in:
parent
b5ee251adb
commit
f18269353b
2 changed files with 23 additions and 25 deletions
26
src/Bar.ahk
26
src/Bar.ahk
|
@ -230,30 +230,6 @@ Bar_cmdGuiEnter:
|
||||||
}
|
}
|
||||||
Return
|
Return
|
||||||
|
|
||||||
Bar_getBatteryStatus(ByRef batteryLifePercent, ByRef acLineStatus)
|
|
||||||
{
|
|
||||||
VarSetCapacity(powerStatus, (1 + 1 + 1 + 1 + 4 + 4))
|
|
||||||
success := DllCall("GetSystemPowerStatus", "UInt", &powerStatus)
|
|
||||||
If (ErrorLevel != 0 Or success = 0)
|
|
||||||
{
|
|
||||||
MsgBox 16, Power Status, Can't get the power status...
|
|
||||||
Return
|
|
||||||
}
|
|
||||||
acLineStatus := NumGet(powerStatus, 0, "Char")
|
|
||||||
batteryLifePercent := NumGet(powerStatus, 2, "Char")
|
|
||||||
|
|
||||||
If acLineStatus = 0
|
|
||||||
acLineStatus = off
|
|
||||||
Else If acLineStatus = 1
|
|
||||||
acLineStatus = on
|
|
||||||
Else If acLineStatus = 255
|
|
||||||
acLineStatus = ?
|
|
||||||
|
|
||||||
If batteryLifePercent = 255
|
|
||||||
batteryLifePercent = ???
|
|
||||||
}
|
|
||||||
;; PhiLho: AC/Battery status (http://www.autohotkey.com/forum/topic7633.html)
|
|
||||||
|
|
||||||
Bar_getHeight()
|
Bar_getHeight()
|
||||||
{
|
{
|
||||||
Global Bar_#0_#1, Bar_#0_#1H, Bar_#0_#2, Bar_#0_#2H, Bar_ctrlHeight, Bar_height, Bar_textHeight
|
Global Bar_#0_#1, Bar_#0_#1H, Bar_#0_#2, Bar_#0_#2H, Bar_ctrlHeight, Bar_height, Bar_textHeight
|
||||||
|
@ -437,7 +413,7 @@ Bar_updateStatus()
|
||||||
Gui, %GuiN%: Default
|
Gui, %GuiN%: Default
|
||||||
If Config_readinBat
|
If Config_readinBat
|
||||||
{
|
{
|
||||||
Bar_getBatteryStatus(b1, b2)
|
ResourceMonitor_getBatteryStatus(b1, b2)
|
||||||
b3 := SubStr(" " b1, -2)
|
b3 := SubStr(" " b1, -2)
|
||||||
i := Config_viewCount + 3
|
i := Config_viewCount + 3
|
||||||
If (b1 < 10) And (b2 = "off")
|
If (b1 < 10) And (b2 = "off")
|
||||||
|
|
|
@ -71,6 +71,28 @@ ResourceMonitor_getText()
|
||||||
Return, text
|
Return, text
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ResourceMonitor_getBatteryStatus(ByRef batteryLifePercent, ByRef acLineStatus) {
|
||||||
|
VarSetCapacity(powerStatus, (1 + 1 + 1 + 1 + 4 + 4))
|
||||||
|
success := DllCall("GetSystemPowerStatus", "UInt", &powerStatus)
|
||||||
|
If (ErrorLevel != 0 Or success = 0) {
|
||||||
|
MsgBox 16, Power Status, Can't get the power status...
|
||||||
|
Return
|
||||||
|
}
|
||||||
|
acLineStatus := NumGet(powerStatus, 0, "Char")
|
||||||
|
batteryLifePercent := NumGet(powerStatus, 2, "Char")
|
||||||
|
|
||||||
|
If acLineStatus = 0
|
||||||
|
acLineStatus = off
|
||||||
|
Else If acLineStatus = 1
|
||||||
|
acLineStatus = on
|
||||||
|
Else If acLineStatus = 255
|
||||||
|
acLineStatus = ?
|
||||||
|
|
||||||
|
If batteryLifePercent = 255
|
||||||
|
batteryLifePercent = ???
|
||||||
|
}
|
||||||
|
;; PhiLho: AC/Battery status (http://www.autohotkey.com/forum/topic7633.html)
|
||||||
|
|
||||||
ResourceMonitor_getDiskLoad(ByRef readLoad, ByRef writeLoad)
|
ResourceMonitor_getDiskLoad(ByRef readLoad, ByRef writeLoad)
|
||||||
{
|
{
|
||||||
Global ResourceMonitor_hDrive
|
Global ResourceMonitor_hDrive
|
||||||
|
|
Loading…
Reference in a new issue