gnome-power-manager r3222 - in trunk: . data/icons/16x16/status data/icons/22x22/status data/icons/24x24/status data/icons/48x48/status data/icons/scalable/status docs src
- From: rhughes svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-power-manager r3222 - in trunk: . data/icons/16x16/status data/icons/22x22/status data/icons/24x24/status data/icons/48x48/status data/icons/scalable/status docs src
- Date: Tue, 3 Feb 2009 17:36:14 +0000 (UTC)
Author: rhughes
Date: Tue Feb 3 17:36:14 2009
New Revision: 3222
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3222&view=rev
Log:
2009-02-03 Richard Hughes <richard hughsie com>
* data/icons/16x16/status/Makefile.am:
* data/icons/22x22/status/Makefile.am:
* data/icons/24x24/status/Makefile.am:
* data/icons/48x48/status/Makefile.am:
* data/icons/scalable/status/Makefile.am:
* docs/icon-naming.txt:
* src/gpm-devicekit.c: (gpm_devicekit_get_object_icon):
Upload new icons in 16, 22, and 24 sizes in on-shelf perspective.
This makes the g-p-m icons match the other icons in the panel, and
makes it much easier to read the level.
Icons from the legendary Andreas Nilsson, many thanks.
Added:
trunk/data/icons/16x16/status/gpm-battery-000-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-000-charging.png
trunk/data/icons/16x16/status/gpm-battery-000.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-000.png
trunk/data/icons/16x16/status/gpm-battery-020-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-020-charging.png
trunk/data/icons/16x16/status/gpm-battery-020.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-020.png
trunk/data/icons/16x16/status/gpm-battery-040-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-040-charging.png
trunk/data/icons/16x16/status/gpm-battery-040.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-040.png
trunk/data/icons/16x16/status/gpm-battery-060-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-060-charging.png
trunk/data/icons/16x16/status/gpm-battery-060.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-060.png
trunk/data/icons/16x16/status/gpm-battery-080-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-080-charging.png
trunk/data/icons/16x16/status/gpm-battery-080.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-080.png
trunk/data/icons/16x16/status/gpm-battery-100-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-100-charging.png
trunk/data/icons/16x16/status/gpm-battery-100.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-100.png
trunk/data/icons/16x16/status/gpm-battery-missing.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/16x16/status/gpm-primary-missing.png
trunk/data/icons/16x16/status/gpm-keyboard-020.png (contents, props changed)
trunk/data/icons/16x16/status/gpm-keyboard-040.png (contents, props changed)
trunk/data/icons/16x16/status/gpm-keyboard-080.png (contents, props changed)
trunk/data/icons/16x16/status/gpm-mouse-020.png (contents, props changed)
trunk/data/icons/16x16/status/gpm-mouse-040.png (contents, props changed)
trunk/data/icons/16x16/status/gpm-mouse-080.png (contents, props changed)
trunk/data/icons/16x16/status/gpm-phone-020.png (contents, props changed)
trunk/data/icons/16x16/status/gpm-phone-040.png (contents, props changed)
trunk/data/icons/16x16/status/gpm-phone-080.png (contents, props changed)
trunk/data/icons/22x22/status/gpm-battery-000-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-000-charging.png
trunk/data/icons/22x22/status/gpm-battery-000.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-000.png
trunk/data/icons/22x22/status/gpm-battery-020-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-020-charging.png
trunk/data/icons/22x22/status/gpm-battery-020.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-020.png
trunk/data/icons/22x22/status/gpm-battery-040-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-040-charging.png
trunk/data/icons/22x22/status/gpm-battery-040.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-040.png
trunk/data/icons/22x22/status/gpm-battery-060-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-060-charging.png
trunk/data/icons/22x22/status/gpm-battery-060.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-060.png
trunk/data/icons/22x22/status/gpm-battery-080-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-080-charging.png
trunk/data/icons/22x22/status/gpm-battery-080.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-080.png
trunk/data/icons/22x22/status/gpm-battery-100-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-100-charging.png
trunk/data/icons/22x22/status/gpm-battery-100.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-100.png
trunk/data/icons/22x22/status/gpm-battery-missing.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/22x22/status/gpm-primary-missing.png
trunk/data/icons/22x22/status/gpm-keyboard-020.png (contents, props changed)
trunk/data/icons/22x22/status/gpm-keyboard-040.png (contents, props changed)
trunk/data/icons/22x22/status/gpm-keyboard-080.png (contents, props changed)
trunk/data/icons/22x22/status/gpm-mouse-020.png (contents, props changed)
trunk/data/icons/22x22/status/gpm-mouse-040.png (contents, props changed)
trunk/data/icons/22x22/status/gpm-mouse-080.png (contents, props changed)
trunk/data/icons/22x22/status/gpm-phone-020.png (contents, props changed)
trunk/data/icons/22x22/status/gpm-phone-040.png (contents, props changed)
trunk/data/icons/22x22/status/gpm-phone-080.png (contents, props changed)
trunk/data/icons/24x24/status/gpm-battery-000-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-000-charging.png
trunk/data/icons/24x24/status/gpm-battery-000.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-000.png
trunk/data/icons/24x24/status/gpm-battery-020-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-020-charging.png
trunk/data/icons/24x24/status/gpm-battery-020.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-020.png
trunk/data/icons/24x24/status/gpm-battery-040-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-040-charging.png
trunk/data/icons/24x24/status/gpm-battery-040.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-040.png
trunk/data/icons/24x24/status/gpm-battery-060-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-060-charging.png
trunk/data/icons/24x24/status/gpm-battery-060.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-060.png
trunk/data/icons/24x24/status/gpm-battery-080-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-080-charging.png
trunk/data/icons/24x24/status/gpm-battery-080.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-080.png
trunk/data/icons/24x24/status/gpm-battery-100-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-100-charging.png
trunk/data/icons/24x24/status/gpm-battery-100.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-100.png
trunk/data/icons/24x24/status/gpm-battery-missing.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/24x24/status/gpm-primary-missing.png
trunk/data/icons/24x24/status/gpm-keyboard-020.png (contents, props changed)
trunk/data/icons/24x24/status/gpm-keyboard-040.png (contents, props changed)
trunk/data/icons/24x24/status/gpm-keyboard-080.png (contents, props changed)
trunk/data/icons/24x24/status/gpm-mouse-020.png (contents, props changed)
trunk/data/icons/24x24/status/gpm-mouse-040.png (contents, props changed)
trunk/data/icons/24x24/status/gpm-mouse-080.png (contents, props changed)
trunk/data/icons/24x24/status/gpm-phone-020.png (contents, props changed)
trunk/data/icons/24x24/status/gpm-phone-040.png (contents, props changed)
trunk/data/icons/24x24/status/gpm-phone-080.png (contents, props changed)
trunk/data/icons/48x48/status/gpm-battery-000-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-000-charging.png
trunk/data/icons/48x48/status/gpm-battery-000.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-000.png
trunk/data/icons/48x48/status/gpm-battery-020-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-020-charging.png
trunk/data/icons/48x48/status/gpm-battery-020.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-020.png
trunk/data/icons/48x48/status/gpm-battery-040-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-040-charging.png
trunk/data/icons/48x48/status/gpm-battery-040.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-040.png
trunk/data/icons/48x48/status/gpm-battery-060-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-060-charging.png
trunk/data/icons/48x48/status/gpm-battery-060.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-060.png
trunk/data/icons/48x48/status/gpm-battery-080-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-080-charging.png
trunk/data/icons/48x48/status/gpm-battery-080.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-080.png
trunk/data/icons/48x48/status/gpm-battery-100-charging.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-100-charging.png
trunk/data/icons/48x48/status/gpm-battery-100.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-100.png
trunk/data/icons/48x48/status/gpm-battery-missing.png (contents, props changed)
- copied, changed from r3221, /trunk/data/icons/48x48/status/gpm-primary-missing.png
trunk/data/icons/48x48/status/gpm-keyboard-020.png (contents, props changed)
trunk/data/icons/48x48/status/gpm-keyboard-040.png (contents, props changed)
trunk/data/icons/48x48/status/gpm-keyboard-080.png (contents, props changed)
trunk/data/icons/48x48/status/gpm-mouse-020.png (contents, props changed)
trunk/data/icons/48x48/status/gpm-mouse-040.png (contents, props changed)
trunk/data/icons/48x48/status/gpm-mouse-080.png (contents, props changed)
trunk/data/icons/48x48/status/gpm-phone-020.png (contents, props changed)
trunk/data/icons/48x48/status/gpm-phone-040.png (contents, props changed)
trunk/data/icons/48x48/status/gpm-phone-080.png (contents, props changed)
trunk/data/icons/scalable/status/gpm-battery-000-charging.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-000-charging.svg
trunk/data/icons/scalable/status/gpm-battery-000.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-000.svg
trunk/data/icons/scalable/status/gpm-battery-020-charging.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-020-charging.svg
trunk/data/icons/scalable/status/gpm-battery-020.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-020.svg
trunk/data/icons/scalable/status/gpm-battery-040-charging.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-040-charging.svg
trunk/data/icons/scalable/status/gpm-battery-040.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-040.svg
trunk/data/icons/scalable/status/gpm-battery-060-charging.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-060-charging.svg
trunk/data/icons/scalable/status/gpm-battery-060.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-060.svg
trunk/data/icons/scalable/status/gpm-battery-080-charging.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-080-charging.svg
trunk/data/icons/scalable/status/gpm-battery-080.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-080.svg
trunk/data/icons/scalable/status/gpm-battery-100-charging.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-100-charging.svg
trunk/data/icons/scalable/status/gpm-battery-100.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-100.svg
trunk/data/icons/scalable/status/gpm-battery-missing.svg (props changed)
- copied unchanged from r3221, /trunk/data/icons/scalable/status/gpm-primary-missing.svg
Removed:
trunk/data/icons/16x16/status/gpm-keyboard-030.png
trunk/data/icons/16x16/status/gpm-mouse-030.png
trunk/data/icons/16x16/status/gpm-phone-030.png
trunk/data/icons/16x16/status/gpm-primary-000-charging.png
trunk/data/icons/16x16/status/gpm-primary-000.png
trunk/data/icons/16x16/status/gpm-primary-020-charging.png
trunk/data/icons/16x16/status/gpm-primary-020.png
trunk/data/icons/16x16/status/gpm-primary-040-charging.png
trunk/data/icons/16x16/status/gpm-primary-040.png
trunk/data/icons/16x16/status/gpm-primary-060-charging.png
trunk/data/icons/16x16/status/gpm-primary-060.png
trunk/data/icons/16x16/status/gpm-primary-080-charging.png
trunk/data/icons/16x16/status/gpm-primary-080.png
trunk/data/icons/16x16/status/gpm-primary-100-charging.png
trunk/data/icons/16x16/status/gpm-primary-100.png
trunk/data/icons/16x16/status/gpm-primary-charged.png
trunk/data/icons/16x16/status/gpm-primary-missing.png
trunk/data/icons/16x16/status/gpm-ups-charged.png
trunk/data/icons/22x22/status/gpm-keyboard-030.png
trunk/data/icons/22x22/status/gpm-mouse-030.png
trunk/data/icons/22x22/status/gpm-phone-030.png
trunk/data/icons/22x22/status/gpm-primary-000-charging.png
trunk/data/icons/22x22/status/gpm-primary-000.png
trunk/data/icons/22x22/status/gpm-primary-020-charging.png
trunk/data/icons/22x22/status/gpm-primary-020.png
trunk/data/icons/22x22/status/gpm-primary-040-charging.png
trunk/data/icons/22x22/status/gpm-primary-040.png
trunk/data/icons/22x22/status/gpm-primary-060-charging.png
trunk/data/icons/22x22/status/gpm-primary-060.png
trunk/data/icons/22x22/status/gpm-primary-080-charging.png
trunk/data/icons/22x22/status/gpm-primary-080.png
trunk/data/icons/22x22/status/gpm-primary-100-charging.png
trunk/data/icons/22x22/status/gpm-primary-100.png
trunk/data/icons/22x22/status/gpm-primary-charged.png
trunk/data/icons/22x22/status/gpm-primary-missing.png
trunk/data/icons/22x22/status/gpm-ups-charged.png
trunk/data/icons/24x24/status/gpm-keyboard-030.png
trunk/data/icons/24x24/status/gpm-mouse-030.png
trunk/data/icons/24x24/status/gpm-phone-030.png
trunk/data/icons/24x24/status/gpm-primary-000-charging.png
trunk/data/icons/24x24/status/gpm-primary-000.png
trunk/data/icons/24x24/status/gpm-primary-020-charging.png
trunk/data/icons/24x24/status/gpm-primary-020.png
trunk/data/icons/24x24/status/gpm-primary-040-charging.png
trunk/data/icons/24x24/status/gpm-primary-040.png
trunk/data/icons/24x24/status/gpm-primary-060-charging.png
trunk/data/icons/24x24/status/gpm-primary-060.png
trunk/data/icons/24x24/status/gpm-primary-080-charging.png
trunk/data/icons/24x24/status/gpm-primary-080.png
trunk/data/icons/24x24/status/gpm-primary-100-charging.png
trunk/data/icons/24x24/status/gpm-primary-100.png
trunk/data/icons/24x24/status/gpm-primary-charged.png
trunk/data/icons/24x24/status/gpm-primary-missing.png
trunk/data/icons/24x24/status/gpm-ups-charged.png
trunk/data/icons/48x48/status/gpm-keyboard-030.png
trunk/data/icons/48x48/status/gpm-mouse-030.png
trunk/data/icons/48x48/status/gpm-phone-030.png
trunk/data/icons/48x48/status/gpm-primary-000-charging.png
trunk/data/icons/48x48/status/gpm-primary-000.png
trunk/data/icons/48x48/status/gpm-primary-020-charging.png
trunk/data/icons/48x48/status/gpm-primary-020.png
trunk/data/icons/48x48/status/gpm-primary-040-charging.png
trunk/data/icons/48x48/status/gpm-primary-040.png
trunk/data/icons/48x48/status/gpm-primary-060-charging.png
trunk/data/icons/48x48/status/gpm-primary-060.png
trunk/data/icons/48x48/status/gpm-primary-080-charging.png
trunk/data/icons/48x48/status/gpm-primary-080.png
trunk/data/icons/48x48/status/gpm-primary-100-charging.png
trunk/data/icons/48x48/status/gpm-primary-100.png
trunk/data/icons/48x48/status/gpm-primary-charged.png
trunk/data/icons/48x48/status/gpm-primary-missing.png
trunk/data/icons/48x48/status/gpm-ups-charged.png
trunk/data/icons/scalable/status/gpm-keyboard-030.svg
trunk/data/icons/scalable/status/gpm-mouse-030.svg
trunk/data/icons/scalable/status/gpm-phone-030.svg
trunk/data/icons/scalable/status/gpm-primary-000-charging.svg
trunk/data/icons/scalable/status/gpm-primary-000.svg
trunk/data/icons/scalable/status/gpm-primary-020-charging.svg
trunk/data/icons/scalable/status/gpm-primary-020.svg
trunk/data/icons/scalable/status/gpm-primary-040-charging.svg
trunk/data/icons/scalable/status/gpm-primary-040.svg
trunk/data/icons/scalable/status/gpm-primary-060-charging.svg
trunk/data/icons/scalable/status/gpm-primary-060.svg
trunk/data/icons/scalable/status/gpm-primary-080-charging.svg
trunk/data/icons/scalable/status/gpm-primary-080.svg
trunk/data/icons/scalable/status/gpm-primary-100-charging.svg
trunk/data/icons/scalable/status/gpm-primary-100.svg
trunk/data/icons/scalable/status/gpm-primary-charged.svg
trunk/data/icons/scalable/status/gpm-primary-missing.svg
trunk/data/icons/scalable/status/gpm-ups-charged.svg
Modified:
trunk/ChangeLog
trunk/data/icons/16x16/status/Makefile.am
trunk/data/icons/16x16/status/gpm-keyboard-000.png
trunk/data/icons/16x16/status/gpm-keyboard-060.png
trunk/data/icons/16x16/status/gpm-keyboard-100.png
trunk/data/icons/16x16/status/gpm-mouse-000.png
trunk/data/icons/16x16/status/gpm-mouse-060.png
trunk/data/icons/16x16/status/gpm-mouse-100.png
trunk/data/icons/16x16/status/gpm-phone-000.png
trunk/data/icons/16x16/status/gpm-phone-060.png
trunk/data/icons/16x16/status/gpm-phone-100.png
trunk/data/icons/22x22/status/Makefile.am
trunk/data/icons/22x22/status/gpm-keyboard-000.png
trunk/data/icons/22x22/status/gpm-keyboard-060.png
trunk/data/icons/22x22/status/gpm-keyboard-100.png
trunk/data/icons/22x22/status/gpm-mouse-000.png
trunk/data/icons/22x22/status/gpm-mouse-060.png
trunk/data/icons/22x22/status/gpm-mouse-100.png
trunk/data/icons/22x22/status/gpm-phone-000.png
trunk/data/icons/22x22/status/gpm-phone-060.png
trunk/data/icons/22x22/status/gpm-phone-100.png
trunk/data/icons/24x24/status/Makefile.am
trunk/data/icons/24x24/status/gpm-keyboard-000.png
trunk/data/icons/24x24/status/gpm-keyboard-060.png
trunk/data/icons/24x24/status/gpm-keyboard-100.png
trunk/data/icons/24x24/status/gpm-mouse-000.png
trunk/data/icons/24x24/status/gpm-mouse-060.png
trunk/data/icons/24x24/status/gpm-mouse-100.png
trunk/data/icons/24x24/status/gpm-phone-000.png
trunk/data/icons/24x24/status/gpm-phone-060.png
trunk/data/icons/24x24/status/gpm-phone-100.png
trunk/data/icons/48x48/status/Makefile.am
trunk/data/icons/48x48/status/gpm-keyboard-000.png
trunk/data/icons/48x48/status/gpm-keyboard-060.png
trunk/data/icons/48x48/status/gpm-keyboard-100.png
trunk/data/icons/48x48/status/gpm-mouse-000.png
trunk/data/icons/48x48/status/gpm-mouse-060.png
trunk/data/icons/48x48/status/gpm-mouse-100.png
trunk/data/icons/48x48/status/gpm-phone-000.png
trunk/data/icons/48x48/status/gpm-phone-060.png
trunk/data/icons/48x48/status/gpm-phone-100.png
trunk/data/icons/scalable/status/Makefile.am
trunk/docs/icon-naming.txt
trunk/src/gpm-devicekit.c
Modified: trunk/data/icons/16x16/status/Makefile.am
==============================================================================
--- trunk/data/icons/16x16/status/Makefile.am (original)
+++ trunk/data/icons/16x16/status/Makefile.am Tue Feb 3 17:36:14 2009
@@ -16,31 +16,36 @@
gpm-inhibit.png \
gpm-inhibit-invalid.png \
gpm-keyboard-000.png \
- gpm-keyboard-030.png \
+ gpm-keyboard-020.png \
+ gpm-keyboard-040.png \
gpm-keyboard-060.png \
+ gpm-keyboard-080.png \
gpm-keyboard-100.png \
gpm-phone-000.png \
- gpm-phone-030.png \
+ gpm-phone-020.png \
+ gpm-phone-040.png \
gpm-phone-060.png \
+ gpm-phone-080.png \
gpm-phone-100.png \
gpm-mouse-000.png \
- gpm-mouse-030.png \
+ gpm-mouse-020.png \
+ gpm-mouse-040.png \
gpm-mouse-060.png \
+ gpm-mouse-080.png \
gpm-mouse-100.png \
- gpm-primary-000.png \
- gpm-primary-020.png \
- gpm-primary-040.png \
- gpm-primary-060.png \
- gpm-primary-080.png \
- gpm-primary-100.png \
- gpm-primary-000-charging.png \
- gpm-primary-020-charging.png \
- gpm-primary-040-charging.png \
- gpm-primary-060-charging.png \
- gpm-primary-080-charging.png \
- gpm-primary-100-charging.png \
- gpm-primary-charged.png \
- gpm-primary-missing.png \
+ gpm-battery-000.png \
+ gpm-battery-020.png \
+ gpm-battery-040.png \
+ gpm-battery-060.png \
+ gpm-battery-080.png \
+ gpm-battery-100.png \
+ gpm-battery-000-charging.png \
+ gpm-battery-020-charging.png \
+ gpm-battery-040-charging.png \
+ gpm-battery-060-charging.png \
+ gpm-battery-080-charging.png \
+ gpm-battery-100-charging.png \
+ gpm-battery-missing.png \
gpm-ups-000.png \
gpm-ups-020.png \
gpm-ups-040.png \
@@ -53,7 +58,6 @@
gpm-ups-060-charging.png \
gpm-ups-080-charging.png \
gpm-ups-100-charging.png \
- gpm-ups-charged.png \
gpm-ups-missing.png
noinst_DATA =
Copied: trunk/data/icons/16x16/status/gpm-battery-000-charging.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-000-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-000.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-000.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-020-charging.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-020-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-020.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-020.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-040-charging.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-040-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-040.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-040.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-060-charging.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-060-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-060.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-060.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-080-charging.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-080-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-080.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-080.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-100-charging.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-100-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-100.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-100.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/16x16/status/gpm-battery-missing.png (from r3221, /trunk/data/icons/16x16/status/gpm-primary-missing.png)
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/16x16/status/gpm-keyboard-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/16x16/status/gpm-keyboard-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/16x16/status/gpm-keyboard-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/16x16/status/gpm-keyboard-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/16x16/status/gpm-keyboard-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/16x16/status/gpm-keyboard-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/16x16/status/gpm-mouse-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/16x16/status/gpm-mouse-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/16x16/status/gpm-mouse-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/16x16/status/gpm-mouse-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/16x16/status/gpm-mouse-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/16x16/status/gpm-mouse-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/16x16/status/gpm-phone-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/16x16/status/gpm-phone-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/16x16/status/gpm-phone-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/16x16/status/gpm-phone-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/16x16/status/gpm-phone-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/16x16/status/gpm-phone-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/22x22/status/Makefile.am
==============================================================================
--- trunk/data/icons/22x22/status/Makefile.am (original)
+++ trunk/data/icons/22x22/status/Makefile.am Tue Feb 3 17:36:14 2009
@@ -16,31 +16,36 @@
gpm-inhibit.png \
gpm-inhibit-invalid.png \
gpm-keyboard-000.png \
- gpm-keyboard-030.png \
+ gpm-keyboard-020.png \
+ gpm-keyboard-040.png \
gpm-keyboard-060.png \
+ gpm-keyboard-080.png \
gpm-keyboard-100.png \
gpm-phone-000.png \
- gpm-phone-030.png \
+ gpm-phone-020.png \
+ gpm-phone-040.png \
gpm-phone-060.png \
+ gpm-phone-080.png \
gpm-phone-100.png \
gpm-mouse-000.png \
- gpm-mouse-030.png \
+ gpm-mouse-020.png \
+ gpm-mouse-040.png \
gpm-mouse-060.png \
+ gpm-mouse-080.png \
gpm-mouse-100.png \
- gpm-primary-000.png \
- gpm-primary-020.png \
- gpm-primary-040.png \
- gpm-primary-060.png \
- gpm-primary-080.png \
- gpm-primary-100.png \
- gpm-primary-000-charging.png \
- gpm-primary-020-charging.png \
- gpm-primary-040-charging.png \
- gpm-primary-060-charging.png \
- gpm-primary-080-charging.png \
- gpm-primary-100-charging.png \
- gpm-primary-charged.png \
- gpm-primary-missing.png \
+ gpm-battery-000.png \
+ gpm-battery-020.png \
+ gpm-battery-040.png \
+ gpm-battery-060.png \
+ gpm-battery-080.png \
+ gpm-battery-100.png \
+ gpm-battery-000-charging.png \
+ gpm-battery-020-charging.png \
+ gpm-battery-040-charging.png \
+ gpm-battery-060-charging.png \
+ gpm-battery-080-charging.png \
+ gpm-battery-100-charging.png \
+ gpm-battery-missing.png \
gpm-ups-000.png \
gpm-ups-020.png \
gpm-ups-040.png \
@@ -53,7 +58,6 @@
gpm-ups-060-charging.png \
gpm-ups-080-charging.png \
gpm-ups-100-charging.png \
- gpm-ups-charged.png \
gpm-ups-missing.png
noinst_DATA =
Copied: trunk/data/icons/22x22/status/gpm-battery-000-charging.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-000-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-000.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-000.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-020-charging.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-020-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-020.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-020.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-040-charging.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-040-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-040.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-040.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-060-charging.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-060-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-060.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-060.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-080-charging.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-080-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-080.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-080.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-100-charging.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-100-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-100.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-100.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/22x22/status/gpm-battery-missing.png (from r3221, /trunk/data/icons/22x22/status/gpm-primary-missing.png)
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/22x22/status/gpm-keyboard-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/22x22/status/gpm-keyboard-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/22x22/status/gpm-keyboard-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/22x22/status/gpm-keyboard-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/22x22/status/gpm-keyboard-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/22x22/status/gpm-keyboard-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/22x22/status/gpm-mouse-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/22x22/status/gpm-mouse-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/22x22/status/gpm-mouse-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/22x22/status/gpm-mouse-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/22x22/status/gpm-mouse-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/22x22/status/gpm-mouse-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/22x22/status/gpm-phone-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/22x22/status/gpm-phone-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/22x22/status/gpm-phone-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/22x22/status/gpm-phone-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/22x22/status/gpm-phone-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/22x22/status/gpm-phone-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/24x24/status/Makefile.am
==============================================================================
--- trunk/data/icons/24x24/status/Makefile.am (original)
+++ trunk/data/icons/24x24/status/Makefile.am Tue Feb 3 17:36:14 2009
@@ -16,31 +16,36 @@
gpm-inhibit.png \
gpm-inhibit-invalid.png \
gpm-keyboard-000.png \
- gpm-keyboard-030.png \
+ gpm-keyboard-020.png \
+ gpm-keyboard-040.png \
gpm-keyboard-060.png \
+ gpm-keyboard-080.png \
gpm-keyboard-100.png \
gpm-phone-000.png \
- gpm-phone-030.png \
+ gpm-phone-020.png \
+ gpm-phone-040.png \
gpm-phone-060.png \
+ gpm-phone-080.png \
gpm-phone-100.png \
gpm-mouse-000.png \
- gpm-mouse-030.png \
+ gpm-mouse-020.png \
+ gpm-mouse-040.png \
gpm-mouse-060.png \
+ gpm-mouse-080.png \
gpm-mouse-100.png \
- gpm-primary-000.png \
- gpm-primary-020.png \
- gpm-primary-040.png \
- gpm-primary-060.png \
- gpm-primary-080.png \
- gpm-primary-100.png \
- gpm-primary-000-charging.png \
- gpm-primary-020-charging.png \
- gpm-primary-040-charging.png \
- gpm-primary-060-charging.png \
- gpm-primary-080-charging.png \
- gpm-primary-100-charging.png \
- gpm-primary-charged.png \
- gpm-primary-missing.png \
+ gpm-battery-000.png \
+ gpm-battery-020.png \
+ gpm-battery-040.png \
+ gpm-battery-060.png \
+ gpm-battery-080.png \
+ gpm-battery-100.png \
+ gpm-battery-000-charging.png \
+ gpm-battery-020-charging.png \
+ gpm-battery-040-charging.png \
+ gpm-battery-060-charging.png \
+ gpm-battery-080-charging.png \
+ gpm-battery-100-charging.png \
+ gpm-battery-missing.png \
gpm-ups-000.png \
gpm-ups-020.png \
gpm-ups-040.png \
@@ -53,7 +58,6 @@
gpm-ups-060-charging.png \
gpm-ups-080-charging.png \
gpm-ups-100-charging.png \
- gpm-ups-charged.png \
gpm-ups-missing.png
noinst_DATA =
Copied: trunk/data/icons/24x24/status/gpm-battery-000-charging.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-000-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-000.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-000.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-020-charging.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-020-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-020.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-020.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-040-charging.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-040-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-040.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-040.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-060-charging.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-060-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-060.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-060.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-080-charging.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-080-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-080.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-080.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-100-charging.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-100-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-100.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-100.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/24x24/status/gpm-battery-missing.png (from r3221, /trunk/data/icons/24x24/status/gpm-primary-missing.png)
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/24x24/status/gpm-keyboard-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/24x24/status/gpm-keyboard-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/24x24/status/gpm-keyboard-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/24x24/status/gpm-keyboard-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/24x24/status/gpm-keyboard-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/24x24/status/gpm-keyboard-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/24x24/status/gpm-mouse-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/24x24/status/gpm-mouse-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/24x24/status/gpm-mouse-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/24x24/status/gpm-mouse-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/24x24/status/gpm-mouse-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/24x24/status/gpm-mouse-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/24x24/status/gpm-phone-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/24x24/status/gpm-phone-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/24x24/status/gpm-phone-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/24x24/status/gpm-phone-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/24x24/status/gpm-phone-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/24x24/status/gpm-phone-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/48x48/status/Makefile.am
==============================================================================
--- trunk/data/icons/48x48/status/Makefile.am (original)
+++ trunk/data/icons/48x48/status/Makefile.am Tue Feb 3 17:36:14 2009
@@ -17,31 +17,36 @@
gpm-inhibit.png \
gpm-inhibit-invalid.png \
gpm-keyboard-000.png \
- gpm-keyboard-030.png \
+ gpm-keyboard-020.png \
+ gpm-keyboard-040.png \
gpm-keyboard-060.png \
+ gpm-keyboard-080.png \
gpm-keyboard-100.png \
gpm-phone-000.png \
- gpm-phone-030.png \
+ gpm-phone-020.png \
+ gpm-phone-040.png \
gpm-phone-060.png \
+ gpm-phone-080.png \
gpm-phone-100.png \
gpm-mouse-000.png \
- gpm-mouse-030.png \
+ gpm-mouse-020.png \
+ gpm-mouse-040.png \
gpm-mouse-060.png \
+ gpm-mouse-080.png \
gpm-mouse-100.png \
- gpm-primary-000.png \
- gpm-primary-020.png \
- gpm-primary-040.png \
- gpm-primary-060.png \
- gpm-primary-080.png \
- gpm-primary-100.png \
- gpm-primary-000-charging.png \
- gpm-primary-020-charging.png \
- gpm-primary-040-charging.png \
- gpm-primary-060-charging.png \
- gpm-primary-080-charging.png \
- gpm-primary-100-charging.png \
- gpm-primary-charged.png \
- gpm-primary-missing.png \
+ gpm-battery-000.png \
+ gpm-battery-020.png \
+ gpm-battery-040.png \
+ gpm-battery-060.png \
+ gpm-battery-080.png \
+ gpm-battery-100.png \
+ gpm-battery-000-charging.png \
+ gpm-battery-020-charging.png \
+ gpm-battery-040-charging.png \
+ gpm-battery-060-charging.png \
+ gpm-battery-080-charging.png \
+ gpm-battery-100-charging.png \
+ gpm-battery-missing.png \
gpm-ups-000.png \
gpm-ups-020.png \
gpm-ups-040.png \
@@ -54,7 +59,6 @@
gpm-ups-060-charging.png \
gpm-ups-080-charging.png \
gpm-ups-100-charging.png \
- gpm-ups-charged.png \
gpm-ups-missing.png
noinst_DATA =
Copied: trunk/data/icons/48x48/status/gpm-battery-000-charging.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-000-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-000.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-000.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-020-charging.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-020-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-020.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-020.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-040-charging.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-040-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-040.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-040.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-060-charging.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-060-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-060.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-060.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-080-charging.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-080-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-080.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-080.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-100-charging.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-100-charging.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-100.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-100.png)
==============================================================================
Binary files. No diff available.
Copied: trunk/data/icons/48x48/status/gpm-battery-missing.png (from r3221, /trunk/data/icons/48x48/status/gpm-primary-missing.png)
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/48x48/status/gpm-keyboard-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/48x48/status/gpm-keyboard-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/48x48/status/gpm-keyboard-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/48x48/status/gpm-keyboard-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/48x48/status/gpm-keyboard-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/48x48/status/gpm-keyboard-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/48x48/status/gpm-mouse-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/48x48/status/gpm-mouse-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/48x48/status/gpm-mouse-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/48x48/status/gpm-mouse-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/48x48/status/gpm-mouse-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/48x48/status/gpm-mouse-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/48x48/status/gpm-phone-000.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/48x48/status/gpm-phone-020.png
==============================================================================
Binary file. No diff available.
Added: trunk/data/icons/48x48/status/gpm-phone-040.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/48x48/status/gpm-phone-060.png
==============================================================================
Binary files. No diff available.
Added: trunk/data/icons/48x48/status/gpm-phone-080.png
==============================================================================
Binary file. No diff available.
Modified: trunk/data/icons/48x48/status/gpm-phone-100.png
==============================================================================
Binary files. No diff available.
Modified: trunk/data/icons/scalable/status/Makefile.am
==============================================================================
--- trunk/data/icons/scalable/status/Makefile.am (original)
+++ trunk/data/icons/scalable/status/Makefile.am Tue Feb 3 17:36:14 2009
@@ -17,31 +17,27 @@
gpm-inhibit.svg \
gpm-inhibit-invalid.svg \
gpm-keyboard-000.svg \
- gpm-keyboard-030.svg \
gpm-keyboard-060.svg \
gpm-keyboard-100.svg \
gpm-phone-000.svg \
- gpm-phone-030.svg \
gpm-phone-060.svg \
gpm-phone-100.svg \
gpm-mouse-000.svg \
- gpm-mouse-030.svg \
gpm-mouse-060.svg \
gpm-mouse-100.svg \
- gpm-primary-000.svg \
- gpm-primary-020.svg \
- gpm-primary-040.svg \
- gpm-primary-060.svg \
- gpm-primary-080.svg \
- gpm-primary-100.svg \
- gpm-primary-000-charging.svg \
- gpm-primary-020-charging.svg \
- gpm-primary-040-charging.svg \
- gpm-primary-060-charging.svg \
- gpm-primary-080-charging.svg \
- gpm-primary-100-charging.svg \
- gpm-primary-charged.svg \
- gpm-primary-missing.svg \
+ gpm-battery-000.svg \
+ gpm-battery-020.svg \
+ gpm-battery-040.svg \
+ gpm-battery-060.svg \
+ gpm-battery-080.svg \
+ gpm-battery-100.svg \
+ gpm-battery-000-charging.svg \
+ gpm-battery-020-charging.svg \
+ gpm-battery-040-charging.svg \
+ gpm-battery-060-charging.svg \
+ gpm-battery-080-charging.svg \
+ gpm-battery-100-charging.svg \
+ gpm-battery-missing.svg \
gpm-ups-000.svg \
gpm-ups-020.svg \
gpm-ups-040.svg \
@@ -54,7 +50,6 @@
gpm-ups-060-charging.svg \
gpm-ups-080-charging.svg \
gpm-ups-100-charging.svg \
- gpm-ups-charged.svg \
gpm-ups-missing.svg
noinst_DATA =
Modified: trunk/docs/icon-naming.txt
==============================================================================
--- trunk/docs/icon-naming.txt (original)
+++ trunk/docs/icon-naming.txt Tue Feb 3 17:36:14 2009
@@ -13,35 +13,20 @@
080 = 71% - 90%
100 = 91% - 100%
-A mobile phone scale is divided into 4 percenage groups:
-
-000 = 0% - 25%
-030 = 26% - 50%
-060 = 51% - 75%
-100 = 76% - 100%
-
-A wireless device scale is divided into 4 csr groups:
-
-000 = CSR0,CSR1
-030 = CSR2,CSR3
-060 = CSR4,CSR5
-100 = CSR6,CSR7
-
** Icon Names **
These are the icon names.
gpm-ac-adapter = AC adapter icon
gpm-primary-{index} = Laptop battery icon
-gpm-primary-{index}-charging = Laptop battery icon, on AC power
-gpm-primary-charged = Laptop battery icon 100% fill, on AC power
+gpm-primary-{index}-charging = Laptop battery icon, charging
gpm-primary-missing = Laptop battery missing or state invalid
gpm-ups-{index} = UPS battery icon
gpm-ups-{index}-charging = UPS battery icon, charging
gpm-ups-charged = UPS battery icon 100% fill, on AC power
gpm-ups-missing = UPS battery missing or state invalid
-gpm-mouse-{wireless} = CSR mouse icon
-gpm-keyboard-{wireless} = CSR keyboard icon
+gpm-mouse-{index} = CSR mouse icon
+gpm-keyboard-{index} = CSR keyboard icon
gpm-inhibit-invalid = Inhibit icon when service not available
gpm-hibernate = Hibernate icon
gpm-suspend = Suspend icon
Modified: trunk/src/gpm-devicekit.c
==============================================================================
--- trunk/src/gpm-devicekit.c (original)
+++ trunk/src/gpm-devicekit.c Tue Feb 3 17:36:14 2009
@@ -80,10 +80,6 @@
/* get correct icon prefix */
prefix = dkp_device_type_to_text (obj->type);
- /* TODO: rename icons when we remove HAL backend */
- if (obj->type == DKP_DEVICE_TYPE_BATTERY)
- prefix = "primary";
-
/* get the icon from some simple rules */
if (obj->type == DKP_DEVICE_TYPE_LINE_POWER) {
filename = g_strdup ("gpm-ac-adapter");
@@ -96,7 +92,7 @@
filename = g_strdup_printf ("gpm-%s-missing", prefix);
} else if (obj->state == DKP_DEVICE_STATE_FULLY_CHARGED) {
- filename = g_strdup_printf ("gpm-%s-charged", prefix);
+ filename = g_strdup_printf ("gpm-%s-100", prefix);
} else if (obj->state == DKP_DEVICE_STATE_CHARGING) {
index_str = gpm_devicekit_get_object_icon_index (obj);
@@ -109,15 +105,17 @@
} else if (obj->type == DKP_DEVICE_TYPE_MOUSE ||
obj->type == DKP_DEVICE_TYPE_KEYBOARD ||
obj->type == DKP_DEVICE_TYPE_PHONE) {
- if (obj->percentage < 26)
- index_str = "000";
- else if (obj->percentage < 51)
- index_str = "030";
- else if (obj->percentage < 60)
- index_str = "060";
- else
- index_str = "100";
- filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
+ if (!obj->is_present) {
+ /* battery missing */
+ filename = g_strdup_printf ("gpm-%s-000", prefix);
+
+ } else if (obj->state == DKP_DEVICE_STATE_FULLY_CHARGED) {
+ filename = g_strdup_printf ("gpm-%s-100", prefix);
+
+ } else {
+ index_str = gpm_devicekit_get_object_icon_index (obj);
+ filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
+ }
}
egg_debug ("got filename: %s", filename);
return filename;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
