rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=65e0cd853cc9df003ccd3d37fa9363d13bcdcc4b
commit 65e0cd853cc9df003ccd3d37fa9363d13bcdcc4b
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Mon Apr 4 15:14:19 2016 +0300
theme: add radio style
T3373
---
data/themes/default/images/radio_button_back.png | Bin 0 -> 1116 bytes
.../default/images/radio_button_dim_back.png | Bin 0 -> 1145 bytes
data/themes/default/images/radio_button_dim_on.png | Bin 0 -> 1305 bytes
.../default/images/radio_button_dim_shadow.png | Bin 0 -> 1292 bytes
data/themes/default/images/radio_button_on.png | Bin 0 -> 1382 bytes
data/themes/default/images/radio_button_shadow.png | Bin 0 -> 1397 bytes
data/themes/default/widgets/radio.edc | 459 ++++++++++-----------
7 files changed, 207 insertions(+), 252 deletions(-)
diff --git a/data/themes/default/images/radio_button_back.png
b/data/themes/default/images/radio_button_back.png
new file mode 100644
index 0000000..8ed91f3
Binary files /dev/null and b/data/themes/default/images/radio_button_back.png
differ
diff --git a/data/themes/default/images/radio_button_dim_back.png
b/data/themes/default/images/radio_button_dim_back.png
new file mode 100644
index 0000000..562691f
Binary files /dev/null and
b/data/themes/default/images/radio_button_dim_back.png differ
diff --git a/data/themes/default/images/radio_button_dim_on.png
b/data/themes/default/images/radio_button_dim_on.png
new file mode 100644
index 0000000..a206d6b
Binary files /dev/null and b/data/themes/default/images/radio_button_dim_on.png
differ
diff --git a/data/themes/default/images/radio_button_dim_shadow.png
b/data/themes/default/images/radio_button_dim_shadow.png
new file mode 100644
index 0000000..ef7ddac
Binary files /dev/null and
b/data/themes/default/images/radio_button_dim_shadow.png differ
diff --git a/data/themes/default/images/radio_button_on.png
b/data/themes/default/images/radio_button_on.png
new file mode 100644
index 0000000..6db1810
Binary files /dev/null and b/data/themes/default/images/radio_button_on.png
differ
diff --git a/data/themes/default/images/radio_button_shadow.png
b/data/themes/default/images/radio_button_shadow.png
new file mode 100644
index 0000000..a582869
Binary files /dev/null and b/data/themes/default/images/radio_button_shadow.png
differ
diff --git a/data/themes/default/widgets/radio.edc
b/data/themes/default/widgets/radio.edc
index e97cc37..e5ed96e 100644
--- a/data/themes/default/widgets/radio.edc
+++ b/data/themes/default/widgets/radio.edc
@@ -1,311 +1,266 @@
-group { name: "elm/radio/base/style_editor";
- images {
- image: "styles-preview-bg-current.png" COMP;
- }
+group { name: "elm/radio/base/default";
+ images.image: "radio_button_back.png" COMP;
+ images.image: "radio_button_shadow.png" COMP;
+ images.image: "radio_button_on.png" COMP;
+ images.image: "radio_button_dim_back.png" COMP;
+ images.image: "radio_button_dim_shadow.png" COMP;
+ images.image: "radio_button_dim_on.png" COMP;
parts {
- part { name: "bg";
- type: SWALLOW;
- mouse_events: 0;
+ part { name: "inset"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
+ rel1.offset: 2 2;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 2 -3;
+ color_class: "bg_entry";
+ image.normal: "radio_button_back.png";
align: 0.0 0.5;
- min: 24 16;
- max: 24 19;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- fixed: 1 0;
- rel1 {
- offset: 1 1;
- }
- rel2 {
- relative: 0.0 1.0;
- offset: 1 -2;
- }
+ min: 18 19;
+ max: 18 19;
+ fixed: 1 1;
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ image.normal: "radio_button_dim_back.png";
}
}
- part { name: "radio";
- type: IMAGE;
- mouse_events: 0;
+ part { name: "indicator"; mouse_events: 0;
scale: 1;
+ clip_to: "clip";
description { state: "default" 0.0;
+ rel1.to: "inset";
+ rel2.to: "inset";
+ image.normal: "radio_button_on.png";
visible: 0;
- rel1 {
- to: "bg";
- }
- rel2 {
- to: "bg";
- }
- image {
- normal: "styles-preview-bg-current.png";
- middle: DEFAULT;
- }
}
- description { state: "visible" 0.0;
- rel1 {
- to: "bg";
- }
- rel2 {
- to: "bg";
- }
- image {
- normal: "styles-preview-bg-current.png";
- middle: DEFAULT;
- }
+ description { state: "selected" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ image.normal: "radio_button_dim_on.png";
+ }
+ description { state: "selected_disabled" 0.0;
+ inherit: "disabled" 0.0;
+ visible: 1;
}
}
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "shadow"; mouse_events: 0;
scale: 1;
+ clip_to: "clip";
+ repeat_events: 1;
description { state: "default" 0.0;
+ rel1.to: "inset";
+ rel2.to: "inset";
+ image.normal: "radio_button_shadow.png";
visible: 0;
- align: 0.0 0.5;
- fixed: 1 0;
- rel1 {
- relative: 1.0 0.0;
- offset: 1 1;
- to_x: "bg";
- }
- rel2 {
- offset: 1 -2;
- to_x: "bg";
- }
- }
- description { state: "visible" 0.0;
- align: 0.0 0.5;
- fixed: 1 0;
- min: 22 22;
- aspect: 1.0 1.0;
- rel1 {
- relative: 1.0 0.0;
- offset: 1 1;
- to_x: "bg";
- }
- rel2 {
- offset: 1 -2;
- to_x: "bg";
- }
}
description { state: "disabled" 0.0;
- visible: 0;
- align: 0.0 0.5;
- fixed: 1 0;
- color: 255 255 255 128;
- rel1 {
- relative: 1.0 0.0;
- offset: 1 1;
- to_x: "bg";
- }
- rel2 {
- offset: 1 -2;
- to_x: "bg";
- }
+ inherit: "default" 0.0;
+ image.normal: "radio_button_dim_shadow.png";
}
- description { state: "disabled_visible" 0.0;
- align: 0.0 0.5;
- fixed: 1 0;
- aspect: 1.0 1.0;
- color: 255 255 255 128;
- rel1 {
- relative: 1.0 0.0;
- offset: 1 1;
- to_x: "bg";
- }
- rel2 {
- offset: 1 -2;
- to_x: "bg";
- }
+ }
+ part { name: "clip"; type: RECT;
+ description { state: "default" 0.0;
}
}
- part { name: "elm.text";
- type: TEXT;
- mouse_events: 0;
+ part { name: "elm.swallow.content"; type: SWALLOW;
scale: 1;
+ clip_to: "clip";
description { state: "default" 0.0;
+ fixed: 1 0;
visible: 0;
- color: 0 0 0 255;
- rel1 {
- relative: 1.0 0.0;
- offset: 1 1;
- to_x: "elm.swallow.content";
- }
- rel2 {
- offset: -2 -2;
- }
- text {
- font: "PT";
- size: 10;
- align: -1.0 0.5;
- }
+ align: 0.0 0.5;
+ max: 0 0;
+ rel1.to_x: "inset";
+ rel1.relative: 1.0 0.0;
+ rel2.to_x: "inset";
+ rel2.relative: 1.0 1.0;
}
description { state: "visible" 0.0;
- color: 0 0 0 255;
- rel1 {
- relative: 1.0 0.0;
- offset: 1 1;
- to_x: "elm.swallow.content";
- }
- rel2 {
- offset: -2 -2;
- }
- text {
- font: "PT";
- size: 10;
- min: 1 1;
- align: -1.0 0.5;
- ellipsis: -1.0;
+ inherit: "default" 0.0;
+ rel1.offset: 6 1;
+ rel2.offset: 6 -2;
+ visible: 1;
+ aspect: 1.0 1.0;
+ min: 16 16;
+ }
+ }
+ part { name: "elm.text"; type: TEXT; mouse_events: 0;
+ effect: SHADOW BOTTOM;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1.offset: 6 2;
+ rel1.to_x: "elm.swallow.content";
+ rel1.relative: 1.0 0.0;
+ rel2.offset: -7 -3;
+ color_class: "main";
+ text { font: PT; size: 12;
+ min: 0 0;
+ align: 0.0 0.5;
+ text_class: "radio";
}
}
description { state: "disabled" 0.0;
- visible: 0;
- color: 0 0 0 128;
- color3: 0 0 0 0;
- rel1 {
- relative: 1.0 0.0;
- offset: 1 1;
- to_x: "elm.swallow.content";
- }
- rel2 {
- offset: -2 -2;
- }
- text {
- font: "PT";
- size: 10;
- align: -1.0 0.5;
- }
+ inherit: "default" 0.0;
+ color_class: "main_disabled";
+ color3: 255 255 255 255;
}
- description { state: "disabled_visible" 0.0;
- color: 0 0 0 128;
- color3: 0 0 0 0;
- rel1 {
- relative: 1.0 0.0;
- offset: 1 1;
- to_x: "elm.swallow.content";
- }
- rel2 {
- offset: -2 -2;
- }
- text {
- font: "PT";
- size: 10;
- min: 1 1;
- align: -1.0 0.5;
- ellipsis: -1.0;
- }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ text.min: 1 1;
+ text.ellipsis: -1;
}
- }
- part { name: "events";
- type: RECT;
- ignore_flags: "ON_HOLD";
- description { state: "default" 0.0;
- color: 0 0 0 0;
- rel1 {
- to: "bg";
- }
- rel2 {
- to: "bg";
- }
+ description { state: "visible_disabled" 0.0;
+ inherit: "default" 0.0;
+ color_class: "main_disabled";
+ color3: 255 255 255 255;
+ visible: 1;
+ text.min: 1 1;
+ text.ellipsis: -1;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "event"; type: RECT;
description { state: "default" 0.0;
- visible: 0;
color: 0 0 0 0;
}
description { state: "disabled" 0.0;
- color: 0 0 0 0;
+ inherit: "default" 0.0;
+ visible: 0;
}
}
}
programs {
- program { name: "click";
- signal: "mouse,up,1";
- source: "events";
- action: SIGNAL_EMIT "elm,action,radio,toggle" "";
+ program { name: "clicked";
+ signal: "mouse,clicked,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,radio,toggle" "elm";
}
- program { name: "radio_on";
- signal: "elm,state,radio,on";
- source: "elm";
+ program { name: "icon,visible";
+ signal: "elm,state,icon,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
- target: "radio";
+ target: "elm.swallow.content";
}
- program { name: "radio_off";
- signal: "elm,state,radio,off";
- source: "elm";
+ program { name: "icon,hidden";
+ signal: "elm,state,icon,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "radio";
+ target: "elm.swallow.content";
}
- program { name: "text_show";
- signal: "elm,state,text,visible";
- source: "elm";
+
+ /* enabled */
+ program { name: "radio,on[enabled]";
+ signal: "elm,state,radio,on"; source: "elm";
+ action: STATE_SET "selected" 0.0;
+ filter: "event" "default";
+ target: "indicator";
+ }
+ program { name: "radio,off[enabled]";
+ signal: "elm,state,radio,off"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ filter: "event" "default";
+ target: "indicator";
+ }
+ program { name: "text,visible[enabled]";
+ signal: "elm,state,text,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
+ filter: "event" "default";
target: "elm.text";
}
- program { name: "text_hide";
- signal: "elm,state,text,hidden";
- source: "elm";
+ program { name: "text,hidden[enabled]";
+ signal: "elm,state,text,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
+ filter: "event" "default";
target: "elm.text";
}
- program { name: "icon_show";
- signal: "elm,state,icon,visible";
- source: "elm";
- action: STATE_SET "visible" 0.0;
- target: "elm.swallow.content";
+ /* disabled */
+ program { name: "radio,on[disabled]";
+ signal: "elm,state,radio,on"; source: "elm";
+ action: STATE_SET "selected_disabled" 0.0;
+ filter: "event" "disabled";
+ target: "indicator";
+ }
+ program { name: "radio,off[disabled]";
+ signal: "elm,state,radio,off"; source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ filter: "event" "disabled";
+ target: "indicator";
+ }
+ program { name: "text,visible[disabled]";
+ signal: "elm,state,text,visible"; source: "elm";
+ action: STATE_SET "visible_disabled" 0.0;
+ filter: "event" "disabled";
+ target: "elm.text";
}
- program { name: "icon_hide";
- signal: "elm,state,icon,hidden";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.swallow.content";
+ program { name: "text,hidden[disabled]";
+ signal: "elm,state,text,hidden"; source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ filter: "event" "disabled";
+ target: "elm.text";
}
- program { name: "disable";
- signal: "elm,state,disabled";
- source: "elm";
- action: STATE_SET "disabled" 0.0;
- target: "disabler";
- after: "disable_text";
- }
- program { name: "disable_text";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- else
- set_state(PART:"elm.text", "disabled", 0.0);
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (!strcmp(st, "visible"))
- set_state(PART:"elm.swallow.content", "disabled_visible", 0.0);
- else
- set_state(PART:"elm.swallow.content", "disabled", 0.0);
- }
+ program { name: "text,disable[default]";
+ signal: "elm,state,disabled"; source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ filter: "elm.text" "default";
+ target: "elm.text";
+ }
+ program { name: "text,disable[visible]";
+ signal: "elm,state,disabled"; source: "elm";
+ action: STATE_SET "visible_disabled" 0.0;
+ filter: "elm.text" "visible";
+ target: "elm.text";
+ }
+ program { name: "indicator,disable[default]";
+ signal: "elm,state,disabled"; source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ filter: "indicator" "default";
+ target: "indicator";
+ }
+ program { name: "indicator,disable[selected]";
+ signal: "elm,state,disabled"; source: "elm";
+ action: STATE_SET "selected_disabled" 0.0;
+ filter: "indicator" "selected";
+ target: "indicator";
+ }
+ program { name: "other,disable";
+ signal: "elm,state,disabled"; source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "inset";
+ target: "shadow";
+ target: "event";
}
- program { name: "enable";
- signal: "elm,state,enabled";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "disabler";
- after: "enable_text";
- }
- program { name: "enable_text";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "disabled_visible"))
- set_state(PART:"elm.text", "visible", 0.0);
- else
- set_state(PART:"elm.text", "default", 0.0);
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (!strcmp(st, "visible"))
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- else
- set_state(PART:"elm.swallow.content", "default", 0.0);
- }
+ program { name: "text,enable[default]";
+ signal: "elm,state,enabled"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ filter: "elm.text" "disabled";
+ target: "elm.text";
+ }
+ program { name: "text,enable[visible]";
+ signal: "elm,state,enabled"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ filter: "elm.text" "visible_disabled";
+ target: "elm.text";
+ }
+ program { name: "indicator,enable[default]";
+ signal: "elm,state,enabled"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ filter: "indicator" "disabled";
+ target: "indicator";
+ }
+ program { name: "indicator,enable[selected]";
+ signal: "elm,state,enabled"; source: "elm";
+ action: STATE_SET "selected" 0.0;
+ filter: "indicator" "selected_disabled";
+ target: "indicator";
+ }
+ program { name: "other,enable";
+ signal: "elm,state,enabled"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "inset";
+ target: "shadow";
+ target: "event";
}
}
}
--
