applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

power: Use CcStrengthBar for battery level to get closer to the new design

Browse source
This commit is contained in:
Richard Hughes 2012-02-14 12:48:10 +00:00
parent 0ea3d7dd3c
commit cef4e593bb
3 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
panels/power/Makefile.am
View file

@ -8,6 +8,7 @@ INCLUDES = \
-DGNOMECC_UI_DIR="\"$(uidir)\"" \ -DGNOMECC_UI_DIR="\"$(uidir)\"" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-I$(srcdir)/../../shell/ \
$(NULL) $(NULL)
ccpanelsdir = $(PANELS_DIR) ccpanelsdir = $(PANELS_DIR)

32
panels/power/cc-power-panel.c
View file

@ -27,6 +27,7 @@
#include <gnome-settings-daemon/gsd-enums.h> #include <gnome-settings-daemon/gsd-enums.h>
#include "cc-power-panel.h" #include "cc-power-panel.h"
#include "cc-strength-bar.h"
#define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w) #define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w)
@ -43,6 +44,7 @@ struct _CcPowerPanelPrivate
GtkBuilder *builder; GtkBuilder *builder;
GDBusProxy *proxy; GDBusProxy *proxy;
UpClient *up_client; UpClient *up_client;
CcStrengthBar *progressbar_primary;
}; };
enum enum
@ -211,10 +213,8 @@ set_device_battery_primary (CcPowerPanel *panel, GVariant *device)
&time); &time);
/* set the percentage */ /* set the percentage */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, cc_strength_bar_set_fraction (priv->progressbar_primary,
"progressbar_primary")); percentage / 100.0f);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget),
percentage / 100.0f);
/* clear the warning */ /* clear the warning */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
@ -326,10 +326,8 @@ set_device_ups_primary (CcPowerPanel *panel, GVariant *device)
&time); &time);
/* set the percentage */ /* set the percentage */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, cc_strength_bar_set_fraction (priv->progressbar_primary,
"progressbar_primary")); percentage / 100.0f);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget),
percentage / 100.0f);
/* always show the warning */ /* always show the warning */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
@ -608,10 +606,10 @@ add_device_secondary (CcPowerPanel *panel,
gtk_misc_set_alignment (GTK_MISC (widget), 0.0f, 0.5f); gtk_misc_set_alignment (GTK_MISC (widget), 0.0f, 0.5f);
gtk_label_set_markup (GTK_LABEL (widget), status->str); gtk_label_set_markup (GTK_LABEL (widget), status->str);
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
widget = gtk_progress_bar_new (); widget = cc_strength_bar_new ();
gtk_widget_set_margin_right (widget, 32); gtk_widget_set_margin_right (widget, 32);
gtk_widget_set_margin_top (widget, 3); gtk_widget_set_margin_top (widget, 3);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), percentage / 100.0f); cc_strength_bar_set_fraction (CC_STRENGTH_BAR (widget), percentage / 100.0f);
gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
@ -1009,6 +1007,20 @@ cc_power_panel_init (CcPowerPanel *self)
return; return;
} }
/* add custom progressbar */
widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
"progressbar_primary"));
gtk_widget_hide (widget);
self->priv->progressbar_primary = CC_STRENGTH_BAR (cc_strength_bar_new ());
widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
"box_primary"));
gtk_box_pack_end (GTK_BOX (widget),
GTK_WIDGET (self->priv->progressbar_primary),
FALSE,
TRUE,
0);
gtk_widget_set_visible (GTK_WIDGET (self->priv->progressbar_primary), TRUE);
self->priv->cancellable = g_cancellable_new (); self->priv->cancellable = g_cancellable_new ();
/* get initial icon state */ /* get initial icon state */

1
panels/power/power.ui
View file

@ -307,7 +307,6 @@
</child> </child>
<child> <child>
<object class="GtkProgressBar" id="progressbar_primary"> <object class="GtkProgressBar" id="progressbar_primary">
<property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="fraction">0.5</property> <property name="fraction">0.5</property>
</object> </object>