kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into devs/hermet/lottie

This commit is contained in:
Hermet Park 2019-09-26 11:42:57 +09:00
parent f2012f3c6e 41d0ead833
commit da0fd08439
294 changed files with 6065 additions and 4957 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NEWS
View File

@ -29,26 +29,6 @@ Features:
Fixes:
* eo: Fix missing varags cleanup (CID1399080)
* efl_core_command_line: Fix logically dead code (CID1399106)
* efl_ui_widget_common: Fix potential resource leak (CID1399088)
* efl_ui_selection_manager: Fix unchecked return value (CID1399092)
* evas_device: Fix dereferencing null pointer (CID1399091)
* efl_ui_stack: Fix dereference null return value (CID1399082)
* efl_ui_datepicker: Fix uninitialized scalar value (CID1397006)
* efl_ui_grid: Fix dereferencing null pointer (CID1397000)
* ecore_con: Fix dereferencing of null pointer (CID1396990)
* elm_atspi_bridge: Fix resource leak (CID1399429)
* efl_ui_win: Fix dereference null return value (CID1399428)
* efl_ui_win: Fix dereference null return (CID1399427)
* efl_ui_win: Fix dereference null return (CID1399426)
* efl_ui_win: Fix dereference null return value (CID1399425)
* efreet: Fix resource leak (CID1399090)
* efl_ui_text: Fix resource leak (CID1396998)
* eldbus: Fix dereference after null check (CID1399422)
* efl_ui_focus_manager_calc: Fix resource leaks (CID1396984, CID1396965)
* elm_focus_legacy: Fix resource leaks (CID1399096, CID1399095)
* eldbus: Fix resource leak (CID1399097)
* efl_canvas_vg_object: Fix dereference after null check (CID1399423, CID1399421)
* efl_ui_win: fix hw accel detection
* efl_ui_layout: Eina_Error type has been modified to work correctly.
@ -229,6 +209,8 @@ Fixes:
* fix xpm loader to be threadable - fixes so much stuff...
* efl: check file's mtime in efl.file::file_set to determine if file is the same
* meson.build: allow to disable tiff evas loader
* ecore/signal: also use nonblock for writing side of signal pipe
* ector engine: +null checking.
Changes since 1.21.0:
---------------------

2
data/elementary/themes/edc/efl/bg.edc
View File

@ -7,7 +7,7 @@
*/
group { "efl/bg";
data.item: "version" "119";
data.item: "version" "123";
images.image: "bevel_dark_out.png" COMP;
parts {
part { name: "clipper"; type: RECT;

12
data/elementary/themes/edc/efl/border.edc
View File

@ -7,7 +7,7 @@
* - virtual keyboard
*/
group { "efl/border";
group { "efl/border"; data.item: "version" "123";
images.image: "vgrad_med_lighter.png" COMP;
images.image: "vgrad_med_dark.png" COMP;
images.image: "bevel_out.png" COMP;
@ -130,7 +130,7 @@ group { "efl/border";
rel.to: "efl.menu";
}
}
swallow { "efl.menu";
swallow { "efl.menu"; required;
required: 1; // since 1.19
desc { "default";
rel.to: "indicator_spacer";
@ -162,7 +162,7 @@ group { "efl/border";
}
/* application contents */
swallow { "efl.client";
swallow { "efl.client"; required;
clip: "client_clip";
desc { "default";
rel.to: "client_spacer";
@ -308,7 +308,7 @@ group { "efl/border";
rel2.relative: 1.2 1.2;
}
}
swallow { "efl.icon"; nomouse;
swallow { "efl.icon"; nomouse; required;
clip_to: "top_clip";
desc { "default";
rel1.to: "icon";
@ -694,7 +694,7 @@ group { "efl/border";
color: 0 0 0 0;
}
}
swallow { "efl.indicator";
swallow { "efl.indicator"; required;
clip: "bg_clip";
desc { "default";
rel.to: "top_clip";
@ -1124,6 +1124,7 @@ group { "efl/border";
group { "efl/border/dialog";
inherit: "efl/border";
data.item: "version" "123";
parts {
text { "efl.text.title";
clip: "top_clip";
@ -1191,6 +1192,7 @@ group { "efl/border/dialog";
group { "efl/border/naviframe";
inherit: "efl/border";
data.item: "version" "123";
images.image: "sym_left_dark_normal.png" COMP;
images.image: "sym_left_glow_normal.png" COMP;
images.image: "sym_left_light_normal.png" COMP;

24
data/elementary/themes/edc/efl/button.edc
View File

@ -1,4 +1,4 @@
group { name: "efl/button";
group { name: "efl/button"; data.item: "version" "123";
images.image: "button_normal.png" COMP;
images.image: "button_clicked.png" COMP;
@ -320,7 +320,7 @@ group { name: "efl/button";
}
}
program { name: "buttonactivate";
signal: "efl,anim,activate"; source: "efl";
signal: "efl,state,animation,activated"; source: "efl";
action: STATE_SET "pressed" 0.0;
target: "base";
after: "button_unpressed_anim";
@ -331,7 +331,7 @@ group { name: "efl/button";
target: "base";
}
program { name: "button_text_visible";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -339,7 +339,7 @@ group { name: "efl/button";
}
}
program { name: "button_text_hidden";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -347,7 +347,7 @@ group { name: "efl/button";
}
}
program { name: "button_icon_visible";
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -355,7 +355,7 @@ group { name: "efl/button";
}
}
program { name: "button_icon_hidden";
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
@ -403,7 +403,7 @@ group { name: "efl/button";
#undef BACKGROUND
}
group { name: "efl/button:anchor";
group { name: "efl/button:anchor"; data.item: "version" "123";
images.image: "horizontal_separated_bar_small_glow.png" COMP;
#define ICON 1
#define LABEL 2
@ -696,7 +696,7 @@ group { name: "efl/button:anchor";
target: "text2";
}
program {
signal: "efl,anim,activate"; source: "efl";
signal: "efl,state,animation,activated"; source: "efl";
action: STATE_SET "clicked" 0.0;
target: "bar2";
target: "text2";
@ -713,7 +713,7 @@ group { name: "efl/button:anchor";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { name: "button_text_visible";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -721,7 +721,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_text_hidden";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -729,7 +729,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_icon_visible";
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -737,7 +737,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_icon_hidden";
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);

7
data/elementary/themes/edc/efl/calendar.edc
View File

@ -420,7 +420,7 @@
} \
}
group { "efl/calendar";
group { "efl/calendar"; data.item: "version" "123";
images.image: "sym_left_light_normal.png" COMP;
images.image: "sym_right_light_normal.png" COMP;
images.image: "sym_left_glow_normal.png" COMP;
@ -541,7 +541,7 @@ group { "efl/calendar";
#undef CIT
#undef CH
group { name: "efl/calendar/inc_button";
group { name: "efl/calendar/inc_button"; data.item: "version" "123";
images.image: "sym_right_light_normal.png" COMP;
images.image: "sym_right_glow_normal.png" COMP;
images.image: "sym_right_dark_normal.png" COMP;
@ -647,7 +647,7 @@ group { "efl/calendar";
action: SIGNAL_EMIT "efl,action,click" "";
}
program { name: "access_pressed";
signal: "efl,action,anim,activate";
signal: "efl,state,animation,activated";
source: "efl";
action: STATE_SET "pressed" 0.0;
target: "arrow.image";
@ -693,6 +693,7 @@ group { "efl/calendar";
group { name: "efl/calendar/dec_button";
inherit: "efl/calendar/inc_button";
data.item: "version" "123";
images.image: "sym_left_light_normal.png" COMP;
images.image: "sym_left_glow_normal.png" COMP;
images.image: "sym_left_dark_normal.png" COMP;

36
data/elementary/themes/edc/efl/check.edc
View File

@ -1,4 +1,4 @@
group { "efl/check";
group { "efl/check"; data.item: "version" "123";
images.image: "inset_shadow_tiny.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "sym_check_alum.png" COMP;
@ -258,17 +258,17 @@ group { "efl/check";
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
program {
signal: "efl,state,check,on"; source: "efl";
signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected" 0.0;
target: "indicator";
}
program {
signal: "efl,state,check,off"; source: "efl";
signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default" 0.0;
target: "indicator";
}
program {
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -276,7 +276,7 @@ group { "efl/check";
}
}
program {
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -284,7 +284,7 @@ group { "efl/check";
}
}
program {
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -292,7 +292,7 @@ group { "efl/check";
}
}
program {
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
@ -322,7 +322,7 @@ group { "efl/check";
#undef DISABLE
}
group { "efl/check:toggle";
group { "efl/check:toggle"; data.item: "version" "123";
images.image: "inset_shadow_tiny.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "bevel_out.png" COMP;
@ -773,7 +773,7 @@ group { "efl/check:toggle";
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
program {
signal: "efl,state,check,on"; source: "efl";
signal: "efl,state,selected"; source: "efl";
script {
new Float:drag;
if (get_int(is_rtl) == 0) {
@ -785,7 +785,7 @@ group { "efl/check:toggle";
}
}
program {
signal: "efl,state,check,off"; source: "efl";
signal: "efl,state,unselected"; source: "efl";
script {
new Float:drag;
if (get_int(is_rtl) == 0) {
@ -809,9 +809,9 @@ group { "efl/check:toggle";
}
if (((get_int(is_rtl) == 1) && (dx <= 0.5)) ||
(get_int(is_rtl) == 0) && (dx > 0.5)) {
emit("efl,action,check,off", "efl");
emit("efl,action,unselect", "efl");
} else {
emit("efl,action,check,on", "efl");
emit("efl,action,select", "efl");
}
}
}
@ -842,9 +842,9 @@ group { "efl/check:toggle";
}
if (((get_int(is_rtl) == 1) && (dx <= 0.5)) ||
(get_int(is_rtl) == 0) && (dx > 0.5)) {
emit("efl,action,check,on", "efl");
emit("efl,action,select", "efl");
} else {
emit("efl,action,check,off", "efl");
emit("efl,action,unselect", "efl");
}
set_int(was_drag, 1);
set_int(is_drag, 0);
@ -864,7 +864,7 @@ group { "efl/check:toggle";
target: "glow_but";
}
program {
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -872,7 +872,7 @@ group { "efl/check:toggle";
}
}
program {
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -880,7 +880,7 @@ group { "efl/check:toggle";
}
}
program {
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -888,7 +888,7 @@ group { "efl/check:toggle";
}
}
program {
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);

1
data/elementary/themes/edc/efl/collection.edc
View File

@ -1,3 +1,4 @@
group { "efl/collection";
inherit: "efl/scroller";
data.item: "version" "123";
}

6
data/elementary/themes/edc/efl/cursor.edc
View File

@ -78,7 +78,7 @@
// "watch"
// "xterm"
group { name: "efl/cursor/hand1";
group { name: "efl/cursor/hand1"; data.item: "version" "123";
images.image: "pointer_hand1.png" COMP;
parts {
part { name: "base"; mouse_events: 0; scale: 1;
@ -103,7 +103,7 @@ group { name: "efl/cursor/hand1";
}
}
group { name: "efl/cursor/blank";
group { name: "efl/cursor/blank"; data.item: "version" "123";
parts {
part { name: "efl.hotspot"; type: SWALLOW;
description { state: "default" 0.0;
@ -116,7 +116,7 @@ group { name: "efl/cursor/blank";
}
}
group { name: "efl/cursor/xterm";
group { name: "efl/cursor/xterm"; data.item: "version" "123";
images.image: "pointer_entry_bar.png" COMP;
images.image: "led_dot_white.png" COMP;
parts {

12
data/elementary/themes/edc/efl/datepicker.edc
View File

@ -1,4 +1,4 @@
group { "efl/datepicker";
group { "efl/datepicker"; data.item: "version" "123";
parts {
spacer { "base";
scale;
@ -182,7 +182,7 @@ group { "efl/datepicker";
}
}
group { "efl/datepicker/spin_button";
group { "efl/datepicker/spin_button"; data.item: "version" "123";
parts {
rect { "clip";
desc { "default";
@ -282,25 +282,25 @@ group { "efl/datepicker/spin_button";
}
programs {
program { "entry_active";
signal: "efl,state,entry,active";
signal: "efl,entry,visible,on";
source: "efl";
action: STATE_SET "active";
target: "efl.entry";
}
program { "entry_inactive";
signal: "efl,state,entry,inactive";
signal: "efl,entry,visible,off";
source: "efl";
action: STATE_SET "default";
target: "efl.entry";
}
program { "text_button_active";
signal: "efl,state,button,active";
signal: "efl,button,visible,on";
source: "efl";
action: STATE_SET "default";
target: "efl.text_button";
}
program { "text_button_inactive";
signal: "efl,state,button,inactive";
signal: "efl,button,visible,off";
source: "efl";
action: STATE_SET "inactive";
target: "efl.text_button";

14
data/elementary/themes/edc/efl/focus.edc
View File

@ -1,4 +1,4 @@
group { name: "efl/focus_highlight/top";
group { name: "efl/focus_highlight/top"; data.item: "version" "123";
images.image: "box_glow.png" COMP;
images.image: "box_outline.png" COMP;
data.item: "animate" "on";
@ -118,7 +118,7 @@ group { name: "efl/focus_highlight/top";
}
programs {
program {
signal: "efl,action,focus,show"; source: "efl";
signal: "efl,focus,visible,on"; source: "efl";
action: ACTION_STOP;
target: "pulse";
target: "pulse2";
@ -132,17 +132,17 @@ group { name: "efl/focus_highlight/top";
after: "go3";
}
program { name: "go3";
action: SIGNAL_EMIT "efl,action,focus,show,end" "efl";
action: SIGNAL_EMIT "efl,focus,visible,on,done" "efl";
}
program {
signal: "efl,action,focus,hide"; source: "efl";
signal: "efl,focus,visible,off"; source: "efl";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.4;
target: "clip";
after: "stop2";
}
program { name: "stop2";
action: SIGNAL_EMIT "efl,action,focus,hide,end" "efl";
action: SIGNAL_EMIT "efl,focus,visible,off,done" "efl";
after: "stop3";
}
program { name: "stop3";
@ -164,14 +164,14 @@ group { name: "efl/focus_highlight/top";
after: "pulse";
}
program {
signal: "efl,state,anim,stop"; source: "efl";
signal: "efl,state,animating,stopped"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
}
}
}
group { name: "efl/focus_highlight/top:blank";
group { name: "efl/focus_highlight/top:blank"; data.item: "version" "123";
parts {
}
}

2
data/elementary/themes/edc/efl/frame.edc
View File

@ -1,4 +1,4 @@
group { name: "efl/frame";
group { name: "efl/frame"; data.item: "version" "123";
images.image: "shadow_square_tiny.png" COMP;
images.image: "vgrad_med_curved.png" COMP;
images.image: "bevel_out.png" COMP;

4
data/elementary/themes/edc/efl/grid.edc
View File

@ -1,12 +1,14 @@
group { "efl/grid";
inherit: "efl/scroller";
data.item: "version" "123";
}
group { "efl/view_grid";
inherit: "efl/grid";
data.item: "version" "123";
}
group { "efl/grid_item";
group { "efl/grid_item"; data.item: "version" "123";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
images.image: "bevel_dark_out.png" COMP;

2
data/elementary/themes/edc/efl/group_item.edc
View File

@ -1,6 +1,6 @@
group { "efl/group_item"; nomouse; program_source: "efl";
group { "efl/group_item"; data.item: "version" "123"; nomouse; program_source: "efl";
images.image: "shadow_square_tiny.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "horizontal_separated_bar_small_glow.png" COMP;

7
data/elementary/themes/edc/efl/image_zoomable.edc
View File

@ -1,5 +1,6 @@
group { name: "efl/image_zoomable";
inherit: "efl/scroller";
data.item: "version" "123";
images.image: "knob_round_busy.png" COMP;
images.image: "glow_round_corners.png" COMP;
parts {
@ -45,7 +46,7 @@ group { name: "efl/image_zoomable";
}
programs {
program { name: "spin";
signal: "efl,state,busy,start"; source: "efl";
signal: "efl,state,busy,started"; source: "efl";
action: ACTION_STOP;
target: "spin";
target: "spin0";
@ -73,14 +74,14 @@ group { name: "efl/image_zoomable";
}
program {
signal: "efl,state,busy,start"; source: "efl";
signal: "efl,state,busy,started"; source: "efl";
action: STATE_SET "active" 0.0;
transition: SINUSOIDAL 0.25;
target: "busy_clip";
}
program {
signal: "efl,state,busy,stop"; source: "efl";
signal: "efl,state,busy,stopped"; source: "efl";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0;
target: "busy_clip";

6
data/elementary/themes/edc/efl/list.edc
View File

@ -1,12 +1,14 @@
group { "efl/list";
inherit: "efl/scroller";
data.item: "version" "123";
}
group { "efl/list_view";
inherit: "efl/list";
data.item: "version" "123";
}
group { "efl/list_item";
group { "efl/list_item"; data.item: "version" "123";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
images.image: "bevel_curved_horiz_out.png" COMP;
@ -293,7 +295,7 @@ group { "efl/list_item";
}
}
group { "efl/list_item:placeholder";
group { "efl/list_item:placeholder"; data.item: "version" "123";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
images.image: "bevel_curved_horiz_out.png" COMP;

3
data/elementary/themes/edc/efl/navigation_bar.edc
View File

@ -1,5 +1,5 @@
//Efl.Ui.Navigation_Bar Themes
group { "efl/navigation_bar";
group { "efl/navigation_bar"; data.item: "version" "123";
styles {
style { name: "navigation_bar_text";
base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=navigation_bar_text style=shadow,bottom shadow_color=#00000080 ellipsis=1.0 wrap=mixed";
@ -101,6 +101,7 @@ group { "efl/navigation_bar";
group { name: "efl/navigation_bar/back_button";
inherit: "efl/button";
data.item: "version" "123";
images.image: "icon_arrow_left.png" COMP;
parts {
image { name: "icon_arrow_left";

2
data/elementary/themes/edc/efl/navigation_layout.edc
View File

@ -1,5 +1,5 @@
//Efl.Ui.Navigation_Layout Themes
group { "efl/navigation_layout";
group { "efl/navigation_layout"; data.item: "version" "123";
parts {
spacer { "base";
desc { "default";

4
data/elementary/themes/edc/efl/pager.edc
View File

@ -1,4 +1,4 @@
group { "efl/pager";
group { "efl/pager"; data.item: "version" "123";
parts {
spacer { "base";
scale;
@ -32,7 +32,7 @@ group { "efl/pager";
}
}
group { "efl/pager/indicator";
group { "efl/pager/indicator"; data.item: "version" "123";
images {
image: "ring_white_middle.png" COMP;
}

15
data/elementary/themes/edc/efl/panel.edc
View File

@ -1,4 +1,4 @@
group { name: "efl/panel";
group { name: "efl/panel"; data.item: "version" "123";
data {
item: "handler_size" "30";
}
@ -10,7 +10,7 @@ group { name: "efl/panel";
}
}
}
group { name: "efl/panel/scrollable/left";
group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
parts {
part { name: "efl.panel_area";
type: SWALLOW;
@ -102,7 +102,7 @@ group { name: "efl/panel/scrollable/left";
}
}
group { name: "efl/panel/scrollable/right";
group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
parts {
part { name: "efl.event_area";
type: SWALLOW;
@ -194,7 +194,7 @@ group { name: "efl/panel/scrollable/right";
}
}
group { name: "efl/panel/scrollable/top";
group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
parts {
part { name: "efl.panel_area";
type: SWALLOW;
@ -286,7 +286,7 @@ group { name: "efl/panel/scrollable/top";
}
}
group { name: "efl/panel/scrollable/bottom";
group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
parts {
part { name: "efl.event_area";
type: SWALLOW;
@ -378,7 +378,7 @@ group { name: "efl/panel/scrollable/bottom";
}
}
group { name: "efl/panel/left";
group { name: "efl/panel/left"; data.item: "version" "123";
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
images.image: "shadow_square_tiny.png" COMP;
@ -627,6 +627,7 @@ group { name: "efl/panel/left";
group { name: "efl/panel/right";
inherit: "efl/panel/left";
data.item: "version" "123";
parts {
part { name: "base";
description { state: "default" 0.0;
@ -681,6 +682,7 @@ group { name: "efl/panel/right";
group { name: "efl/panel/top";
inherit: "efl/panel/left";
data.item: "version" "123";
parts {
part { name: "base";
description { state: "default" 0.0;
@ -775,6 +777,7 @@ group { name: "efl/panel/top";
group { name: "efl/panel/bottom";
inherit: "efl/panel/top";
data.item: "version" "123";
parts {
part { name: "base";
description { state: "default" 0.0;

12
data/elementary/themes/edc/efl/panes.edc
View File

@ -13,7 +13,7 @@
#define PANEMIN2 16
#define PANEWID 32
group { name: "efl/panes/vertical";
group { name: "efl/panes/vertical"; data.item: "version" "123";
images.image: "holes_vert.png" COMP;
parts {
//TODO: remove left/right
@ -143,7 +143,7 @@ group { name: "efl/panes/vertical";
}
}
group { name: "efl/panes/horizontal";
group { name: "efl/panes/horizontal"; data.item: "version" "123";
images.image: "holes_horiz.png" COMP;
parts {
//TODO: remove left/right
@ -273,7 +273,7 @@ group { name: "efl/panes/horizontal";
}
}
group { name: "efl/panes/vertical:flush";
group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
images.image: "downlight_glow_left.png" COMP;
images.image: "downlight_glow_right.png" COMP;
parts {
@ -490,7 +490,7 @@ group { name: "efl/panes/vertical:flush";
}
}
group { name: "efl/panes/horizontal:flush";
group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
images.image: "downlight_glow.png" COMP;
images.image: "downlight_glow_up.png" COMP;
parts {
@ -709,6 +709,7 @@ group { name: "efl/panes/horizontal:flush";
group { name: "efl/panes/vertical:left-fold";
inherit: "efl/panes/vertical";
data.item: "version" "123";
images.image: "icon_arrow_left.png" COMP;
images.image: "icon_arrow_right.png" COMP;
script {
@ -772,6 +773,7 @@ group { name: "efl/panes/vertical:left-fold";
group { name: "efl/panes/vertical:right-fold";
inherit: "efl/panes/vertical";
data.item: "version" "123";
images.image: "icon_arrow_left.png" COMP;
images.image: "icon_arrow_right.png" COMP;
script {
@ -835,6 +837,7 @@ group { name: "efl/panes/vertical:right-fold";
group { name: "efl/panes/horizontal:up-fold";
inherit: "efl/panes/horizontal";
data.item: "version" "123";
images.image: "icon_arrow_up.png" COMP;
images.image: "icon_arrow_down.png" COMP;
script {
@ -898,6 +901,7 @@ group { name: "efl/panes/horizontal:up-fold";
group { name: "efl/panes/horizontal:down-fold";
inherit: "efl/panes/horizontal";
data.item: "version" "123";
images.image: "icon_arrow_up.png" COMP;
images.image: "icon_arrow_down.png" COMP;
script {

8
data/elementary/themes/edc/efl/pointer.edc
View File

@ -1,4 +1,4 @@
group { name: "efl/pointer";
group { name: "efl/pointer"; data.item: "version" "123";
images {
image: "pointer.png" COMP;
image: "pointer_glow.png" COMP;
@ -105,6 +105,7 @@ group { name: "efl/pointer";
group { name: "efl/pointer:bottom_right_corner";
inherit: "efl/pointer";
data.item: "version" "123";
images.image: "mini_box_glow.png" COMP;
parts {
part { name: "box";
@ -141,6 +142,7 @@ group { name: "efl/pointer:bottom_right_corner";
group { name: "efl/pointer:bottom_left_corner";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;
@ -158,6 +160,7 @@ group { name: "efl/pointer:bottom_left_corner";
group { name: "efl/pointer:bottom_side";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;
@ -174,6 +177,7 @@ group { name: "efl/pointer:bottom_side";
group { name: "efl/pointer:top_right_corner";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;
@ -190,6 +194,7 @@ group { name: "efl/pointer:top_right_corner";
group { name: "efl/pointer:top_left_corner";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;
@ -206,6 +211,7 @@ group { name: "efl/pointer:top_left_corner";
group { name: "efl/pointer:top_side";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;

31
data/elementary/themes/edc/efl/popup.edc
View File

@ -1,5 +1,6 @@
//Efl.Ui.Popup Themes
group { "efl/popup";
data.item: "version" "123";
images.image: "rounded_square.png" COMP;
parts {
spacer { "base";
@ -28,10 +29,9 @@ group { "efl/popup";
}
}
group { "efl/alert_popup";
group { "efl/alert_popup"; data.item: "version" "123";
images.image: "rounded_square.png" COMP;
parts {
alias: "title" "efl.text.title";
image { "bg";
desc { "default";
min: 100 100;
@ -106,20 +106,26 @@ group { "efl/alert_popup";
}
programs {
program {
signal: "efl,title,show"; source: "efl";
signal: "efl,title,visible,on"; source: "efl";
action: STATE_SET "title_visible" 0.0;
target: "title_bg";
target: "efl.text.title";
}
program {
signal: "efl,buttons,show"; source: "efl";
signal: "efl,title,visible,off"; source: "efl";
action: STATE_SET "default" 0.0;
target: "title_bg";
target: "efl.text.title";
}
program {
signal: "efl,buttons,visible,on"; source: "efl";
action: STATE_SET "button_visible" 0.0;
target: "efl.buttons";
}
}
}
group { "efl/popup/backwall";
group { "efl/popup/backwall"; data.item: "version" "123";
alias: "efl/alert_popup/backwall";
parts {
rect { "base";
@ -151,32 +157,32 @@ group { "efl/popup/backwall";
programs {
program {
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
action: STATE_SET "content_visible" 0.0;
target: "base";
target: "efl.content";
}
program {
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
target: "efl.content";
}
program {
signal: "mouse,clicked,1"; source: "block";
action: SIGNAL_EMIT "efl,action,clicked" "efl";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
}
}
group { "efl/alert_popup/button_layout1";
group { "efl/alert_popup/button_layout1"; data.item: "version" "123";
parts {
swallow { "efl.button1"; required;
}
}
}
group { "efl/alert_popup/button_layout2";
group { "efl/alert_popup/button_layout2"; data.item: "version" "123";
parts {
spacer { "div1";
desc { "default";
@ -200,7 +206,7 @@ group { "efl/alert_popup/button_layout2";
}
}
group { "efl/alert_popup/button_layout3";
group { "efl/alert_popup/button_layout3"; data.item: "version" "123";
parts {
spacer { "div1";
desc { "default";
@ -241,12 +247,15 @@ group { "efl/alert_popup/button_layout3";
group { "efl/alert_popup/left_button";
inherit: "efl/button";
data.item: "version" "123";
}
group { "efl/alert_popup/right_button";
inherit: "efl/button";
data.item: "version" "123";
}
group { "efl/alert_popup/button";
inherit: "efl/button";
data.item: "version" "123";
}

21
data/elementary/themes/edc/efl/progress.edc
View File

@ -1,4 +1,5 @@
group { "efl/progressbar/horizontal";
data.item: "version" "123";
images.image: "inset_bar_horiz_base.png" COMP;
images.image: "inset_bar_horiz_light.png" COMP;
images.image: "inset_bar_horiz_inside_base.png" COMP;
@ -504,7 +505,7 @@ group { "efl/progressbar/horizontal";
target: "efl.text.status";
}
program { name: "text-visible";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@ -512,7 +513,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "text-hidden";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@ -520,7 +521,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-visible";
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@ -528,7 +529,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-hidden";
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
@ -559,6 +560,7 @@ group { "efl/progressbar/horizontal";
}
group { "efl/progressbar/vertical";
data.item: "version" "123";
images.image: "inset_bar_vert_base.png" COMP;
images.image: "inset_bar_vert_light.png" COMP;
images.image: "inset_bar_vert_inside_base.png" COMP;
@ -1077,7 +1079,7 @@ group { "efl/progressbar/vertical";
target: "efl.text.status";
}
program { name: "text-visible";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@ -1085,7 +1087,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "text-hidden";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@ -1093,7 +1095,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-visible";
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@ -1101,7 +1103,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-hidden";
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
@ -1132,6 +1134,7 @@ group { "efl/progressbar/vertical";
}
group { "efl/progressbar/horizontal:wheel";
data.item: "version" "123";
alias: "efl/progressbar/vertical:wheel";
images.image: "knob_round_busy.png" COMP;
images.image: "glow_round_corners.png" COMP;
@ -1226,6 +1229,7 @@ group { "efl/progressbar/horizontal:wheel";
group { "efl/progressbar/horizontal:double";
inherit: "efl/progressbar/horizontal";
data.item: "version" "123";
images {
image: "inset_bar_horiz_glow_base_double.png" COMP;
image: "inset_bar_horiz_glow_inv_base_double.png" COMP;
@ -1315,6 +1319,7 @@ group { "efl/progressbar/horizontal:double";
group { "efl/progressbar/vertical:double";
inherit: "efl/progressbar/vertical";
data.item: "version" "123";
images {
image: "inset_bar_vert_glow_base_double.png" COMP;
image: "inset_bar_vert_glow_inv_base_double.png" COMP;

13
data/elementary/themes/edc/efl/radio.edc
View File

@ -1,4 +1,5 @@
group { "efl/radio";
data.item: "version" "123";
images.image: "inset_shadow_circle_tiny.png" COMP;
images.image: "inset_circle_tiny.png" COMP;
images.image: "sym_radio_alum.png" COMP;
@ -224,17 +225,17 @@ group { "efl/radio";
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
program {
signal: "efl,state,radio,on"; source: "efl";
signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected" 0.0;
target: "indicator";
}
program {
signal: "efl,state,radio,off"; source: "efl";
signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default" 0.0;
target: "indicator";
}
program {
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -242,7 +243,7 @@ group { "efl/radio";
}
}
program {
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -250,7 +251,7 @@ group { "efl/radio";
}
}
program {
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -258,7 +259,7 @@ group { "efl/radio";
}
}
program {
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);

161
data/elementary/themes/edc/efl/scroller.edc
View File

@ -1,4 +1,5 @@
group { name: "efl/scroller";
data.item: "version" "123";
images.image: "inset_shadow.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "bevel_out.png" COMP;
@ -300,7 +301,7 @@ group { name: "efl/scroller";
}
}
program {
signal: "efl,action,show,vbar"; source: "efl";
signal: "efl,vertical_bar,visible,on"; source: "efl";
action: STATE_SET "default" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
@ -315,7 +316,7 @@ group { name: "efl/scroller";
target: "arrow2_vbar_indent";
}
program {
signal: "efl,action,hide,vbar"; source: "efl";
signal: "efl,vertical_bar,visible,off"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
@ -377,20 +378,6 @@ group { name: "efl/scroller";
action_on_pos_vbar(10);
}
}
program { name: "loop_set_vbar";
signal: "efl,loop_y,set"; source: "efl";
script {
set_int(loop_y, 1);
action_on_pos_vbar(10);
}
}
program { name: "loop_unset_vbar";
signal: "efl,loop_y,unset"; source: "efl";
script {
set_int(loop_y, 0);
action_on_pos_vbar(10);
}
}
// horiz bar /////////////////////////////////////////////////////////////
part { name: "sb_hbar_show"; type: RECT;
@ -581,7 +568,7 @@ group { name: "efl/scroller";
}
}
program {
signal: "efl,action,show,hbar"; source: "efl";
signal: "efl,horizontal_bar,visible,on"; source: "efl";
action: STATE_SET "default" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
@ -596,7 +583,7 @@ group { name: "efl/scroller";
target: "arrow2_hbar_indent";
}
program {
signal: "efl,action,hide,hbar"; source: "efl";
signal: "efl,horizontal_bar,visible,off"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
@ -658,20 +645,6 @@ group { name: "efl/scroller";
action_on_pos_hbar(10);
}
}
program { name: "loop_set_hbar";
signal: "efl,loop_x,set"; source: "efl";
script {
set_int(loop_x, 1);
action_on_pos_hbar(10);
}
}
program { name: "loop_unset_hbar";
signal: "efl,loop_x,unset"; source: "efl";
script {
set_int(loop_x, 0);
action_on_pos_hbar(10);
}
}
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel1.to: "efl.background";
@ -1128,7 +1101,7 @@ group { name: "efl/scroller";
}
program {
signal: "mouse,down,*"; source: "efl.dragable.vbar";
action: SIGNAL_EMIT "efl,vbar,press" "efl";
action: SIGNAL_EMIT "efl,vertical_bar,press" "efl";
}
program {
signal: "mouse,up,1"; source: "efl.dragable.vbar";
@ -1152,7 +1125,7 @@ group { name: "efl/scroller";
}
program {
signal: "mouse,down,*"; source: "efl.dragable.hbar";
action: SIGNAL_EMIT "efl,hbar,press" "efl";
action: SIGNAL_EMIT "efl,horizontal_bar,press" "efl";
}
program {
signal: "mouse,up,1"; source: "efl.dragable.hbar";
@ -1164,77 +1137,14 @@ group { name: "efl/scroller";
}
program {
signal: "mouse,up,*"; source: "efl.dragable.hbar";
action: SIGNAL_EMIT "efl,hbar,unpress" "efl";
}
program {
signal: "efl,action,looping,left"; source: "efl";
action: STATE_SET "effect" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
after: "looping,left,done";
}
program { name: "looping,left,done";
action: SIGNAL_EMIT "efl,looping,left,done" "efl";
}
program {
signal: "efl,action,looping,left,end"; source: "efl";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
}
program {
signal: "efl,action,looping,right"; source: "efl";
action: STATE_SET "effect" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
after: "looping,right,done";
}
program { name: "looping,right,done";
action: SIGNAL_EMIT "efl,looping,right,done" "efl";
}
program {
signal: "efl,action,looping,right,end"; source: "efl";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
}
program {
signal: "efl,action,looping,up"; source: "efl";
action: STATE_SET "effect" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
after: "looping,up,done";
}
program { name: "looping,up,done";
action: SIGNAL_EMIT "efl,looping,up,done" "efl";
}
program {
signal: "efl,action,looping,up,end"; source: "efl";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
}
program {
signal: "efl,action,looping,down"; source: "efl";
action: STATE_SET "effect" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
after: "looping,down,done";
}
program { name: "looping,down,done";
action: SIGNAL_EMIT "efl,looping,down,done" "efl";
}
program {
signal: "efl,action,looping,down,end"; source: "efl";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
action: SIGNAL_EMIT "efl,horizontal_bar,unpress" "efl";
}
}
}
group { name: "efl/scroller:noclip";
inherit: "efl/scroller";
data.item: "version" "123";
parts {
part { name: "clipper";
description { state: "default" 0.0;
@ -1269,6 +1179,7 @@ group { name: "efl/scroller:noclip";
group { name: "efl/scroller:popup/no_inset_shadow";
inherit: "efl/scroller";
data.item: "version" "123";
parts {
part { name: "inset";
description { state: "default" 0.0;
@ -1282,55 +1193,3 @@ group { name: "efl/scroller:popup/no_inset_shadow";
}
}
}
group { name: "efl/scroller/contents";
parts {
part { name: "efl.content"; required;
type: SWALLOW;
description { state: "default" 0.0;
}
}
part { name: "efl.content_r"; required;
type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 1.0 0.0;
to: "efl.content";
}
rel2 {
relative: 2.0 1.0;
to: "efl.content";
}
}
}
part { name: "efl.content_b"; required;
type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 0.0 1.0;
to: "efl.content";
}
rel2 {
relative: 1.0 2.0;
to: "efl.content";
}
}
}
part { name: "efl.content_rb"; required;
type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 1.0 1.0;
to: "efl.content";
}
rel2 {
relative: 2.0 2.0;
to: "efl.content";
}
}
}
}
}

4
data/elementary/themes/edc/efl/slider.edc
View File

@ -1,4 +1,5 @@
group { "efl/slider/horizontal";
data.item: "version" "123";
alias: "efl/slider/horizontal:disabled";
images.image: "slider_run_base_horiz.png" COMP;
images.image: "slider_run_bevel_horiz.png" COMP;
@ -235,6 +236,7 @@ group { "efl/slider/horizontal";
}
group { "efl/slider/vertical";
data.item: "version" "123";
alias: "efl/slider/vertical:disabled";
images.image: "slider_run_base_vert.png" COMP;
images.image: "slider_run_bevel_vert.png" COMP;
@ -473,6 +475,7 @@ group { "efl/slider/vertical";
//Range
group { "efl/slider_interval/horizontal";
data.item: "version" "123";
alias: "efl/slider/horizontal:disabled";
images.image: "slider_run_base_horiz.png" COMP;
images.image: "slider_run_bevel_horiz.png" COMP;
@ -755,6 +758,7 @@ group { "efl/slider_interval/horizontal";
}
group { "efl/slider_interval/vertical";
data.item: "version" "123";
alias: "efl/slider/vertical:disabled";
images.image: "slider_run_base_vert.png" COMP;
images.image: "slider_run_bevel_vert.png" COMP;

1
data/elementary/themes/edc/efl/spin.edc
View File

@ -1,4 +1,5 @@
group { "efl/spin";
data.item: "version" "123";
parts {
rect { "bg";
scale;

18
data/elementary/themes/edc/efl/spin_button.edc
View File

@ -1,4 +1,5 @@
group { "efl/spin_button/horizontal";
data.item: "version" "123";
images.image: "vert_bar_inset.png" COMP;
parts {
rect { "clip";
@ -100,25 +101,25 @@ group { "efl/spin_button/horizontal";
}
programs {
program { "entry_active";
signal: "efl,state,entry,active";
signal: "efl,entry,visible,on";
source: "efl";
action: STATE_SET "active";
target: "efl.entry";
}
program { "entry_inactive";
signal: "efl,state,entry,inactive";
signal: "efl,entry,visible,off";
source: "efl";
action: STATE_SET "default";
target: "efl.entry";
}
program { "text_button_active";
signal: "efl,state,button,active";
signal: "efl,button,visible,on";
source: "efl";
action: STATE_SET "default";
target: "efl.text_button";
}
program { "text_button_inactive";
signal: "efl,state,button,inactive";
signal: "efl,button,visible,off";
source: "efl";
action: STATE_SET "inactive";
target: "efl.text_button";
@ -152,6 +153,7 @@ group { "efl/spin_button/horizontal";
group { "efl/spin_button/vertical";
inherit: "efl/spin_button/horizontal";
data.item: "version" "123";
parts {
image { "inset"; nomouse;
desc { "default";
@ -203,6 +205,7 @@ group { "efl/spin_button/vertical";
}
group { "efl/spin_button/horizontal/inc_button";
data.item: "version" "123";
images.image: "sym_right_light_normal.png" COMP;
images.image: "sym_right_glow_normal.png" COMP;
images.image: "sym_right_dark_normal.png" COMP;
@ -308,7 +311,7 @@ group { "efl/spin_button/horizontal/inc_button";
action: SIGNAL_EMIT "efl,action,click" "";
}
program { name: "access_pressed";
signal: "efl,action,anim,activate";
signal: "efl,state,animation,activated";
source: "efl";
action: STATE_SET "pressed" 0.0;
target: "arrow.image";
@ -355,10 +358,12 @@ group { "efl/spin_button/horizontal/inc_button";
group { "efl/spin_button/horizontal/entry";
alias: "efl/spin_button/vertical/entry";
inherit: "efl/text";
data.item: "version" "123";
}
group { "efl/spin_button/horizontal/dec_button";
inherit: "efl/spin_button/horizontal/inc_button";
data.item: "version" "123";
images.image: "sym_left_light_normal.png" COMP;
images.image: "sym_left_glow_normal.png" COMP;
images.image: "sym_left_dark_normal.png" COMP;
@ -384,6 +389,7 @@ group { "efl/spin_button/horizontal/dec_button";
group { "efl/spin_button/horizontal/text_button";
alias: "efl/spin_button/vertical/text_button";
data.item: "version" "123";
parts {
part { name: "bg";
type: SPACER;
@ -461,6 +467,7 @@ group { "efl/spin_button/horizontal/text_button";
group { "efl/spin_button/vertical/inc_button";
inherit: "efl/spin_button/horizontal/inc_button";
data.item: "version" "123";
images.image: "sym_up_light_normal.png" COMP;
images.image: "sym_up_glow_normal.png" COMP;
images.image: "sym_up_dark_normal.png" COMP;
@ -486,6 +493,7 @@ group { "efl/spin_button/vertical/inc_button";
group { "efl/spin_button/vertical/dec_button";
inherit: "efl/spin_button/horizontal/dec_button";
data.item: "version" "123";
images.image: "sym_down_light_normal.png" COMP;
images.image: "sym_down_glow_normal.png" COMP;
images.image: "sym_down_dark_normal.png" COMP;

10
data/elementary/themes/edc/efl/tab_bar.edc
View File

@ -1,4 +1,5 @@
group { "efl/tab_bar";
data.item: "version" "123";
images.image: "vgrad_med_lighter.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
@ -60,6 +61,7 @@ group { "efl/tab_bar";
}
group { "efl/tab_bar/tab";
data.item: "version" "123";
images.image: "shadow_inset_bevels.png" COMP;
images.image: "shadow_angled_in_sides.png" COMP;
images.image: "horizontal_separated_bar_small_glow.png" COMP;
@ -434,13 +436,13 @@ group { "efl/tab_bar/tab";
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
program {
signal: "efl,orient,horizontal"; source: "efl";
signal: "efl,state,horizontal"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
target: "bend_clip";
}
program {
signal: "efl,orient,vertical"; source: "efl";
signal: "efl,state,vertical"; source: "efl";
action: STATE_SET "vert" 0.0;
target: "base";
target: "bend_clip";
@ -482,7 +484,7 @@ group { "efl/tab_bar/tab";
target: "highlight";
}
program { name: "st1";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -490,7 +492,7 @@ group { "efl/tab_bar/tab";
}
}
program { name: "st2";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);

1
data/elementary/themes/edc/efl/tab_page.edc
View File

@ -1,4 +1,5 @@
group { "efl/tab_page";
data.item: "version" "123";
parts {
spacer { "base";
scale;

1
data/elementary/themes/edc/efl/tab_pager.edc
View File

@ -1,4 +1,5 @@
group { "efl/tab_pager";
data.item: "version" "123";
parts {
spacer { "base";
scale;

4
data/elementary/themes/edc/efl/tags.edc
View File

@ -1,4 +1,5 @@
group { "efl/tags";
data.item: "version" "123";
data.item: "horizontal_pad" 0;
data.item: "vertical_pad" 0;
data.item: "closed_height" 0;
@ -24,6 +25,7 @@ group { "efl/tags";
}
group { "efl/tags/label";
data.item: "version" "123";
parts {
text { "efl.text";
nomouse;
@ -46,6 +48,7 @@ group { "efl/tags/label";
}
group { "efl/tags/btn";
data.item: "version" "123";
images.image: "button_normal.png" COMP;
images.image: "button_clicked.png" COMP;
images.image: "sym_close_dark_normal.png" COMP;
@ -289,6 +292,7 @@ group { "efl/tags/btn";
}
group { "efl/tags/number";
data.item: "version" "123";
parts {
text { "efl.text";
nomouse;

89
data/elementary/themes/edc/efl/text.edc
View File

@ -1,6 +1,7 @@
group { "efl/text/scroller";
inherit: "efl/scroller";
data.item: "version" "123";
image: "bg_glow_in.png" COMP;
parts {
part { name: "efl.background"; type: SWALLOW;
@ -157,6 +158,7 @@ group { "efl/text/scroller";
}
group { "efl/text/single/scroller";
data.item: "version" "123";
images.image: "bevel_in.png" COMP;
images.image: "inset_shadow.png" COMP;
image: "bg_glow_in.png" COMP;
@ -389,6 +391,7 @@ group { "efl/text/single/scroller";
}
group { "efl/text/cursor";
data.item: "version" "123";
min: 1 0;
images.image: "white_bar_vert_glow.png" COMP;
parts {
@ -491,6 +494,7 @@ group { "efl/text/cursor";
}
group { "efl/text/selection";
data.item: "version" "123";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
@ -501,6 +505,7 @@ group { "efl/text/selection";
}
group { "efl/text/anchor";
data.item: "version" "123";
images.image: "horizontal_separated_bar_small_glow.png" COMP;
parts {
part { name: "bar";
@ -518,6 +523,7 @@ group { "efl/text/anchor";
}
group { "efl/text";
data.item: "version" "123";
data {
item: "font.name" "Sans";
item: "font.size" "10";
@ -637,6 +643,7 @@ group { "efl/text";
}
group { "efl/text/magnifier";
data.item: "version" "123";
images.image: "frame_rounded.png" COMP;
parts {
part { name: "bg"; type: RECT; mouse_events: 0;
@ -699,6 +706,7 @@ group { "efl/text/magnifier";
}
group { "efl/text/handler/start";
data.item: "version" "123";
images.image: "handle_pick_up_left.png" COMP;
parts {
part { name: "base"; mouse_events: 0;
@ -747,6 +755,7 @@ group { "efl/text/handler/start";
}
group { "efl/text/handler/end";
data.item: "version" "123";
images.image: "handle_pick_up_right.png" COMP;
parts {
part { name: "base"; mouse_events: 0;
@ -800,124 +809,124 @@ group { "efl/text/handler/end";
// Tanya - Latvia
// http://lazycrazy.deviantart.com/
// http://lazycrazy.deviantart.com/art/Very-Emotional-Emoticons-144461621
group { "efl/text/emoticon/angry"; images.image:
group { "efl/text/emoticon/angry"; data.item: "version" "123"; images.image:
"emo-angry.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-angry.png"; } } } }
group { "efl/text/emoticon/angry-shout"; images.image:
group { "efl/text/emoticon/angry-shout"; data.item: "version" "123"; images.image:
"emo-angry-shout.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-angry-shout.png"; } } } }
group { "efl/text/emoticon/crazy-laugh"; images.image:
group { "efl/text/emoticon/crazy-laugh"; data.item: "version" "123"; images.image:
"emo-crazy-laugh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-crazy-laugh.png"; } } } }
group { "efl/text/emoticon/evil-laugh"; images.image:
group { "efl/text/emoticon/evil-laugh"; data.item: "version" "123"; images.image:
"emo-evil-laugh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-evil-laugh.png"; } } } }
group { "efl/text/emoticon/evil"; images.image:
group { "efl/text/emoticon/evil"; data.item: "version" "123"; images.image:
"emo-evil.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-evil.png"; } } } }
group { "efl/text/emoticon/goggle-smile"; images.image:
group { "efl/text/emoticon/goggle-smile"; data.item: "version" "123"; images.image:
"emo-goggle-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-goggle-smile.png"; } } } }
group { "efl/text/emoticon/grumpy"; images.image:
group { "efl/text/emoticon/grumpy"; data.item: "version" "123"; images.image:
"emo-grumpy.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-grumpy.png"; } } } }
group { "efl/text/emoticon/grumpy-smile"; images.image:
group { "efl/text/emoticon/grumpy-smile"; data.item: "version" "123"; images.image:
"emo-grumpy-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-grumpy-smile.png"; } } } }
group { "efl/text/emoticon/guilty"; images.image:
group { "efl/text/emoticon/guilty"; data.item: "version" "123"; images.image:
"emo-guilty.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-guilty.png"; } } } }
group { "efl/text/emoticon/guilty-smile"; images.image:
group { "efl/text/emoticon/guilty-smile"; data.item: "version" "123"; images.image:
"emo-guilty-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-guilty-smile.png"; } } } }
group { "efl/text/emoticon/haha"; images.image:
group { "efl/text/emoticon/haha"; data.item: "version" "123"; images.image:
"emo-haha.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-haha.png"; } } } }
group { "efl/text/emoticon/half-smile"; images.image:
group { "efl/text/emoticon/half-smile"; data.item: "version" "123"; images.image:
"emo-half-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-half-smile.png"; } } } }
group { "efl/text/emoticon/happy-panting"; images.image:
group { "efl/text/emoticon/happy-panting"; data.item: "version" "123"; images.image:
"emo-happy-panting.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-happy-panting.png"; } } } }
group { "efl/text/emoticon/happy"; images.image:
group { "efl/text/emoticon/happy"; data.item: "version" "123"; images.image:
"emo-happy.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-happy.png"; } } } }
group { "efl/text/emoticon/indifferent"; images.image:
group { "efl/text/emoticon/indifferent"; data.item: "version" "123"; images.image:
"emo-indifferent.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-indifferent.png"; } } } }
group { "efl/text/emoticon/kiss"; images.image:
group { "efl/text/emoticon/kiss"; data.item: "version" "123"; images.image:
"emo-kiss.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-kiss.png"; } } } }
group { "efl/text/emoticon/knowing-grin"; images.image:
group { "efl/text/emoticon/knowing-grin"; data.item: "version" "123"; images.image:
"emo-knowing-grin.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-knowing-grin.png"; } } } }
group { "efl/text/emoticon/laugh"; images.image:
group { "efl/text/emoticon/laugh"; data.item: "version" "123"; images.image:
"emo-laugh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-laugh.png"; } } } }
group { "efl/text/emoticon/little-bit-sorry"; images.image:
group { "efl/text/emoticon/little-bit-sorry"; data.item: "version" "123"; images.image:
"emo-little-bit-sorry.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-little-bit-sorry.png"; } } } }
group { "efl/text/emoticon/love-lots"; images.image:
group { "efl/text/emoticon/love-lots"; data.item: "version" "123"; images.image:
"emo-love-lots.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-love-lots.png"; } } } }
group { "efl/text/emoticon/love"; images.image:
group { "efl/text/emoticon/love"; data.item: "version" "123"; images.image:
"emo-love.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-love.png"; } } } }
group { "efl/text/emoticon/minimal-smile"; images.image:
group { "efl/text/emoticon/minimal-smile"; data.item: "version" "123"; images.image:
"emo-minimal-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-minimal-smile.png"; } } } }
group { "efl/text/emoticon/not-happy"; images.image:
group { "efl/text/emoticon/not-happy"; data.item: "version" "123"; images.image:
"emo-not-happy.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-not-happy.png"; } } } }
group { "efl/text/emoticon/not-impressed"; images.image:
group { "efl/text/emoticon/not-impressed"; data.item: "version" "123"; images.image:
"emo-not-impressed.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-not-impressed.png"; } } } }
group { "efl/text/emoticon/omg"; images.image:
group { "efl/text/emoticon/omg"; data.item: "version" "123"; images.image:
"emo-omg.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-omg.png"; } } } }
group { "efl/text/emoticon/opensmile"; images.image:
group { "efl/text/emoticon/opensmile"; data.item: "version" "123"; images.image:
"emo-opensmile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-opensmile.png"; } } } }
group { "efl/text/emoticon/smile"; images.image:
group { "efl/text/emoticon/smile"; data.item: "version" "123"; images.image:
"emo-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-smile.png"; } } } }
group { "efl/text/emoticon/sorry"; images.image:
group { "efl/text/emoticon/sorry"; data.item: "version" "123"; images.image:
"emo-sorry.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-sorry.png"; } } } }
group { "efl/text/emoticon/squint-laugh"; images.image:
group { "efl/text/emoticon/squint-laugh"; data.item: "version" "123"; images.image:
"emo-squint-laugh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-squint-laugh.png"; } } } }
group { "efl/text/emoticon/surprised"; images.image:
group { "efl/text/emoticon/surprised"; data.item: "version" "123"; images.image:
"emo-surprised.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-surprised.png"; } } } }
group { "efl/text/emoticon/suspicious"; images.image:
group { "efl/text/emoticon/suspicious"; data.item: "version" "123"; images.image:
"emo-suspicious.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-suspicious.png"; } } } }
group { "efl/text/emoticon/tongue-dangling"; images.image:
group { "efl/text/emoticon/tongue-dangling"; data.item: "version" "123"; images.image:
"emo-tongue-dangling.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-tongue-dangling.png"; } } } }
group { "efl/text/emoticon/tongue-poke"; images.image:
group { "efl/text/emoticon/tongue-poke"; data.item: "version" "123"; images.image:
"emo-tongue-poke.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-tongue-poke.png"; } } } }
group { "efl/text/emoticon/uh"; images.image:
group { "efl/text/emoticon/uh"; data.item: "version" "123"; images.image:
"emo-uh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-uh.png"; } } } }
group { "efl/text/emoticon/unhappy"; images.image:
group { "efl/text/emoticon/unhappy"; data.item: "version" "123"; images.image:
"emo-unhappy.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-unhappy.png"; } } } }
group { "efl/text/emoticon/very-sorry"; images.image:
group { "efl/text/emoticon/very-sorry"; data.item: "version" "123"; images.image:
"emo-very-sorry.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-very-sorry.png"; } } } }
group { "efl/text/emoticon/what"; images.image:
group { "efl/text/emoticon/what"; data.item: "version" "123"; images.image:
"emo-what.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-what.png"; } } } }
group { "efl/text/emoticon/wink"; images.image:
group { "efl/text/emoticon/wink"; data.item: "version" "123"; images.image:
"emo-wink.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-wink.png"; } } } }
group { "efl/text/emoticon/worried"; images.image:
group { "efl/text/emoticon/worried"; data.item: "version" "123"; images.image:
"emo-worried.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-worried.png"; } } } }
group { "efl/text/emoticon/wtf"; images.image:
group { "efl/text/emoticon/wtf"; data.item: "version" "123"; images.image:
"emo-wtf.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-wtf.png"; } } } }
//------------------------------------------------------------

1
data/elementary/themes/edc/efl/textpath.edc
View File

@ -1,4 +1,5 @@
group { name: "efl/textpath";
data.item: "version" "123";
styles {
style { name: "textpath_style2";
base: "font="FN" font_size=16 text_class=tb_plain wrap=none align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080";

14
data/elementary/themes/edc/efl/timepicker.edc
View File

@ -1,4 +1,5 @@
group { "efl/timepicker";
data.item: "version" "123";
nomouse;
parts {
spacer { "base";
@ -321,7 +322,7 @@ group { "efl/timepicker";
}
programs {
program { "visible_ampm";
signal: "efl,state,ampm,visible";
signal: "efl,ampm,visible,on";
source: "efl";
script {
set_state(PART:"base", "default", 0.0);
@ -330,7 +331,7 @@ group { "efl/timepicker";
}
}
program { "invisible_ampm";
signal: "efl,state,ampm,invisible";
signal: "efl,ampm,visible,off";
source: "efl";
script {
set_state(PART:"base", "24layout", 0.0);
@ -339,7 +340,7 @@ group { "efl/timepicker";
}
}
program { "visible_colon_field0";
signal: "efl,state,colon,visible,field0";
signal: "efl,colon_field0,visible,on";
source: "efl";
action: STATE_SET "default";
target: "padding_center1";
@ -348,7 +349,7 @@ group { "efl/timepicker";
target: "padding_center2";
}
program { "invisible_colon_field0";
signal: "efl,state,colon,invisible,field0";
signal: "efl,colon_field0,visible,off";
source: "efl";
action: STATE_SET "invisible";
target: "padding_center1";
@ -357,7 +358,7 @@ group { "efl/timepicker";
target: "padding_center2";
}
program { "visible_colon_field1";
signal: "efl,state,colon,visible,field1";
signal: "efl,colon_field1,visible,on";
source: "efl";
action: STATE_SET "default";
target: "padding_center3";
@ -366,7 +367,7 @@ group { "efl/timepicker";
target: "padding_center4";
}
program { "invisible_colon_field1";
signal: "efl,state,colon,invisible,field1";
signal: "efl,colon_field1,visible,off";
source: "efl";
action: STATE_SET "invisible";
target: "padding_center3";
@ -379,6 +380,7 @@ group { "efl/timepicker";
group { "efl/timepicker/button";
inherit: "efl/button";
data.item: "version" "123";
parts {
image { "base";
desc { "default";

4
data/elementary/themes/edc/efl/uiclock.edc
View File

@ -103,6 +103,7 @@
}
group { "efl/uiclock";
data.item: "version" "123";
parts {
rect { "bg";
desc { "default";
@ -213,15 +214,18 @@ group { "efl/uiclock";
// AM_PM_BUTTON
group { "efl/uiclock/ampm"
data.item: "version" "123";
inherit: "efl/button";
}
//ENTRY
group { "efl/uiclock/text"
data.item: "version" "123";
inherit: "efl/text";
alias: "efl/uiclock/text/single";
alias: "efl/uiclock/text/single-noedit";
}
group { "efl/uiclock/text/selection"
data.item: "version" "123";
inherit: "efl/text/selection";
}

1
data/elementary/themes/edc/efl/video.edc
View File

@ -1,4 +1,5 @@
group { name: "efl/video";
data.item: "version" "123";
parts {
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;

2
data/elementary/themes/edc/efl/win.edc
View File

@ -1,5 +1,5 @@
group { "efl/win";
data.item: "version" "119";
data.item: "version" "123";
parts {
rect { "client_clip"; nomouse; }
swallow { "efl.menu";

3
src/benchmarks/elementary/collection.c
View File

@ -155,8 +155,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
}
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Item_Container benchmark"),
efl_text_set(efl_added, "Efl.Ui.Item_Container benchmark"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);
printf("Building %d objects\n", items);

1
src/bin/elementary/meson.build
View File

@ -157,6 +157,7 @@ elementary_test_src = [
'test_ui_tab_pager.c',
'test_ui_relative_layout.c',
'test_ui_collection.c',
'test_ui_collection_view.c',
'test_ui_items.c',
'test_ui_frame.c',
'test_efl_ui_animation_view.c',

4
src/bin/elementary/test.c
View File

@ -399,8 +399,9 @@ void test_ui_spotlight_scroll(void *data, Evas_Object *obj, void *event_info);
void test_ui_relative_layout(void *data, Evas_Object *obj, void *event_info);
void test_efl_ui_radio(void *data, Evas_Object *obj, void *event_info);
void test_efl_ui_collection_list(void *data, Evas_Object *obj, void *event_info );
void test_efl_ui_collection_list(void *data, Evas_Object *obj, void *event_info);
void test_efl_ui_collection_grid(void *data, Evas_Object *obj, void *event_info);
void test_efl_ui_collection_view(void *data, Evas_Object *obj, void *event_info);
void test_efl_ui_item(void *data, Evas_Object *obj, void *event_info);
void test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
@ -909,6 +910,7 @@ add_tests:
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Relative_Layout", test_ui_relative_layout);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection List", test_efl_ui_collection_list);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection Grid", test_efl_ui_collection_grid);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection_View", test_efl_ui_collection_view);
ADD_TEST_EO(NULL, "Containers", "Items", test_efl_ui_item);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Frame", test_ui_frame);

2
src/bin/elementary/test_efl_anim_alpha.c
View File

@ -53,7 +53,7 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
}
//Let Animation Object start animation
efl_player_start(ad->anim_obj);
efl_player_playing_set(ad->anim_obj, EINA_TRUE);
}
static void

2
src/bin/elementary/test_efl_anim_group_parallel.c
View File

@ -54,7 +54,7 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
}
//Let Animation Object start animation
efl_player_start(ad->anim_obj);
efl_player_playing_set(ad->anim_obj, EINA_TRUE);
}
static void

2
src/bin/elementary/test_efl_anim_group_sequential.c
View File

@ -53,7 +53,7 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
}
//Let Animation Object start animation
efl_player_start(ad->anim_obj);
efl_player_playing_set(ad->anim_obj, EINA_TRUE);
}
static void

4
src/bin/elementary/test_efl_anim_interpolator.c
View File

@ -113,7 +113,7 @@ _anim_start(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
int index = (uintptr_t)evas_object_data_get(obj, "index");
//Let Animation Object start animation
efl_player_start(ad->anim_obj[index]);
efl_player_playing_set(ad->anim_obj[index], EINA_TRUE);
elm_object_disabled_set(obj, EINA_TRUE);
elm_object_disabled_set(ad->start_all_btn, EINA_TRUE);
@ -128,7 +128,7 @@ _anim_start_all(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
for (i = 0; i < INTERP_NUM; i++)
{
//Let Animation Object start animation
efl_player_start(ad->anim_obj[i]);
efl_player_playing_set(ad->anim_obj[i], EINA_TRUE);
elm_object_disabled_set(ad->btn[i], EINA_TRUE);
}

6
src/bin/elementary/test_efl_anim_pause.c
View File

@ -69,7 +69,7 @@ _start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
efl_text_set(obj, "Start Alpha Animation from 0.0 to 1.0");
}
//Let Animation Object start animation
efl_player_start(ad->anim_obj);
efl_player_playing_set(ad->anim_obj, EINA_TRUE);
}
static void
@ -82,13 +82,13 @@ _pause_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
if (ad->is_anim_paused)
{
//Pause animation
efl_player_play_set(ad->anim_obj, EINA_FALSE);
efl_player_paused_set(ad->anim_obj, EINA_TRUE);
elm_object_text_set(obj, "Resume Animation");
}
else
{
//Resume animation
efl_player_play_set(ad->anim_obj, EINA_TRUE);
efl_player_paused_set(ad->anim_obj, EINA_FALSE);
elm_object_text_set(obj, "Pause Animation");
}
}

5
src/bin/elementary/test_efl_anim_repeat.c
View File

@ -106,7 +106,7 @@ _start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
}
//Let Animation Object start animation
efl_player_start(ad->anim_obj);
efl_player_playing_set(ad->anim_obj, EINA_TRUE);
}
static void
@ -122,8 +122,7 @@ test_efl_anim_repeat(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
App_Data *ad = calloc(1, sizeof(App_Data));
if (!ad) return;
Evas_Object *win = elm_win_add(NULL, "Efl Animation Repeat", ELM_WIN_BASIC);
elm_win_title_set(win, "Efl Animation Repeat");
Evas_Object *win = elm_win_util_standard_add(NULL, "Efl Animation Repeat");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_smart_callback_add(win, "delete,request", _win_del_cb, ad);

2
src/bin/elementary/test_efl_anim_rotate.c
View File

@ -53,7 +53,7 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
}
//Let Animation Object start animation
efl_player_start(ad->anim_obj);
efl_player_playing_set(ad->anim_obj, EINA_TRUE);
}
static void

2
src/bin/elementary/test_efl_anim_scale.c
View File

@ -53,7 +53,7 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
}
//Let Animation Object start animation
efl_player_start(ad->anim_obj);
efl_player_playing_set(ad->anim_obj, EINA_TRUE);
}
static void

2
src/bin/elementary/test_efl_anim_start_delay.c
View File

@ -68,7 +68,7 @@ _start_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
}
//Let Animation Object start animation
efl_player_start(ad->anim_obj);
efl_player_playing_set(ad->anim_obj, EINA_TRUE);
}
static void

2
src/bin/elementary/test_efl_anim_translate.c
View File

@ -53,7 +53,7 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
}
//Let Animation Object start animation
efl_player_start(ad->anim_obj);
efl_player_playing_set(ad->anim_obj, EINA_TRUE);
}
static void

6
src/bin/elementary/test_efl_ui_animation_view.c
View File

@ -142,8 +142,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
char buf[255];
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
// Create a box in Canvas
@ -297,8 +296,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
char buf[255];
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
// Create a box

12
src/bin/elementary/test_efl_ui_text.c
View File

@ -42,8 +42,7 @@ test_efl_ui_text_label(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
char *markup;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Canvas_Layout"),
efl_text_set(efl_added, "Efl Canvas_Layout"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win);
@ -146,8 +145,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
Eo *bt;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Text"),
efl_text_set(efl_added, "Efl Ui Text"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win);
@ -205,8 +203,7 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
Eo *win, *bx, *en;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Text Input Field"),
efl_text_set(efl_added, "Efl Ui Text Input Field"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win);
@ -295,8 +292,7 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
Eina_File *f;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Text Item Factory"),
efl_text_set(efl_added, "Efl Ui Text Item Factory"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win);

8
src/bin/elementary/test_evas_snapshot.c
View File

@ -46,8 +46,12 @@ _anim_toggle(void *data, const Efl_Event *ev EINA_UNUSED)
it = efl_content_iterate(table);
EINA_ITERATOR_FOREACH(it, o)
{
if (efl_isa(o, EFL_PLAYER_INTERFACE) && efl_player_playable_get(o))
efl_player_play_set(o, !efl_player_play_get(o));
if (efl_isa(o, EFL_PLAYER_INTERFACE) && efl_playable_get(o))
{
if (!efl_player_playing_get(o))
efl_player_playing_set(o, EINA_TRUE);
efl_player_paused_set(o, !efl_player_paused_get(o));
}
}
eina_iterator_free(it);
}

4
src/bin/elementary/test_gfx_filters.c
View File

@ -407,8 +407,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_file_set(efl_added, buf),
efl_name_set(efl_added, images[k].src_name),
elm_object_tooltip_text_set(efl_added, images[k].src_name));
if (efl_player_playable_get(o))
efl_player_play_set(o, 1);
if (efl_playable_get(o))
efl_player_playing_set(o, 1);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _img_click, win);
efl_pack(box2, o);
}

19
src/bin/elementary/test_photocam.c
View File

@ -152,8 +152,8 @@ my_bt_open(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
}
if (file && eina_str_has_extension(file, ".gif")
&& efl_player_playable_get(ph))
efl_player_play_set(ph, EINA_TRUE);
&& efl_playable_get(ph))
efl_player_playing_set(ph, EINA_TRUE);
}
static void
@ -754,11 +754,11 @@ test_photocam_icon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
static void
_zoomable_clicked_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{
Eina_Bool play;
Eina_Bool paused;
play = !efl_player_play_get(ev->object);
printf("image clicked! play = %d\n", play);
efl_player_play_set(ev->object, play);
paused = efl_player_paused_get(ev->object);
printf("image clicked! paused = %d\n", paused);
efl_player_paused_set(ev->object, !paused);
}
static void
@ -806,8 +806,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
char buf[PATH_MAX];
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"),
efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win,
@ -830,10 +829,10 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _zoomable_clicked_cb, NULL)
);
if (efl_player_playable_get(zoomable))
if (efl_playable_get(zoomable))
{
printf("animation is available for this image.\n");
efl_player_play_set(zoomable, EINA_TRUE);
efl_player_playing_set(zoomable, EINA_TRUE);
}
rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win,

3
src/bin/elementary/test_ui_button.c
View File

@ -30,8 +30,7 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
char buf[PATH_MAX];
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Button"),
efl_text_set(efl_added, "Efl.Ui.Button"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

3
src/bin/elementary/test_ui_clock.c
View File

@ -49,8 +49,7 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
Evas_Object *win, *bx;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Clock"),
efl_text_set(efl_added, "Efl.Ui.Clock"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win,

15
src/bin/elementary/test_ui_collection.c
View File

@ -5,15 +5,15 @@
#include <Efl_Ui.h>
static void
_select_all(void *data, const Efl_Event *ev EINA_UNUSED)
_all_select(void *data, const Efl_Event *ev EINA_UNUSED)
{
efl_ui_select_all(data);
efl_ui_all_select(data);
}
static void
_unselect_all(void *data, const Efl_Event *ev EINA_UNUSED)
_all_unselect(void *data, const Efl_Event *ev EINA_UNUSED)
{
efl_ui_unselect_all(data);
efl_ui_all_unselect(data);
}
static void
@ -176,8 +176,7 @@ void create_item_container_ui(const Efl_Class *collection_class, const Efl_Class
Match_Content_Ctx *ctx = calloc(1, sizeof(*ctx));
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, name),
efl_text_set(efl_added, name),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
tbl = efl_add(EFL_UI_TABLE_CLASS, win);
efl_content_set(win, tbl);
@ -285,14 +284,14 @@ void create_item_container_ui(const Efl_Class *collection_class, const Efl_Class
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Select All");
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _select_all, item_container);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _all_select, item_container);
efl_pack_table(tbl, o, 0, 11, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Unselect All");
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _unselect_all, item_container);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _all_unselect, item_container);
efl_pack_table(tbl, o, 0, 12, 1, 1);

144
src/bin/elementary/test_ui_collection_view.c Normal file
View File

@ -0,0 +1,144 @@
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
#define NUM_ITEMS 50
static Efl_Model*
_make_model(Efl_Ui_Win *win)
{
Eina_Value vi;
Efl_Generic_Model *model, *child;
unsigned int i;
model = efl_add(EFL_GENERIC_MODEL_CLASS, win);
model = efl_add(EFL_UI_VIEW_MODEL_CLASS, model,
efl_ui_view_model_set(efl_added, model));
eina_value_setup(&vi, EINA_VALUE_TYPE_INT);
efl_ui_view_model_property_string_add(model, "relative", "Relative index ${child.index}", "WRONG", "WRONG");
efl_ui_view_model_property_string_add(model, "title", "Initial index ${initial}", "WRONG", "WRONG");
for (i = 0; i < (NUM_ITEMS); i++)
{
child = efl_model_child_add(model);
eina_value_set(&vi, i);
efl_model_property_set(child, "initial", &vi);
}
eina_value_flush(&vi);
return model;
}
static void
_item_constructing(void *data EINA_UNUSED, const Efl_Event *ev)
{
Efl_Gfx_Entity *item = ev->info;
if (!efl_ui_item_calc_locked_get(item))
efl_gfx_hint_size_min_set(item, EINA_SIZE2D(100, 50));
}
static void
_item_select(void *data, const Efl_Event *ev)
{
Efl_Ui_Widget *w = efl_ui_single_selectable_last_selected_get(ev->object);
Efl_Model *m = efl_ui_view_model_get(w);
if (m) efl_ui_view_model_set(data, m);
}
void test_efl_ui_collection_view(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Efl_Ui_Win *win;
Efl_Model *model;
Efl_Ui_Frame *f;
Efl_Ui_Table *tbl;
Efl_Ui_List_View *lv;
Efl_Ui_Grid_View *gv;
Efl_Ui_Factory *fg, *fl;
Efl_Ui_Box *ib;
Efl_Ui_Widget *o;
Efl_Model_Provider *provider;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Collection_View"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
tbl = efl_add(EFL_UI_TABLE_CLASS, win,
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(500, 300)));
efl_content_set(win, tbl);
model = _make_model(win);
fg = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win,
efl_ui_property_bind(efl_added, "text", "title"),
efl_ui_widget_factory_item_class_set(efl_added, EFL_UI_GRID_DEFAULT_ITEM_CLASS));
efl_event_callback_add(fg, EFL_UI_FACTORY_EVENT_ITEM_CONSTRUCTING, _item_constructing, NULL);
fl = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win,
efl_ui_property_bind(efl_added, "text", "title"),
efl_ui_widget_factory_item_class_set(efl_added, EFL_UI_LIST_DEFAULT_ITEM_CLASS));
provider = efl_add(EFL_MODEL_PROVIDER_CLASS, win);
lv = efl_add(EFL_UI_LIST_VIEW_CLASS, tbl,
efl_ui_collection_view_factory_set(efl_added, fl),
efl_ui_view_model_set(efl_added, model));
efl_pack_table(tbl, lv, 0, 1, 1, 1);
gv = efl_add(EFL_UI_GRID_VIEW_CLASS, tbl,
efl_ui_collection_view_factory_set(efl_added, fg),
efl_ui_view_model_set(efl_added, model));
efl_pack_table(tbl, gv, 2, 1, 1, 1);
f = efl_add(EFL_UI_FRAME_CLASS, tbl,
efl_text_set(efl_added, "Selected item"),
efl_ui_frame_autocollapse_set(efl_added, EINA_FALSE));
efl_provider_register(f, EFL_MODEL_PROVIDER_CLASS, provider);
efl_pack_table(tbl, f, 1, 1, 1, 1);
efl_event_callback_add(lv, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, _item_select, provider);
ib = efl_add(EFL_UI_BOX_CLASS, f,
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
efl_gfx_hint_weight_set(efl_added, 1, 1),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
efl_content_set(f, efl_added));
o = elm_label_add(ib);
elm_object_text_set(o, "title:");
efl_gfx_hint_weight_set(o, 1, 0);
efl_gfx_hint_align_set(o, 0.5, 1.0);
efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1));
efl_pack(ib, o);
efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(ib);
elm_object_text_set(o, "NONE");
efl_ui_property_bind(o, "elm.text", "title");
efl_gfx_hint_weight_set(o, 1, 0);
efl_gfx_hint_align_set(o, 0.5, 1.0);
efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1));
efl_pack(ib, o);
efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(ib);
elm_object_text_set(o, "relative:");
efl_gfx_hint_weight_set(o, 1, 0);
efl_gfx_hint_align_set(o, 0.5, 1.0);
efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1));
efl_pack(ib, o);
efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(ib);
elm_object_text_set(o, "NONE");
efl_ui_property_bind(o, "elm.text", "relative");
efl_gfx_hint_weight_set(o, 1, 0);
efl_gfx_hint_align_set(o, 0.5, 1.0);
efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1));
efl_pack(ib, o);
efl_gfx_entity_visible_set(o, 1);
}

3
src/bin/elementary/test_ui_datepicker.c
View File

@ -19,8 +19,7 @@ test_ui_datepicker(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
Eo *win, *bx;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Datepicker"),
efl_text_set(efl_added, "Efl.Ui.Datepicker"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win,

3
src/bin/elementary/test_ui_frame.c
View File

@ -16,8 +16,7 @@ test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
Eo *win, *bx, *f, *txt;
win = efl_add_ref(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Frame"),
efl_text_set(efl_added, "Efl.Ui.Frame"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win,

3
src/bin/elementary/test_ui_items.c
View File

@ -54,8 +54,7 @@ void test_efl_ui_item(void *data EINA_UNUSED,
Eo *win, *box, *o;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Item examples"),
efl_text_set(efl_added, "Item examples"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

3
src/bin/elementary/test_ui_pager.c
View File

@ -701,8 +701,7 @@ void test_ui_pager(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Pager"),
efl_text_set(efl_added, "Pager"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
panes = efl_add(EFL_UI_PANES_CLASS, win,

3
src/bin/elementary/test_ui_pager_scroll.c
View File

@ -901,8 +901,7 @@ void test_ui_pager_scroll(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Pager"),
efl_text_set(efl_added, "Pager"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
panes = efl_add(EFL_UI_PANES_CLASS, win,

6
src/bin/elementary/test_ui_panel.c
View File

@ -11,8 +11,7 @@ test_ui_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
Eo *win, *table, *panel;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Panel"),
efl_text_set(efl_added, "Efl.Ui.Panel"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
table = efl_add(EFL_UI_TABLE_CLASS, win,
@ -104,8 +103,7 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
Eo *win, *box, *check, *btn, *table, *list, *panel;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Panel"),
efl_text_set(efl_added, "Efl.Ui.Panel"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
box = efl_add(EFL_UI_BOX_CLASS, win,

3
src/bin/elementary/test_ui_panes.c
View File

@ -10,8 +10,7 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
Eo *win, *panes, *panes_h;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Panes"),
efl_text_set(efl_added, "Efl.Ui.Panes"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

3
src/bin/elementary/test_ui_progressbar.c
View File

@ -152,8 +152,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
pd = (pbdata *)calloc(1, sizeof(pbdata));
pd->win = win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Progressbar"),
efl_text_set(efl_added, "Efl.Ui.Progressbar"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST,
_win_delete_req_cb, pd)

3
src/bin/elementary/test_ui_radio.c
View File

@ -96,8 +96,7 @@ void test_efl_ui_radio(void *data EINA_UNUSED,
Efl_Ui_Button *o;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Radio_Box"),
efl_text_set(efl_added, "Efl.Ui.Radio_Box"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
table = efl_add(EFL_UI_TABLE_CLASS, win);
efl_content_set(win, table);

3
src/bin/elementary/test_ui_relative_layout.c
View File

@ -276,8 +276,7 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
Eo *win, *vbox, *f, *hbox;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
vbox = efl_add(EFL_UI_BOX_CLASS, win,

9
src/bin/elementary/test_ui_scroller.c
View File

@ -32,8 +32,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
int i, j;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Scroller"),
efl_text_set(efl_added, "Efl Ui Scroller"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
@ -137,8 +136,7 @@ test_efl_ui_scroller_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
int i;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Scroller Simple"),
efl_text_set(efl_added, "Efl Ui Scroller Simple"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
@ -173,8 +171,7 @@ test_efl_ui_scroller_simple2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
int i;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Scroller Simple2"),
efl_text_set(efl_added, "Efl Ui Scroller Simple2"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));

3
src/bin/elementary/test_ui_slider.c
View File

@ -53,8 +53,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
Eo *win, *bx, *hbx;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Slider"),
efl_text_set(efl_added, "Efl.Ui.Slider"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win,

3
src/bin/elementary/test_ui_slider_interval.c
View File

@ -34,8 +34,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
double step;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Slider_Interval"),
efl_text_set(efl_added, "Efl.Ui.Slider_Interval"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win,

3
src/bin/elementary/test_ui_spin.c
View File

@ -40,8 +40,7 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
Eo *win, *bx, *sp;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spin"),
efl_text_set(efl_added, "Efl.Ui.Spin"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win,

3
src/bin/elementary/test_ui_spin_button.c
View File

@ -29,8 +29,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
};
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spin_Button"),
efl_text_set(efl_added, "Efl.Ui.Spin_Button"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win,

9
src/bin/elementary/test_ui_spotlight.c
View File

@ -856,8 +856,7 @@ test_ui_spotlight_stack(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spotlight Stack"),
efl_text_set(efl_added, "Efl.Ui.Spotlight Stack"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
panes = efl_add(EFL_UI_PANES_CLASS, win,
@ -955,8 +954,7 @@ test_ui_spotlight_plain(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spotlight Plain"),
efl_text_set(efl_added, "Efl.Ui.Spotlight Plain"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
panes = efl_add(EFL_UI_PANES_CLASS, win,
@ -1050,8 +1048,7 @@ test_ui_spotlight_scroll(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spotlight Scroll"),
efl_text_set(efl_added, "Efl.Ui.Spotlight Scroll"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
panes = efl_add(EFL_UI_PANES_CLASS, win,

3
src/bin/elementary/test_ui_tab_pager.c
View File

@ -104,8 +104,7 @@ test_ui_tab_pager(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Tab_Pager"),
efl_text_set(efl_added, "Efl.Ui.Tab_Pager"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _win_del_cb, ad));

3
src/bin/elementary/test_ui_tags.c
View File

@ -60,8 +60,7 @@ test_ui_tags(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
char buf[PATH_MAX];
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Tags"),
efl_text_set(efl_added, "Efl.Ui.Tags"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
snprintf(buf, sizeof(buf), "%s/objects/multibuttonentry.edj", elm_app_data_dir_get());

3
src/bin/elementary/test_ui_timepicker.c
View File

@ -20,8 +20,7 @@ test_ui_timepicker(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
Eo *win, *bx;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Timepicker"),
efl_text_set(efl_added, "Efl.Ui.Timepicker"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
bx = efl_add(EFL_UI_BOX_CLASS, win,

3
src/bin/elementary/test_win_indicator.c
View File

@ -93,8 +93,7 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
// FIXME: Resizing window should no cause sizing issues!
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Win.Indicator"),
efl_text_set(efl_added, "Efl.Win.Indicator"),
efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(300, -1)),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, indicator);

9
src/bin/eolian/docs.c
View File

@ -27,13 +27,8 @@ _generate_ref(const Eolian_State *state, const char *refn, Eina_Strbuf *wbuf)
char *n = strdup(eolian_object_name_get(decl));
char *p = n;
while ((p = strchr(p, '.'))) *p = '_';
if (eolian_object_type_get(decl) == EOLIAN_OBJECT_VARIABLE)
{
const Eolian_Variable *v = (const Eolian_Variable *)decl;
/* constants are emitted as macros */
if (eolian_variable_type_get(v) == EOLIAN_VAR_CONSTANT)
eina_str_toupper(&n);
}
if (eolian_object_type_get(decl) == EOLIAN_OBJECT_CONSTANT)
eina_str_toupper(&n);
eina_strbuf_append(wbuf, n);
free(n);
return;

5
src/bin/eolian/main.c
View File

@ -392,8 +392,11 @@ _write_source(const Eolian_State *eos, const char *ofname,
const Eolian_Class *cl = eolian_state_class_by_file_get(eos, ifname);
eo_gen_types_source_gen(eolian_state_objects_by_file_get(eos, ifname), buf);
eo_gen_source_gen(cl, buf);
if (cl || (eot && eina_strbuf_length_get(buf)))
if (cl || eot)
{
/* always have at least a stub in order to allow unconditional generation */
if (!eina_strbuf_length_get(buf))
eina_strbuf_append(buf, "/* Nothing to implement. */\n");
if (!_write_file(ofname, buf))
goto done;
ret = EINA_TRUE;

93
src/bin/eolian/types.c
View File

@ -168,12 +168,12 @@ _type_generate(const Eolian_State *state, const Eolian_Typedecl *tp,
}
static Eina_Strbuf *
_var_generate(const Eolian_State *state, const Eolian_Variable *vr)
_const_generate(const Eolian_State *state, const Eolian_Constant *vr)
{
char *fn = strdup(eolian_variable_name_get(vr));
char *fn = strdup(eolian_constant_name_get(vr));
char *p = strrchr(fn, '.');
if (p) *p = '\0';
Eina_Strbuf *buf = eo_gen_docs_full_gen(state, eolian_variable_documentation_get(vr),
Eina_Strbuf *buf = eo_gen_docs_full_gen(state, eolian_constant_documentation_get(vr),
fn, 0);
if (p)
{
@ -184,31 +184,23 @@ _var_generate(const Eolian_State *state, const Eolian_Variable *vr)
eina_str_toupper(&fn);
if (!buf) buf = eina_strbuf_new();
else eina_strbuf_append_char(buf, '\n');
const Eolian_Type *vt = eolian_variable_base_type_get(vr);
if (eolian_variable_type_get(vr) == EOLIAN_VAR_CONSTANT)
{
/* we generate a define macro here, as it's a constant */
eina_strbuf_prepend_printf(buf, "#ifndef %s\n", fn);
eina_strbuf_append_printf(buf, "#define %s ", fn);
const Eolian_Expression *vv = eolian_variable_value_get(vr);
Eolian_Value val = eolian_expression_eval(vv, EOLIAN_MASK_ALL);
Eina_Stringshare *lit = eolian_expression_value_to_literal(&val);
eina_strbuf_append(buf, lit);
Eina_Stringshare *exp = eolian_expression_serialize(vv);
if (exp && strcmp(lit, exp))
eina_strbuf_append_printf(buf, " /* %s */", exp);
eina_stringshare_del(lit);
eina_stringshare_del(exp);
eina_strbuf_append(buf, "\n#endif");
}
else
{
Eina_Stringshare *ct = eolian_type_c_type_get(vt);
eina_strbuf_append_printf(buf, "EWAPI extern %s %s;", ct, fn);
eina_stringshare_del(ct);
}
/* we generate a define macro here, as it's a constant */
eina_strbuf_prepend_printf(buf, "#ifndef %s\n", fn);
eina_strbuf_append_printf(buf, "#define %s ", fn);
const Eolian_Expression *vv = eolian_constant_value_get(vr);
Eolian_Value val = eolian_expression_eval(vv, EOLIAN_MASK_ALL);
Eina_Stringshare *lit = eolian_expression_value_to_literal(&val);
eina_strbuf_append(buf, lit);
Eina_Stringshare *exp = eolian_expression_serialize(vv);
if (exp && strcmp(lit, exp))
eina_strbuf_append_printf(buf, " /* %s */", exp);
eina_stringshare_del(lit);
eina_stringshare_del(exp);
eina_strbuf_append(buf, "\n#endif");
free(fn);
if (eolian_variable_is_beta(vr))
if (eolian_constant_is_beta(vr))
{
eina_strbuf_prepend(buf, "#ifdef EFL_BETA_API_SUPPORT\n");
eina_strbuf_append(buf, "\n#endif /* EFL_BETA_API_SUPPORT */");
@ -259,13 +251,13 @@ void eo_gen_types_header_gen(const Eolian_State *state,
{
Eolian_Object_Type dt = eolian_object_type_get(decl);
if (dt == EOLIAN_OBJECT_VARIABLE)
if (dt == EOLIAN_OBJECT_CONSTANT)
{
const Eolian_Variable *vr = (const Eolian_Variable *)decl;
if (!vr || eolian_variable_is_extern(vr))
const Eolian_Constant *vr = (const Eolian_Constant *)decl;
if (!vr || eolian_constant_is_extern(vr))
continue;
Eina_Strbuf *vbuf = _var_generate(state, vr);
Eina_Strbuf *vbuf = _const_generate(state, vr);
if (vbuf)
{
eina_strbuf_append(buf, eina_strbuf_string_get(vbuf));
@ -375,43 +367,6 @@ _source_gen_error(Eina_Strbuf *buf, const Eolian_Error *err)
eina_strbuf_append(buf, " return err;\n}\n\n");
}
static void
_source_gen_var(Eina_Strbuf *buf, const Eolian_Variable *vr)
{
if (eolian_variable_is_extern(vr))
return;
if (eolian_variable_type_get(vr) == EOLIAN_VAR_CONSTANT)
return;
const Eolian_Expression *vv = eolian_variable_value_get(vr);
if (!vv)
return;
char *fn = strdup(eolian_variable_name_get(vr));
for (char *p = strchr(fn, '.'); p; p = strchr(p, '.'))
*p = '_';
eina_str_toupper(&fn);
const Eolian_Type *vt = eolian_variable_base_type_get(vr);
Eina_Stringshare *ct = eolian_type_c_type_get(vt);
eina_strbuf_append_printf(buf, "EWAPI %s %s = ", ct, fn);
eina_stringshare_del(ct);
free(fn);
Eolian_Value val = eolian_expression_eval(vv, EOLIAN_MASK_ALL);
Eina_Stringshare *lit = eolian_expression_value_to_literal(&val);
eina_strbuf_append(buf, lit);
eina_strbuf_append_char(buf, ';');
Eina_Stringshare *exp = eolian_expression_serialize(vv);
if (exp && strcmp(lit, exp))
eina_strbuf_append_printf(buf, " /* %s */", exp);
eina_stringshare_del(lit);
eina_stringshare_del(exp);
eina_strbuf_append(buf, "\n");
}
void eo_gen_types_source_gen(Eina_Iterator *itr, Eina_Strbuf *buf)
{
const Eolian_Object *decl;
@ -421,8 +376,6 @@ void eo_gen_types_source_gen(Eina_Iterator *itr, Eina_Strbuf *buf)
if (dt == EOLIAN_OBJECT_ERROR)
_source_gen_error(buf, (const Eolian_Error *)decl);
else if (dt == EOLIAN_OBJECT_VARIABLE)
_source_gen_var(buf, (const Eolian_Variable *)decl);
}
eina_iterator_free(itr);
}

2
src/bin/eolian_mono/eolian/mono/blacklist.hh
View File

@ -17,7 +17,7 @@ inline bool is_function_blacklisted(std::string const& c_name)
return
c_name == "efl_event_callback_array_priority_add"
|| c_name == "efl_constructor"
|| c_name == "efl_player_position_get"
|| c_name == "efl_player_playback_position_get"
|| c_name == "efl_ui_widget_focus_set"
|| c_name == "efl_ui_widget_focus_get"
|| c_name == "efl_ui_text_password_get"

19
src/bin/eolian_mono/eolian/mono/documentation.hh
View File

@ -187,17 +187,14 @@ struct documentation_generator
ref += function_conversion(data, (const ::Eolian_Function *)data2, name_tail);
is_beta = eolian_object_is_beta(data) || eolian_object_is_beta(data2);
break;
case ::EOLIAN_OBJECT_VARIABLE:
if (::eolian_variable_type_get((::Eolian_Variable *)data) == ::EOLIAN_VAR_CONSTANT)
{
auto names = utils::split(name_helpers::managed_namespace(::eolian_object_name_get(data)), '.');
names.pop_back(); // Remove var name
ref = name_helpers::join_namespaces(names, '.');
ref += "Constants.";
ref += name_helpers::managed_name(::eolian_object_short_name_get(data));
}
// Otherwise, do nothing and no <see> tag will be generated. Because, who would
// reference a global (non-constant) variable in the docs?
case ::EOLIAN_OBJECT_CONSTANT:
{
auto names = utils::split(name_helpers::managed_namespace(::eolian_object_name_get(data)), '.');
names.pop_back(); // Remove var name
ref = name_helpers::join_namespaces(names, '.');
ref += "Constants.";
ref += name_helpers::managed_name(::eolian_object_short_name_get(data));
}
break;
case ::EOLIAN_OBJECT_UNKNOWN:
// If the reference cannot be resolved, just return an empty string and

2
src/bin/eolian_mono/eolian/mono/variable_definition.hh
View File

@ -28,7 +28,7 @@ namespace eolian_mono {
struct constant_definition_generator
{
template<typename OutputIterator, typename Context>
bool generate(OutputIterator sink, attributes::variable_def constant, Context const& context) const
bool generate(OutputIterator sink, attributes::constant_def constant, Context const& context) const
{
// Open partial class
if (!name_helpers::open_namespaces(sink, constant.namespaces, context))

4
src/bin/eolian_mono/eolian_mono.cc
View File

@ -177,10 +177,10 @@ run(options_type const& opts)
// Constants
{
auto var_cxt = context_add_tag(class_context{class_context::variables}, context);
for (efl::eina::iterator<const Eolian_Variable> var_iterator( ::eolian_state_constants_by_file_get(opts.state, basename_input.c_str()))
for (efl::eina::iterator<const Eolian_Constant> var_iterator( ::eolian_state_constants_by_file_get(opts.state, basename_input.c_str()))
, var_last; var_iterator != var_last; ++var_iterator)
{
efl::eolian::grammar::attributes::variable_def var(&*var_iterator, opts.unit);
efl::eolian::grammar::attributes::constant_def var(&*var_iterator, opts.unit);
if (!eolian_mono::constant_definition.generate(iterator, var, var_cxt))
{
throw std::runtime_error("Failed to generate enum");

80
src/bindings/luajit/eolian.lua
View File

@ -25,7 +25,7 @@ ffi.cdef [[
typedef struct _Eolian_Constructor Eolian_Constructor;
typedef struct _Eolian_Event Eolian_Event;
typedef struct _Eolian_Expression Eolian_Expression;
typedef struct _Eolian_Variable Eolian_Variable;
typedef struct _Eolian_Constant Eolian_Constant;
typedef struct _Eolian_Error Eolian_Error;
typedef struct _Eolian_Struct_Type_Field Eolian_Struct_Type_Field;
typedef struct _Eolian_Enum_Type_Field Eolian_Enum_Type_Field;
@ -43,7 +43,7 @@ ffi.cdef [[
EOLIAN_OBJECT_STRUCT_FIELD,
EOLIAN_OBJECT_ENUM_FIELD,
EOLIAN_OBJECT_TYPE,
EOLIAN_OBJECT_VARIABLE,
EOLIAN_OBJECT_CONSTANT,
EOLIAN_OBJECT_EXPRESSION,
EOLIAN_OBJECT_FUNCTION,
EOLIAN_OBJECT_FUNCTION_PARAMETER,
@ -207,12 +207,6 @@ ffi.cdef [[
| EOLIAN_MASK_NULL
} Eolian_Expression_Mask;
typedef enum {
EOLIAN_VAR_UNKNOWN = 0,
EOLIAN_VAR_CONSTANT,
EOLIAN_VAR_GLOBAL
} Eolian_Variable_Type;
typedef union {
char c;
Eina_Bool b;
@ -325,11 +319,9 @@ ffi.cdef [[
Eina_Iterator *eolian_unit_objects_get(const Eolian_Unit *unit);
const Eolian_Class *eolian_unit_class_by_name_get(const Eolian_Unit *unit, const char *class_name);
Eina_Iterator *eolian_unit_classes_get(const Eolian_Unit *unit);
const Eolian_Variable *eolian_unit_global_by_name_get(const Eolian_Unit *unit, const char *name);
const Eolian_Variable *eolian_unit_constant_by_name_get(const Eolian_Unit *unit, const char *name);
const Eolian_Constant *eolian_unit_constant_by_name_get(const Eolian_Unit *unit, const char *name);
const Eolian_Error *eolian_unit_error_by_name_get(const Eolian_Unit *unit, const char *name);
Eina_Iterator *eolian_unit_constants_get(const Eolian_Unit *unit);
Eina_Iterator *eolian_unit_globals_get(const Eolian_Unit *unit);
Eina_Iterator *eolian_unit_errors_get(const Eolian_Unit *unit);
const Eolian_Typedecl *eolian_unit_alias_by_name_get(const Eolian_Unit *unit, const char *name);
const Eolian_Typedecl *eolian_unit_struct_by_name_get(const Eolian_Unit *unit, const char *name);
@ -339,7 +331,6 @@ ffi.cdef [[
Eina_Iterator *eolian_unit_enums_get(const Eolian_Unit *unit);
Eina_Iterator *eolian_state_objects_by_file_get(const Eolian_State *state, const char *file_name);
const Eolian_Class *eolian_state_class_by_file_get(const Eolian_State *state, const char *file_name);
Eina_Iterator *eolian_state_globals_by_file_get(const Eolian_State *state, const char *file_name);
Eina_Iterator *eolian_state_constants_by_file_get(const Eolian_State *state, const char *file_name);
Eina_Iterator *eolian_state_errors_by_file_get(const Eolian_State *state, const char *file_name);
Eina_Iterator *eolian_state_aliases_by_file_get(const Eolian_State *state, const char *file_name);
@ -348,7 +339,7 @@ ffi.cdef [[
Eolian_Class_Type eolian_class_type_get(const Eolian_Class *klass);
const Eolian_Documentation *eolian_class_documentation_get(const Eolian_Class *klass);
const char *eolian_class_eo_prefix_get(const Eolian_Class *klass);
const char *eolian_class_c_prefix_get(const Eolian_Class *klass);
const char *eolian_class_event_prefix_get(const Eolian_Class *klass);
const char *eolian_class_data_type_get(const Eolian_Class *klass);
const Eolian_Class *eolian_class_parent_get(const Eolian_Class *klass);
@ -462,11 +453,10 @@ ffi.cdef [[
Eolian_Unary_Operator eolian_expression_unary_operator_get(const Eolian_Expression *expr);
const Eolian_Expression *eolian_expression_unary_expression_get(const Eolian_Expression *expr);
Eolian_Value_t eolian_expression_value_get(const Eolian_Expression *expr);
Eolian_Variable_Type eolian_variable_type_get(const Eolian_Variable *var);
const Eolian_Documentation *eolian_variable_documentation_get(const Eolian_Variable *var);
const Eolian_Type *eolian_variable_base_type_get(const Eolian_Variable *var);
const Eolian_Expression *eolian_variable_value_get(const Eolian_Variable *var);
Eina_Bool eolian_variable_is_extern(const Eolian_Variable *var);
const Eolian_Documentation *eolian_constant_documentation_get(const Eolian_Constant *var);
const Eolian_Type *eolian_constant_type_get(const Eolian_Constant *var);
const Eolian_Expression *eolian_constant_value_get(const Eolian_Constant *var);
Eina_Bool eolian_constant_is_extern(const Eolian_Constant *var);
const char *eolian_documentation_summary_get(const Eolian_Documentation *doc);
const char *eolian_documentation_description_get(const Eolian_Documentation *doc);
const char *eolian_documentation_since_get(const Eolian_Documentation *doc);
@ -522,7 +512,7 @@ M.object_type = {
STRUCT_FIELD = 3,
ENUM_FIELD = 4,
TYPE = 5,
VARIABLE = 6,
CONSTANT = 6,
EXPRESSION = 7,
FUNCTION = 8,
FUNCTION_PARAMETER = 9,
@ -674,12 +664,6 @@ local unit_idx, wrap_unit = gen_wrap {
eolian.eolian_unit_classes_get(cast_unit(self)))
end,
global_by_name_get = function(self, name)
local v = eolian.eolian_unit_global_by_name_get(cast_unit(self), name)
if v == nil then return nil end
return v
end,
constant_by_name_get = function(self, name)
local v = eolian.eolian_unit_constant_by_name_get(cast_unit(self), name)
if v == nil then return nil end
@ -693,15 +677,10 @@ local unit_idx, wrap_unit = gen_wrap {
end,
constants_get = function(self)
return Ptr_Iterator("const Eolian_Variable *",
return Ptr_Iterator("const Eolian_Constant *",
eolian.eolian_unit_constants_get(cast_unit(self)))
end,
globals_get = function(self)
return Ptr_Iterator("const Eolian_Variable *",
eolian.eolian_unit_globals_get(cast_unit(self)))
end,
errors_get = function(self)
return Ptr_Iterator("const Eolian_Error *",
eolian.eolian_unit_errors_get(cast_unit(self)))
@ -860,13 +839,8 @@ ffi.metatype("Eolian_State", {
return v
end,
globals_by_file_get = function(unit, fname)
return Ptr_Iterator("const Eolian_Variable*",
eolian.eolian_state_globals_by_file_get(self, fname))
end,
constants_by_file_get = function(unit, fname)
return Ptr_Iterator("const Eolian_Variable*",
return Ptr_Iterator("const Eolian_Constant*",
eolian.eolian_state_constants_by_file_get(self, fname))
end,
@ -1461,8 +1435,8 @@ M.Class = ffi.metatype("Eolian_Class", {
return v
end,
eo_prefix_get = function(self)
local v = eolian.eolian_class_eo_prefix_get(self)
c_prefix_get = function(self)
local v = eolian.eolian_class_c_prefix_get(self)
if v == nil then
local buf = self:namespaces_get()
buf[#buf + 1] = self:short_name_get()
@ -1474,7 +1448,7 @@ M.Class = ffi.metatype("Eolian_Class", {
event_prefix_get = function(self)
local v = eolian.eolian_class_event_prefix_get(self)
if v == nil then
return self:eo_prefix_get()
return self:c_prefix_get()
end
return ffi.string(v)
end,
@ -1606,12 +1580,6 @@ emask.NUMBER = bit.bor(emask.INT , emask.FLOAT)
emask.ALL = bit.bor(emask.NUMBER, emask.BOOL,
emask.STRING, emask.CHAR, emask.NULL)
M.variable_type = {
UNKNOWN = 0,
CONSTANT = 1,
GLOBAL = 2
}
local value_con = {
[etype.INT ] = function(v) return tonumber(v.value.i ) end,
[etype.UINT ] = function(v) return tonumber(v.value.u ) end,
@ -1737,32 +1705,28 @@ M.Expression = ffi.metatype("Eolian_Expression", {
}
})
M.Variable = ffi.metatype("Eolian_Variable", {
M.Constant = ffi.metatype("Eolian_Constant", {
__index = wrap_object {
type_get = function(self)
return tonumber(eolian.eolian_variable_type_get(self))
end,
documentation_get = function(self)
local v = eolian.eolian_variable_documentation_get(self)
local v = eolian.eolian_constant_documentation_get(self)
if v == nil then return nil end
return v
end,
base_type_get = function(self)
local v = eolian.eolian_variable_base_type_get(self)
type_get = function(self)
local v = eolian.eolian_constant_type_get(self)
if v == nil then return nil end
return v
end,
value_get = function(self)
local v = eolian.eolian_variable_value_get(self)
local v = eolian.eolian_constant_value_get(self)
if v == nil then return nil end
return v
end,
is_extern = function(self)
return eolian.eolian_variable_is_extern(self) ~= 0
return eolian.eolian_constant_is_extern(self) ~= 0
end
}
})
@ -1890,8 +1854,8 @@ M.Eolian_Doc_Token = ffi.metatype("Eolian_Doc_Token", {
elseif tp == reft.ENUM_FIELD then
return tp, ffi.cast("const Eolian_Typedecl *", stor[0]),
ffi.cast("const Eolian_Enum_Type_Field *", stor[1])
elseif tp == reft.VARIABLE then
return tp, ffi.cast("const Eolian_Variable *", stor[0])
elseif tp == reft.CONSTANT then
return tp, ffi.cast("const Eolian_Constant *", stor[0])
else
return reft.UNKNOWN
end

3
src/bindings/mono/efl_mono/Bind.cs
View File

@ -112,8 +112,7 @@ public class BindableFactoryPart<T>
/// <summary>Binds the given factory to this part.</summary>
public Eina.Error BindFactory(Efl.Ui.IFactory factory)
{
this.Binder.BindFactory(this.PartName, factory);
return Eina.Error.NO_ERROR;
return this.Binder.BindFactory(this.PartName, factory);
}
}

11
src/bindings/mono/eo_mono/EoWrapper.cs
View File

@ -413,4 +413,15 @@ public abstract class EoWrapper : IWrapper, IDisposable
} // namespace Eo
/// <summary>Concrete realization of Efl.Object.
///
/// Some legacy classes (like Evas.Canvas) may be returned by some methods. As these classes are not bound, we
/// allow minimal interaction with them through <see cref="Efl.Object" />.
///
/// But as <see cref="Efl.Object" /> is abstract, whis realized class will allow us to create C# instances of it.</summary>
internal class ObjectRealized : Efl.Object
{
protected ObjectRealized(Efl.Eo.Globals.WrappingHandle ch) : base(ch) { }
}
} // namespace Efl

2
src/bindings/mono/eo_mono/iwrapper.cs
View File

@ -843,7 +843,7 @@ public static class ClassRegister
if (t == null)
{
return typeof(Efl.Object);
return typeof(Efl.ObjectRealized);
}
}

3
src/examples/elementary/efl_canvas_layout_text.c
View File

@ -121,8 +121,7 @@ efl_main(void *data EINA_UNUSED,
Eo *win;
win = efl_add(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Canvas_Layout"),
efl_text_set(efl_added, "Efl Canvas_Layout"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST, _on_win_delete, NULL));

107
src/examples/elementary/efl_ui_collection_view_example_1.c Normal file
View File

@ -0,0 +1,107 @@
// gcc -o efl_ui_collection_view_example_1 efl_ui_collection_view_example_1.c `pkg-config --cflags --libs efl-ui
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#else
# define EFL_BETA_API_SUPPORT 1
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
#include <Efl.h>
#include <Eio.h>
#include <stdio.h>
#define NUM_ITEMS 400
static Efl_Model*
_make_model(Evas_Object *win)
{
Eina_Value vtext;
Efl_Generic_Model *model, *child;
unsigned int i;
char buf[256];
model = efl_add(EFL_GENERIC_MODEL_CLASS, win);
eina_value_setup(&vtext, EINA_VALUE_TYPE_STRING);
for (i = 0; i < (NUM_ITEMS); i++)
{
child = efl_model_child_add(model);
snprintf(buf, sizeof(buf), "Item # %i", i);
eina_value_set(&vtext, buf);
efl_model_property_set(child, "title", &vtext);
}
eina_value_flush(&vtext);
return model;
}
static void
_item_constructing(void *data EINA_UNUSED, const Efl_Event *ev)
{
Efl_Gfx_Entity *item = ev->info;
if (!efl_ui_item_calc_locked_get(item))
efl_gfx_hint_size_min_set(item, EINA_SIZE2D(50, 50));
}
EAPI_MAIN void
efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
{
Efl_Ui_Factory *factory;
Evas_Object *win, *li;
Eo *model;
Eo *position_manager;
Efl_App *app = ev->object;
Eina_Accessor *ac;
Eina_Bool list = EINA_TRUE, multi = EINA_FALSE, none = EINA_FALSE;
Efl_Ui_Select_Mode mode = EFL_UI_SELECT_MODE_SINGLE;
const char *arg;
unsigned int i;
ac = efl_core_command_line_command_access(app);
EINA_ACCESSOR_FOREACH(ac, i, arg)
{
if (eina_streq(arg, "grid")) list = EINA_FALSE;
if (eina_streq(arg, "multi")) multi = EINA_TRUE;
if (eina_streq(arg, "none")) none = EINA_TRUE;
}
eina_accessor_free(ac);
if (multi) mode = EFL_UI_SELECT_MODE_MULTI;
if (none) mode = EFL_UI_SELECT_MODE_NONE;
win = efl_add(EFL_UI_WIN_CLASS, app,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_ui_win_autohide_set(efl_added, EINA_TRUE));
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
model = _make_model(win);
factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win);
efl_ui_property_bind(factory, "text", "title");
if (list)
{
position_manager = efl_new(EFL_UI_POSITION_MANAGER_LIST_CLASS);
efl_ui_widget_factory_item_class_set(factory, EFL_UI_LIST_DEFAULT_ITEM_CLASS);
}
else
{
position_manager = efl_new(EFL_UI_POSITION_MANAGER_GRID_CLASS);
efl_ui_widget_factory_item_class_set(factory, EFL_UI_GRID_DEFAULT_ITEM_CLASS);
efl_event_callback_add(factory, EFL_UI_FACTORY_EVENT_ITEM_CONSTRUCTING, _item_constructing, NULL);
}
li = efl_add(EFL_UI_COLLECTION_VIEW_CLASS, win,
efl_ui_collection_view_position_manager_set(efl_added, position_manager),
efl_ui_view_model_set(efl_added, model),
efl_ui_multi_selectable_async_select_mode_set(efl_added, mode),
efl_ui_collection_view_factory_set(efl_added, factory));
efl_content_set(win, li);
//showall
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 320));
}
EFL_MAIN()

3
src/examples/elementary/efl_ui_grid_example_1.c
View File

@ -23,8 +23,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
Efl_Ui_Item *gitem;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Grid"),
efl_text_set(efl_added, "Efl.Ui.Grid"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
box = efl_add(EFL_UI_BOX_CLASS, win);

5
src/examples/elementary/efl_ui_list_example_1.c
View File

@ -30,7 +30,7 @@ _list_selected(void *data EINA_UNUSED, const Efl_Event *ev)
Eo *item = ev->info, *tmp;
printf("list item [%p:%d] is %s\n", item, efl_ui_item_index_get(item), (efl_ui_selectable_selected_get(item)? "selected" : "unselected"));
Eina_Iterator *selects = efl_ui_selected_items_get(list);
Eina_Iterator *selects = efl_ui_selected_iterator_new(list);
EINA_ITERATOR_FOREACH(selects, tmp)
printf("selected [%p:%d] ", tmp, efl_ui_item_index_get(tmp));
@ -110,8 +110,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.List"),
efl_text_set(efl_added, "Efl.Ui.List"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

38
src/examples/elementary/efl_ui_list_view_example_1.c
View File

@ -14,39 +14,20 @@
#define NUM_ITEMS 400
const char *styles[] = {
"odd",
"even"
};
char edj_path[PATH_MAX];
static void
_realized_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
Efl_Ui_List_View_Item_Event *ie = event->info;
if (!ie->layout) return;
Efl_Gfx_Entity *layout = event->info;
Efl_Ui_Layout *layout = ie->layout;
elm_object_focus_allow_set(layout, EINA_TRUE);
}
/*
static void
_unrealized_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
Efl_Ui_List_View_Item_Event *ie = event->info;
efl_ui_view_model_set(ie->layout, NULL);
efl_del(ie->layout);
}
*/
static Efl_Model*
_make_model(Evas_Object *win)
{
Eina_Value vtext;
Efl_Generic_Model *model, *child;
unsigned int i, s;
unsigned int i;
char buf[256];
model = efl_add(EFL_GENERIC_MODEL_CLASS, win);
@ -54,10 +35,7 @@ _make_model(Evas_Object *win)
for (i = 0; i < (NUM_ITEMS); i++)
{
s = i%2;
child = efl_model_child_add(model);
eina_value_set(&vtext, styles[s]);
efl_model_property_set(child, "odd_style", &vtext);
snprintf(buf, sizeof(buf), "Item # %i", i);
eina_value_set(&vtext, buf);
@ -88,17 +66,13 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win);
efl_ui_widget_factory_item_class_set(factory, EFL_UI_LIST_DEFAULT_ITEM_CLASS);
efl_ui_property_bind(factory, "signal/efl,state,%v", "odd_style");
efl_ui_property_bind(factory, "signal/efl,state,%{selected;unselected}", "selected");
efl_ui_property_bind(factory, "efl.text", "title");
li = efl_add(EFL_UI_LIST_VIEW_CLASS, win
, efl_ui_list_view_layout_factory_set(efl_added, factory)
, efl_ui_view_model_set(efl_added, selmodel)
);
li = efl_add(EFL_UI_LIST_VIEW_CLASS, win,
efl_ui_collection_view_factory_set(efl_added, factory),
efl_ui_view_model_set(efl_added, selmodel));
efl_event_callback_add(li, EFL_UI_LIST_VIEW_EVENT_ITEM_REALIZED, _realized_cb, NULL);
// efl_event_callback_add(li, EFL_UI_LIST_VIEW_EVENT_ITEM_UNREALIZED, _unrealized_cb, NULL);
efl_event_callback_add(li, EFL_UI_COLLECTION_VIEW_EVENT_ITEM_REALIZED, _realized_cb, NULL);
elm_win_resize_object_add(win, li);
evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

3
src/examples/elementary/efl_ui_list_view_example_2.c
View File

@ -37,13 +37,12 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
efl_ui_property_bind(factory, "efl.text", "filename");
li = efl_add(EFL_UI_LIST_VIEW_CLASS, win);
efl_ui_list_view_layout_factory_set(li, factory);
efl_ui_collection_view_factory_set(li, factory);
efl_ui_view_model_set(li, model);
evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
imgf = efl_add(EFL_UI_IMAGE_FACTORY_CLASS, win);
efl_ui_property_bind(imgf, "", "path"); //connect to "path" property
efl_ui_factory_bind(factory, "efl.icon", imgf);

54
src/examples/elementary/efl_ui_list_view_example_3.c
View File

@ -52,17 +52,15 @@ static void
_cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Priv_Data *priv = (Priv_Data*)data;
efl_unref(priv->model);
efl_del(priv->model);
}
static void
_focused(void *data, const Efl_Event *event)
_selected(void *data, const Efl_Event *event)
{
Priv_Data *priv = (Priv_Data*)data;
Evas_Object *focused = efl_ui_focus_manager_focus_get(event->object);
if (focused)
priv->selected = focused;
priv->selected = efl_ui_single_selectable_last_selected_get(event->object);
}
static void
@ -77,7 +75,7 @@ _bt_add_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
child = efl_model_child_add(priv->model);
eina_value_set(&vtext, elm_object_text_get(priv->e_name));
efl_model_property_set(child, "name", &vtext);
efl_model_property_set(child, "filename", &vtext);
eina_value_set(&vtext, elm_object_text_get(priv->e_occ));
efl_model_property_set(child, "occupation", &vtext);
@ -95,7 +93,6 @@ _bt_del_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
Priv_Data *priv = (Priv_Data*)data;
Eo *child = NULL;
//l = efl_ui_focus_manager_focus_get(priv->list1);
if(priv->selected)
{
printf("focused %p\n", priv->selected);
@ -113,21 +110,21 @@ static void
_bt_none_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Evas_Object *li = data;
efl_ui_list_view_select_mode_set(li, ELM_OBJECT_SELECT_MODE_NONE);
efl_ui_multi_selectable_async_select_mode_set(li, EFL_UI_SELECT_MODE_NONE);
}
static void
_bt_donly_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
_bt_donly_clicked(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Evas_Object *li = data;
efl_ui_list_view_select_mode_set(li, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
/* Evas_Object *li = data; */
/* efl_ui_multi_selectable_async_select_mode_set(li, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); */
}
static void
_bt_default_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Evas_Object *li = data;
efl_ui_list_view_select_mode_set(li, ELM_OBJECT_SELECT_MODE_DEFAULT);
efl_ui_multi_selectable_async_select_mode_set(li, EFL_UI_SELECT_MODE_SINGLE);
}
static void
@ -146,28 +143,21 @@ _bt_unset_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
static void
_realized_1_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
Efl_Ui_List_View_Item_Event *ie = event->info;
Efl_Gfx_Entity *layout = event->info;
evas_object_size_hint_weight_set(ie->layout, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(ie->layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_ui_property_bind(ie->layout, "efl.text", "name");
efl_ui_property_bind(ie->layout, "signal/efl,state,%v", "odd_style");
efl_ui_property_bind(layout, "efl.text", "filename");
}
static void
_realized_2_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
Efl_Ui_List_View_Item_Event *ie = event->info;
printf("relized 2\n");
Efl_Gfx_Entity *layout = event->info;
elm_object_focus_allow_set(ie->layout, EINA_TRUE);
evas_object_size_hint_weight_set(ie->layout, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(ie->layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_ui_property_bind(ie->layout, "efl.text", "occupation");
efl_ui_property_bind(layout, "efl.text", "occupation");
}
static Efl_Model*
_make_model()
_make_model(void)
{
Eina_Value vtext, value;
Efl_Generic_Model *model, *child;
@ -182,11 +172,8 @@ _make_model()
{
child = efl_model_child_add(model);
i%2 ? eina_value_set(&vtext, "even") : eina_value_set(&vtext, "odd");
efl_model_property_set(child, "odd_style", &vtext);
eina_value_set(&vtext, texts[(i % len)]);
efl_model_property_set(child, "name", &vtext);
efl_model_property_set(child, "filename", &vtext);
eina_value_set(&vtext, subtexts[(i % len)]);
efl_model_property_set(child, "occupation", &vtext);
@ -226,21 +213,20 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
efl_ui_widget_factory_item_class_set(factory, EFL_UI_LIST_DEFAULT_ITEM_CLASS);
priv->list1 = efl_add(EFL_UI_LIST_VIEW_CLASS, win, efl_ui_view_model_set(efl_added, priv->model));
efl_event_callback_add(priv->list1, EFL_UI_LIST_VIEW_EVENT_ITEM_REALIZED, _realized_1_cb, priv);
efl_event_callback_add(priv->list1, EFL_UI_COLLECTION_VIEW_EVENT_ITEM_REALIZED, _realized_1_cb, priv);
evas_object_size_hint_weight_set(priv->list1, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(priv->list1, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(bx, priv->list1);
efl_ui_list_view_layout_factory_set(priv->list1, factory);
efl_ui_collection_view_factory_set(priv->list1, factory);
factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win);
efl_ui_property_bind(factory, "efl.text", "filename");
efl_ui_property_bind(factory, "signal/efl,state,%v", "selected");
efl_ui_widget_factory_item_class_set(factory, EFL_UI_LIST_DEFAULT_ITEM_CLASS);
priv->list2 = efl_add(EFL_UI_LIST_VIEW_CLASS, win, efl_ui_view_model_set(efl_added, priv->model));
efl_event_callback_add(priv->list2, EFL_UI_LIST_VIEW_EVENT_ITEM_REALIZED, _realized_2_cb, priv->list2);
efl_event_callback_add(priv->list2, EFL_UI_COLLECTION_VIEW_EVENT_ITEM_REALIZED, _realized_2_cb, priv->list2);
evas_object_size_hint_weight_set(priv->list2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(priv->list2, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_ui_list_view_layout_factory_set(priv->list2, factory);
efl_ui_collection_view_factory_set(priv->list2, factory);
vbx = elm_box_add(win);
elm_box_pack_end(bx, vbx);
@ -313,7 +299,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
elm_box_pack_end(vbx, bt);
elm_box_pack_end(bx, priv->list2);
efl_event_callback_add(priv->list2, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _focused ,priv);
efl_event_callback_add(priv->list2, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, _selected, priv);
evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, priv);

3
src/examples/elementary/efl_ui_radio_example_01.c
View File

@ -25,8 +25,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Radio example"),
efl_text_set(efl_added, "Efl.Ui.Radio example"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

3
src/examples/elementary/efl_ui_relative_layout_example_01.c
View File

@ -16,8 +16,7 @@ elm_main(int argc, char **argv)
Eo *win, *layout, *btn1, *btn2, *btn3;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
layout = efl_add(EFL_UI_RELATIVE_LAYOUT_CLASS, win,

Some files were not shown because too many files have changed in this diff Show More