yakov pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=99314df37c85291d9e58ce7c38b31998a8ed5e1f
commit 99314df37c85291d9e58ce7c38b31998a8ed5e1f Author: Yakov Goldberg <[email protected]> Date: Wed Mar 11 19:11:58 2015 +0200 Add support for Elm Fileselector Entry widget --- data/config/func_names.json | 4 ++++ src/bin/egui_gui/egui_layout.json | 46 ++++++++++++++++++++++++++++++++++++++- src/bin/egui_gui/egui_logic.c | 4 ++++ src/lib/database.h | 1 + 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/data/config/func_names.json b/data/config/func_names.json index 748904f..c5234b5 100644 --- a/data/config/func_names.json +++ b/data/config/func_names.json @@ -118,6 +118,10 @@ "Elm_Fileselector": { "Evas.Object.size":[200, 200] + }, + "Elm_Fileselector_Entry": + { + "Evas.Object.size":[100, 22] } }, "OPERATIONS" : diff --git a/src/bin/egui_gui/egui_layout.json b/src/bin/egui_gui/egui_layout.json index 4ab48df..e8ff02c 100644 --- a/src/bin/egui_gui/egui_layout.json +++ b/src/bin/egui_gui/egui_layout.json @@ -1132,7 +1132,8 @@ "fctr_separator_it":[0, 26, 1, 1], "fctr_frame_it":[0, 27, 1, 1], "fctr_evas_image_it":[0, 28, 1, 1], - "fctr_fileselector_it":[0, 29, 1, 1] + "fctr_fileselector_it":[0, 29, 1, 1], + "fctr_fileselector_entry_it":[0, 30, 1, 1] } }, "fctr_win_it": @@ -2425,6 +2426,49 @@ "Evas.Object.visibility":[true] } }, + "fctr_fileselector_entry_it": + { + "Desc": + { + "parent":"fctr_table", + "class":"Elm_Box", + "public":true + }, + "Properties": + { + "Elm_Box.horizontal":[true], + "Elm_Box.padding":[7, 0], + "Evas.Object.visibility":[true] + }, + "Contains":["fctr_fileselector_entry_image", "fctr_fileselector_entry_label"] + }, + "fctr_fileselector_entry_image": + { + "Desc": + { + "parent":"fctr_fileselector_entry_it", + "class":"Elm_Image" + }, + "Properties": + { + "Evas.Object.size_hint_min":[25, 25], + "Elm_Image.resizable":[true, true], + "Evas.Object.visibility":[true] + } + }, + "fctr_fileselector_entry_label": + { + "Desc": + { + "parent":"fctr_fileselector_entry_it", + "class":"Elm_Label" + }, + "Properties": + { + "Elm_Widget.part_text":[null, "Elm Fileselector_Entry"], + "Evas.Object.visibility":[true] + } + }, "right_panes": { "Desc": diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c index ecd0712..f1d0707 100644 --- a/src/bin/egui_gui/egui_logic.c +++ b/src/bin/egui_gui/egui_logic.c @@ -792,6 +792,7 @@ _factory_vertical_pack(Eina_Bool vertical_pack) elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_evas_image_it, 0, 28, 1, 1); elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_it, 0, 29, 1, 1); + elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_entry_it, 0, 30, 1, 1); } else { @@ -836,6 +837,8 @@ _factory_vertical_pack(Eina_Bool vertical_pack) elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_frame_it, 0, 9, 1, 1); elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_evas_image_it, 1, 9, 1, 1); elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_it, 2, 9, 1, 1); + + elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_entry_it, 0, 10, 1, 1); } } @@ -1034,6 +1037,7 @@ egui_start() _factory_item_finalize(g_main_wdgs->main_win->fctr_frame_it, "factory_frame.png", DB_DEF_FRAME_CLASS, EINA_TRUE); _factory_item_finalize(g_main_wdgs->main_win->fctr_evas_image_it, "factory_image.png", DB_DEF_EVAS_IMAGE_CLASS, EINA_TRUE); _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_it, "factory_image.png", DB_DEF_FILESELECTOR_CLASS, EINA_TRUE); + _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_entry_it, "factory_image.png", DB_DEF_FILESELECTOR_ENTRY_CLASS, EINA_TRUE); /*FIXME: Need to unpack inline image, so pass it into delete callback*/ evas_object_smart_callback_add(g_main_wdgs->main_win->main_win, "delete,request", _main_win_del_cb, NULL); diff --git a/src/lib/database.h b/src/lib/database.h index 8f72308..f3da6c0 100644 --- a/src/lib/database.h +++ b/src/lib/database.h @@ -115,6 +115,7 @@ typedef struct _Container_Desc Container_Desc; #define DB_DEF_SEPARATOR_CLASS "Elm_Separator" #define DB_DEF_FRAME_CLASS "Elm_Frame" #define DB_DEF_FILESELECTOR_CLASS "Elm_Fileselector" +#define DB_DEF_FILESELECTOR_ENTRY_CLASS "Elm_Fileselector_Entry" #define VISIBILITY_SET "visibility" #define SIZE_SET "size" --
