diff --git a/data/themes/default.edc b/data/themes/default.edc index c35b63c40..293370027 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -24748,98 +24748,184 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); name: "e/init/splash"; /* images used */ images { - image: "vgrad_dark.png" COMP; - // image: "circle_shade.png" COMP; - image: "grill_dark_tiny_pattern.png" COMP; - image: "logo_white_128.png" COMP; - image: "init_check1.png" COMP; - image: "init_check2.png" COMP; - image: "busy-1.png" COMP; - image: "busy-2.png" COMP; - image: "busy-3.png" COMP; - image: "busy-4.png" COMP; - image: "busy-5.png" COMP; - image: "busy-6.png" COMP; - image: "busy-7.png" COMP; - image: "busy-8.png" COMP; - image: "busy-9.png" COMP; + image: "exq-bglight.png" COMP; + image: "exq-logo.png" COMP; + image: "exq-bar.png" COMP; + image: "exq-barglow.png" COMP; } script { public is_ready; public do_end; } parts { - /* splash is fullscreen so we want a background of some sort. we have - * taken the default desktop wallpaper here as it should look nice */ + part { name: "base"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 255; + } + } + part { name: "light"; + description { state: "default" 0.0; + align: 0.5 0.222222222; + rel1.relative: 0.104166667 0.515625; + rel2.relative: 0.895833333 0.796875; + aspect: 2.111111111 2.111111111; + aspect_preference: HORIZONTAL; + max: 380 180; + image.normal: "exq-bglight.png"; + color: 0 0 0 255; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "logoclip"; + type: RECT; + description { state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + } + part { name: "logo"; + clip_to: "logoclip"; + description { state: "default" 0.0; + align: 0.5 0.774193548; + rel1.relative: 0.272916667 0.315625; + rel2.relative: 0.727083333 0.6546875; + aspect: 0.557603687 0.557603687; + aspect_preference: BOTH; + max: 121 217; + image.normal: "exq-logo.png"; + } + } + part { name: "bar"; + description { state: "default" 0.0; + rel1 { + to_x: "exquisite.progress"; + to_y: "bar_clip"; + offset: -9 -9; + } + rel2 { + to_x: "exquisite.progress"; + to_y: "bar_clip"; + offset: 8 -1; + } + image.normal: "exq-bar.png"; + image.border: 10 10 10 0; + color: 255 255 255 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "barglow"; + description { state: "default" 0.0; + align: 1.0 0.5; + max: 31 999; + rel1 { + to: "bar"; + relative: 0.0 0.0; + offset: 9 4; + } + rel2 { + to_x: "bar"; + to_y: "bar_clip"; + relative: 1.0 0.52173913; + offset: -5 4; + } + image.normal: "exq-barglow.png"; + image.border: 0 10 10 10; + color: 255 255 255 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "bar_clip"; + mouse_events: 0; + type: RECT; + description { state: "default" 0.0; + visible: 0; + rel1.relative: 0.0625 0.59375; + rel2.relative: 0.9375 0.7375; + } + } part { - name: "background_image"; - description { - state: "default" 0.0; - image { - normal: "vgrad_dark.png"; - } - fill { - smooth: 0; - size { - relative: 0 1.0; - offset: 36 0; - } - } - } - } - part { - name: "grill"; - description { - state: "default" 0.0; - image { - normal: "grill_dark_tiny_pattern.png"; - } - fill { - size { - relative: 0 0; - offset: 144 144; - } - } - } - } -// part { name: "shade"; -// mouse_events: 0; -// description { state: "default" 0.0; -// image.normal: "circle_shade.png"; -// fill.smooth: 0; -// } -// } - - part { - name: "e.text.title"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - description { - state: "default" 0.0; - align: 0.5 0.0; - rel1 { - relative: 0.0 1.0; - offset: 0 0; - to: "logo"; - } - rel2 { - relative: 1.0 1.0; - offset: -1 0; - to: "logo"; - } - color: 255 255 255 255; - color3: 0 0 0 32; - text { - text: "Enlightenment"; + name: "exquisite.progress"; + mouse_events: 0; + type: RECT; + description { + state: "default" 0.0; + visible: 0; + aspect: 1.0 1.0; + rel1 { + to: "bar_clip"; + relative: 0.5 0.0; + offset: 0 0; + } + rel2 { + to: "bar_clip"; + relative: 0.5 1.0; + offset: -1 -1; + } + } + } + part { name: "e.text.title"; + type: TEXT; + description { state: "default" 0.0; + rel1 { + to_y: "logo"; + relative: 0.05 -0.4; + } + rel2 { + to_y: "logo"; + relative: 0.95 -0.2; + } + color: 255 255 255 0; + text { font: "Sans:style=Bold"; - size: 20; - min: 1 1; - align: 0.5 0.5; + size: 24; + fit: 0 1; text_class: "init_title"; - } - } - } + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "e.text.status"; + type: TEXT; + description { state: "default" 0.0; + rel1 { + to: "e.text.title"; + relative: 0.0 1.0; + } + rel2 { + to: "e.text.title"; + relative: 1.0 1.5; + } + color: 255 255 255 0; + text { + font: "Sans"; + size: 10; + fit: 0 1; + text_class: "init_text"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 128; + } + } part { name: "e.text.version"; type: TEXT; @@ -24855,7 +24941,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); relative: 1.0 1.0; offset: -2 -2; } - color: 255 255 255 255; + color: 255 255 255 64; color3: 0 0 0 32; text { text: "0.17.0"; @@ -24867,203 +24953,9 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } } } - part { - name: "e.text.status"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - description { - state: "default" 0.0; - align: 0.5 0.0; - rel1 { - relative: 0.0 1.0; - offset: 0 1; - to: "e.text.title"; - } - rel2 { - relative: 1.0 1.0; - offset: -1 1; - to: "e.text.title"; - } - color: 255 255 255 255; - color3: 0 0 0 32; - text { - text: "Starting Enlightenment. Please wait."; - font: "Sans:style=Bold"; - size: 10; - min: 1 1; - align: 0.5 0.5; - text_class: "init_text"; - } - } - } - part { - name: "e.text.disable_text"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { - relative: 0.0 0.0; - offset: 8 8; - } - rel2 { - relative: 0.0 0.0; - offset: 8 8; - } - color: 255 255 255 255; - color3: 0 0 0 32; - text { - text: "Disable this splash screen in future."; - font: "Sans"; - size: 10; - min: 1 1; - align: 0.0 0.0; - text_class: "init_text"; - } - } - } - part { - name: "disable_check"; - mouse_events: 0; - description { - state: "default" 0.0; - min: 20 20; - max: 20 20; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: 0 0; - to: "e.text.disable_text"; - } - rel2 { - relative: 1.0 1.0; - offset: 0 -1; - to: "e.text.disable_text"; - } - image { - normal: "init_check1.png"; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - image { - normal: "init_check2.png"; - } - } - } - part { - name: "enable_event"; - type: RECT; - description { - state: "default" 0.0; - visible: 0; - color: 0 0 0 0; - rel1 { - to: "e.text.disable_text"; - relative: 0.0 0.0; - offset: -5 -5; - } - rel2 { - to: "disable_check"; - relative: 1.0 1.0; - offset: 4 4; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { - name: "disable_event"; - type: RECT; - description { - state: "default" 0.0; - visible: 1; - color: 0 0 0 0; - rel1 { - to: "e.text.disable_text"; - relative: 0.0 0.0; - offset: -5 -5; - } - rel2 { - to: "disable_check"; - relative: 1.0 1.0; - offset: 4 4; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { - name: "busy"; - mouse_events: 0; - description { - state: "default" 0.0; - min: 32 32; - max: 32 32; - aspect: 1.0 1.0; - align: 0.5 1.0; - aspect_preference: BOTH; - rel1 { - to_y: "logo"; - relative: 0.0 0.0; - offset: 0 -1; - } - rel2 { - to_y: "logo"; - relative: 1.0 0.0; - offset: -1 -1; - } - image { - normal: "busy-9.png"; - tween: "busy-1.png"; - tween: "busy-2.png"; - tween: "busy-3.png"; - tween: "busy-4.png"; - tween: "busy-5.png"; - tween: "busy-6.png"; - tween: "busy-7.png"; - tween: "busy-8.png"; - } - } - } - part { - name: "logo"; - mouse_events: 0; - description { - state: "default" 0.0; - max: 128 128; - aspect: 1.0 1.0; - aspect_preference: BOTH; - rel1 { - relative: 0.25 0.25; - } - rel2 { - relative: 0.75 0.75; - } - image { - normal: "logo_white_128.png"; - } - } - description { - state: "done" 0.0; - inherit: "default" 0.0; - color: 255 255 255 0; - } - } } programs { - program { - name: "init"; + program { name: "init"; signal: "load"; source: ""; script { @@ -25071,30 +24963,81 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); set_int(do_end, 0); } } - program { - name: "busy_anim"; - signal: "show"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.3333; - target: "busy"; - after: "busy_anim"; - } - program { - name: "ready"; + program { name: "show1"; + signal: "show"; + source: ""; + in: 0.5 0.0; + action: STATE_SET "visible" 0.0; + transition: LINEAR 2.0; + target: "light"; + after: "show2"; + } + program { name: "show2"; + action: STATE_SET "visible" 0.0; + transition: LINEAR 2.0; + target: "logoclip"; + after: "show3"; + } + program { name: "show3"; + action: STATE_SET "visible" 0.0; + transition: LINEAR 2.0; + target: "bar"; + after: "pulsate1"; + after: "ready"; + } + + program { name: "pulsate1"; + action: STATE_SET "visible" 0.0; + transition: SINUSOIDAL 1.0; + target: "barglow"; + after: "pulsate2"; + } + program { name: "pulsate2"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 1.0; + target: "barglow"; + after: "pulsate1"; + } + + program { name: "exit1"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.5; + target: "bar"; + target: "barglow"; + after: "exit2"; + } + program { name: "exit2"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.5; + target: "logoclip"; + target: "barglow"; + target: "e.text.title"; + target: "e.text.status"; + after: "exit3"; + } + program { name: "exit3"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.5; + target: "light"; + after: "exit4"; + } + program { name: "exit4"; + action: SIGNAL_EMIT "e,state,done_ok" "e"; + } + + program { name: "ready"; script { new val; val = get_int(do_end); if (val == 1) - run_program(PROGRAM:"done2"); + run_program(PROGRAM:"exit1"); else set_int(is_ready, 1); } } - program { - name: "done1"; /* when e tells the splash screen it is done - * starting up, the init splash gets this signal */ + program { name: "done1"; /* when e tells the splash screen it is done + * starting up, the init splash gets this signal */ signal: "e,state,done"; source: "e"; script { @@ -25102,56 +25045,11 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); val = get_int(is_ready); if (val == 1) - run_program(PROGRAM:"done2"); + run_program(PROGRAM:"exit1"); else set_int(do_end, 1); } } - program { - name: "done2"; - action: STATE_SET "done" 0.0; - transition: ACCELERATE 1.0; - target: "logo"; - after: "done3"; - } - program { - name: "done3"; /* at the end signal back to e we are done shutting - * down the splash ans all animations are done */ - action: SIGNAL_EMIT "e,state,done_ok" "e"; - } - /* handle a mouse down (click) event on the disable splash check - * event area (covering both label and checkbox) */ - program { - name: "disable_down"; /* name of program */ - signal: "mouse,down,1"; /* signal that triggers it */ - source: "disable_event"; /* source of the signal */ - action: STATE_SET "active" 0.0; /* set state to active */ - target: "disable_check"; /* these are the thngs to set to active */ - target: "disable_event"; - target: "enable_event"; - after: "disable_on"; /* and after that is done run the disable_on - * program to tell e about this */ - } - program { - name: "enable_down"; - signal: "mouse,down,1"; - source: "enable_event"; - action: STATE_SET "default" 0.0; - target: "disable_check"; - target: "disable_event"; - target: "enable_event"; - after: "disable_off"; - } - /* when a user toggles the checkbox - these programs signal back to - * e to enable or disable the splash */ - program { - name: "disable_on"; - action: SIGNAL_EMIT "e,action,init,disable" "e"; - } - program { - name: "disable_off"; - action: SIGNAL_EMIT "e,action,init,enable" "e"; - } } } /* this group is used for other screens/xinerama zones etc. other than @@ -25161,44 +25059,12 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); group { name: "e/init/extra_screen"; parts { - part { - name: "background_image"; - description { - state: "default" 0.0; - image { - normal: "vgrad_dark.png"; - } - fill { - smooth: 0; - size { - relative: 0 1.0; - offset: 36 0; - } - } - } - } - part { - name: "grill"; - description { - state: "default" 0.0; - image { - normal: "grill_dark_tiny_pattern.png"; - } - fill { - size { - relative: 0 0; - offset: 144 144; - } - } - } - } -// part { name: "shade"; -// mouse_events: 0; -// description { state: "default" 0.0; -// image.normal: "circle_shade.png"; -// fill.smooth: 0; -// } -// } + part { name: "base"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 255; + } + } } } @@ -25295,6 +25161,34 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } } } + part { name: "e.text.filename"; + type: TEXT; + effect: SOFT_SHADOW; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + align: 0.5 1.0; + rel1 { + to: "bot2"; + relative: 0.0 1.0; + offset: 2 -11; + } + rel2 { + to: "bot2"; + relative: 1.0 1.0; + offset: -3 -11; + } + color: 255 255 255 255; + color3: 0 0 0 32; + text { + font: "Sans:style=Bold"; + size: 10; + min: 1 1; + align: 0.5 1.0; + } + } + } part { name: "e.swallow.buttons"; type: SWALLOW; @@ -25511,34 +25405,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } } } - part { name: "e.text.filename"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - align: 0.5 1.0; - rel1 { - to: "bot2"; - relative: 0.0 1.0; - offset: 2 -11; - } - rel2 { - to: "bot2"; - relative: 1.0 1.0; - offset: -3 -11; - } - color: 255 255 255 255; - color3: 0 0 0 32; - text { - font: "Sans:style=Bold"; - size: 10; - min: 1 1; - align: 0.5 1.0; - } - } - } part { name: "shadow1"; mouse_events: 0; scale: 1; @@ -25641,9 +25507,14 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); source: "events"; action: SIGNAL_EMIT "e,action,click" "e"; } - program { name: "out"; + program { name: "outb"; signal: "mouse,down,1"; source: "aout"; + action: SIGNAL_EMIT "e,action,panel,show" "e"; + } + program { name: "out"; + signal: "e,action,panel,show"; + source: "e"; action: STATE_SET "out" 0.0; target: "aout"; target: "cover"; @@ -25663,9 +25534,14 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); target: "cover"; after: "in2"; } - program { name: "in"; + program { name: "inb"; signal: "mouse,down,1"; source: "ain"; + action: SIGNAL_EMIT "e,action,panel,hide" "e"; + } + program { name: "in"; + signal: "e,action,panel,hide"; + source: "e"; action: STATE_SET "default" 0.0; target: "aout"; after: "in2"; @@ -25744,11 +25620,11 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); description { state: "default" 0.0; visible: 0; rel1 { - to: "base"; + to: "icon_box"; offset: -10 -10; } rel2 { - to: "base"; + to: "icon_box"; offset: 9 9; } fill.smooth: 0; @@ -25969,11 +25845,11 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); description { state: "default" 0.0; visible: 0; rel1 { - to: "base"; + to: "icon_box"; offset: -10 -10; } rel2 { - to: "base"; + to: "icon_box"; offset: 9 9; } fill.smooth: 0; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index abf1bdf06..5bb681843 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -560,5 +560,9 @@ wp-tb3.png \ wp-tbs.png \ systray_rounded_corners.png \ theme-label.png \ -glow.png +glow.png \ +exq-barglow.png \ +exq-bar.png \ +exq-bglight.png \ +exq-logo.png diff --git a/data/themes/images/exq-bar.png b/data/themes/images/exq-bar.png new file mode 100644 index 000000000..221a2d9df Binary files /dev/null and b/data/themes/images/exq-bar.png differ diff --git a/data/themes/images/exq-barglow.png b/data/themes/images/exq-barglow.png new file mode 100644 index 000000000..053bf33b5 Binary files /dev/null and b/data/themes/images/exq-barglow.png differ diff --git a/data/themes/images/exq-bglight.png b/data/themes/images/exq-bglight.png new file mode 100644 index 000000000..0417eb086 Binary files /dev/null and b/data/themes/images/exq-bglight.png differ diff --git a/data/themes/images/exq-logo.png b/data/themes/images/exq-logo.png new file mode 100644 index 000000000..8568a4934 Binary files /dev/null and b/data/themes/images/exq-logo.png differ