Revision 735432

Go back to digest for 18th November 2007

Other in User Interface

Jakob Petsovits committed changes in /trunk/KDE/kdebase/runtime/pics/oxygen:

Icon naming spec compliance, battery cleanup part 2.
Moving battery icons from actions to status:

* battery-discharging-000 -> battery-low
* battery-discharging-020 -> battery-caution
* battery-discharging-(040|060|080|100) -> battery-\1
* battery-charging-000 -> battery-charging-low
* battery-charging-020 -> battery-charging-caution
* battery-charging-(040|060|080|100) -> battery-charging-\1

battery-charging-100 is an intermediate solution and will probably be removed sometime, but you can keep using it in your code (although plain battery-charging is better).

This means that

1. we conform to the naming spec for battery icons, plus have a few additional but compatible ones.

2. if your battery daemon uses composite strings, like QString("battery") + charging_state + percentage and Pino didn't find those when grepping through KDE/, please drop me a note and let me look at the code so I can see how to best fix them.

3. KLaptopDaemon depends on battery icons with a #FFFFFF colored free space that is drawn blue according to the charging state. And that's a mess. Totally impossible to standardize on battery icons this way, somebody needs to fix that icon usage code.

File Changes

Added 84 files
  • /trunk/KDE/kdebase/runtime/pics/oxygen
  •   /16x16/status/battery-040.png
  •   /16x16/status/battery-060.png
  •   /16x16/status/battery-080.png
  •   /16x16/status/battery-100.png
  •   /16x16/status/battery-caution.png
  •   /16x16/status/battery-charging-040.png
  •   /16x16/status/battery-charging-060.png
  •   /16x16/status/battery-charging-080.png
  •   /16x16/status/battery-charging-100.png
  •   /16x16/status/battery-charging-caution.png
  •   /16x16/status/battery-charging-low.png
  •   /16x16/status/battery-low.png
  •   /22x22/status/battery-040.png
  •   /22x22/status/battery-060.png
  •   /22x22/status/battery-080.png
  •   /22x22/status/battery-100.png
  •   /22x22/status/battery-caution.png
  •   /22x22/status/battery-charging-040.png
  •   /22x22/status/battery-charging-060.png
  •   /22x22/status/battery-charging-080.png
  •   /22x22/status/battery-charging-100.png
  •   /22x22/status/battery-charging-caution.png
  •   /22x22/status/battery-charging-low.png
  •   /22x22/status/battery-low.png
  •   /32x32/status/battery-040.png
  •   /32x32/status/battery-060.png
  •   /32x32/status/battery-080.png
  •   /32x32/status/battery-100.png
  •   /32x32/status/battery-caution.png
  •   /32x32/status/battery-charging-040.png
  •   /32x32/status/battery-charging-060.png
  •   /32x32/status/battery-charging-080.png
  •   /32x32/status/battery-charging-100.png
  •   /32x32/status/battery-charging-caution.png
  •   /32x32/status/battery-charging-low.png
  •   /32x32/status/battery-low.png
  •   /48x48/status/battery-040.png
  •   /48x48/status/battery-060.png
  •   /48x48/status/battery-080.png
  •   /48x48/status/battery-100.png
  •   /48x48/status/battery-caution.png
  •   /48x48/status/battery-charging-040.png
  •   /48x48/status/battery-charging-060.png
  •   /48x48/status/battery-charging-080.png
  •   /48x48/status/battery-charging-100.png
  •   /48x48/status/battery-charging-caution.png
  •   /48x48/status/battery-charging-low.png
  •   /48x48/status/battery-low.png
  •   /scalable/status/battery-040.svgz
  •   /scalable/status/battery-060.svgz
  •   /scalable/status/battery-080.svgz
  •   /scalable/status/battery-100.svgz
  •   /scalable/status/battery-caution.svgz
  •   /scalable/status/battery-charging-040.svgz
  •   /scalable/status/battery-charging-060.svgz
  •   /scalable/status/battery-charging-080.svgz
  •   /scalable/status/battery-charging-100.svgz
  •   /scalable/status/battery-charging-caution.svgz
  •   /scalable/status/battery-charging-low.svgz
  •   /scalable/status/battery-low.svgz
  •   /scalable/status/small/16x16/battery-040.svgz
  •   /scalable/status/small/16x16/battery-060.svgz
  •   /scalable/status/small/16x16/battery-080.svgz
  •   /scalable/status/small/16x16/battery-100.svgz
  •   /scalable/status/small/16x16/battery-caution.svgz
  •   /scalable/status/small/16x16/battery-charging-040.svgz
  •   /scalable/status/small/16x16/battery-charging-060.svgz
  •   /scalable/status/small/16x16/battery-charging-080.svgz
  •   /scalable/status/small/16x16/battery-charging-100.svgz
  •   /scalable/status/small/16x16/battery-charging-caution.svgz
  •   /scalable/status/small/16x16/battery-charging-low.svgz
  •   /scalable/status/small/16x16/battery-low.svgz
  •   /scalable/status/small/22x22/battery-040.svgz
  •   /scalable/status/small/22x22/battery-060.svgz
  •   /scalable/status/small/22x22/battery-080.svgz
  •   /scalable/status/small/22x22/battery-100.svgz
  •   /scalable/status/small/22x22/battery-caution.svgz
  •   /scalable/status/small/22x22/battery-charging-040.svgz
  •   /scalable/status/small/22x22/battery-charging-060.svgz
  •   /scalable/status/small/22x22/battery-charging-080.svgz
  •   /scalable/status/small/22x22/battery-charging-100.svgz
  •   /scalable/status/small/22x22/battery-charging-caution.svgz
  •   /scalable/status/small/22x22/battery-charging-low.svgz
  •   /scalable/status/small/22x22/battery-low.svgz
Deleted 84 files
  • /trunk/KDE/kdebase/runtime/pics/oxygen
  •   /16x16/actions/battery-charging-000.png
  •   /16x16/actions/battery-charging-020.png
  •   /16x16/actions/battery-charging-040.png
  •   /16x16/actions/battery-charging-060.png
  •   /16x16/actions/battery-charging-080.png
  •   /16x16/actions/battery-charging-100.png
  •   /16x16/actions/battery-discharging-000.png
  •   /16x16/actions/battery-discharging-020.png
  •   /16x16/actions/battery-discharging-040.png
  •   /16x16/actions/battery-discharging-060.png
  •   /16x16/actions/battery-discharging-080.png
  •   /16x16/actions/battery-discharging-100.png
  •   /22x22/actions/battery-charging-000.png
  •   /22x22/actions/battery-charging-020.png
  •   /22x22/actions/battery-charging-040.png
  •   /22x22/actions/battery-charging-060.png
  •   /22x22/actions/battery-charging-080.png
  •   /22x22/actions/battery-charging-100.png
  •   /22x22/actions/battery-discharging-000.png
  •   /22x22/actions/battery-discharging-020.png
  •   /22x22/actions/battery-discharging-040.png
  •   /22x22/actions/battery-discharging-060.png
  •   /22x22/actions/battery-discharging-080.png
  •   /22x22/actions/battery-discharging-100.png
  •   /32x32/actions/battery-charging-000.png
  •   /32x32/actions/battery-charging-020.png
  •   /32x32/actions/battery-charging-040.png
  •   /32x32/actions/battery-charging-060.png
  •   /32x32/actions/battery-charging-080.png
  •   /32x32/actions/battery-charging-100.png
  •   /32x32/actions/battery-discharging-000.png
  •   /32x32/actions/battery-discharging-020.png
  •   /32x32/actions/battery-discharging-040.png
  •   /32x32/actions/battery-discharging-060.png
  •   /32x32/actions/battery-discharging-080.png
  •   /32x32/actions/battery-discharging-100.png
  •   /48x48/actions/battery-charging-000.png
  •   /48x48/actions/battery-charging-020.png
  •   /48x48/actions/battery-charging-040.png
  •   /48x48/actions/battery-charging-060.png
  •   /48x48/actions/battery-charging-080.png
  •   /48x48/actions/battery-charging-100.png
  •   /48x48/actions/battery-discharging-000.png
  •   /48x48/actions/battery-discharging-020.png
  •   /48x48/actions/battery-discharging-040.png
  •   /48x48/actions/battery-discharging-060.png
  •   /48x48/actions/battery-discharging-080.png
  •   /48x48/actions/battery-discharging-100.png
  •   /scalable/actions/battery-charging-000.svgz
  •   /scalable/actions/battery-charging-020.svgz
  •   /scalable/actions/battery-charging-040.svgz
  •   /scalable/actions/battery-charging-060.svgz
  •   /scalable/actions/battery-charging-080.svgz
  •   /scalable/actions/battery-charging-100.svgz
  •   /scalable/actions/battery-discharging-000.svgz
  •   /scalable/actions/battery-discharging-020.svgz
  •   /scalable/actions/battery-discharging-040.svgz
  •   /scalable/actions/battery-discharging-060.svgz
  •   /scalable/actions/battery-discharging-080.svgz
  •   /scalable/actions/battery-discharging-100.svgz
  •   /scalable/actions/small/16x16/battery-charging-000.svgz
  •   /scalable/actions/small/16x16/battery-charging-020.svgz
  •   /scalable/actions/small/16x16/battery-charging-040.svgz
  •   /scalable/actions/small/16x16/battery-charging-060.svgz
  •   /scalable/actions/small/16x16/battery-charging-080.svgz
  •   /scalable/actions/small/16x16/battery-charging-100.svgz
  •   /scalable/actions/small/16x16/battery-discharging-000.svgz
  •   /scalable/actions/small/16x16/battery-discharging-020.svgz
  •   /scalable/actions/small/16x16/battery-discharging-040.svgz
  •   /scalable/actions/small/16x16/battery-discharging-060.svgz
  •   /scalable/actions/small/16x16/battery-discharging-080.svgz
  •   /scalable/actions/small/16x16/battery-discharging-100.svgz
  •   /scalable/actions/small/22x22/battery-charging-000.svgz
  •   /scalable/actions/small/22x22/battery-charging-020.svgz
  •   /scalable/actions/small/22x22/battery-charging-040.svgz
  •   /scalable/actions/small/22x22/battery-charging-060.svgz
  •   /scalable/actions/small/22x22/battery-charging-080.svgz
  •   /scalable/actions/small/22x22/battery-charging-100.svgz
  •   /scalable/actions/small/22x22/battery-discharging-000.svgz
  •   /scalable/actions/small/22x22/battery-discharging-020.svgz
  •   /scalable/actions/small/22x22/battery-discharging-040.svgz
  •   /scalable/actions/small/22x22/battery-discharging-060.svgz
  •   /scalable/actions/small/22x22/battery-discharging-080.svgz
  •   /scalable/actions/small/22x22/battery-discharging-100.svgz
168 files changed in total