From c35074725451b916d2629e1379a75214dbd5b540 Mon Sep 17 00:00:00 2001 From: fbaumanis Date: Sat, 18 Apr 2020 22:55:38 +0200 Subject: [PATCH 1/1] Show battery vendor and model in notifications --- src/xfpm-battery.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c index cc733635..577810de 100644 --- a/src/xfpm-battery.c +++ b/src/xfpm-battery.c @@ -99,17 +99,19 @@ static gchar * xfpm_battery_get_message_from_battery_state (XfpmBattery *battery) { gchar *msg = NULL; - + gchar *vendor = NULL; + gchar *model = NULL; + g_object_get(battery->priv->device, "vendor", &vendor, "model", &model); if (battery->priv->type == UP_DEVICE_KIND_BATTERY || battery->priv->type == UP_DEVICE_KIND_UPS) { switch (battery->priv->state) { case UP_DEVICE_STATE_FULLY_CHARGED: - msg = g_strdup_printf (_("Your %s is fully charged"), battery->priv->battery_name); + msg = g_strdup_printf (_("%s %s\nYour %s is fully charged"), vendor, model, battery->priv->battery_name); break; case UP_DEVICE_STATE_CHARGING: - msg = g_strdup_printf (_("Your %s is charging"), battery->priv->battery_name); + msg = g_strdup_printf (_("%s %s\nYour %s is charging"), vendor, model, battery->priv->battery_name); if ( battery->priv->time_to_full != 0 ) { @@ -119,7 +121,7 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery) est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_full); - msg = g_strdup_printf (_("%s (%i%%)\n%s until fully charged"), tmp, battery->priv->percentage, est_time_str); + msg = g_strdup_printf (_("%s %s\n%s (%i%%)\n%s until fully charged"), vendor, model, tmp, battery->priv->percentage, est_time_str); g_free (est_time_str); g_free (tmp); } @@ -127,9 +129,9 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery) break; case UP_DEVICE_STATE_DISCHARGING: if (battery->priv->ac_online) - msg = g_strdup_printf (_("Your %s is discharging"), battery->priv->battery_name); + msg = g_strdup_printf (_("%s %s\nYour %s is discharging"), vendor, model battery->priv->battery_name); else - msg = g_strdup_printf (_("System is running on %s power"), battery->priv->battery_name); + msg = g_strdup_printf (_("%s %s\nSystem is running on %s power"), vendor, model, battery->priv->battery_name); if ( battery->priv->time_to_empty != 0 ) { @@ -139,13 +141,13 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery) est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_empty); - msg = g_strdup_printf (_("%s (%i%%)\nEstimated time left is %s"), tmp, battery->priv->percentage, est_time_str); + msg = g_strdup_printf (_("%s %s\n%s (%i%%)\nEstimated time left is %s"), vendor, model, tmp, battery->priv->percentage, est_time_str); g_free (tmp); g_free (est_time_str); } break; case UP_DEVICE_STATE_EMPTY: - msg = g_strdup_printf (_("Your %s is empty"), battery->priv->battery_name); + msg = g_strdup_printf (_("%s %s\nYour %s is empty"), vendor, model, battery->priv->battery_name); break; default: break; -- 2.20.1