billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=797db618c3550d4a7c948e7e91221217b98e48a5
commit 797db618c3550d4a7c948e7e91221217b98e48a5 Author: Boris Faure <[email protected]> Date: Tue Apr 7 21:40:56 2020 +0200 mild.edc: remove unused parts + reindent --- data/themes/mild.edc | 662 ++++++++++++++++++++++----------------------------- 1 file changed, 288 insertions(+), 374 deletions(-) diff --git a/data/themes/mild.edc b/data/themes/mild.edc index 4f87a1c..2696d7a 100644 --- a/data/themes/mild.edc +++ b/data/themes/mild.edc @@ -61,11 +61,6 @@ collections { get_state_val(PART:"base", STATE_COLOR, r, g, b, a); set_state_val(PART:"base", STATE_COLOR, r, g, b, v); set_state(PART:"base", "custom", 0.0); - - custom_state(PART:"fade", "default", 0.0); - get_state_val(PART:"fade", STATE_COLOR, r, g, b, a); - set_state_val(PART:"fade", STATE_COLOR, r, g, b, v); - set_state(PART:"fade", "custom", 0.0); } } @@ -102,94 +97,13 @@ collections { target: "focusclip"; } - part { name: "baseclip"; type: RECT; - clip_to: "focusclip"; - description { state: "default" 0.0; - } - description { state: "image" 0.0; - inherit: "default" 0.0; - color: 255 255 255 0; - visible: 0; - } - description { state: "scale" 0.0; - inherit: "default" 0.0; - color: 255 255 255 0; - visible: 0; - } - description { state: "edje" 0.0; - inherit: "default" 0.0; - color: 255 255 255 0; - visible: 0; - } - description { state: "movie" 0.0; - inherit: "default" 0.0; - color: 255 255 255 0; - visible: 0; - } - } part { name: "base"; type: RECT; mouse_events: 1; - clip_to: "baseclip"; + clip_to: "focusclip"; description { state: "default" 0.0; color_class: "BG"; } } - part { name: "fade"; type: RECT; - description { state: "default" 0.0; - } - } - part { name: "terminology.background"; type: SWALLOW; - clip_to: "fade"; - description { state: "default" 0.0; - } - description { state: "image" 0.0; - inherit: "default" 0.0; - } - description { state: "scale" 0.0; - inherit: "default" 0.0; - } - description { state: "edje" 0.0; - inherit: "default" 0.0; - } - description { state: "movie" 0.0; - inherit: "default" 0.0; - } - } - program { name: "media_off"; - signal: "media,off"; - source: "terminology"; - action: STATE_SET "default" 0.0; - target: "terminology.background"; - target: "baseclip"; - } - program { name: "media_img"; - signal: "media,image"; - source: "terminology"; - action: STATE_SET "image" 0.0; - target: "terminology.background"; - target: "baseclip"; - } - program { name: "media_scale"; - signal: "media,scale"; - source: "terminology"; - action: STATE_SET "scale" 0.0; - target: "terminology.background"; - target: "baseclip"; - } - program { name: "media_edje"; - signal: "media,edje"; - source: "terminology"; - action: STATE_SET "edje" 0.0; - target: "terminology.background"; - target: "baseclip"; - } - program { name: "media_mov"; - signal: "media,movie"; - source: "terminology"; - action: STATE_SET "movie" 0.0; - target: "terminology.background"; - target: "baseclip"; - } part { name: "bellclip"; type: RECT; description { state: "default" 0.0; @@ -2532,328 +2446,328 @@ collections { } ////////////////////////////////////////////////////////////////////////////// - //// an object to contain the selection tool used for selecting tabs (with - //// a glow grid of terms - group { name: "terminology/sel/base"; - images { - image: "pm_fill.png" COMP; - } - script { - public message(Msg_Type:type, id, ...) { - if ((type != MSG_INT) || (id != 1)) return; + //// an object to contain the selection tool used for selecting tabs (with + //// a glow grid of terms + group { name: "terminology/sel/base"; + images { + image: "pm_fill.png" COMP; + } + script { + public message(Msg_Type:type, id, ...) { + if ((type != MSG_INT) || (id != 1)) return; - if (getarg(2) < 100) - set_state(PART:"fill", "translucent", 0.0); - else - set_state(PART:"fill", "default", 0.0); + if (getarg(2) < 100) + set_state(PART:"fill", "translucent", 0.0); + else + set_state(PART:"fill", "default", 0.0); } } - parts { - //////////////////////////////////////////////////////////////////// - // background and shadows - part { name: "fill"; - mouse_events: 0; - description { state: "default" 0.0; - image.normal: "pm_fill.png"; - fill { - size.relative: 0.0 0.0; - size.offset: 64 64; - } - } - description { state: "translucent" 0.0; - inherit: "default" 0.0; - visible: 0; + parts { + //////////////////////////////////////////////////////////////////// + // background and shadows + part { name: "fill"; + mouse_events: 0; + description { state: "default" 0.0; + image.normal: "pm_fill.png"; + fill { + size.relative: 0.0 0.0; + size.offset: 64 64; } } - program { - signal: "translucent,on"; source: "terminology"; - action: STATE_SET "translucent" 0.0; - target: "fill"; - } - program { - signal: "translucent,off"; source: "terminology"; - action: STATE_SET "default" 0.0; - target: "fill"; + description { state: "translucent" 0.0; + inherit: "default" 0.0; + visible: 0; } + } + program { + signal: "translucent,on"; source: "terminology"; + action: STATE_SET "translucent" 0.0; + target: "fill"; + } + program { + signal: "translucent,off"; source: "terminology"; + action: STATE_SET "default" 0.0; + target: "fill"; + } - //////////////////////////////////////////////////////////////////// - // content (where the grid of terms goes) - part { name: "clip"; type: RECT; - description { state: "default" 0.0; - } + //////////////////////////////////////////////////////////////////// + // content (where the grid of terms goes) + part { name: "clip"; type: RECT; + description { state: "default" 0.0; } - part { name: "terminology.content"; type: SWALLOW; - clip_to: "clip"; - description { state: "default" 0.0; - } + } + part { name: "terminology.content"; type: SWALLOW; + clip_to: "clip"; + description { state: "default" 0.0; } } } + } - group { name: "terminology/sel/item"; - images { - image: "bg_bevel.png" COMP; - image: "pm_shadow.png" COMP; - image: "cr_glow.png" COMP; - image: "bg_led_base.png" COMP; - image: "bg_led.png" COMP; - image: "bg_led_strobe.png" COMP; - } - parts { - //////////////////////////////////////////////////////////////////// - // base background and selection image - part { name: "clip"; type: RECT; - description { state: "default" 0.0; - rel1.to: "terminology.content"; - rel2.to: "terminology.content"; - color: 128 128 128 255; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } + group { name: "terminology/sel/item"; + images { + image: "bg_bevel.png" COMP; + image: "pm_shadow.png" COMP; + image: "cr_glow.png" COMP; + image: "bg_led_base.png" COMP; + image: "bg_led.png" COMP; + image: "bg_led_strobe.png" COMP; + } + parts { + //////////////////////////////////////////////////////////////////// + // base background and selection image + part { name: "clip"; type: RECT; + description { state: "default" 0.0; + rel1.to: "terminology.content"; + rel2.to: "terminology.content"; + color: 128 128 128 255; } - part { name: "shadow"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "terminology.content"; - rel2.to: "terminology.content"; - rel1.offset: -5 -5; - rel2.offset: 4 4; - image.normal: "pm_shadow.png"; - image.border: 64 64 64 64; - image.border_scale_by: 0.1; - color: 255 255 255 128; - fill.smooth: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - rel1.offset: -40 -40; - rel2.offset: 39 39; - image.border_scale_by: 1.0; - color: 255 255 255 255; - } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } - - part { name: "glow"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "terminology.content"; - rel2.to: "terminology.content"; - rel1.offset: -4 -4; - rel2.offset: 3 3; - image { - normal: "cr_glow.png"; - border: 9 9 9 9; - } - color: 255 255 255 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } + } + part { name: "shadow"; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "terminology.content"; + rel2.to: "terminology.content"; + rel1.offset: -5 -5; + rel2.offset: 4 4; + image.normal: "pm_shadow.png"; + image.border: 64 64 64 64; + image.border_scale_by: 0.1; + color: 255 255 255 128; + fill.smooth: 0; } + description { state: "selected" 0.0; + inherit: "default" 0.0; + rel1.offset: -40 -40; + rel2.offset: 39 39; + image.border_scale_by: 1.0; + color: 255 255 255 255; + } + } - //////////////////////////////////////////////////////////////////// - // swallowed terminal content + bg inside it - part { name: "base"; type: RECT; - clip_to: "clip"; - description { state: "default" 0.0; - color_class: "BG"; - rel1.to: "terminology.content"; - rel2.to: "terminology.content"; + part { name: "glow"; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "terminology.content"; + rel2.to: "terminology.content"; + rel1.offset: -4 -4; + rel2.offset: 3 3; + image { + normal: "cr_glow.png"; + border: 9 9 9 9; } + color: 255 255 255 0; } - part { name: "terminology.content"; type: SWALLOW; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.relative: 0.1 0.1; - rel2.relative: 0.9 0.9; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } - program { - signal: "selected"; source: "terminology"; - action: STATE_SET "selected" 0.0; - transition: DECELERATE 0.2 CURRENT; - target: "terminology.content"; - target: "terminology.label"; - target: "shadow"; - target: "clip"; - target: "glow"; + } + + //////////////////////////////////////////////////////////////////// + // swallowed terminal content + bg inside it + part { name: "base"; type: RECT; + clip_to: "clip"; + description { state: "default" 0.0; + color_class: "BG"; + rel1.to: "terminology.content"; + rel2.to: "terminology.content"; } - program { - signal: "selected,start"; source: "terminology"; - action: STATE_SET "selected" 0.0; - target: "terminology.content"; - target: "terminology.label"; - target: "shadow"; - target: "clip"; - target: "glow"; + } + part { name: "terminology.content"; type: SWALLOW; + clip_to: "clip"; + description { state: "default" 0.0; + rel1.relative: 0.1 0.1; + rel2.relative: 0.9 0.9; } - program { - signal: "unselected"; source: "terminology"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.4 CURRENT; - target: "terminology.content"; - target: "terminology.label"; - target: "shadow"; - target: "clip"; - target: "glow"; - } - - //////////////////////////////////////////////////////////////////// - // fancy stuff over the top of the terminal for shading and labelling - part { name: "bevel"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "terminology.content"; - rel2.to: "terminology.content"; - image.normal: "bg_bevel.png"; - image.border: 3 3 5 3; - image.middle: 0; - fill.smooth: 0; - } + description { state: "selected" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + } + } + program { + signal: "selected"; source: "terminology"; + action: STATE_SET "selected" 0.0; + transition: DECELERATE 0.2 CURRENT; + target: "terminology.content"; + target: "terminology.label"; + target: "shadow"; + target: "clip"; + target: "glow"; + } + program { + signal: "selected,start"; source: "terminology"; + action: STATE_SET "selected" 0.0; + target: "terminology.content"; + target: "terminology.label"; + target: "shadow"; + target: "clip"; + target: "glow"; + } + program { + signal: "unselected"; source: "terminology"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.4 CURRENT; + target: "terminology.content"; + target: "terminology.label"; + target: "shadow"; + target: "clip"; + target: "glow"; + } + + //////////////////////////////////////////////////////////////////// + // fancy stuff over the top of the terminal for shading and labelling + part { name: "bevel"; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "terminology.content"; + rel2.to: "terminology.content"; + image.normal: "bg_bevel.png"; + image.border: 3 3 5 3; + image.middle: 0; + fill.smooth: 0; } - part { name: "terminology.label"; type: TEXT; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1.to: "terminology.content"; - rel2.to: "terminology.content"; - color: 255 255 255 255; + } + part { name: "terminology.label"; type: TEXT; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "terminology.content"; + rel2.to: "terminology.content"; + color: 255 255 255 255; + align: 0.5 1.0; + text { font: "Sans"; size: 10; align: 0.5 1.0; - text { font: "Sans"; size: 10; - align: 0.5 1.0; - min: 0 1; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - text { font:"Sans:style=Bold"; } + min: 0 1; } } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + text { font:"Sans:style=Bold"; } + } + } - //////////////////////////////////////////////////////////////////// - // visual bell - spinning red siren light - part { name: "bell_base"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - color: 255 255 255 0; - min: 32 32; - max: 32 32; - rel1.to: "terminology.content"; - rel2.to: "terminology.content"; - align: 1.0 1.0; - image.normal: "bg_led_base.png"; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } + //////////////////////////////////////////////////////////////////// + // visual bell - spinning red siren light + part { name: "bell_base"; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + color: 255 255 255 0; + min: 32 32; + max: 32 32; + rel1.to: "terminology.content"; + rel2.to: "terminology.content"; + align: 1.0 1.0; + image.normal: "bg_led_base.png"; } - part { name: "bell"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - color: 255 255 255 0; - rel1.to: "bell_base"; - rel2.to: "bell_base"; - image.normal: "bg_led.png"; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; } - part { name: "bell_strobe"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - color: 255 255 255 0; - rel1.to: "bell"; - rel2.to: "bell"; - image.normal: "bg_led_strobe.png"; - map { - on: 1; - smooth: 1; - rotation.center: "bell"; - } - } - description { state: "spin" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - map.rotation.z: 36.0; - } - description { state: "spin_done" 0.0; - inherit: "spin" 0.0; - map.rotation.z: 720.0; - } - description { state: "spin_done2" 0.0; - inherit: "spin" 0.0; - map.rotation.z: 1440.0; + } + part { name: "bell"; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + color: 255 255 255 0; + rel1.to: "bell_base"; + rel2.to: "bell_base"; + image.normal: "bg_led.png"; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + } + part { name: "bell_strobe"; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + color: 255 255 255 0; + rel1.to: "bell"; + rel2.to: "bell"; + image.normal: "bg_led_strobe.png"; + map { + on: 1; + smooth: 1; + rotation.center: "bell"; } } - program { - signal: "bell"; source: "terminology"; - action: STATE_SET "default" 0.0; - target: "bell_base"; - target: "bell"; - target: "bell_strobe"; - after: "bell"; - } - program { name: "bell"; - action: STATE_SET "visible" 0.0; - target: "bell_base"; - after: "bell2"; - } - program { name: "bell2"; - action: STATE_SET "visible" 0.0; - transition: DECELERATE 0.1; - target: "bell"; - after: "bell3"; - } - program { name: "bell3"; - action: STATE_SET "spin" 0.0; - transition: LINEAR 0.1; - target: "bell_strobe"; - after: "bell4.2"; - } - program { name: "bell4.2"; - action: STATE_SET "spin_done" 0.0; - transition: LINEAR 0.9; - target: "bell_strobe"; - after: "bell4.3"; - } - program { name: "bell4.3"; - action: STATE_SET "spin_done2" 0.0; - transition: LINEAR 1.0; - target: "bell_strobe"; - after: "bell4.4"; - } - program { name: "bell4.4"; - action: STATE_SET "spin_done" 0.0; - target: "bell_strobe"; - after: "bell4.3"; + description { state: "spin" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + map.rotation.z: 36.0; + } + description { state: "spin_done" 0.0; + inherit: "spin" 0.0; + map.rotation.z: 720.0; + } + description { state: "spin_done2" 0.0; + inherit: "spin" 0.0; + map.rotation.z: 1440.0; } } + program { + signal: "bell"; source: "terminology"; + action: STATE_SET "default" 0.0; + target: "bell_base"; + target: "bell"; + target: "bell_strobe"; + after: "bell"; + } + program { name: "bell"; + action: STATE_SET "visible" 0.0; + target: "bell_base"; + after: "bell2"; + } + program { name: "bell2"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.1; + target: "bell"; + after: "bell3"; + } + program { name: "bell3"; + action: STATE_SET "spin" 0.0; + transition: LINEAR 0.1; + target: "bell_strobe"; + after: "bell4.2"; + } + program { name: "bell4.2"; + action: STATE_SET "spin_done" 0.0; + transition: LINEAR 0.9; + target: "bell_strobe"; + after: "bell4.3"; + } + program { name: "bell4.3"; + action: STATE_SET "spin_done2" 0.0; + transition: LINEAR 1.0; + target: "bell_strobe"; + after: "bell4.4"; + } + program { name: "bell4.4"; + action: STATE_SET "spin_done" 0.0; + target: "bell_strobe"; + after: "bell4.3"; + } } + } -////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////// //// an object overlayd on text that is a link group { name: "terminology/link"; images { --
