diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index 9726b6ccd..e69dca42b 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -53,6 +53,7 @@ edc/systray.edc \ edc/tasks.edc \ edc/textblock.edc \ edc/toolbar.edc \ +edc/transitions.edc \ edc/winlist.edc \ edc/wizard.edc \ edc/xkbswitch.edc \ @@ -196,6 +197,8 @@ img/inset_circle_tiny.png \ img/inset_shadow_circle_tiny.png \ img/inset_shadow.png \ img/inset_shadow_tiny.png \ +img/img_example_1.png \ +img/img_example_2.png \ img/knob_round_busy.png \ img/knob_round_small_busy.png \ img/knob_round_small_normal.png \ @@ -287,6 +290,7 @@ img/vgrad_med_darker.png \ img/vgrad_med_dark.png \ img/vgrad_med_lighter.png \ img/vgrad_med.png \ +img/vgrad_shadow_bi.png \ img/vgrad_tall.png \ img/white_bar_vert_glow.png \ img/wifi_base.png \ diff --git a/data/themes/default.edc b/data/themes/default.edc index ce951472a..2afc804fa 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -18,6 +18,7 @@ collections { #include "edc/init.edc" #include "edc/about-e.edc" #include "edc/about-theme.edc" +#include "edc/transitions.edc" // widgets #include "edc/menu.edc" #include "edc/button.edc" @@ -64,8 +65,8 @@ collections { #include "edc/O/randr.edc" #include "edc/O/spectrum.edc" #include "edc/O/temperature.edc" -#include "edc/O/transitions.edc" #include "edc/O/wallpaper.edc" +//#include "edc/O/transitions.edc" //#include "edc/O/about.edc" //#include "edc/O/init.edc" //#include "edc/O/ibarbox.edc" diff --git a/data/themes/edc/O/evrything.edc b/data/themes/edc/O/evrything.edc index b7ef0a94d..41505007d 100644 --- a/data/themes/edc/O/evrything.edc +++ b/data/themes/edc/O/evrything.edc @@ -3,6 +3,7 @@ /////////////////////////////////////////////////////////////////////////////// group { + images.image: "O/vgrad_light.png" COMP; name: "e/modules/everything/list"; parts { part { diff --git a/data/themes/edc/transitions.edc b/data/themes/edc/transitions.edc new file mode 100644 index 000000000..b385d0a88 --- /dev/null +++ b/data/themes/edc/transitions.edc @@ -0,0 +1,146 @@ +group { name: "e/transpreview/0"; + images.image: "img_example_1.png" LOSSY 92; + parts { + part { name: "clip"; type: RECT; + description { state: "default" 0.0; + } + } + part { name: "bg"; + clip_to: "clip"; + description {state: "default" 0.0; + image.normal: "img_example_1.png"; + ASPECT_FILL((400/300)) + } + } + } +} + +group { name: "e/transpreview/1"; + images.image: "img_example_2.png" LOSSY 92; + parts { + part { name: "clip"; type: RECT; + description { state: "default" 0.0; + } + } + part { name: "bg"; + clip_to: "clip"; + description {state: "default" 0.0; + image.normal: "img_example_2.png"; + ASPECT_FILL((400/300)) + } + } + } +} + +group { name: "e/transitions/crossfade"; + parts { + part { name: "e.swallow.bg.old"; type: SWALLOW; + description { state: "default" 0.0; + } + } + part { name: "e.swallow.bg.new"; type: SWALLOW; + clip_to: "bg_new_clip"; + description { state: "default" 0.0; + } + } + part { name: "bg_new_clip"; type: RECT; + description { state: "default" 0.0; + color: 255 255 255 0; + } + description { state: "done" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + } + programs { + program { + signal: "e,action,start"; source: "e"; + action: STATE_SET "done" 0.0; + transition: SINUSOIDAL 1.0; + target: "bg_new_clip"; + after: "go2"; + } + program { name: "go2"; + action: SIGNAL_EMIT "e,state,done" ""; + } + } +} + +group { name: "e/transitions/vswipe"; + images.image: "vgrad_shadow_bi.png" COMP; + parts { + part { name: "e.swallow.bg.old"; type: SWALLOW; + clip_to: "bg_prev_clip"; + description { state: "default" 0.0; + } + } + part { name: "e.swallow.bg.new"; type: SWALLOW; + clip_to: "bg_new_clip"; + description { state: "default" 0.0; + } + } + part { name: "divideold"; + clip_to: "bg_prev_clip"; + description { state: "default" 0.0; + image.normal: "vgrad_shadow_bi.png"; + rel1.to: "bg_prev_clip"; + rel1.relative: 0.0 0.0; + rel2.to: "bg_prev_clip"; + rel2.relative: 1.0 0.0; + min: 0 80; + max: 99999 80; + TILED_HORIZ(80) + } + } + part { name: "dividenew"; + clip_to: "bg_new_clip"; + description { state: "default" 0.0; + image.normal: "vgrad_shadow_bi.png"; + rel1.to: "bg_new_clip"; + rel1.relative: 0.0 1.0; + rel2.to: "bg_new_clip"; + rel2.relative: 1.0 1.0; + min: 0 80; + max: 99999 80; + TILED_HORIZ(80) + } + } + part { name: "bg_prev_clip"; type: RECT; + description { state: "default" 0.0; + rel1.offset: 0 -40; + rel2.offset: -1 39; + } + description { state: "done" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 1.0; + rel1.offset: 0 39; + } + } + part { name: "bg_new_clip"; type: RECT; + description { state: "default" 0.0; + rel2.relative: 1.0 0.0; + rel1.offset: 0 -40; + rel2.offset: -1 -40; + } + description { state: "done" 0.0; + inherit: "default" 0.0; + rel2.relative: 1.0 1.0; + rel2.offset: -1 39; + } + } + programs { + program { + signal: "e,action,start"; source: "e"; + action: STATE_SET "done" 0.0; + transition: SINUSOIDAL 1.0; + target: "bg_new_clip"; + target: "bg_prev_clip"; + after: "go2"; + } + program { name: "go2"; + action: SIGNAL_EMIT "e,state,done" ""; + } + } + } +} diff --git a/data/themes/img/img_example_1.png b/data/themes/img/img_example_1.png new file mode 100644 index 000000000..2738394c4 Binary files /dev/null and b/data/themes/img/img_example_1.png differ diff --git a/data/themes/img/img_example_2.png b/data/themes/img/img_example_2.png new file mode 100644 index 000000000..9de082726 Binary files /dev/null and b/data/themes/img/img_example_2.png differ diff --git a/data/themes/img/vgrad_shadow_bi.png b/data/themes/img/vgrad_shadow_bi.png new file mode 100644 index 000000000..3e24272fd Binary files /dev/null and b/data/themes/img/vgrad_shadow_bi.png differ