diff --git a/data/themes/default.edc b/data/themes/default.edc index 5d26899..5904d96 100644 --- a/data/themes/default.edc +++ b/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; diff --git a/data/themes/images/Makefile.mk b/data/themes/images/Makefile.mk index ecdb6c3..172b567 100644 --- a/data/themes/images/Makefile.mk +++ b/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) diff --git a/data/themes/images/bevel_dark_out.png b/data/themes/images/bevel_dark_out.png deleted file mode 100644 index f22c0ae..0000000 Binary files a/data/themes/images/bevel_dark_out.png and /dev/null differ diff --git a/data/themes/images/bg_bevel.png b/data/themes/images/bg_bevel.png deleted file mode 100644 index 61c6105..0000000 Binary files a/data/themes/images/bg_bevel.png and /dev/null differ diff --git a/data/themes/images/bg_glint.png b/data/themes/images/bg_glint.png deleted file mode 100644 index 0fe17c0..0000000 Binary files a/data/themes/images/bg_glint.png and /dev/null differ diff --git a/data/themes/images/bg_shine.png b/data/themes/images/bg_shine.png deleted file mode 100644 index c3cd9a2..0000000 Binary files a/data/themes/images/bg_shine.png and /dev/null differ diff --git a/data/themes/images/glow_exclam.png b/data/themes/images/glow_exclam.png deleted file mode 100644 index 088ccb8..0000000 Binary files a/data/themes/images/glow_exclam.png and /dev/null differ diff --git a/data/themes/images/icon_arrow_right.png b/data/themes/images/icon_arrow_right.png index 13589a1..12b6066 100644 Binary files a/data/themes/images/icon_arrow_right.png and b/data/themes/images/icon_arrow_right.png differ diff --git a/data/themes/images/icon_close.png b/data/themes/images/icon_close.png index 0750f22..d36bc12 100644 Binary files a/data/themes/images/icon_close.png and b/data/themes/images/icon_close.png differ diff --git a/data/themes/images/icon_close2.png b/data/themes/images/icon_close2.png deleted file mode 100644 index 69c740d..0000000 Binary files a/data/themes/images/icon_close2.png and /dev/null differ diff --git a/data/themes/images/icon_eject.png b/data/themes/images/icon_eject.png index 6da8c3c..0ae912d 100644 Binary files a/data/themes/images/icon_eject.png and b/data/themes/images/icon_eject.png differ diff --git a/data/themes/images/icon_exclamation.png b/data/themes/images/icon_exclamation.png new file mode 100644 index 0000000..3e6713b Binary files /dev/null and b/data/themes/images/icon_exclamation.png differ diff --git a/data/themes/images/icon_forward.png b/data/themes/images/icon_forward.png index ab8fb90..d8596fa 100644 Binary files a/data/themes/images/icon_forward.png and b/data/themes/images/icon_forward.png differ diff --git a/data/themes/images/icon_fullscreen.png b/data/themes/images/icon_fullscreen.png index fe9ec50..b07e84f 100644 Binary files a/data/themes/images/icon_fullscreen.png and b/data/themes/images/icon_fullscreen.png differ diff --git a/data/themes/images/icon_fullscreen2.png b/data/themes/images/icon_fullscreen2.png deleted file mode 100644 index 71aad4c..0000000 Binary files a/data/themes/images/icon_fullscreen2.png and /dev/null differ diff --git a/data/themes/images/icon_mute.png b/data/themes/images/icon_mute.png index b38a73d..0b9720e 100644 Binary files a/data/themes/images/icon_mute.png and b/data/themes/images/icon_mute.png differ diff --git a/data/themes/images/icon_next.png b/data/themes/images/icon_next.png index cf0ac58..45b8a51 100644 Binary files a/data/themes/images/icon_next.png and b/data/themes/images/icon_next.png differ diff --git a/data/themes/images/icon_next2.png b/data/themes/images/icon_next2.png deleted file mode 100644 index 33347ef..0000000 Binary files a/data/themes/images/icon_next2.png and /dev/null differ diff --git a/data/themes/images/icon_pause.png b/data/themes/images/icon_pause.png index c749389..2c6f490 100644 Binary files a/data/themes/images/icon_pause.png and b/data/themes/images/icon_pause.png differ diff --git a/data/themes/images/icon_pause2.png b/data/themes/images/icon_pause2.png deleted file mode 100644 index 6c40c8d..0000000 Binary files a/data/themes/images/icon_pause2.png and /dev/null differ diff --git a/data/themes/images/icon_play.png b/data/themes/images/icon_play.png index 1ebe192..d619d1d 100644 Binary files a/data/themes/images/icon_play.png and b/data/themes/images/icon_play.png differ diff --git a/data/themes/images/icon_play2.png b/data/themes/images/icon_play2.png deleted file mode 100644 index 35ffc68..0000000 Binary files a/data/themes/images/icon_play2.png and /dev/null differ diff --git a/data/themes/images/icon_prev.png b/data/themes/images/icon_prev.png index 3f22def..5005501 100644 Binary files a/data/themes/images/icon_prev.png and b/data/themes/images/icon_prev.png differ diff --git a/data/themes/images/icon_prev2.png b/data/themes/images/icon_prev2.png deleted file mode 100644 index 6611718..0000000 Binary files a/data/themes/images/icon_prev2.png and /dev/null differ diff --git a/data/themes/images/icon_refresh.png b/data/themes/images/icon_refresh.png index 736a8cb..71f0e84 100644 Binary files a/data/themes/images/icon_refresh.png and b/data/themes/images/icon_refresh.png differ diff --git a/data/themes/images/icon_rewind.png b/data/themes/images/icon_rewind.png index 1519dcb..0f1b041 100644 Binary files a/data/themes/images/icon_rewind.png and b/data/themes/images/icon_rewind.png differ diff --git a/data/themes/images/icon_spanner.png b/data/themes/images/icon_spanner.png index 7e2d51a..fa90a33 100644 Binary files a/data/themes/images/icon_spanner.png and b/data/themes/images/icon_spanner.png differ diff --git a/data/themes/images/icon_spanner2.png b/data/themes/images/icon_spanner2.png deleted file mode 100644 index baebf6b..0000000 Binary files a/data/themes/images/icon_spanner2.png and /dev/null differ diff --git a/data/themes/images/icon_stop.png b/data/themes/images/icon_stop.png index e306ec8..6ffbb0a 100644 Binary files a/data/themes/images/icon_stop.png and b/data/themes/images/icon_stop.png differ diff --git a/data/themes/images/icon_unfullscreen.png b/data/themes/images/icon_unfullscreen.png index 6be4761..aee86c4 100644 Binary files a/data/themes/images/icon_unfullscreen.png and b/data/themes/images/icon_unfullscreen.png differ diff --git a/data/themes/images/icon_unfullscreen2.png b/data/themes/images/icon_unfullscreen2.png deleted file mode 100644 index a5eab71..0000000 Binary files a/data/themes/images/icon_unfullscreen2.png and /dev/null differ diff --git a/data/themes/images/icon_volume.png b/data/themes/images/icon_volume.png index 96644a6..81c2dc6 100644 Binary files a/data/themes/images/icon_volume.png and b/data/themes/images/icon_volume.png differ diff --git a/data/themes/images/icon_volume2.png b/data/themes/images/icon_volume2.png deleted file mode 100644 index f8cda1c..0000000 Binary files a/data/themes/images/icon_volume2.png and /dev/null differ diff --git a/data/themes/images/pm_overlay.png b/data/themes/images/pm_overlay.png deleted file mode 100644 index 3c25c73..0000000 Binary files a/data/themes/images/pm_overlay.png and /dev/null differ diff --git a/data/themes/images/pm_shadow.png b/data/themes/images/pm_shadow.png deleted file mode 100644 index cde4f73..0000000 Binary files a/data/themes/images/pm_shadow.png and /dev/null differ diff --git a/data/themes/images/posglow.png b/data/themes/images/posglow.png deleted file mode 100644 index 9570d6f..0000000 Binary files a/data/themes/images/posglow.png and /dev/null differ diff --git a/data/themes/images/vgrad-dark-inv-trans.png b/data/themes/images/vgrad-dark-inv-trans.png deleted file mode 100644 index 571e7c3..0000000 Binary files a/data/themes/images/vgrad-dark-inv-trans.png and /dev/null differ diff --git a/data/themes/images/vgrad-dark-inv.png b/data/themes/images/vgrad-dark-inv.png deleted file mode 100644 index a29057c..0000000 Binary files a/data/themes/images/vgrad-dark-inv.png and /dev/null differ diff --git a/data/themes/images/win_glow.png b/data/themes/images/win_glow.png deleted file mode 100644 index d513f66..0000000 Binary files a/data/themes/images/win_glow.png and /dev/null differ diff --git a/data/themes/orig/musicmode.xcf.gz b/data/themes/orig/musicmode.xcf.gz deleted file mode 100644 index 355817a..0000000 Binary files a/data/themes/orig/musicmode.xcf.gz and /dev/null differ diff --git a/data/themes/orig/next.xcf.gz b/data/themes/orig/next.xcf.gz deleted file mode 100644 index fb10319..0000000 Binary files a/data/themes/orig/next.xcf.gz and /dev/null differ diff --git a/data/themes/orig/pause.xcf.gz b/data/themes/orig/pause.xcf.gz deleted file mode 100644 index 2af8017..0000000 Binary files a/data/themes/orig/pause.xcf.gz and /dev/null differ diff --git a/data/themes/orig/play.xcf.gz b/data/themes/orig/play.xcf.gz deleted file mode 100644 index 36b7f61..0000000 Binary files a/data/themes/orig/play.xcf.gz and /dev/null differ diff --git a/data/themes/orig/prev.xcf.gz b/data/themes/orig/prev.xcf.gz deleted file mode 100644 index 72fde3d..0000000 Binary files a/data/themes/orig/prev.xcf.gz and /dev/null differ diff --git a/data/themes/orig/vol.xcf.gz b/data/themes/orig/vol.xcf.gz deleted file mode 100644 index d55ae1c..0000000 Binary files a/data/themes/orig/vol.xcf.gz and /dev/null differ