yakov pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=95af7aec86d7aa1566d6559abd7469573ca8b413
commit 95af7aec86d7aa1566d6559abd7469573ca8b413 Author: Yakov Goldberg <yako...@samsung.com> Date: Wed Mar 25 19:15:32 2015 +0200 Add support for Elm Progressbar widget --- data/config/black_list.json | 3 ++- data/config/egui_all.eo | 2 +- src/bin/egui_gui/egui_layout.json | 46 ++++++++++++++++++++++++++++++++++++++- src/bin/egui_gui/egui_logic.c | 4 ++++ src/lib/database.h | 1 + 5 files changed, 53 insertions(+), 3 deletions(-) diff --git a/data/config/black_list.json b/data/config/black_list.json index 9c241aa..f407060 100644 --- a/data/config/black_list.json +++ b/data/config/black_list.json @@ -45,5 +45,6 @@ "Elm_Box":["layout"], "Elm_Win": ["illume_command_send","wm_available_rotations","available_profiles","keyboard_mode","indicator_opacity","indicator_mode","trap_data","fake_canvas"], "Elm_Bg":["option"], - "Elm_Slider":["indicator_visible_mode", "indicator_format_function", "units_format_function"] + "Elm_Slider":["indicator_visible_mode", "indicator_format_function", "units_format_function"], + "Elm_Progressbar":["unit_format_function"] } diff --git a/data/config/egui_all.eo b/data/config/egui_all.eo index b678ecc..fa8f19e 100644 --- a/data/config/egui_all.eo +++ b/data/config/egui_all.eo @@ -1,3 +1,3 @@ -class EGUI_ALL (Elm_Win, Elm_Bg, Elm_Box, Elm_Table, Elm_Menu, Elm_Diskselector, Elm_Ctxpopup, Elm_Actionslider, Elm_Bubble, Elm_Button, Elm_Calendar, Elm_Check, Elm_Radio, Elm_Clock, Elm_Colorselector, Elm_Image, Elm_Icon, Elm_Label, Elm_Entry, Elm_Flip, Elm_Genlist, Elm_Gengrid, Elm_Dayselector, Elm_Toolbar, Elm_Layout, Elm_Scroller, Elm_Panes, Elm_Fileselector_Button, Elm_Fileselector_Entry, Elm_Fileselector, Elm_Frame, Elm_Grid, Elm_Panel, Elm_Separator, Elm_Hoversel, Evas.Image, Elm [...] +class EGUI_ALL (Elm_Win, Elm_Bg, Elm_Box, Elm_Table, Elm_Menu, Elm_Diskselector, Elm_Ctxpopup, Elm_Actionslider, Elm_Bubble, Elm_Button, Elm_Calendar, Elm_Check, Elm_Radio, Elm_Clock, Elm_Colorselector, Elm_Image, Elm_Icon, Elm_Label, Elm_Entry, Elm_Flip, Elm_Genlist, Elm_Gengrid, Elm_Dayselector, Elm_Toolbar, Elm_Layout, Elm_Scroller, Elm_Panes, Elm_Fileselector_Button, Elm_Fileselector_Entry, Elm_Fileselector, Elm_Frame, Elm_Grid, Elm_Panel, Elm_Separator, Elm_Hoversel, Evas.Image, Elm [...] { } diff --git a/src/bin/egui_gui/egui_layout.json b/src/bin/egui_gui/egui_layout.json index 47c2a30..d6e1789 100644 --- a/src/bin/egui_gui/egui_layout.json +++ b/src/bin/egui_gui/egui_layout.json @@ -1135,7 +1135,8 @@ "fctr_fileselector_it":[0, 29, 1, 1], "fctr_fileselector_entry_it":[0, 30, 1, 1], "fctr_fileselector_button_it":[0, 31, 1, 1], - "fctr_slider_it":[0, 32, 1, 1] + "fctr_slider_it":[0, 32, 1, 1], + "fctr_progressbar_it":[0, 33, 1, 1] } }, "fctr_win_it": @@ -2557,6 +2558,49 @@ "Evas.Object.visibility":[true] } }, + "fctr_progressbar_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_progressbar_image", "fctr_progressbar_label"] + }, + "fctr_progressbar_image": + { + "Desc": + { + "parent":"fctr_progressbar_it", + "class":"Elm_Image" + }, + "Properties": + { + "Evas.Object.size_hint_min":[25, 25], + "Elm_Image.resizable":[true, true], + "Evas.Object.visibility":[true] + } + }, + "fctr_progressbar_label": + { + "Desc": + { + "parent":"fctr_progressbar_it", + "class":"Elm_Label" + }, + "Properties": + { + "Elm_Widget.part_text":[null, "Progress Bar"], + "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 384f194..64b3cd6 100644 --- a/src/bin/egui_gui/egui_logic.c +++ b/src/bin/egui_gui/egui_logic.c @@ -796,6 +796,7 @@ _factory_vertical_pack(Eina_Bool vertical_pack) elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_button_it, 0, 31, 1, 1); elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_slider_it, 0, 32, 1, 1); + elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_slider_it, 0, 33, 1, 1); } else { @@ -844,6 +845,8 @@ _factory_vertical_pack(Eina_Bool vertical_pack) elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_entry_it, 0, 10, 1, 1); elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_button_it, 1, 10, 1, 1); elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_slider_it, 2, 10, 1, 1); + + elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_slider_it, 0, 11, 1, 1); } } @@ -1045,6 +1048,7 @@ egui_start() _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_entry_it, "factory_image.png", DB_DEF_FILESELECTOR_ENTRY_CLASS, EINA_TRUE); _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_button_it, "factory_image.png", DB_DEF_FILESELECTOR_BUTTON_CLASS, EINA_TRUE); _factory_item_finalize(g_main_wdgs->main_win->fctr_slider_it, "factory_image.png", DB_DEF_SLIDER_CLASS, EINA_TRUE); + _factory_item_finalize(g_main_wdgs->main_win->fctr_progressbar_it, "factory_image.png", DB_DEF_PROGRESSBAR_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 5429f9b..3ca8248 100644 --- a/src/lib/database.h +++ b/src/lib/database.h @@ -117,6 +117,7 @@ typedef struct _Container_Desc Container_Desc; #define DB_DEF_FILESELECTOR_ENTRY_CLASS "Elm_Fileselector_Entry" #define DB_DEF_FILESELECTOR_BUTTON_CLASS "Elm_Fileselector_Button" #define DB_DEF_SLIDER_CLASS "Elm_Slider" +#define DB_DEF_PROGRESSBAR_CLASS "Elm_Progressbar" #define VISIBILITY_SET "visibility" #define SIZE_SET "size" --