diff options
author | Yakov Goldberg <yakov.g@samsung.com> | 2013-12-22 17:13:18 +0200 |
---|---|---|
committer | Yakov Goldberg <yakov.g@samsung.com> | 2013-12-22 17:13:18 +0200 |
commit | a0d56c35f58e49b370f219387ce3701e68658352 (patch) | |
tree | 5c3e978a2c3e69c57c8f39997583f7fa0af2df81 | |
parent | 4330488648da58d8bd7ed2f1446648a421c24b5e (diff) | |
parent | c452f1b3875ad5ca6bd513bff024087fbef59ea7 (diff) |
Merge branch 'develop'v0.2.1
-rw-r--r-- | py/func_names.json | 10 | ||||
-rw-r--r-- | src/bin/egui_gui/egui_layout_c.json | 70 | ||||
-rw-r--r-- | src/lib/db_dynamic_init.h | 4 |
3 files changed, 79 insertions, 5 deletions
diff --git a/py/func_names.json b/py/func_names.json index 5badd0d..a6e73a5 100644 --- a/py/func_names.json +++ b/py/func_names.json | |||
@@ -126,6 +126,16 @@ | |||
126 | "display_name" : "Policy" | 126 | "display_name" : "Policy" |
127 | }, | 127 | }, |
128 | { | 128 | { |
129 | "tokens" : ["elm_scrollable_interface_content_min_limit_cb_set"], | ||
130 | "name" : "content_min_limit_cb_set", | ||
131 | "display_name" : "Content Min Limit Cb" | ||
132 | }, | ||
133 | { | ||
134 | "tokens" : ["elm_scrollable_interface_content_min_limit"], | ||
135 | "name" : "content_min_limit", | ||
136 | "display_name" : "Content Min Limit" | ||
137 | }, | ||
138 | { | ||
129 | "tokens" : ["elm_obj_image_file_set"], | 139 | "tokens" : ["elm_obj_image_file_set"], |
130 | "name" : "image_file_set", | 140 | "name" : "image_file_set", |
131 | "display_name" : "Image File" | 141 | "display_name" : "Image File" |
diff --git a/src/bin/egui_gui/egui_layout_c.json b/src/bin/egui_gui/egui_layout_c.json index d463165..8aaed7d 100644 --- a/src/bin/egui_gui/egui_layout_c.json +++ b/src/bin/egui_gui/egui_layout_c.json | |||
@@ -323,6 +323,8 @@ _create_main_win() | |||
323 | Eo *main_box; | 323 | Eo *main_box; |
324 | Eo *hor_box; | 324 | Eo *hor_box; |
325 | Eo *fctr_table; | 325 | Eo *fctr_table; |
326 | Eo *fctr_scroll; | ||
327 | Eo *fctr_scroll_box; | ||
326 | Eo *fctr_win_it; | 328 | Eo *fctr_win_it; |
327 | Eo *fctr_win_image; | 329 | Eo *fctr_win_image; |
328 | Eo *fctr_win_label; | 330 | Eo *fctr_win_label; |
@@ -375,7 +377,9 @@ _create_main_win() | |||
375 | Eo *right_panes; | 377 | Eo *right_panes; |
376 | Eo *left_panes; | 378 | Eo *left_panes; |
377 | Eo *right_panel_box; | 379 | Eo *right_panel_box; |
380 | Eo *right_panes_internal; | ||
378 | Eo *left_panel_box; | 381 | Eo *left_panel_box; |
382 | Eo *left_panes_internal; | ||
379 | Eo *objtree_table; | 383 | Eo *objtree_table; |
380 | Eo *objtree_list; | 384 | Eo *objtree_list; |
381 | Eo *objtree_filter_box; | 385 | Eo *objtree_filter_box; |
@@ -610,13 +614,13 @@ _create_main_win() | |||
610 | "horizontal":[true], | 614 | "horizontal":[true], |
611 | "fixed":[false], | 615 | "fixed":[false], |
612 | "content_left_size":[0.65], | 616 | "content_left_size":[0.65], |
613 | "content_set":["left", "fctr_table", null], | 617 | "content_set":["left", "fctr_scroll", null], |
614 | "content_set":["right", "sequences_box", null] | 618 | "content_set":["right", "sequences_box", null] |
615 | } | 619 | } |
616 | } | 620 | } |
617 | } | 621 | } |
618 | @!egui */ | 622 | @!egui */ |
619 | Eo *left_panes_internal = eo_add(ELM_OBJ_PANES_CLASS, left_panel_box); | 623 | left_panes_internal = eo_add(ELM_OBJ_PANES_CLASS, left_panel_box); |
620 | eo_unref(left_panes_internal); | 624 | eo_unref(left_panes_internal); |
621 | eo_do(left_panes_internal, evas_obj_size_hint_weight_set(1.000000, 1.000000)); | 625 | eo_do(left_panes_internal, evas_obj_size_hint_weight_set(1.000000, 1.000000)); |
622 | eo_do(left_panes_internal, evas_obj_size_hint_align_set(-1, -1.000000)); | 626 | eo_do(left_panes_internal, evas_obj_size_hint_align_set(-1, -1.000000)); |
@@ -627,6 +631,62 @@ _create_main_win() | |||
627 | eo_do(left_panel_box, elm_obj_box_pack_end(left_panes_internal)); | 631 | eo_do(left_panel_box, elm_obj_box_pack_end(left_panes_internal)); |
628 | /* @egui | 632 | /* @egui |
629 | { | 633 | { |
634 | "fctr_scroll": | ||
635 | { | ||
636 | "Desc": | ||
637 | { | ||
638 | "parent":"left_panes_internal", | ||
639 | "class":"Elm_Scroller", | ||
640 | "type":"widget" | ||
641 | }, | ||
642 | "Properties": | ||
643 | { | ||
644 | "size_hint_weight_set":[1, 1], | ||
645 | "size_hint_align_set":[-1, -1], | ||
646 | "bounce_allow":[false, true], | ||
647 | "content_min_limit":[false, true], | ||
648 | "visibility_set":[true], | ||
649 | "content_set":[null, "fctr_scroll_box", null] | ||
650 | } | ||
651 | } | ||
652 | } | ||
653 | @!egui */ | ||
654 | fctr_scroll = eo_add(ELM_OBJ_SCROLLER_CLASS, left_panes_internal); | ||
655 | eo_unref(fctr_scroll); | ||
656 | eo_do(fctr_scroll, evas_obj_size_hint_weight_set(1.000000, 1.000000)); | ||
657 | eo_do(fctr_scroll, evas_obj_size_hint_align_set(-1.000000, -1.000000)); | ||
658 | eo_do(fctr_scroll, elm_scrollable_interface_bounce_allow_set(EINA_FALSE, EINA_TRUE)); | ||
659 | eo_do(fctr_scroll, elm_scrollable_interface_content_min_limit(EINA_FALSE, EINA_TRUE)); | ||
660 | eo_do(fctr_scroll, evas_obj_visibility_set(EINA_TRUE)); | ||
661 | eo_do(left_panes_internal, elm_obj_container_content_set("left", fctr_scroll, NULL)); | ||
662 | /* @egui | ||
663 | { | ||
664 | "fctr_scroll_box": | ||
665 | { | ||
666 | "Desc": | ||
667 | { | ||
668 | "parent":"fctr_scroll", | ||
669 | "class":"Elm_Box", | ||
670 | "type":"widget" | ||
671 | }, | ||
672 | "Properties": | ||
673 | { | ||
674 | "size_hint_weight_set":[1, 0], | ||
675 | "size_hint_align_set":[-1, 0], | ||
676 | "pack_end":["fctr_table"], | ||
677 | "visibility_set":[true] | ||
678 | } | ||
679 | } | ||
680 | } | ||
681 | @!egui */ | ||
682 | fctr_scroll_box = eo_add(ELM_OBJ_BOX_CLASS, fctr_scroll); | ||
683 | eo_unref(fctr_scroll_box); | ||
684 | eo_do(fctr_scroll_box, evas_obj_size_hint_weight_set(1.000000, 0.000000)); | ||
685 | eo_do(fctr_scroll_box, evas_obj_size_hint_align_set(-1, 0.000000)); | ||
686 | eo_do(fctr_scroll_box, evas_obj_visibility_set(EINA_TRUE)); | ||
687 | eo_do(fctr_scroll, elm_obj_container_content_set(NULL, fctr_scroll_box, NULL)); | ||
688 | /* @egui | ||
689 | { | ||
630 | "fctr_table": | 690 | "fctr_table": |
631 | { | 691 | { |
632 | "Desc": | 692 | "Desc": |
@@ -663,10 +723,10 @@ _create_main_win() | |||
663 | fctr_table = eo_add(ELM_OBJ_TABLE_CLASS, left_panes_internal); | 723 | fctr_table = eo_add(ELM_OBJ_TABLE_CLASS, left_panes_internal); |
664 | eo_unref(fctr_table); | 724 | eo_unref(fctr_table); |
665 | pub_widgets.fctr_table = fctr_table; | 725 | pub_widgets.fctr_table = fctr_table; |
666 | eo_do(fctr_table, evas_obj_size_hint_align_set(0.100000, -1.000000)); | 726 | eo_do(fctr_table, evas_obj_size_hint_align_set(0.500000, -1.000000)); |
667 | eo_do(fctr_table, elm_obj_table_padding_set(6, 7)); | 727 | eo_do(fctr_table, elm_obj_table_padding_set(6, 7)); |
668 | eo_do(left_panes_internal, elm_obj_container_content_set("left", fctr_table, NULL)); | ||
669 | eo_do(fctr_table, evas_obj_visibility_set(EINA_TRUE)); | 728 | eo_do(fctr_table, evas_obj_visibility_set(EINA_TRUE)); |
729 | eo_do(fctr_scroll_box, elm_obj_box_pack_end(fctr_table)); | ||
670 | 730 | ||
671 | /* @egui | 731 | /* @egui |
672 | { | 732 | { |
@@ -2081,7 +2141,7 @@ _create_main_win() | |||
2081 | } | 2141 | } |
2082 | } | 2142 | } |
2083 | @!egui */ | 2143 | @!egui */ |
2084 | Eo *right_panes_internal = eo_add(ELM_OBJ_PANES_CLASS, right_panel_box); | 2144 | right_panes_internal = eo_add(ELM_OBJ_PANES_CLASS, right_panel_box); |
2085 | eo_unref(right_panes_internal); | 2145 | eo_unref(right_panes_internal); |
2086 | eo_do(right_panes_internal, evas_obj_size_hint_weight_set(1.000000, 1.000000)); | 2146 | eo_do(right_panes_internal, evas_obj_size_hint_weight_set(1.000000, 1.000000)); |
2087 | eo_do(right_panes_internal, evas_obj_size_hint_align_set(-1, -1.000000)); | 2147 | eo_do(right_panes_internal, evas_obj_size_hint_align_set(-1, -1.000000)); |
diff --git a/src/lib/db_dynamic_init.h b/src/lib/db_dynamic_init.h index 7b68794..9ea50b6 100644 --- a/src/lib/db_dynamic_init.h +++ b/src/lib/db_dynamic_init.h | |||
@@ -172,6 +172,8 @@ static Gui_Type_Desc _elm_wdg_access_info_set_params[] = {{GUI_TYPE_STRING, "cha | |||
172 | static Gui_Type_Desc _elm_wdg_part_text_set_params[] = {{GUI_TYPE_STRING, "char*"}, {GUI_TYPE_STRING, "char*"}, {GUI_TYPE_NONE, "none"}}; | 172 | static Gui_Type_Desc _elm_wdg_part_text_set_params[] = {{GUI_TYPE_STRING, "char*"}, {GUI_TYPE_STRING, "char*"}, {GUI_TYPE_NONE, "none"}}; |
173 | static Gui_Type_Desc _elm_scrollable_interface_policy_set_params[] = {{GUI_TYPE_ENUM, "Elm_Scroller_Policy"}, {GUI_TYPE_ENUM, "Elm_Scroller_Policy"}, {GUI_TYPE_NONE, "none"}}; | 173 | static Gui_Type_Desc _elm_scrollable_interface_policy_set_params[] = {{GUI_TYPE_ENUM, "Elm_Scroller_Policy"}, {GUI_TYPE_ENUM, "Elm_Scroller_Policy"}, {GUI_TYPE_NONE, "none"}}; |
174 | static Gui_Type_Desc _elm_scrollable_interface_bounce_allow_set_params[] = {{GUI_TYPE_BOOL, "Eina_Bool"}, {GUI_TYPE_BOOL, "Eina_Bool"}, {GUI_TYPE_NONE, "none"}}; | 174 | static Gui_Type_Desc _elm_scrollable_interface_bounce_allow_set_params[] = {{GUI_TYPE_BOOL, "Eina_Bool"}, {GUI_TYPE_BOOL, "Eina_Bool"}, {GUI_TYPE_NONE, "none"}}; |
175 | static Gui_Type_Desc _elm_scrollable_interface_content_min_limit_cb_set_params[] = {{GUI_TYPE_NONE, "none"}}; | ||
176 | static Gui_Type_Desc _elm_scrollable_interface_content_min_limit_params[] = {{GUI_TYPE_BOOL, "Eina_Bool"}, {GUI_TYPE_BOOL, "Eina_Bool"}, {GUI_TYPE_NONE, "none"}}; | ||
175 | static Gui_Type_Desc _elm_obj_panel_orient_set_params[] = {{GUI_TYPE_ENUM, "Elm_Panel_Orient"}, {GUI_TYPE_NONE, "none"}}; | 177 | static Gui_Type_Desc _elm_obj_panel_orient_set_params[] = {{GUI_TYPE_ENUM, "Elm_Panel_Orient"}, {GUI_TYPE_NONE, "none"}}; |
176 | static Gui_Type_Desc _elm_obj_panel_hidden_set_params[] = {{GUI_TYPE_BOOL, "Eina_Bool"}, {GUI_TYPE_NONE, "none"}}; | 178 | static Gui_Type_Desc _elm_obj_panel_hidden_set_params[] = {{GUI_TYPE_BOOL, "Eina_Bool"}, {GUI_TYPE_NONE, "none"}}; |
177 | static Gui_Type_Desc _evas_obj_size_hint_min_set_params[] = {{GUI_TYPE_SINT, "Evas_Coord"}, {GUI_TYPE_SINT, "Evas_Coord"}, {GUI_TYPE_NONE, "none"}}; | 179 | static Gui_Type_Desc _evas_obj_size_hint_min_set_params[] = {{GUI_TYPE_SINT, "Evas_Coord"}, {GUI_TYPE_SINT, "Evas_Coord"}, {GUI_TYPE_NONE, "none"}}; |
@@ -230,6 +232,8 @@ static Op_Desc _eo_op_arr[] = { | |||
230 | {"Elm_Widget", "part_text_set", "Part Text", &ELM_WIDGET_BASE_ID, ELM_WIDGET_SUB_ID_PART_TEXT_SET, EGUI_EO_DO_CALL, "elm_wdg_part_text_set", _elm_wdg_part_text_set_params}, | 232 | {"Elm_Widget", "part_text_set", "Part Text", &ELM_WIDGET_BASE_ID, ELM_WIDGET_SUB_ID_PART_TEXT_SET, EGUI_EO_DO_CALL, "elm_wdg_part_text_set", _elm_wdg_part_text_set_params}, |
231 | {"Elm_Interface_Scrollable", "policy", "Policy", &ELM_SCROLLABLE_INTERFACE_BASE_ID, ELM_SCROLLABLE_INTERFACE_SUB_ID_POLICY_SET, EGUI_EO_DO_CALL, "elm_scrollable_interface_policy_set", _elm_scrollable_interface_policy_set_params}, | 233 | {"Elm_Interface_Scrollable", "policy", "Policy", &ELM_SCROLLABLE_INTERFACE_BASE_ID, ELM_SCROLLABLE_INTERFACE_SUB_ID_POLICY_SET, EGUI_EO_DO_CALL, "elm_scrollable_interface_policy_set", _elm_scrollable_interface_policy_set_params}, |
232 | {"Elm_Interface_Scrollable", "bounce_allow", "Bounce Allow", &ELM_SCROLLABLE_INTERFACE_BASE_ID, ELM_SCROLLABLE_INTERFACE_SUB_ID_BOUNCE_ALLOW_SET, EGUI_EO_DO_CALL, "elm_scrollable_interface_bounce_allow_set", _elm_scrollable_interface_bounce_allow_set_params}, | 234 | {"Elm_Interface_Scrollable", "bounce_allow", "Bounce Allow", &ELM_SCROLLABLE_INTERFACE_BASE_ID, ELM_SCROLLABLE_INTERFACE_SUB_ID_BOUNCE_ALLOW_SET, EGUI_EO_DO_CALL, "elm_scrollable_interface_bounce_allow_set", _elm_scrollable_interface_bounce_allow_set_params}, |
235 | {"Elm_Interface_Scrollable", "content_min_limit_cb_set", "Content Min Limit Cb", &ELM_SCROLLABLE_INTERFACE_BASE_ID, ELM_SCROLLABLE_INTERFACE_SUB_ID_CONTENT_MIN_LIMIT_CB_SET, EGUI_EO_DO_CALL, "elm_scrollable_interface_content_min_limit_cb_set", _elm_scrollable_interface_content_min_limit_cb_set_params}, | ||
236 | {"Elm_Interface_Scrollable", "content_min_limit", "Content Min Limit", &ELM_SCROLLABLE_INTERFACE_BASE_ID, ELM_SCROLLABLE_INTERFACE_SUB_ID_CONTENT_MIN_LIMIT, EGUI_EO_DO_CALL, "elm_scrollable_interface_content_min_limit", _elm_scrollable_interface_content_min_limit_params}, | ||
233 | {"Elm_Panel", "panel_orient", "Orientation", &ELM_OBJ_PANEL_BASE_ID, ELM_OBJ_PANEL_SUB_ID_ORIENT_SET, EGUI_EO_DO_CALL, "elm_obj_panel_orient_set", _elm_obj_panel_orient_set_params}, | 237 | {"Elm_Panel", "panel_orient", "Orientation", &ELM_OBJ_PANEL_BASE_ID, ELM_OBJ_PANEL_SUB_ID_ORIENT_SET, EGUI_EO_DO_CALL, "elm_obj_panel_orient_set", _elm_obj_panel_orient_set_params}, |
234 | {"Elm_Panel", "panel_hidden", "Hidden", &ELM_OBJ_PANEL_BASE_ID, ELM_OBJ_PANEL_SUB_ID_HIDDEN_SET, EGUI_EO_DO_CALL, "elm_obj_panel_hidden_set", _elm_obj_panel_hidden_set_params}, | 238 | {"Elm_Panel", "panel_hidden", "Hidden", &ELM_OBJ_PANEL_BASE_ID, ELM_OBJ_PANEL_SUB_ID_HIDDEN_SET, EGUI_EO_DO_CALL, "elm_obj_panel_hidden_set", _elm_obj_panel_hidden_set_params}, |
235 | {"Evas_Object", "size_hint_min_set", "Size Hint Min", &EVAS_OBJ_BASE_ID, EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_SET, EGUI_EO_DO_CALL, "evas_obj_size_hint_min_set", _evas_obj_size_hint_min_set_params}, | 239 | {"Evas_Object", "size_hint_min_set", "Size Hint Min", &EVAS_OBJ_BASE_ID, EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_SET, EGUI_EO_DO_CALL, "evas_obj_size_hint_min_set", _evas_obj_size_hint_min_set_params}, |