Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PowerStatus: minor cleanup.

Browse Source 
* Moved low battery notification code into its own method.
* Slightly changed low battery notification text.
This commit is contained in:
Axel Dörfler 2014-12-29 10:19:18 +01:00
parent 7ccbecc056
commit f1bfd2dff3
2 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/apps/powerstatus/PowerStatusView.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2012, Haiku, Inc. All Rights Reserved.
* Copyright 2006-2014, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -410,38 +410,7 @@ PowerStatusView::Update(bool force)
if ((hadBattery && !fHasBattery)
|| (previousPercent > kLowBatteryPercentage
&& fPercent <= kLowBatteryPercentage)) {
BBitmap* bitmap = NULL;
BResources resources;
resources.SetToImage((void*)&instantiate_deskbar_item);
if (resources.InitCheck() == B_OK) {
size_t resourceSize = 0;
const void* resourceData = resources.LoadResource(
B_VECTOR_ICON_TYPE, fHasBattery
? "battery_low" : "battery_critical", &resourceSize);
if (resourceData != NULL) {
BMemoryIO memoryIO(resourceData, resourceSize);
bitmap = BTranslationUtils::GetBitmap(&memoryIO);
}
}
BNotification notification(fHasBattery ? B_INFORMATION_NOTIFICATION
: B_ERROR_NOTIFICATION);
if (fHasBattery) {
notification.SetTitle(B_TRANSLATE("Battery low"));
notification.SetContent(B_TRANSLATE(
"The battery level is getting low, please plug the device in."));
} else {
notification.SetTitle(B_TRANSLATE("Battery critical"));
notification.SetContent(B_TRANSLATE(
"The battery level is critical, please plug the device in"
" immediately."));
}
notification.SetIcon(bitmap);
notification.Send();
delete bitmap;
_NotifyLowBattery();
}
}
@ -505,7 +474,45 @@ PowerStatusView::_GetBatteryInfo(battery_info* batteryInfo, int batteryID)
}
// #pragma mark -
void
PowerStatusView::_NotifyLowBattery()
{
BBitmap* bitmap = NULL;
BResources resources;
resources.SetToImage((void*)&instantiate_deskbar_item);
if (resources.InitCheck() == B_OK) {
size_t resourceSize = 0;
const void* resourceData = resources.LoadResource(
B_VECTOR_ICON_TYPE, fHasBattery
? "battery_low" : "battery_critical", &resourceSize);
if (resourceData != NULL) {
BMemoryIO memoryIO(resourceData, resourceSize);
bitmap = BTranslationUtils::GetBitmap(&memoryIO);
}
}
BNotification notification(
fHasBattery ? B_INFORMATION_NOTIFICATION : B_ERROR_NOTIFICATION);
if (fHasBattery) {
notification.SetTitle(B_TRANSLATE("Battery low"));
notification.SetContent(B_TRANSLATE(
"The battery level is getting low, please plug in the device."));
} else {
notification.SetTitle(B_TRANSLATE("Battery critical"));
notification.SetContent(B_TRANSLATE(
"The battery level is critical, please plug in the device "
"immediately."));
}
notification.SetIcon(bitmap);
notification.Send();
delete bitmap;
}
// #pragma mark - Replicant view
PowerStatusReplicant::PowerStatusReplicant(BRect frame, int32 resizingMode,

1
src/apps/powerstatus/PowerStatusView.h
View File

@ -49,6 +49,7 @@ private:
void _Init();
void _SetLabel(char* buffer, size_t bufferLength);
void _DrawBattery(BRect rect);
void _NotifyLowBattery();
protected:
PowerStatusDriverInterface* fDriverInterface;