From fe09dc7fae0c359273de1ed842bd297663c3111a Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Sun, 12 Apr 2015 13:58:32 +0200 Subject: [PATCH] Add option to show percentage/remaining time in panel plugin --- common/xfpm-config.h | 1 + .../power-manager-plugin/power-manager-button.c | 206 +++++++++++++++++---- 2 files changed, 166 insertions(+), 41 deletions(-) diff --git a/common/xfpm-config.h b/common/xfpm-config.h index 1a19194..fd7f8fb 100644 --- a/common/xfpm-config.h +++ b/common/xfpm-config.h @@ -76,6 +76,7 @@ G_BEGIN_DECLS #define BRIGHTNESS_SWITCH_SAVE "brightness-switch-restore-on-exit" #define HANDLE_BRIGHTNESS_KEYS "handle-brightness-keys" #define SHOW_BRIGHTNESS_POPUP "show-brightness-popup" +#define PROP_SHOW_PANEL_LABEL "show-panel-label" G_END_DECLS diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c index ef9b2ea..2497c58 100644 --- a/panel-plugins/power-manager-plugin/power-manager-button.c +++ b/panel-plugins/power-manager-plugin/power-manager-button.c @@ -68,6 +68,8 @@ struct PowerManagerButtonPrivate /* The actual panel icon image */ GtkWidget *panel_icon_image; + GtkWidget *panel_label; + GtkWidget *hbox; /* Keep track of icon name to redisplay during size changes */ gchar *panel_icon_name; /* Keep track of the last icon size for use during updates */ @@ -92,6 +94,8 @@ struct PowerManagerButtonPrivate */ gint32 brightness_min_level; + gboolean show_panel_label; + /* filter range value changed events for snappier UI feedback */ guint set_level_timeout; }; @@ -112,6 +116,7 @@ typedef enum { PROP_0 = 0, PROP_BRIGHTNESS_MIN_LEVEL, + PROP_show_panel_label, } POWER_MANAGER_BUTTON_PROPERTIES; enum { @@ -128,6 +133,8 @@ static void power_manager_button_finalize (GObject *object); static GList* find_device_in_list (PowerManagerButton *button, const gchar *object_path); static gboolean power_manager_button_device_icon_expose (GtkWidget *img, GdkEventExpose *event, gpointer userdata); static void power_manager_button_set_icon (PowerManagerButton *button); +static void power_manager_button_set_label (PowerManagerButton *button, gdouble percentage, guint64 time_to_empty_or_full); +static void power_manager_button_update_label (PowerManagerButton *button, UpDevice *device); static gboolean power_manager_button_press_event (GtkWidget *widget, GdkEventButton *event); static gboolean power_manager_button_menu_add_device (PowerManagerButton *button, BatteryDevice *battery_device, gboolean append); static void increase_brightness (PowerManagerButton *button); @@ -354,6 +361,38 @@ power_manager_button_device_icon_expose (GtkWidget *img, GdkEventExpose *event, return FALSE; } +static void +power_manager_button_update_label (PowerManagerButton *button, UpDevice *device) +{ + guint state; + gdouble percentage; + guint64 time_to_empty; + guint64 time_to_full; + + if (!POWER_MANAGER_IS_BUTTON (button) | !UP_IS_DEVICE (device)) + return; + + if (button->priv->show_panel_label <= 0 | button->priv->show_panel_label >3) + { + gtk_widget_hide (GTK_WIDGET (button->priv->panel_label)); + return; + } + + g_object_get (device, + "state", &state, + "percentage", &percentage, + "time-to-empty", &time_to_empty, + "time-to-full", &time_to_full, + NULL); + + /* Hide the label if the battery is fully charged */ + if (state == UP_DEVICE_STATE_CHARGING) + power_manager_button_set_label (button, percentage, time_to_full); + else if (state == UP_DEVICE_STATE_FULLY_CHARGED) + gtk_widget_hide (GTK_WIDGET (button->priv->panel_label)); + else + power_manager_button_set_label (button, percentage, time_to_empty); +} static void power_manager_button_update_device_icon_and_details (PowerManagerButton *button, UpDevice *device) @@ -362,6 +401,10 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button, BatteryDevice *battery_device, *display_device; const gchar *object_path = up_device_get_object_path(device); gchar *details, *icon_name, *upower_icon; + guint state; + gdouble percentage; + guint64 time_to_empty; + guint64 time_to_full; GdkPixbuf *pix = NULL; guint type = 0; @@ -380,7 +423,11 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button, /* hack, this depends on XFPM_DEVICE_TYPE_* being in sync with UP_DEVICE_KIND_* */ g_object_get (device, "kind", &type, + "state", &state, "icon-name", &upower_icon, + "percentage", &percentage, + "time-to-empty", &time_to_empty, + "time-to-full", &time_to_full, NULL); icon_name = get_device_icon_name (button->priv->upower, device); @@ -414,6 +461,10 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button, g_free (button->priv->panel_icon_name); button->priv->panel_icon_name = upower_icon; power_manager_button_set_icon (button); + if (state == UP_DEVICE_STATE_CHARGING) + power_manager_button_set_label (button, percentage, time_to_full); + else + power_manager_button_set_label (button, percentage, time_to_empty); /* update tooltip */ power_manager_button_set_tooltip (button); } @@ -701,6 +752,48 @@ set_brightness_min_level (PowerManagerButton *button, gint32 new_brightness_leve } } +#ifdef XFCE_PLUGIN +static void +power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerManagerButton *button) +{ + GtkStyleContext *context; + GtkBorder padding, border; + gint width; + gint xthickness; + gint ythickness; + + g_return_val_if_fail (POWER_MANAGER_IS_BUTTON (button), FALSE); + g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE); + g_return_if_fail (size > 0); + + size /= xfce_panel_plugin_get_nrows (plugin); + + /* Calculate the size of the widget because the theme can override it */ + context = gtk_widget_get_style_context (GTK_WIDGET (button)); + gtk_style_context_get_padding (context, gtk_widget_get_state_flags (GTK_WIDGET (button)), &padding); + gtk_style_context_get_border (context, gtk_widget_get_state_flags (GTK_WIDGET (button)), &border); + xthickness = padding.left+padding.right+border.left+border.right; + ythickness = padding.top+padding.bottom+border.top+border.bottom; + + /* Calculate the size of the space left for the icon */ + width = size - 2* MAX (xthickness, ythickness); + + /* Since symbolic icons are usually only provided in 16px we + * try to be clever and use size steps */ + if (width <= 21) + button->priv->panel_icon_width = 16; + else if (width >=22 && width <= 29) + button->priv->panel_icon_width = 24; + else if (width >= 30 && width <= 40) + button->priv->panel_icon_width = 32; + else + button->priv->panel_icon_width = width; + + gtk_widget_set_size_request (GTK_WIDGET(plugin), size, size); + power_manager_button_set_icon (button); +} +#endif + static void power_manager_button_set_property (GObject *object, guint property_id, @@ -716,6 +809,21 @@ power_manager_button_set_property (GObject *object, case PROP_BRIGHTNESS_MIN_LEVEL: set_brightness_min_level (button, g_value_get_int (value)); break; +#ifdef XFCE_PLUGIN + case PROP_SHOW_PANEL_LABEL: + button->priv->show_panel_label = g_value_get_int (value); + if (button->priv->show_panel_label > 0 && button->priv->show_panel_label <= 3) + { + gtk_widget_show (button->priv->panel_label); + power_manager_button_update_label (button, button->priv->display_device); + } + else + gtk_widget_hide (button->priv->panel_label); + power_manager_button_size_changed_cb (button->priv->plugin, + xfce_panel_plugin_get_size (button->priv->plugin), + button); + break; +#endif default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -740,6 +848,11 @@ power_manager_button_get_property(GObject *object, default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; +#ifdef XFCE_PLUGIN + case PROP_SHOW_PANEL_LABEL: + g_value_set_int (value, button->priv->show_panel_label); + break; +#endif } } @@ -790,6 +903,13 @@ power_manager_button_class_init (PowerManagerButtonClass *klass) BRIGHTNESS_SLIDER_MIN_LEVEL, -1, G_MAXINT32, -1, XFPM_PARAM_FLAGS)); + + g_object_class_install_property (object_class, + PROP_show_panel_label, + g_param_spec_int (show_panel_label, + NULL, NULL, + 0, G_MAXINT16, 3, + XFPM_PARAM_FLAGS)); #undef XFPM_PARAM_FLAGS } @@ -893,6 +1013,9 @@ power_manager_button_new (void) PROPERTIES_PREFIX BRIGHTNESS_SLIDER_MIN_LEVEL, G_TYPE_INT, G_OBJECT (button), BRIGHTNESS_SLIDER_MIN_LEVEL); + xfconf_g_property_bind (button->priv->channel, PROPERTIES_PREFIX show_panel_label, G_TYPE_INT, + G_OBJECT (button), show_panel_label); + return GTK_WIDGET (button); } @@ -907,6 +1030,39 @@ power_manager_button_set_icon (PowerManagerButton *button) } +static void +power_manager_button_set_label (PowerManagerButton *button, gdouble percentage, + guint64 time_to_empty_or_full) +{ + gchar *label_string; + gint hours; + gint minutes; + gchar *remaining_time = NULL; + + /* Create the short timestring in the format hh:mm */ + minutes = (int) ( ( time_to_empty_or_full / 60.0 ) + 0.5 ); + if (minutes < 60) + remaining_time = g_strdup_printf ("0:%d", minutes); + else + { + hours = minutes / 60; + minutes = minutes % 60; + remaining_time = g_strdup_printf ("%d:%d", hours, minutes); + } + + /* Set the label accordingly or hide it if the battery is full */ + if (button->priv->show_panel_label == 1) + label_string = g_strdup_printf ("%d%%", (int) percentage); + else if (button->priv->show_panel_label == 2) + label_string = g_strdup_printf ("%s", remaining_time); + else if (button->priv->show_panel_label == 3) + label_string = g_strdup_printf ("(%s, %d%%)", remaining_time, (int) percentage); + + gtk_label_set_text (GTK_LABEL (button->priv->panel_label), label_string); + + g_free (label_string); +} + const gchar * power_manager_button_get_icon_name (PowerManagerButton *button) { @@ -931,46 +1087,6 @@ power_manager_button_press_event (GtkWidget *widget, GdkEventButton *event) #ifdef XFCE_PLUGIN static void -power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerManagerButton *button) -{ - GtkStyleContext *context; - GtkBorder padding, border; - gint width; - gint xthickness; - gint ythickness; - - g_return_if_fail (POWER_MANAGER_IS_BUTTON (button)); - g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin)); - g_return_if_fail (size > 0); - - size /= xfce_panel_plugin_get_nrows (plugin); - - /* Calculate the size of the widget because the theme can override it */ - context = gtk_widget_get_style_context (GTK_WIDGET (button)); - gtk_style_context_get_padding (context, gtk_widget_get_state_flags (GTK_WIDGET (button)), &padding); - gtk_style_context_get_border (context, gtk_widget_get_state_flags (GTK_WIDGET (button)), &border); - xthickness = padding.left+padding.right+border.left+border.right; - ythickness = padding.top+padding.bottom+border.top+border.bottom; - - /* Calculate the size of the space left for the icon */ - width = size - 2* MAX (xthickness, ythickness); - - /* Since symbolic icons are usually only provided in 16px we - * try to be clever and use size steps */ - if (width <= 21) - button->priv->panel_icon_width = 16; - else if (width >=22 && width <= 29) - button->priv->panel_icon_width = 24; - else if (width >= 30 && width <= 40) - button->priv->panel_icon_width = 32; - else - button->priv->panel_icon_width = width; - - gtk_widget_set_size_request (GTK_WIDGET(plugin), size, size); - power_manager_button_set_icon (button); -} - -static void power_manager_button_style_update_cb (XfcePanelPlugin *plugin, PowerManagerButton *button) { gtk_widget_reset_style (GTK_WIDGET (plugin)); @@ -994,6 +1110,7 @@ void power_manager_button_show (PowerManagerButton *button) { GtkWidget *mi; + GtkWidget *hbox; g_return_if_fail (POWER_MANAGER_IS_BUTTON (button)); @@ -1003,7 +1120,12 @@ power_manager_button_show (PowerManagerButton *button) #endif button->priv->panel_icon_image = gtk_image_new (); - gtk_container_add (GTK_CONTAINER (button), button->priv->panel_icon_image); + button->priv->panel_label = gtk_label_new (""); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (button->priv->panel_icon_image), TRUE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (button->priv->panel_label), TRUE, FALSE, 0); + + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (hbox)); /* help dialog */ mi = gtk_menu_item_new_with_mnemonic (_("_Help")); @@ -1025,6 +1147,8 @@ power_manager_button_show (PowerManagerButton *button) #endif gtk_widget_show_all (GTK_WIDGET(button)); + + power_manager_button_update_label (button, button->priv->display_device); power_manager_button_set_tooltip (button); /* Add all the devcies currently attached to the system */ -- 2.1.4