diff options
| author | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2014-08-17 18:25:27 +0200 |
|---|---|---|
| committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2014-08-17 18:25:27 +0200 |
| commit | aff3dabff0c327bfa2e6891991d6e379b81e2dd1 (patch) | |
| tree | 9286d645fe3e8a0986fa6e696557eaf939b5daf2 /common | |
| parent | 64cd25f7d31ecbb82f53bceac0e5596338b431e9 (diff) | |
| download | ixfce4-power-manager-aff3dabff0c327bfa2e6891991d6e379b81e2dd1.tar.gz | |
Use generic icon-names for the devices
Draw the progressbar indicating the load-status of the devices
with cairo, eradicating the need for an icon per load-status.
TODO: Add the same drawing routine for the devices tab in the
settings manager.
Diffstat (limited to 'common')
| -rw-r--r-- | common/xfpm-icons.h | 24 | ||||
| -rw-r--r-- | common/xfpm-power-common.c | 16 |
2 files changed, 16 insertions, 24 deletions
diff --git a/common/xfpm-icons.h b/common/xfpm-icons.h index a417aab8..f6418ef4 100644 --- a/common/xfpm-icons.h +++ b/common/xfpm-icons.h @@ -26,21 +26,21 @@ G_BEGIN_DECLS #define XFPM_AC_ADAPTER_ICON "xfpm-ac-adapter" #define XFPM_UPS_ICON "xfpm-ups-100" -#define XFPM_KBD_ICON "xfpm-keyboard-100" -#define XFPM_MOUSE_ICON "xfpm-mouse-100" -#define XFPM_PHONE_ICON "xfpm-phone-100" -#define XFPM_PDA_ICON "xfpm-pda-100" +#define XFPM_KBD_ICON "input-keyboard" +#define XFPM_MOUSE_ICON "input-mouse" +#define XFPM_PHONE_ICON "phone" +#define XFPM_PDA_ICON "pda" #define XFPM_PRIMARY_ICON_PREFIX "xfpm-primary-" #define XFPM_UPS_ICON_PREFIX "xfpm-ups-" -#define XFPM_MOUSE_ICON_PREFIX "xfpm-mouse-" -#define XFPM_KBD_ICON_PREFIX "xfpm-keyboard-" -#define XFPM_PDA_ICON_PREFIX "xfpm-pda-" -#define XFPM_PHONE_ICON_PREFIX "xfpm-phone-" -#define XFPM_MEDIA_PLAYER_PREFIX "xfpm-mediaplayer-" -#define XFPM_MONITOR_PREFIX "xfpm-monitor-" -#define XFPM_COMPUTER_ICON_PREFIX "xfpm-computer-" -#define XFPM_TABLET_ICON_PREFIX "xfpm-tablet-" +#define XFPM_MOUSE_ICON_PREFIX "input-mouse" +#define XFPM_KBD_ICON_PREFIX "input-keyboard" +#define XFPM_PDA_ICON_PREFIX "pda" +#define XFPM_PHONE_ICON_PREFIX "phone" +#define XFPM_MEDIA_PLAYER_PREFIX "multimedia-player" +#define XFPM_MONITOR_PREFIX "video-display" +#define XFPM_COMPUTER_ICON_PREFIX "computer" +#define XFPM_TABLET_ICON_PREFIX "tablet" #define XFPM_DISPLAY_BRIGHTNESS_ICON "xfpm-brightness-lcd" #define XFPM_DISPLAY_BRIGHTNESS_INVALID_ICON "xfpm-brightness-lcd-missing" /* When no hw found */ diff --git a/common/xfpm-power-common.c b/common/xfpm-power-common.c index 59f98f13..8c3034fc 100644 --- a/common/xfpm-power-common.c +++ b/common/xfpm-power-common.c @@ -296,18 +296,10 @@ get_device_icon_name (UpClient *upower, UpDevice *device) } else { - if ( state == UP_DEVICE_STATE_EMPTY ) - { - icon_name = g_strdup_printf ("%s000", icon_prefix); - } - else if ( state == UP_DEVICE_STATE_FULLY_CHARGED ) - { - icon_name = g_strdup_printf ("%s100", icon_prefix); - } - else if ( state == UP_DEVICE_STATE_DISCHARGING || state == UP_DEVICE_STATE_CHARGING ) - { - icon_name = g_strdup_printf ("%s%s", icon_prefix, xfpm_battery_get_icon_index (type, percentage)); - } + + if ( state == UP_DEVICE_STATE_EMPTY || state == UP_DEVICE_STATE_FULLY_CHARGED || + state == UP_DEVICE_STATE_DISCHARGING || state == UP_DEVICE_STATE_CHARGING ) + icon_name = icon_prefix; else if (is_display_device (upower, device)) { /* Desktop system with no batteries */ |