[Xfce4-commits] [xfce/xfce4-power-manager] 58/64: Add/Remove device icons
noreply at xfce.org
noreply at xfce.org
Mon May 26 06:00:53 CEST 2014
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit 7a99e4fa0ade478015516606fed0b62f5d4907a7
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Tue May 20 20:05:35 2014 +0300
Add/Remove device icons
Remove old icons which aren't used in UPower and add new icons
that are.
---
common/xfpm-icons.h | 10 ++--
common/xfpm-power-common.c | 127 +++++++++++-------------------------------
common/xfpm-power-common.h | 7 ---
data/icons/32x32/Makefile.am | 4 +-
4 files changed, 38 insertions(+), 110 deletions(-)
diff --git a/common/xfpm-icons.h b/common/xfpm-icons.h
index 179ecc9..5ebc063 100644
--- a/common/xfpm-icons.h
+++ b/common/xfpm-icons.h
@@ -38,15 +38,15 @@ G_BEGIN_DECLS
#define XFPM_UPS_ICON_PREFIX "xfpm-ups-"
#define XFPM_MOUSE_ICON_PREFIX "xfpm-mouse-"
#define XFPM_KBD_ICON_PREFIX "xfpm-keyboard-"
-#define XFPM_CAMERA_ICON_PREFIX "xfpm-camera-"
#define XFPM_PDA_ICON_PREFIX "xfpm-pda-"
#define XFPM_PHONE_ICON_PREFIX "xfpm-phone-"
-#define XFPM_KBD_MOUSE_ICON_PREFIX "xfpm-keyboard-mouse-"
+#define XFPM_MEDIA_PLAYER_PREFIX "xfpm-mediaplayer-"
+#define XFPM_MONITOR_PREFIX "xfpm-monitor-"
#define XFPM_DISPLAY_BRIGHTNESS_ICON "xfpm-brightness-lcd"
-#define XFPM_DISPLAY_BRIGHTNESS_INVALID_ICON "xfpm-brightness-lcd-invalid" /* When no hw found */
-#define XFPM_HIBERNATE_ICON "xfpm-hibernate"
-#define XFPM_SUSPEND_ICON "xfpm-suspend"
+#define XFPM_DISPLAY_BRIGHTNESS_INVALID_ICON "xfpm-brightness-lcd-missing" /* When no hw found */
+#define XFPM_HIBERNATE_ICON "xfpm-hibernate"
+#define XFPM_SUSPEND_ICON "xfpm-suspend"
G_END_DECLS
diff --git a/common/xfpm-power-common.c b/common/xfpm-power-common.c
index 04caea0..3c9174a 100644
--- a/common/xfpm-power-common.c
+++ b/common/xfpm-power-common.c
@@ -31,101 +31,8 @@
#include "xfpm-icons.h"
-/**
- * xfpm_power_translate_device_type:
- *
- **/
-const gchar *
-xfpm_power_translate_device_type (guint type)
-{
- switch (type)
- {
- case UP_DEVICE_KIND_BATTERY:
- return _("Battery");
- case UP_DEVICE_KIND_UPS:
- return _("UPS");
- case UP_DEVICE_KIND_LINE_POWER:
- return _("Line power");
- case UP_DEVICE_KIND_MOUSE:
- return _("Mouse");
- case UP_DEVICE_KIND_KEYBOARD:
- return _("Keyboard");
- case UP_DEVICE_KIND_MONITOR:
- return _("Monitor");
- case UP_DEVICE_KIND_PDA:
- return _("PDA");
- case UP_DEVICE_KIND_PHONE:
- return _("Phone");
- case UP_DEVICE_KIND_TABLET:
- return _("Tablet");
- case UP_DEVICE_KIND_COMPUTER:
- return _("Computer");
- case UP_DEVICE_KIND_UNKNOWN:
- return _("Unknown");
- }
- return _("Battery");
-}
-
-/**
- * xfpm_power_translate_technology:
- *
- **/
-const gchar *xfpm_power_translate_technology (guint value)
-{
- switch (value)
- {
- case 0:
- return _("Unknown");
- case 1:
- return _("Lithium ion");
- case 2:
- return _("Lithium polymer");
- case 3:
- return _("Lithium iron phosphate");
- case 4:
- return _("Lead acid");
- case 5:
- return _("Nickel cadmium");
- case 6:
- return _("Nickel metal hybride");
- }
-
- return _("Unknown");
-}
-
-const gchar *xfpm_power_get_icon_name (guint device_type)
-{
- switch (device_type)
- {
- case UP_DEVICE_KIND_BATTERY:
- return XFPM_BATTERY_ICON;
- case UP_DEVICE_KIND_UPS:
- return XFPM_UPS_ICON;
- case UP_DEVICE_KIND_LINE_POWER:
- return XFPM_AC_ADAPTER_ICON;
- case UP_DEVICE_KIND_MOUSE:
- return XFPM_MOUSE_ICON;
- case UP_DEVICE_KIND_KEYBOARD:
- return XFPM_KBD_ICON;
- case UP_DEVICE_KIND_MONITOR:
- return "monitor";
- case UP_DEVICE_KIND_COMPUTER:
- return "monitor"; /* fixme */
- case UP_DEVICE_KIND_PDA:
- return XFPM_PDA_ICON;
- case UP_DEVICE_KIND_PHONE:
- return XFPM_PHONE_ICON;
- case UP_DEVICE_KIND_TABLET:
- return XFPM_PHONE_ICON;
- case UP_DEVICE_KIND_MEDIA_PLAYER:
- return XFPM_PHONE_ICON; /* fixme */
- case UP_DEVICE_KIND_UNKNOWN:
- return XFPM_BATTERY_ICON;
- }
- return XFPM_BATTERY_ICON;
-}
const gchar * G_GNUC_CONST
xfpm_battery_get_icon_index (UpDeviceKind type, guint percent)
@@ -136,11 +43,11 @@ xfpm_battery_get_icon_index (UpDeviceKind type, guint percent)
}
else if (percent < 30)
{
- return ( (type == UP_DEVICE_KIND_BATTERY || type == UP_DEVICE_KIND_UPS) ? "020" : "030");
+ return "020";
}
else if (percent < 50)
{
- return ( (type == UP_DEVICE_KIND_BATTERY || type == UP_DEVICE_KIND_UPS ) ? "040" : "030");
+ return "040";
}
else if (percent < 70)
{
@@ -148,7 +55,7 @@ xfpm_battery_get_icon_index (UpDeviceKind type, guint percent)
}
else if (percent < 90)
{
- return ((type == UP_DEVICE_KIND_BATTERY || type == UP_DEVICE_KIND_UPS) ? "080" : "060");
+ return "080";
}
return "100";
@@ -201,6 +108,9 @@ xfpm_battery_get_time_string (guint seconds)
gchar *
xfpm_battery_get_icon_prefix_device_enum_type (UpDeviceKind type)
{
+ /* mapped from
+ * http://cgit.freedesktop.org/upower/tree/libupower-glib/up-types.h
+ */
if ( type == UP_DEVICE_KIND_BATTERY )
{
return g_strdup (XFPM_PRIMARY_ICON_PREFIX);
@@ -221,6 +131,31 @@ xfpm_battery_get_icon_prefix_device_enum_type (UpDeviceKind type)
{
return g_strdup (XFPM_PHONE_ICON_PREFIX);
}
+ else if ( type == UP_DEVICE_KIND_PDA )
+ {
+ return g_strdup (XFPM_PDA_ICON_PREFIX);
+ }
+ else if ( type == UP_DEVICE_KIND_MEDIA_PLAYER )
+ {
+ return g_strdup (XFPM_MEDIA_PLAYER_PREFIX);
+ }
+ else if ( type == UP_DEVICE_KIND_LINE_POWER )
+ {
+ return g_strdup (XFPM_AC_ADAPTER_ICON);
+ }
+ else if ( type == UP_DEVICE_KIND_MONITOR )
+ {
+ return g_strdup (XFPM_MONITOR_PREFIX);
+ }
+ else if ( type == UP_DEVICE_KIND_TABLET )
+ {
+ /* Tablet ... pda, same thing :) */
+ return g_strdup (XFPM_PDA_ICON_PREFIX);
+ }
+ else if ( type == UP_DEVICE_KIND_COMPUTER )
+ {
+ return g_strdup (XFPM_PRIMARY_ICON_PREFIX);
+ }
return g_strdup (XFPM_PRIMARY_ICON_PREFIX);
}
diff --git a/common/xfpm-power-common.h b/common/xfpm-power-common.h
index 920dff4..f2d1d19 100644
--- a/common/xfpm-power-common.h
+++ b/common/xfpm-power-common.h
@@ -40,13 +40,6 @@
#define POLKIT_AUTH_HIBERNATE_LOGIND "org.freedesktop.login1.hibernate"
-
-const gchar *xfpm_power_translate_device_type (guint type);
-
-const gchar *xfpm_power_translate_technology (guint value);
-
-const gchar *xfpm_power_get_icon_name (guint device_type);
-
const gchar *G_GNUC_CONST xfpm_battery_get_icon_index (UpDeviceKind type, guint percent);
gchar *xfpm_battery_get_time_string (guint seconds);
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 9d259a5..9bc0986 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -61,5 +61,5 @@ Data_DATA = \
xfpm-ups-060.png \
xfpm-ups-080.png \
xfpm-ups-100.png \
- xfpm-brightness-lcd-invalid.png \
- xfpm-brightness-lcd.png
\ No newline at end of file
+ xfpm-brightness-lcd-missing.png \
+ xfpm-brightness-lcd.png
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list