simplify, reduce, and make uniform all edc

This commit is contained in:
zmike 2014-05-02 15:06:19 -04:00
parent c2ec05e9a5
commit ed541796c0
2 changed files with 65 additions and 129 deletions

View File

@ -5,52 +5,42 @@
collections {
// layout for dark theme
group { name: "etv/main/layout";
group { "etv/main/layout"; program_source: "elm";
parts {
part { name: "base";
type: RECT;
description { state: "default" 0.0;
rect { "base";
desc {
color: 64 64 64 255;
}
}
part { name: "preview";
type: SWALLOW;
swallow { "preview";
scale: 1;
description { state: "default" 0.0;
desc {
min: PREVIEW_WIDTH 0;
rel1.to: "base";
rel2 {
to_x: "base";
to_y: "menu_bottom_line";
relative: 1.0 0.0;
}
rel2.to_x: "base";
rel2.to_y: "menu_bottom_line";
rel2.relative: 1.0 0.0;
align: 0.0 0.5;
}
}
part { name: "menu_bottom_line";
type: RECT;
rect { "menu_bottom_line"; nomouse;
scale: 1;
description { state: "default" 0.0;
desc {
min: 0 1;
fixed: 0 1;
color: 73 73 73 255;
rel1.to: "edje_name_txt";
rel2 {
to: "edje_name_txt";
relative: 1.0 0.0;
}
rel2.to: "edje_name_txt";
rel2.relative: 1.0 0.0;
align: 0.5 1.0;
}
}
part { name: "edje_name_txt";
type: TEXT;
text { "edje_name_txt"; nomouse;
scale: 1;
description { state: "default" 0.0;
desc {
fixed: 0 1;
rel1 {
to: "base";
relative: 0.0 1.0;
}
rel1.to: "base";
rel1.relative: 0.0 1.0;
rel2.to: "base";
rel2.offset: -10 -1;
align: 0.0 1.0;
@ -62,46 +52,33 @@ collections {
}
}
}
part { name: "popup";
type: SWALLOW;
swallow { "popup";
scale: 1;
description { state: "default" 0.0;
desc {
fixed: 1 1;
min: POPUP_WIDTH POPUP_HEIGHT;
max: POPUP_WIDTH POPUP_HEIGHT;
align: 0.5 0.0;
visible: 0;
hid;
rel1.relative: 0.0 1.0;
link.base: "popup,hide";
link.transition: DECEL 0.5;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
desc { "visible"; inherit: "default";
vis;
align: 0.5 0.5;
rel1.relative: 0.0 0.0;
link.base: "popup,show";
link.transition: SPRING 1.2 2.0 6;
}
}
program { name: "popup,show";
signal: "popup,show";
source: "elm";
action: STATE_SET "visible" 0.0;
transition: SPRING 1.2 2.0 6;
target: "popup";
}
program { name: "popup,hide";
signal: "popup,hide";
source: "elm";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "popup";
}
}
}
group { name: "etv/preview/layout";
group { "etv/preview/layout";
parts {
part { name: "elm.swallow.icon";
type: SWALLOW;
description { state: "default" 0.0;
swallow { "elm.swallow.icon";
desc {
fixed: 1 1;
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;

View File

@ -1,95 +1,54 @@
collections {
group { name : "etv/main/layout";
group { "etv/main/layout";
parts {
part { name : "background";
type: RECT;
mouse_events: 0;
description { state : "default" 0.0; }
}
part { name : "title";
type : SWALLOW;
scale : 1;
description { state : "default" 0.0;
rel2 {
to : "button_description";
relative : 0.0 1.0;
}
rect { "background"; nomouse; }
swallow { "title";
scale: 1;
desc {
rel2.to: "button_description";
rel2.relative: 0.0 1.0;
}
}
part { name : "button_description";
type : SWALLOW;
scale : 1;
description { state : "default" 0.0;
align : 0.5 0;
swallow { "button_description";
scale: 1;
desc {
align: 0.5 0;
fixed: 0 1;
rel1 {
relative : 0.8 0.0;
}
rel2 {
relative : 1.0 0.0;
}
rel1.relative: 0.8 0.0;
rel2.relative: 1.0 0.0;
}
}
part { name : "preview";
type : SWALLOW;
scale : 1;
description { state : "default" 0.0;
rel1 {
to : "title";
relative : 0.0 1.0;
}
rel2 {
to : "option_set";
relative : 1.0 0.0;
}
swallow { "preview";
scale: 1;
desc {
rel1.to: "title";
rel1.relative: 0.0 1.0;
rel2.to: "option_set";
rel2.relative: 1.0 0.0;
}
}
part { name : "option";
type : SWALLOW;
scale : 1;
description { state : "default" 0.0;
swallow { "option";
scale: 1;
desc {
fixed: 0 1;
align: 0.5 1.0;
rel1.relative : 0.0 1.0;
rel1.relative: 0.0 1.0;
}
}
part { name : "option_set";
type : SWALLOW;
scale : 1;
description { state : "default" 0.0;
fixed : 0 1;
rel1.to : "option";
rel2 {
to : "option";
relative : 1.0 0.0;
}
swallow { "option_set";
scale: 1;
desc {
fixed: 0 1;
rel1.to: "option";
rel2.to: "option";
rel2.relative: 1.0 0.0;
link.base: "option,unset,clicked" "option";
link.transition: ACCEL 0.3;
}
description { state : "set" 0.1;
fixed : 0 1;
align : 0.5 1.0;
rel1.to : "option";
rel2 {
to : "option";
relative : 1.0 0.0;
}
}
}
programs {
program {
name : "option_set_show";
signal : "option,set,clicked";
source : "option";
action : STATE_SET "set" 0.1;
target : "option_set";
transition : DECELERATE 0.3;
}
program {
name : "option_set_hide";
signal : "option,unset,clicked";
source : "option";
action : STATE_SET "default" 0.0;
target : "option_set";
transition : ACCELERATE 0.3;
desc { "active"; inherit: "default";
align: 0.5 1.0;
link.base: "option,set,clicked" "option";
link.transition: DECEL 0.3;
}
}
}