From 6575fee2a9366c335bf4cf4b10579ca5b2d33a13 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 13 Oct 2019 19:39:06 +0100 Subject: [PATCH] TH - multibuttonentry --- .../themes/edc/elm/multibuttonentry.edc | 175 +++++++----------- 1 file changed, 64 insertions(+), 111 deletions(-) diff --git a/data/elementary/themes/edc/elm/multibuttonentry.edc b/data/elementary/themes/edc/elm/multibuttonentry.edc index 63ad74ff3d..d9fe2567f2 100644 --- a/data/elementary/themes/edc/elm/multibuttonentry.edc +++ b/data/elementary/themes/edc/elm/multibuttonentry.edc @@ -3,27 +3,22 @@ group { name: "elm/multibuttonentry/base/default"; data.item: "vertical_pad" 0; data.item: "closed_height" 0; parts { - part { name: "bg"; - type: RECT; - scale: 1; + part { name: "bg"; type: RECT; description { state: "default" 0.0; color_class: "multibuttonentry_bg"; } } - part { name: "elm.swallow.background"; - type: SWALLOW; + part { name: "elm.swallow.background"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } } /* this widget was released with non-namespaced parts in legacy api */ alias: "box.swallow" "elm.swallow.box"; part { name: "elm.swallow.box"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } } } @@ -32,19 +27,18 @@ group { name: "elm/multibuttonentry/base/default"; group { name: "elm/multibuttonentry/label/default"; parts { part { name: "elm.text"; type: TEXT; mouse_events: 0; - effect: GLOW; scale: 1; description { state: "default" 0.0; - color: FN_COL_HIGHLIGHT; - color_class: "multibuttonentry_label"; + color: 160 160 160 255; text { font: FNBD; size: 10; min: 1 1; ellipsis: -1; align: 0.5 0.5; text_class: "multibuttonentry_label"; } - rel1.offset: 2 2; + rel1.offset: 4 4; rel2.offset: -5 -5; + offscale; } } } @@ -54,29 +48,25 @@ group { name: "elm/multibuttonentry/guidetext/default"; parts { part { name: "elm.text"; type: TEXT; scale: 1; - effect: SHADOW BOTTOM; description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -4 -4; - color: FN_COL_DISABLE; + rel1.offset: 4 4; + rel2.offset: -5 -5; + color: 80 80 80 255;; text { font: FNBD; size: 10; min: 0 1; align: 0.0 0.5; } + offscale; } } } } group { name: "elm/multibuttonentry/btn/default"; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; - images.image: "sym_close_dark_normal.png" COMP; - images.image: "sym_close_dark_selected.png" COMP; - images.image: "win_glow.png" COMP; + images.image: "border_close.png" COMP; styles { style { name: "multibuttonentry_textblock_style"; - base: "font="FN" align=0.5 font_size=10 color=#ffffffff style=shadow,bottom shadow_color=#00000080 text_class=multibuttonentry_item ellipsis=1.0"; + base: "font="FN" align=0.5 font_size=10 color=#ffff text_class=multibuttonentry_item ellipsis=1.0"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font="FNBD; @@ -90,45 +80,31 @@ group { name: "elm/multibuttonentry/btn/default"; } parts { - part { name: "bg"; type: RECT; + part { name: "base"; type: RECT; + scale: 1; description { state: "default" 0.0; - color_class: "multibuttonentry_item_bg"; - } - description { state: "pressed" 0.0; - color_class: "multibuttonentry_item_bg_selected"; - } - } - part { name: "base"; - description { state: "default" 0.0; - image.normal: "button_normal.png"; - image.border: 4 4 3 5; - image.middle: SOLID; - rel1.offset: -1 0; - rel2.offset: 0 1; - fill.smooth: 0; + color: 0 0 0 64; + rel1.offset: 2 2; + rel2.offset: -3 -3; + offscale; } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; + color: 0 0 0 192; } } - part { name: "glow"; mouse_events: 0; + part { name: "glow"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "win_glow.png"; - image.border: 9 9 9 9; - image.middle: 0; - rel1.offset: -2 -3; - rel1.to: "base"; - rel2.offset: 1 0; - rel2.to: "base"; - fill.smooth: 0; - color: 255 255 255 0; + rel.to: "base"; + rel1.offset: 0 -1; + rel1.relative: 0.0 1.0; + align: 0.5 1.0; + color: 51 153 255 255; visible: 0; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + min: 0 5; visible: 1; } description { state: "unfocused" 0.0; @@ -137,16 +113,16 @@ group { name: "elm/multibuttonentry/btn/default"; } part { name: "close"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "sym_close_dark_normal.png"; - rel1.to: "del"; - rel2.to: "del"; + image.normal: "border_close.png"; + rel.to: "del"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "sym_close_dark_selected.png"; + color: 255 255 255 255; } } part { name: "del"; type: RECT; @@ -156,94 +132,80 @@ group { name: "elm/multibuttonentry/btn/default"; min: 4 4; align: 1.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; + rel.to: "base"; rel1.relative: 1.0 0.0; - rel1.to: "base"; - rel1.offset: -6 5; - rel2.offset: -6 -7; - rel2.to: "base"; + rel1.offset: -5 4; + rel2.offset: -5 -5; color: 0 0 0 0; + offscale; } } part { name: "elm.btn.text"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; - color_class: "multibuttonentry_item_text"; + rel1.offset: 4 4; + rel2.offset: -5 -5; + rel1.to: "base"; + rel2.to_x: "del"; + rel2.to_y: "base"; + rel2.relative: 0.0 1.0; text { style: "multibuttonentry_textblock_style"; min: 1 1; ellipsis: -1; text_class: "multibuttonentry_item_text"; } visible: 0; - rel1.offset: 5 5; - rel1.to: "base"; - rel2.to_x: "del"; - rel2.to_y: "base"; - rel2.relative: 0.0 1.0; - rel2.offset: -3 -7; + offscale; } } part { name: "text"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; - color_class: "multibuttonentry_item_text"; + rel.to: "elm.btn.text"; + align: 0.0 0.5; text { style: "multibuttonentry_textblock_style"; text_source: "elm.btn.text"; min: 0 1; align: 0.0 0.5; text_class: "multibuttonentry_item_text"; } - align: 0.0 0.5; - rel1.offset: 5 5; - rel1.to: "base"; - rel2.to_x: "del"; - rel2.to_y: "base"; - rel2.relative: 0.0 1.0; - rel2.offset: -3 -7; + color: 160 160 160 255; } description { state: "pressed" 0.0; inherit: "default"; - color_class: "multibuttonentry_item_text_pressed"; - text { - text_class: "multibuttonentry_item_text_pressed"; - } + color: 255 255 255 255; } description { state: "disabled" 0.0; inherit: "default"; - color_class: "multibuttonentry_item_text_disabled"; - text { - text_class: "multibuttonentry_item_text_disabled"; - } + color: 80 80 80 255; } } } programs { - program { - signal: "mouse,clicked,1"; source: "base"; + program { signal: "mouse,clicked,1"; source: "base"; script { if (get_int(disabled) == 0) { emit("clicked", ""); } } } - program { - signal: "elm,state,default"; source: "elm"; + program { signal: "elm,state,default"; source: "elm"; action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.2; target: "glow"; } - program { - signal: "elm,state,focused"; source: "elm"; + program { signal: "elm,state,focused"; source: "elm"; action: STATE_SET "focused" 0.0; + transition: SINUSOIDAL 0.2; target: "glow"; } - program { - signal: "elm,state,enabled"; source: "elm"; + program { signal: "elm,state,enabled"; source: "elm"; script { set_state(PART:"text", "default", 0.0); set_int(disabled , 0); } } - program { - signal: "elm,state,disabled"; source: "elm"; + program { signal: "elm,state,disabled"; source: "elm"; script { new st[31]; new Float: vl; @@ -254,42 +216,34 @@ group { name: "elm/multibuttonentry/btn/default"; set_int(disabled , 1); } } - program { - signal: "elm,state,unfocused"; source: "elm"; + program { signal: "elm,state,unfocused"; source: "elm"; action: STATE_SET "unfocused" 0.0; target: "glow"; } - program { - signal: "mouse,down,1"; source: "base"; + program { signal: "mouse,down,1"; source: "base"; script { if (get_int(disabled) == 0) { set_state(PART:"base", "pressed", 0.0); - set_state(PART:"bg", "pressed", 0.0); set_state(PART:"text", "pressed", 0.0); } } } - program { - signal: "mouse,up,1"; source: "base"; + program { signal: "mouse,up,1"; source: "base"; script { if (get_int(disabled) == 0) { set_state(PART:"base", "default", 0.0); - set_state(PART:"bg", "default", 0.0); set_state(PART:"text", "default", 0.0); } } } - program { - signal: "mouse,clicked,1"; source: "del"; + program { signal: "mouse,clicked,1"; source: "del"; action: SIGNAL_EMIT "elm,deleted" "elm"; } - program { - signal: "mouse,down,1"; source: "del"; + program { signal: "mouse,down,1"; source: "del"; action: STATE_SET "clicked" 0.0; target: "close"; } - program { - signal: "mouse,up,1"; source: "del"; + program { signal: "mouse,up,1"; source: "del"; action: STATE_SET "default" 0.0; target: "close"; } @@ -299,7 +253,7 @@ group { name: "elm/multibuttonentry/btn/default"; group { name: "elm/multibuttonentry/closedbutton/default"; styles { style { name: "textblock_style_multibuttonentry_default"; - base: "font="FNBD" font_size=10 text_class=multibuttonentry_closed style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12 wrap=char"; + base: "font="FNBD" font_size=10 text_class=multibuttonentry_closed color=#a0a0a0ff align=center wrap=char"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font="FNBD; @@ -316,10 +270,9 @@ group { name: "elm/multibuttonentry/closedbutton/default"; part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; - rel1.offset: 2 2; - rel1.to: "bg"; - rel2.offset: -3 -3; - rel2.to: "bg"; + rel.to: "bg"; + rel1.offset: 4 4; + rel2.offset: -5 -5; text { style: "textblock_style_multibuttonentry_default"; min: 1 1; ellipsis: -1;