eage theme/look - update it to be simpler along with existing changes

this up[dates most icons etc.

data/themes/default.edc

@@ -1,15 +1,14 @@
 collections {
-   
+
    group { name: "rage/core";
       images.image: "pm_fill.png" COMP;
-      images.image: "pm_shadow.png" COMP;
       images.image: "vg1.png" COMP;
       images.image: "vg2.png" COMP;
 
       images.image: "shadow_circle_horiz.png" COMP;
       images.image: "shadow_circle_vert.png" COMP;
 
-      images.image: "glow_exclam.png" COMP;
+      images.image: "icon_exclamation.png" COMP;
 
       images.image: "icon_eject.png" COMP;
 
@@ -32,29 +31,15 @@ collections {
       images.image: "icon_fullscreen.png" COMP;
       images.image: "icon_unfullscreen.png" COMP;
       images.image: "icon_close.png" COMP;
-      
+
       images.image: "win_shadow.png" COMP;
 
-      images.image: "vgrad-dark-inv.png" COMP;
-      images.image: "vgrad-dark-inv-trans.png" COMP;
-      images.image: "posglow.png" COMP;
-         
       images.image: "speaker-base.png" COMP;
       images.image: "speaker-bevel-hi.png" COMP;
       images.image: "speaker-bevel-lo.png" COMP;
       images.image: "speaker-over.png" COMP;
       images.image: "speaker-shadow.png" COMP;
 
-      images.image: "icon_next2.png" COMP;
-      images.image: "icon_prev2.png" COMP;
-      images.image: "icon_play2.png" COMP;
-      images.image: "icon_pause2.png" COMP;
-      images.image: "icon_volume2.png" COMP;
-      images.image: "icon_spanner2.png" COMP;
-      images.image: "icon_fullscreen2.png" COMP;
-      images.image: "icon_unfullscreen2.png" COMP;
-      images.image: "icon_close2.png" COMP;
-      
       images.image: "tv-bg.png" COMP;
       images.image: "tv-over.png" COMP;
       images.image: "r-0.png" COMP;
@@ -68,7 +53,7 @@ collections {
          public pos_timer;
          public drag_is_down;
          public novideo;
-         
+
          public pos_timeout(val) {
             set_int(pos_visible, 0);
             set_int(pos_timer, 0);
@@ -80,7 +65,7 @@ collections {
             }
          }
       }
-      
+
       parts {
          //// -- BACKGROUND
          part { name: "bg"; type: RECT; mouse_events: 0;
@@ -251,7 +236,7 @@ collections {
                rel1.to: "base";
                rel2.to: "base";
                fixed: 1 1;
-               image.normal: "glow_exclam.png";
+               image.normal: "icon_exclamation.png";
                max: 24 24;
                aspect: 1.0 1.0; aspect_preference: BOTH;
                color: 255 255 255 0;
@@ -761,7 +746,7 @@ collections {
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_prev2.png";
+               color: 160 160 160 255;
             }
          }
          part { name: "pos_prevev"; type: RECT;
@@ -813,7 +798,7 @@ collections {
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_play2.png";
+               color: 160 160 160 255;
             }
          }
          part { name: "pos_pauseev"; type: RECT;
@@ -834,7 +819,7 @@ collections {
             action: STATE_SET "default" 0.0;
             target: "pos_pause";
          }
-         
+
          part { name: "pos_play";
             scale: 1;
             clip_to: "playpause2";
@@ -847,7 +832,7 @@ collections {
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_pause2.png";
+               color: 160 160 160 255;
             }
          }
          part { name: "pos_playev"; type: RECT;
@@ -868,7 +853,7 @@ collections {
             action: STATE_SET "default" 0.0;
             target: "pos_play";
          }
-         
+
          program {
             signal: "action,play"; source: "rage";
             action: STATE_SET "default" 0.0;
@@ -894,7 +879,7 @@ collections {
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_next2.png";
+               color: 160 160 160 255;
             }
          }
          part { name: "pos_nextev"; type: RECT;
@@ -926,7 +911,7 @@ collections {
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_volume2.png";
+               color: 160 160 160 255;
             }
          }
          part { name: "volev"; type: RECT;
@@ -952,7 +937,7 @@ collections {
             signal: "mouse,clicked,1"; source: "optev";
             action: SIGNAL_EMIT "pos,action,options" "rage";
          }
-         
+
          program {
             signal: "mouse,clicked,1"; source: "fullscreenev";
             action: SIGNAL_EMIT "win,fullscreen" "rage";
@@ -961,12 +946,12 @@ collections {
             signal: "mouse,clicked,1"; source: "unfullscreenev";
             action: SIGNAL_EMIT "win,unfullscreen" "rage";
          }
-         
+
          program {
             signal: "mouse,clicked,1"; source: "closeev";
             action: SIGNAL_EMIT "win,close" "rage";
          }
-         
+
          program {
             signal: "mouse,clicked,1"; source: "pos_prevev";
             action: SIGNAL_EMIT "pos,action,prev" "rage";
@@ -1089,7 +1074,7 @@ collections {
                rel2.relative: 0.0 0.0;
                rel2.offset: 0 0;
                align: 0.0 0.0;
-               image.normal: "icon_volume2.png";
+               image.normal: "icon_volume.png";
                min: 20 20; max: 20 20;
                aspect: 1.0 1.0; aspect_preference: BOTH;
                color: 255 255 255 0;
@@ -1169,7 +1154,7 @@ collections {
                rel2.relative: 0.5 0.5;
                rel1.to: "statusloc";
                rel2.to: "statusloc";
-               image.normal: "icon_play2.png";
+               image.normal: "icon_play.png";
                min: 40 40; max: 40 40;
                aspect: 1.0 1.0; aspect_preference: BOTH;
                color: 255 255 255 0;
@@ -1190,7 +1175,7 @@ collections {
                rel2.relative: 0.5 0.5;
                rel1.to: "statusloc";
                rel2.to: "statusloc";
-               image.normal: "icon_pause2.png";
+               image.normal: "icon_pause.png";
                min: 40 40; max: 40 40;
                aspect: 1.0 1.0; aspect_preference: BOTH;
                color: 255 255 255 0;
@@ -1274,7 +1259,7 @@ collections {
                rel2.relative: 0.5 0.5;
                rel1.to: "statusloc";
                rel2.to: "statusloc";
-               image.normal: "icon_next2.png";
+               image.normal: "icon_next.png";
                min: 40 40; max: 40 40;
                aspect: 1.0 1.0; aspect_preference: BOTH;
                color: 255 255 255 0;
@@ -1316,7 +1301,7 @@ collections {
                rel2.relative: 0.5 0.5;
                rel1.to: "statusloc";
                rel2.to: "statusloc";
-               image.normal: "icon_prev2.png";
+               image.normal: "icon_prev.png";
                min: 40 40; max: 40 40;
                aspect: 1.0 1.0; aspect_preference: BOTH;
                color: 255 255 255 0;
@@ -1392,7 +1377,7 @@ collections {
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_close2.png";
+               color: 160 160 160 255;
             }
          }
          part { name: "closeev"; type: RECT;
@@ -1463,7 +1448,7 @@ collections {
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_fullscreen2.png";
+               color: 160 160 160 255;
             }
          }
          part { name: "fullscreenev"; type: RECT;
@@ -1496,7 +1481,7 @@ collections {
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_unfullscreen2.png";
+               color: 160 160 160 255;
             }
          }
          part { name: "unfullscreenev"; type: RECT;
@@ -1530,7 +1515,7 @@ collections {
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_spanner2.png";
+               color: 160 160 160 255;
             }
          }
          part { name: "optev"; type: RECT;
@@ -1876,7 +1861,6 @@ collections {
 
    group { name: "rage/list/item";
       images.image: "win_shadow.png" COMP;
-      images.image: "win_glow.png" COMP;
 
       parts {
          part { name: "shadow"; mouse_events: 0;
@@ -1893,29 +1877,18 @@ collections {
                fill.smooth: 0;
             }
          }
-         part { name: "base"; type: RECT; mouse_events: 0;
+         part { name: "glow"; type: RECT; mouse_events: 0;
             description { state: "default" 0.0;
-               color: 32 32 32 255;
                rel1.to: "clip";
                rel2.to: "clip";
-            }
-         }
-         part { name: "glow"; mouse_events: 0;
-            description { state: "default" 0.0;
-               image.normal: "win_glow.png";
-               image.border: 9 9 9 9;
-               image.middle: 0;
-               rel1.to: "clip";
-               rel1.offset: -5  -5;
-               rel2.to: "clip";
-               rel2.offset: 4 4;
-               fill.smooth: 0;
-               color: 255 255 255 0;
+               color: 51 153 255 0;
                visible: 0;
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 255;
+               rel1.offset: -4 -4;
+               rel2.offset: 3 3;
+               color: 51 153 255 255;
                visible: 1;
             }
          }
@@ -1924,14 +1897,23 @@ collections {
             action: STATE_SET "selected" 0.0;
             transition: SINUSOIDAL 0.1;
             target: "glow";
+            target: "clip";
          }
          program {
             signal: "rage,state,unselected"; source: "rage";
             action: STATE_SET "default" 0.0;
             transition: SINUSOIDAL 0.3;
             target: "glow";
+            target: "clip";
          }
 
+         part { name: "base"; type: RECT; mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 32 32 32 255;
+               rel1.to: "clip";
+               rel2.to: "clip";
+            }
+         }
          part { name: "clip"; type: RECT;
             description { state: "default" 0.0;
                rel1.offset: 4 4;
@@ -1957,7 +1939,9 @@ collections {
             description { state: "default" 0.0;
                fixed: 1 1;
                align: 0.0 1.0;
+               rel1.to: "clip";
                rel1.offset: 4 4;
+               rel2.to: "clip";
                rel2.offset: -5 -5;
                color: 255 255 255 255;
                text { font: "Sans"; size: 8;

data/themes/images/Makefile.mk

@@ -1,58 +1,39 @@
 THEME_IMGS = \
-data/themes/images/shadow_circle_horiz.png \
-data/themes/images/shadow_circle_vert.png \
-data/themes/images/vg1.png \
-data/themes/images/vg2.png \
-data/themes/images/bevel_dark_out.png \
-data/themes/images/bg_bevel.png \
-data/themes/images/bg_glint.png \
-data/themes/images/bg_shine.png \
 data/themes/images/dimmer.png \
-data/themes/images/glow_exclam.png \
 data/themes/images/icon_arrow_right.png \
-data/themes/images/icon_close2.png \
 data/themes/images/icon_close.png \
 data/themes/images/icon_eject.png \
+data/themes/images/icon_exclamation.png \
 data/themes/images/icon_forward.png \
-data/themes/images/icon_fullscreen2.png \
 data/themes/images/icon_fullscreen.png \
 data/themes/images/icon_mute.png \
-data/themes/images/icon_next2.png \
 data/themes/images/icon_next.png \
-data/themes/images/icon_pause2.png \
 data/themes/images/icon_pause.png \
-data/themes/images/icon_play2.png \
 data/themes/images/icon_play.png \
-data/themes/images/icon_prev2.png \
 data/themes/images/icon_prev.png \
 data/themes/images/icon_refresh.png \
 data/themes/images/icon_rewind.png \
-data/themes/images/icon_spanner2.png \
 data/themes/images/icon_spanner.png \
 data/themes/images/icon_stop.png \
-data/themes/images/icon_unfullscreen2.png \
 data/themes/images/icon_unfullscreen.png \
-data/themes/images/icon_volume2.png \
 data/themes/images/icon_volume.png \
 data/themes/images/pm_fill.png \
-data/themes/images/pm_overlay.png \
-data/themes/images/pm_shadow.png \
 data/themes/images/r-0.png \
 data/themes/images/r-1.png \
 data/themes/images/r-2.png \
 data/themes/images/r-3.png \
 data/themes/images/r-4.png \
-data/themes/images/tv-bg.png \
-data/themes/images/tv-over.png \
-data/themes/images/win_glow.png \
-data/themes/images/win_shadow.png \
-data/themes/images/posglow.png \
+data/themes/images/shadow_circle_horiz.png \
+data/themes/images/shadow_circle_vert.png \
 data/themes/images/speaker-base.png \
 data/themes/images/speaker-bevel-hi.png \
 data/themes/images/speaker-bevel-lo.png \
 data/themes/images/speaker-over.png \
 data/themes/images/speaker-shadow.png \
-data/themes/images/vgrad-dark-inv.png \
-data/themes/images/vgrad-dark-inv-trans.png
+data/themes/images/tv-bg.png \
+data/themes/images/tv-over.png \
+data/themes/images/vg1.png \
+data/themes/images/vg2.png \
+data/themes/images/win_shadow.png
 
 EXTRA_DIST += $(THEME_IMGS)