default theme: fix part names in efl/uiclock

Summary:
Ref T6965
Depends on D6450

Reviewers: devilhorns, zmike

Reviewed By: zmike

Subscribers: cedric, #committers, zmike

Tags: #efl

Maniphest Tasks: T6965

Differential Revision: https://phab.enlightenment.org/D6451
This commit is contained in:
Xavi Artigas 2018-06-29 11:34:57 -04:00 committed by Mike Blumenkrantz
parent 89675c3219
commit d2e631586c
2 changed files with 29 additions and 29 deletions

View File

@ -1,5 +1,5 @@
#define DATETIME_FIELD(_pos) \ #define DATETIME_FIELD(_pos) \
swallow { "field"#_pos; \ swallow { "efl.field"#_pos; \
scale; \ scale; \
clip_to: "clip"; \ clip_to: "clip"; \
desc { "default"; \ desc { "default"; \
@ -8,9 +8,9 @@
align: 0.0 0.5; \ align: 0.0 0.5; \
fixed: 1 1; \ fixed: 1 1; \
rel1.relative: 1.0 0.0; \ rel1.relative: 1.0 0.0; \
rel1.to: "separator"#_pos; \ rel1.to: "efl.separator"#_pos; \
rel2.relative: 1.0 1.0; \ rel2.relative: 1.0 1.0; \
rel2.to: "separator"#_pos; \ rel2.to: "efl.separator"#_pos; \
} \ } \
desc { "enable"; \ desc { "enable"; \
inherit: "default"; \ inherit: "default"; \
@ -23,17 +23,17 @@
signal: "field"#_pos",enable"; \ signal: "field"#_pos",enable"; \
source: "efl"; \ source: "efl"; \
action: STATE_SET "enable"; \ action: STATE_SET "enable"; \
target: "field"#_pos; \ target: "efl.field"#_pos; \
} \ } \
program { "field_"#_pos"disabled"; \ program { "field_"#_pos"disabled"; \
signal: "field"#_pos",disable"; \ signal: "field"#_pos",disable"; \
source: "efl"; \ source: "efl"; \
action: STATE_SET "default"; \ action: STATE_SET "default"; \
target: "field"#_pos; \ target: "efl.field"#_pos; \
} \ } \
} }
#define DATETIME_SEPARATOR(_pos, _after) \ #define DATETIME_SEPARATOR(_pos, _after) \
text { "separator"#_pos; \ text { "efl.separator"#_pos; \
scale; \ scale; \
effect: SHADOW BOTTOM; \ effect: SHADOW BOTTOM; \
clip_to: "disclip"; \ clip_to: "disclip"; \
@ -44,11 +44,11 @@
fixed: 1 0; \ fixed: 1 0; \
rel1 { \ rel1 { \
relative: 1.0 0.0; \ relative: 1.0 0.0; \
to: "field"#_after; \ to: "efl.field"#_after; \
} \ } \
rel2 { \ rel2 { \
relative: 1.0 1.0; \ relative: 1.0 1.0; \
to: "field"#_after; \ to: "efl.field"#_after; \
} \ } \
color_class: "datetime_separator_text"; \ color_class: "datetime_separator_text"; \
text { \ text { \
@ -65,17 +65,17 @@
min: 8 10; \ min: 8 10; \
} \ } \
} \ } \
text { "separator"#_pos"d"; \ text { "efl.separator"#_pos"d"; \
scale; \ scale; \
effect: SHADOW BOTTOM; \ effect: SHADOW BOTTOM; \
clip_to: "disclip2"; \ clip_to: "disclip2"; \
desc { "default"; \ desc { "default"; \
hid; \ hid; \
rel1.to: "separator"#_pos; \ rel1.to: "efl.separator"#_pos; \
rel2.to: "separator"#_pos; \ rel2.to: "efl.separator"#_pos; \
color_class: "datetime_separator_text_disabled"; \ color_class: "datetime_separator_text_disabled"; \
text { \ text { \
text_source: "separator"#_pos; \ text_source: "efl.separator"#_pos; \
font: "Sans"; size: 10; \ font: "Sans"; size: 10; \
text_class: "datetime_separator_text_disabled"; \ text_class: "datetime_separator_text_disabled"; \
} \ } \
@ -90,15 +90,15 @@
signal: "field"#_after",enable"; \ signal: "field"#_after",enable"; \
source: "efl"; \ source: "efl"; \
action: STATE_SET "enable"; \ action: STATE_SET "enable"; \
target: "separator"#_pos; \ target: "efl.separator"#_pos; \
target: "separator"#_pos"d"; \ target: "efl.separator"#_pos"d"; \
} \ } \
program { \ program { \
signal: "field"#_after",disable"; \ signal: "field"#_after",disable"; \
source: "efl"; \ source: "efl"; \
action: STATE_SET "default"; \ action: STATE_SET "default"; \
target: "separator"#_pos; \ target: "efl.separator"#_pos; \
target: "separator"#_pos"d"; \ target: "efl.separator"#_pos"d"; \
} \ } \
} }
@ -111,15 +111,15 @@ group { "efl/uiclock";
} }
rect { "clip"; rect { "clip";
desc { "default"; desc { "default";
rel1.to: "separator0"; rel1.to: "efl.separator0";
rel2.to: "separator7"; rel2.to: "efl.separator7";
} }
} }
rect { "disclip"; rect { "disclip";
clip_to: "clip"; clip_to: "clip";
desc { "default"; desc { "default";
rel1.to: "separator0"; rel1.to: "efl.separator0";
rel2.to: "separator7"; rel2.to: "efl.separator7";
} }
desc { "disabled"; desc { "disabled";
inherit: "default"; inherit: "default";
@ -129,8 +129,8 @@ group { "efl/uiclock";
rect { "disclip2";; rect { "disclip2";;
clip_to: "clip"; clip_to: "clip";
desc { "default"; desc { "default";
rel1.to: "separator0"; rel1.to: "efl.separator0";
rel2.to: "separator7"; rel2.to: "efl.separator7";
hid; hid;
} }
desc { "disabled"; desc { "disabled";
@ -138,7 +138,7 @@ group { "efl/uiclock";
vis; vis;
} }
} }
spacer { "separator0";; spacer { "efl.separator0";;
scale; scale;
desc { "default"; desc { "default";
min: 8 10; min: 8 10;
@ -163,17 +163,17 @@ group { "efl/uiclock";
DATETIME_SEPARATOR(7,6) DATETIME_SEPARATOR(7,6)
DATETIME_FIELD(7) DATETIME_FIELD(7)
DATETIME_SEPARATOR(8,7) DATETIME_SEPARATOR(8,7)
spacer { "separator9";; spacer { "efl.separator9";;
desc { "default"; desc { "default";
rel1.to: "separator7"; rel1.to: "efl.separator7";
rel1.relative: 1.0 0.0; rel1.relative: 1.0 0.0;
min: 8 10; min: 8 10;
} }
} }
rect { "discover";; rect { "discover";;
desc { "default"; desc { "default";
rel1.to: "separator0"; rel1.to: "efl.separator0";
rel2.to: "separator7"; rel2.to: "efl.separator7";
hid; hid;
color: 0 0 0 0; color: 0 0 0 0;
} }

View File

@ -30,8 +30,8 @@
* EFL_UI_CLOCK_TYPE_COUNT are in the valid range, and must get in the * EFL_UI_CLOCK_TYPE_COUNT are in the valid range, and must get in the
* place of "%d". * place of "%d".
*/ */
#define EDC_PART_FIELD_STR "field%d" #define EDC_PART_FIELD_STR "efl.field%d"
#define EDC_PART_SEPARATOR_STR "separator%d" #define EDC_PART_SEPARATOR_STR "efl.separator%d"
#define EDC_PART_FIELD_ENABLE_SIG_STR "field%d,enable" #define EDC_PART_FIELD_ENABLE_SIG_STR "field%d,enable"
#define EDC_PART_FIELD_DISABLE_SIG_STR "field%d,disable" #define EDC_PART_FIELD_DISABLE_SIG_STR "field%d,disable"