summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-06-29 17:30:36 +0300
committerYakov Goldberg <yakov.g@samsung.com>2015-07-30 16:40:32 +0300
commit4d9cff57c396eb6a73b46d0334a4be9fde88a64e (patch)
tree39b44bc6d8a6e28505119f788cc964f3707693f5
parent4164fa25fe330d6ed10a7f496ce156974297e605 (diff)
Reafactoring factory
Most of the widgets in factory are not just images now, but real widgets. Thus when edit theme is changed these widgets are changed too. Added Grid widget
-rw-r--r--data/config/func_names.json18
-rw-r--r--src/bin/gui/dnd.c22
-rw-r--r--src/bin/gui/dnd.h4
-rw-r--r--src/bin/gui/editor.c62
-rw-r--r--src/bin/gui/egui_layout.json1484
-rw-r--r--src/bin/gui/egui_logic.c279
-rw-r--r--src/bin/gui/images/CMakeLists.txt17
-rw-r--r--src/bin/gui/images/factory_actionslider.pngbin3728 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_box.pngbin8403 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_bubble.pngbin6080 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_button.pngbin2307 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_calendar.pngbin27226 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_check.pngbin825 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_clock.pngbin6884 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_colorselector.pngbin27693 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_conformant.pngbin0 -> 9805 bytes
-rw-r--r--src/bin/gui/images/factory_ctxpopup.pngbin12135 -> 6646 bytes
-rw-r--r--src/bin/gui/images/factory_dayselector.pngbin6038 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_diskselector.pngbin5215 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_entry.pngbin4610 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_flip.pngbin4266 -> 110461 bytes
-rw-r--r--src/bin/gui/images/factory_gengrid.pngbin9505 -> 221945 bytes
-rw-r--r--src/bin/gui/images/factory_genlist.pngbin14784 -> 31597 bytes
-rw-r--r--src/bin/gui/images/factory_grid.pngbin0 -> 22623 bytes
-rw-r--r--src/bin/gui/images/factory_image.pngbin3798 -> 81162 bytes
-rw-r--r--src/bin/gui/images/factory_label.pngbin1139 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_menu.pngbin9553 -> 4365 bytes
-rw-r--r--src/bin/gui/images/factory_radio.pngbin2031 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_table.pngbin11285 -> 0 bytes
-rw-r--r--src/bin/gui/images/factory_win.pngbin114252 -> 0 bytes
-rw-r--r--src/lib/generator.c1
31 files changed, 1041 insertions, 846 deletions
diff --git a/data/config/func_names.json b/data/config/func_names.json
index fe83098..be538db 100644
--- a/data/config/func_names.json
+++ b/data/config/func_names.json
@@ -65,6 +65,7 @@
65 "Elm.Entry": 65 "Elm.Entry":
66 { 66 {
67 "Elm.Widget.part_text":[null, "Entry"], 67 "Elm.Widget.part_text":[null, "Entry"],
68 "Elm.Entry.scrollable":[true],
68 "Efl.Gfx.Base.size":[60, 30] 69 "Efl.Gfx.Base.size":[60, 30]
69 }, 70 },
70 "Elm.Flip": 71 "Elm.Flip":
@@ -123,6 +124,10 @@
123 "Elm.Fileselector_Entry": 124 "Elm.Fileselector_Entry":
124 { 125 {
125 "Efl.Gfx.Base.size":[100, 22] 126 "Efl.Gfx.Base.size":[100, 22]
127 },
128 "Elm.Separator":
129 {
130 "Efl.Gfx.Base.size":[4, 100]
126 } 131 }
127 }, 132 },
128 "OPERATIONS" : 133 "OPERATIONS" :
@@ -394,7 +399,18 @@
394 { 399 {
395 "class" : "Elm.Grid", 400 "class" : "Elm.Grid",
396 "name" : "pack", 401 "name" : "pack",
397 "display_name" : "Pack" 402 "display_name" : "Pack",
403 "container_behavior_data":["OBJ_CONTAINER", "CONTAINER_PACK"]
404 },
405 {
406 "class" : "Elm.Grid",
407 "name" : "unpack",
408 "container_behavior_data":["OBJ_CONTAINER", "CONTAINER_UNPACK"]
409 },
410 {
411 "class" : "Elm.Grid",
412 "name" : "clear",
413 "container_behavior_data":["OBJ_CONTAINER", "CONTAINER_UNPACK_ALL"]
398 }, 414 },
399 { 415 {
400 "class" : "Elm.Panel", 416 "class" : "Elm.Panel",
diff --git a/src/bin/gui/dnd.c b/src/bin/gui/dnd.c
index a60717d..66a2162 100644
--- a/src/bin/gui/dnd.c
+++ b/src/bin/gui/dnd.c
@@ -13,7 +13,7 @@
13typedef struct 13typedef struct
14{ 14{
15 const char *data; /*DnD data*/ 15 const char *data; /*DnD data*/
16 Eo *image; /* image for DnD icon. */ 16 char *image_path; /* image for DnD icon. */
17 Eo *obj; /*object, where drag starts */ 17 Eo *obj; /*object, where drag starts */
18 Eo *drag_window_obj; /* Object inside drag window. neede to hide it. */ 18 Eo *drag_window_obj; /* Object inside drag window. neede to hide it. */
19 Eo *drag_window_obj_wref; 19 Eo *drag_window_obj_wref;
@@ -301,14 +301,10 @@ _drag_factory_image_icon_create(void *data, Evas_Object *parent, Evas_Coord *xof
301{ 301{
302 Drag_Info *di = data; 302 Drag_Info *di = data;
303 Evas_Object *ic = NULL; 303 Evas_Object *ic = NULL;
304 Evas_Object *io = di->image; 304 Evas_Coord xm, ym;
305 const char *f, *g;
306 Evas_Coord x, y, w, h, xm, ym;
307 305
308 elm_image_file_get(io, &f, &g);
309 ic = elm_image_add(parent); 306 ic = elm_image_add(parent);
310 elm_image_file_set(ic, f, g); 307 elm_image_file_set(ic, di->image_path, NULL);
311 evas_object_geometry_get(io, &x, &y, &w, &h);
312 evas_object_resize(ic, 40, 40); 308 evas_object_resize(ic, 40, 40);
313 evas_object_show(ic); 309 evas_object_show(ic);
314 310
@@ -454,7 +450,7 @@ _drag_start_from_factory(void *data)
454 Drag_Info *di = data; 450 Drag_Info *di = data;
455 Evas_Object *(*image_create_icon_f)(void *data, Evas_Object *parent, Evas_Coord *xoff, Evas_Coord *yoff) = NULL; 451 Evas_Object *(*image_create_icon_f)(void *data, Evas_Object *parent, Evas_Coord *xoff, Evas_Coord *yoff) = NULL;
456 452
457 image_create_icon_f = (di->image) ? _drag_factory_image_icon_create : _drag_factory_real_object_create; 453 image_create_icon_f = (di->image_path) ? _drag_factory_image_icon_create : _drag_factory_real_object_create;
458 454
459 _drag_factory_timer = NULL; 455 _drag_factory_timer = NULL;
460 _dnd_info.drag_info = di; 456 _dnd_info.drag_info = di;
@@ -496,6 +492,7 @@ static Eina_Bool
496_drag_data_free(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 492_drag_data_free(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
497{ 493{
498 Drag_Info *di = data; 494 Drag_Info *di = data;
495 if (di->image_path) free(di->image_path);
499 free(di); 496 free(di);
500 _dnd_info.drag_info = NULL; 497 _dnd_info.drag_info = NULL;
501 return EO_CALLBACK_CONTINUE; 498 return EO_CALLBACK_CONTINUE;
@@ -504,10 +501,11 @@ _drag_data_free(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *des
504/* Function to make Eo object draggable, when mouse down/up are handled inside. 501/* Function to make Eo object draggable, when mouse down/up are handled inside.
505 * Dragging from factory. */ 502 * Dragging from factory. */
506void 503void
507drag_add(Eo *obj, Eo *image, const char *data) 504drag_add(Eo *obj, const char *image_path, const char *data)
508{ 505{
509 Drag_Info *di = calloc(1, sizeof(Drag_Info)); 506 Drag_Info *di = calloc(1, sizeof(Drag_Info));
510 di->image = image; 507 if (image_path)
508 di->image_path = strdup(image_path);
511 di->data = data; 509 di->data = data;
512 di->obj = obj; 510 di->obj = obj;
513 eo_do(obj, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_DOWN, _drag_mouse_down, di)); 511 eo_do(obj, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_DOWN, _drag_mouse_down, di));
@@ -517,10 +515,10 @@ drag_add(Eo *obj, Eo *image, const char *data)
517/* Function to start dragging, when mouse down/up are handled outside. 515/* Function to start dragging, when mouse down/up are handled outside.
518 * Dragging widgets. */ 516 * Dragging widgets. */
519void 517void
520drag_start(Eo *obj, Eo *image, const char *data, const Gui_Widget *wdg, void (*cb)(const Gui_Widget *, const Eo *)) 518drag_start(Eo *obj, const char *data, const Gui_Widget *wdg, void (*cb)(const Gui_Widget *, const Eo *))
521{ 519{
522 Drag_Info *di = calloc(1, sizeof(Drag_Info)); 520 Drag_Info *di = calloc(1, sizeof(Drag_Info));
523 di->image = image; 521 di->image_path = NULL;
524 di->data = data; 522 di->data = data;
525 di->obj = obj; 523 di->obj = obj;
526 di->wdg = wdg; 524 di->wdg = wdg;
diff --git a/src/bin/gui/dnd.h b/src/bin/gui/dnd.h
index f9e1d3c..79470a7 100644
--- a/src/bin/gui/dnd.h
+++ b/src/bin/gui/dnd.h
@@ -3,10 +3,10 @@
3#define _DND_H 3#define _DND_H
4 4
5void 5void
6drag_add(Eo *obj, Eo *image, const char *data); 6drag_add(Eo *obj, const char *image_path, const char *data);
7 7
8void 8void
9drag_start(Eo *obj, Eo *image, const char *data, const Gui_Widget *wdg, void (*cb)(const Gui_Widget *, const Eo *)); 9drag_start(Eo *obj, const char *data, const Gui_Widget *wdg, void (*cb)(const Gui_Widget *, const Eo *));
10 10
11void 11void
12drag_stop(); 12drag_stop();
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index c099ad2..c783bad 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -76,6 +76,9 @@ static const Egui_Layout_Widgets *g;
76Eina_Bool 76Eina_Bool
77_canvas_resize_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED); 77_canvas_resize_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
78 78
79Eina_Bool
80_theme_selector_hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info);
81
79void 82void
80_active_context_set(Gui_Context *ctx) 83_active_context_set(Gui_Context *ctx)
81{ 84{
@@ -603,7 +606,7 @@ _drag_widget_start(void *data)
603 const Gui_Session *session = gui_context_editor_session_get(wdg_context_get(wdg)); 606 const Gui_Session *session = gui_context_editor_session_get(wdg_context_get(wdg));
604 Eo *wdg_eo = session_eo_get(session, wdg); 607 Eo *wdg_eo = session_eo_get(session, wdg);
605 608
606 drag_start(wdg_eo, NULL, EDITOR_DRAG_DATA, wdg, _drag_start_cb); 609 drag_start(wdg_eo, EDITOR_DRAG_DATA, wdg, _drag_start_cb);
607 drag_started = EINA_TRUE; 610 drag_started = EINA_TRUE;
608 _drag_timer_start = NULL; 611 _drag_timer_start = NULL;
609 return ECORE_CALLBACK_CANCEL; 612 return ECORE_CALLBACK_CANCEL;
@@ -4364,11 +4367,12 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
4364 eo_do(obj, entry_data = elm_obj_layout_text_get(NULL)); 4367 eo_do(obj, entry_data = elm_obj_layout_text_get(NULL));
4365 4368
4366 /* Run CONTENT_PACK for table in order to reset with new coordinates. */ 4369 /* Run CONTENT_PACK for table in order to reset with new coordinates. */
4367 if (!strcmp(container_class_name, DB_DEF_TABLE_CLASS)) 4370 if (!strcmp(container_class_name, DB_DEF_TABLE_CLASS) ||
4371 !strcmp(container_class_name, DB_DEF_GRID_CLASS))
4368 { 4372 {
4369 int number = atoi(entry_data); 4373 int number = atoi(entry_data);
4370 /* Value can't be less then 1 for width and height params. */ 4374 /* For table value can't be less then 1 for width and height params. */
4371 if ((par_idx >= 3) && (number < 1)) 4375 if (!strcmp(container_class_name, DB_DEF_TABLE_CLASS) && (par_idx >= 3) && (number < 1))
4372 { 4376 {
4373 char str[12]; 4377 char str[12];
4374 number = INT_GET(val); 4378 number = INT_GET(val);
@@ -4549,6 +4553,9 @@ _switch_to_context(Gui_Context *ctx)
4549 objtree_item_selected_set(wdg); 4553 objtree_item_selected_set(wdg);
4550 _canvas_resize_cb(NULL, g->main_win->canvas_scroller, NULL, NULL); 4554 _canvas_resize_cb(NULL, g->main_win->canvas_scroller, NULL, NULL);
4551 _canvas_name_update(ctx); 4555 _canvas_name_update(ctx);
4556 Eina_Stringshare *theme_name = gui_context_edit_theme_name_get(_active_context_get());
4557 eo_do(g->main_win->theme_selector_hoversel, elm_obj_widget_part_text_set(NULL, theme_name));
4558 _theme_selector_hover_selected_cb(NULL, NULL, NULL, NULL);
4552} 4559}
4553 4560
4554static void 4561static void
@@ -4768,14 +4775,49 @@ _key_binding_zoom_cb(void *data)
4768 _canvas_resize_cb(NULL, g->main_win->canvas_scroller, NULL, NULL); 4775 _canvas_resize_cb(NULL, g->main_win->canvas_scroller, NULL, NULL);
4769} 4776}
4770 4777
4778static void
4779_factory_theme_apply(Elm_Theme *theme)
4780{
4781 elm_object_theme_set(g->main_win->fctr_button_element, theme);
4782 elm_object_theme_set(g->main_win->fctr_label_element, theme);
4783 elm_object_theme_set(g->main_win->fctr_box_element, theme);
4784 elm_object_theme_set(g->main_win->fctr_table_element, theme);
4785 elm_object_theme_set(g->main_win->fctr_check_element, theme);
4786 elm_object_theme_set(g->main_win->fctr_radio_element, theme);
4787 elm_object_theme_set(g->main_win->fctr_actionslider_element, theme);
4788 elm_object_theme_set(g->main_win->fctr_calendar_element, theme);
4789 elm_object_theme_set(g->main_win->fctr_dayselector_element, theme);
4790 elm_object_theme_set(g->main_win->fctr_separator_element, theme);
4791 elm_object_theme_set(g->main_win->fctr_clock_element, theme);
4792 elm_object_theme_set(g->main_win->fctr_entry_element, theme);
4793 elm_object_theme_set(g->main_win->fctr_colorselector_element, theme);
4794 elm_object_theme_set(g->main_win->fctr_slider_element, theme);
4795 elm_object_theme_set(g->main_win->fctr_progressbar_element, theme);
4796 elm_object_theme_set(g->main_win->fctr_fileselector_element, theme);
4797 elm_object_theme_set(g->main_win->fctr_fileselector_entry_element, theme);
4798 elm_object_theme_set(g->main_win->fctr_fileselector_button_element, theme);
4799 elm_object_theme_set(g->main_win->fctr_icon_element, theme);
4800 elm_object_theme_set(g->main_win->fctr_image_element, theme);
4801 elm_object_theme_set(g->main_win->fctr_bubble_element, theme);
4802 elm_object_theme_set(g->main_win->fctr_hoversel_element, theme);
4803 elm_object_theme_set(g->main_win->fctr_frame_element, theme);
4804 elm_object_theme_set(g->main_win->fctr_win_frame_element, theme);
4805 elm_object_theme_set(g->main_win->fctr_toolbar_element, theme);
4806 elm_object_theme_set(g->main_win->fctr_diskselector_element, theme);
4807 elm_object_theme_set(g->main_win->fctr_panes_element, theme);
4808 elm_object_theme_set(g->main_win->fctr_genlist_element, theme);
4809}
4810
4771Eina_Bool 4811Eina_Bool
4772_theme_selector_hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 4812_theme_selector_hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
4773{ 4813{
4774 const char *choosen_value; 4814 if (event_info)
4775 eo_do(event_info, choosen_value = elm_wdg_item_part_text_get(NULL)); 4815 {
4776 eo_do(obj, elm_obj_widget_part_text_set(NULL, choosen_value)); 4816 const char *choosen_value;
4777 4817 eo_do(event_info, choosen_value = elm_wdg_item_part_text_get(NULL));
4778 gui_context_edit_theme_name_set(_active_context_get(), choosen_value); 4818 eo_do(obj, elm_obj_widget_part_text_set(NULL, choosen_value));
4819 gui_context_edit_theme_name_set(_active_context_get(), choosen_value);
4820 }
4779 4821
4780 /* Apply theme to main widgets. */ 4822 /* Apply theme to main widgets. */
4781 Eid *wdg_id; 4823 Eid *wdg_id;
@@ -4800,6 +4842,8 @@ _theme_selector_hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Even
4800 elm_object_theme_set(fr, theme); 4842 elm_object_theme_set(fr, theme);
4801 } 4843 }
4802 4844
4845 _factory_theme_apply(theme);
4846
4803 elm_theme_free(theme); 4847 elm_theme_free(theme);
4804 return EO_CALLBACK_CONTINUE; 4848 return EO_CALLBACK_CONTINUE;
4805} 4849}
diff --git a/src/bin/gui/egui_layout.json b/src/bin/gui/egui_layout.json
index 1d3da77..e92218e 100644
--- a/src/bin/gui/egui_layout.json
+++ b/src/bin/gui/egui_layout.json
@@ -12,7 +12,8 @@
12 "res_canvas_bg":"images/canvas_bg.jpg", 12 "res_canvas_bg":"images/canvas_bg.jpg",
13 "erigo_icon":"images/erigo_icon.png", 13 "erigo_icon":"images/erigo_icon.png",
14 "move_up_icon":"images/icon_up_arrow.png", 14 "move_up_icon":"images/icon_up_arrow.png",
15 "move_down_icon":"images/icon_down_arrow.png" 15 "move_down_icon":"images/icon_down_arrow.png",
16 "factory_image":"images/factory_image.png"
16 }, 17 },
17 "Eo_Callbacks": 18 "Eo_Callbacks":
18 { 19 {
@@ -1220,35 +1221,35 @@
1220 "Properties": 1221 "Properties":
1221 { 1222 {
1222 "Evas.Object.size_hint_align":[0.05, -1], 1223 "Evas.Object.size_hint_align":[0.05, -1],
1223 "Elm.Table.padding":[6, 7], 1224 "Elm.Table.padding":[2, 2],
1224 "Efl.Gfx.Base.visible":[true] 1225 "Efl.Gfx.Base.visible":[true]
1225 }, 1226 },
1226 "Contains": 1227 "Contains":
1227 { 1228 {
1228 "fctr_win_it":[0, 0, 1, 1], 1229 "fctr_win_it":[0, 0, 1, 1],
1229 "fctr_bg_it":[0, 1, 1, 1], 1230 "fctr_bg_it":[1, 0, 1, 1],
1230 "fctr_button_it":[0, 2, 1, 1], 1231 "fctr_button_it":[2, 0, 1, 1],
1231 "fctr_label_it":[0, 3, 1, 1], 1232 "fctr_label_it":[0, 1, 1, 1],
1232 "fctr_check_it":[0, 4, 1, 1], 1233 "fctr_check_it":[1, 1, 1, 1],
1233 "fctr_radio_it":[0, 5, 1, 1], 1234 "fctr_radio_it":[2, 1, 1, 1],
1234 "fctr_icon_it":[0, 6, 1, 1], 1235 "fctr_icon_it":[0, 2, 1, 1],
1235 "fctr_image_it":[0, 7, 1, 1], 1236 "fctr_image_it":[1, 2, 1, 1],
1236 "fctr_actionslider_it":[0, 8, 1, 1], 1237 "fctr_entry_it":[2, 2, 1, 1],
1237 "fctr_clock_it":[0, 9, 1, 1], 1238 "fctr_clock_it":[0, 3, 1, 1],
1238 "fctr_dayselector_it":[0, 10, 1, 1], 1239 "fctr_colorselector_it":[1, 3, 1, 1],
1239 "fctr_calendar_it":[0, 11, 1, 1], 1240 "fctr_calendar_it":[2, 3, 1, 1],
1240 "fctr_bubble_it":[0, 12, 1, 1], 1241 "fctr_bubble_it":[0, 4, 1, 1],
1241 "fctr_colorselector_it":[0, 13, 1, 1], 1242 "fctr_flip_it":[1, 4, 1, 1],
1242 "fctr_entry_it":[0, 14, 1, 1], 1243 "fctr_frame_it":[2, 4, 1, 1],
1243 "fctr_flip_it":[0, 15, 1, 1], 1244 "fctr_fileselector_it":[0, 5, 1, 2],
1244 "fctr_separator_it":[0, 16, 1, 1], 1245 "fctr_fileselector_entry_it":[1, 5, 2, 1],
1245 "fctr_frame_it":[0, 17, 1, 1], 1246 "fctr_fileselector_button_it":[1, 6, 2, 1],
1246 "fctr_fileselector_it":[0, 18, 1, 1], 1247 "fctr_actionslider_it":[0, 7, 2, 1],
1247 "fctr_fileselector_entry_it":[0, 19, 1, 1], 1248 "fctr_hoversel_it":[2, 7, 1, 1],
1248 "fctr_fileselector_button_it":[0, 20, 1, 1], 1249 "fctr_progressbar_it":[0, 8, 2, 1],
1249 "fctr_slider_it":[0, 21, 1, 1], 1250 "fctr_separator_it":[2, 8, 1, 1],
1250 "fctr_progressbar_it":[0, 22, 1, 1], 1251 "fctr_slider_it":[0, 9, 3, 1],
1251 "fctr_hoversel_it":[0, 23, 1, 1] 1252 "fctr_dayselector_it":[0, 10, 3, 1]
1252 } 1253 }
1253 }, 1254 },
1254 "fctr_table_sep_2": 1255 "fctr_table_sep_2":
@@ -1302,19 +1303,20 @@
1302 "Properties": 1303 "Properties":
1303 { 1304 {
1304 "Evas.Object.size_hint_align":[0.05, -1], 1305 "Evas.Object.size_hint_align":[0.05, -1],
1305 "Elm.Table.padding":[6, 7], 1306 "Elm.Table.padding":[2, 2],
1306 "Efl.Gfx.Base.visible":[true] 1307 "Efl.Gfx.Base.visible":[true]
1307 }, 1308 },
1308 "Contains": 1309 "Contains":
1309 { 1310 {
1310 "fctr_box_it":[0, 0, 1, 1], 1311 "fctr_box_it":[0, 0, 1, 1],
1311 "fctr_table_it":[0, 1, 1, 1], 1312 "fctr_table_it":[1, 0, 1, 1],
1312 "fctr_layout_it":[0, 3, 1, 1], 1313 "fctr_grid_it":[2, 0, 1, 1],
1313 "fctr_naviframe_it":[0, 4, 1, 1], 1314 "fctr_layout_it":[0, 1, 1, 1],
1314 "fctr_panes_it":[0, 5, 1, 1], 1315 "fctr_naviframe_it":[1, 1, 1, 1],
1315 "fctr_conformant_it":[0, 6, 1, 1], 1316 "fctr_panes_it":[2, 1, 1, 1],
1316 "fctr_genlist_it":[0, 7, 1, 1], 1317 "fctr_conformant_it":[0, 2, 1, 1],
1317 "fctr_gengrid_it":[0, 8, 1, 1] 1318 "fctr_genlist_it":[1, 2, 1, 1],
1319 "fctr_gengrid_it":[2, 2, 1, 1]
1318 } 1320 }
1319 }, 1321 },
1320 "fctr_table_sep_4": 1322 "fctr_table_sep_4":
@@ -1368,15 +1370,15 @@
1368 "Properties": 1370 "Properties":
1369 { 1371 {
1370 "Evas.Object.size_hint_align":[0.05, -1], 1372 "Evas.Object.size_hint_align":[0.05, -1],
1371 "Elm.Table.padding":[6, 7], 1373 "Elm.Table.padding":[2, 2],
1372 "Efl.Gfx.Base.visible":[true] 1374 "Efl.Gfx.Base.visible":[true]
1373 }, 1375 },
1374 "Contains": 1376 "Contains":
1375 { 1377 {
1376 "fctr_menu_it":[0, 0, 1, 1], 1378 "fctr_toolbar_it":[0, 0, 1, 1],
1377 "fctr_toolbar_it":[0, 1, 1, 1], 1379 "fctr_diskselector_it":[1, 0, 1, 1],
1378 "fctr_diskselector_it":[0, 2, 1, 1], 1380 "fctr_ctxpopup_it":[0, 1, 1, 1],
1379 "fctr_ctxpopup_it":[0, 3, 1, 1] 1381 "fctr_menu_it":[1, 1, 1, 1]
1380 } 1382 }
1381 }, 1383 },
1382 "fctr_table_sep_6": 1384 "fctr_table_sep_6":
@@ -1430,7 +1432,7 @@
1430 "Properties": 1432 "Properties":
1431 { 1433 {
1432 "Evas.Object.size_hint_align":[0.05, -1], 1434 "Evas.Object.size_hint_align":[0.05, -1],
1433 "Elm.Table.padding":[6, 7], 1435 "Elm.Table.padding":[2, 2],
1434 "Efl.Gfx.Base.visible":[true] 1436 "Efl.Gfx.Base.visible":[true]
1435 }, 1437 },
1436 "Contains": 1438 "Contains":
@@ -1452,33 +1454,25 @@
1452 "Elm.Box.padding":[7, 0], 1454 "Elm.Box.padding":[7, 0],
1453 "Efl.Gfx.Base.visible":[true] 1455 "Efl.Gfx.Base.visible":[true]
1454 }, 1456 },
1455 "Contains":["fctr_win_image", "fctr_win_label"] 1457 "Contains":["fctr_win_image"]
1456 }, 1458 },
1457 "fctr_win_image": 1459 "fctr_win_image":
1458 { 1460 {
1459 "Desc": 1461 "Desc":
1460 { 1462 {
1461 "parent":"fctr_win_it", 1463 "parent":"fctr_frame_it",
1462 "class":"Elm.Image" 1464 "class":"Evas.Image",
1463 }, 1465 "public":true
1464 "Properties":
1465 {
1466 "Evas.Object.size_hint_min":[25, 25],
1467 "Elm.Image.resizable":[true, true],
1468 "Efl.Gfx.Base.visible":[true]
1469 }
1470 },
1471 "fctr_win_label":
1472 {
1473 "Desc":
1474 {
1475 "parent":"fctr_win_it",
1476 "class":"Elm.Label"
1477 }, 1466 },
1478 "Properties": 1467 "Properties":
1479 { 1468 {
1480 "Elm.Widget.part_text":[null, "Window"], 1469 "Evas.Object.size_hint_weight":[1, 1],
1481 "Efl.Gfx.Base.visible":[true] 1470 "Efl.Gfx.Base.visible":[true],
1471 "Evas.Object.size_hint_min":[60, 60],
1472 "Evas.Image.filled":[true],
1473 "Evas.Image.source":["fctr_win_frame_element"],
1474 "Evas.Object.size_hint_align":[-1, -1],
1475 "Evas.Image.source_visible":[false]
1482 } 1476 }
1483 }, 1477 },
1484 "fctr_bg_it": 1478 "fctr_bg_it":
@@ -1495,7 +1489,7 @@
1495 "Elm.Box.padding":[7, 0], 1489 "Elm.Box.padding":[7, 0],
1496 "Efl.Gfx.Base.visible":[true] 1490 "Efl.Gfx.Base.visible":[true]
1497 }, 1491 },
1498 "Contains":["fctr_bg_image", "fctr_bg_label"] 1492 "Contains":["fctr_bg_image"]
1499 }, 1493 },
1500 "fctr_bg_image": 1494 "fctr_bg_image":
1501 { 1495 {
@@ -1506,23 +1500,55 @@
1506 }, 1500 },
1507 "Properties": 1501 "Properties":
1508 { 1502 {
1509 "Evas.Object.size_hint_min":[25, 25], 1503 "Evas.Object.size_hint_min":[55, 55],
1510 "Elm.Image.resizable":[true, true], 1504 "Elm.Image.resizable":[true, true],
1511 "Efl.Gfx.Base.visible":[true] 1505 "Efl.Gfx.Base.visible":[true]
1512 } 1506 }
1513 }, 1507 },
1514 "fctr_bg_label": 1508 "fctr_box_element":
1515 { 1509 {
1516 "Desc": 1510 "Desc":
1517 { 1511 {
1518 "parent":"fctr_bg_it", 1512 "parent":"main_win",
1519 "class":"Elm.Label" 1513 "class":"Elm.Box",
1514 "public":true
1520 }, 1515 },
1521 "Properties": 1516 "Properties":
1522 { 1517 {
1523 "Elm.Widget.part_text":[null, "Background"], 1518 "Elm.Box.padding":[7, 0],
1524 "Efl.Gfx.Base.visible":[true] 1519 "Efl.Gfx.Base.visible":[true]
1525 } 1520 },
1521 "Contains":["fctr_box_element_button_1", "fctr_box_element_button_2"]
1522 },
1523 "fctr_box_element_button_1":
1524 {
1525 "Desc":
1526 {
1527 "parent":"fctr_box_element",
1528 "class":"Elm.Button",
1529 "public":true
1530 },
1531 "Properties":
1532 {
1533 "Elm.Widget.part_text":[null, "Box with"],
1534 "Efl.Gfx.Base.visible":[true],
1535 "Efl.Gfx.Base.size":[80, 30]
1536 }
1537 },
1538 "fctr_box_element_button_2":
1539 {
1540 "Desc":
1541 {
1542 "parent":"fctr_box_element",
1543 "class":"Elm.Button",
1544 "public":true
1545 },
1546 "Properties":
1547 {
1548 "Elm.Widget.part_text":[null, "Buttons"],
1549 "Efl.Gfx.Base.visible":[true],
1550 "Efl.Gfx.Base.size":[80, 30]
1551 }
1526 }, 1552 },
1527 "fctr_box_it": 1553 "fctr_box_it":
1528 { 1554 {
@@ -1538,33 +1564,24 @@
1538 "Elm.Box.padding":[7, 0], 1564 "Elm.Box.padding":[7, 0],
1539 "Efl.Gfx.Base.visible":[true] 1565 "Efl.Gfx.Base.visible":[true]
1540 }, 1566 },
1541 "Contains":["fctr_box_image", "fctr_box_label"] 1567 "Contains":["fctr_box_image"]
1542 }, 1568 },
1543 "fctr_box_image": 1569 "fctr_box_image":
1544 { 1570 {
1545 "Desc": 1571 "Desc":
1546 { 1572 {
1547 "parent":"fctr_box_it", 1573 "parent":"fctr_box_it",
1548 "class":"Elm.Image" 1574 "class":"Evas.Image",
1549 }, 1575 "public":true
1550 "Properties":
1551 {
1552 "Evas.Object.size_hint_min":[25, 25],
1553 "Elm.Image.resizable":[true, true],
1554 "Efl.Gfx.Base.visible":[true]
1555 }
1556 },
1557 "fctr_box_label":
1558 {
1559 "Desc":
1560 {
1561 "parent":"fctr_box_it",
1562 "class":"Elm.Label"
1563 }, 1576 },
1564 "Properties": 1577 "Properties":
1565 { 1578 {
1566 "Elm.Widget.part_text":[null, "Box"], 1579 "Evas.Object.size_hint_weight":[1, 1],
1567 "Efl.Gfx.Base.visible":[true] 1580 "Efl.Gfx.Base.visible":[true],
1581 "Evas.Object.size_hint_min":[60, 50],
1582 "Evas.Image.filled":[true],
1583 "Evas.Image.source":["fctr_box_element"],
1584 "Evas.Image.source_visible":[false]
1568 } 1585 }
1569 }, 1586 },
1570 "fctr_button_it": 1587 "fctr_button_it":
@@ -1581,33 +1598,23 @@
1581 "Elm.Box.padding":[7, 0], 1598 "Elm.Box.padding":[7, 0],
1582 "Efl.Gfx.Base.visible":[true] 1599 "Efl.Gfx.Base.visible":[true]
1583 }, 1600 },
1584 "Contains":["fctr_button_image", "fctr_button_label"] 1601 "Contains":["fctr_button_image"]
1585 }, 1602 },
1586 "fctr_button_image": 1603 "fctr_button_image":
1587 { 1604 {
1588 "Desc": 1605 "Desc":
1589 { 1606 {
1590 "parent":"fctr_button_it", 1607 "parent":"fctr_button_it",
1591 "class":"Elm.Image" 1608 "class":"Evas.Image",
1592 }, 1609 "public":true
1593 "Properties":
1594 {
1595 "Evas.Object.size_hint_min":[25, 25],
1596 "Elm.Image.resizable":[true, true],
1597 "Efl.Gfx.Base.visible":[true]
1598 }
1599 },
1600 "fctr_button_label":
1601 {
1602 "Desc":
1603 {
1604 "parent":"fctr_button_it",
1605 "class":"Elm.Label"
1606 }, 1610 },
1607 "Properties": 1611 "Properties":
1608 { 1612 {
1609 "Elm.Widget.part_text":[null, "Button"], 1613 "Efl.Gfx.Base.visible":[true],
1610 "Efl.Gfx.Base.visible":[true] 1614 "Evas.Object.size_hint_min":[70, 30],
1615 "Evas.Image.filled":[true],
1616 "Evas.Image.source":["fctr_button_element"],
1617 "Evas.Image.source_visible":[false]
1611 } 1618 }
1612 }, 1619 },
1613 "fctr_label_it": 1620 "fctr_label_it":
@@ -1624,33 +1631,25 @@
1624 "Elm.Box.padding":[7, 0], 1631 "Elm.Box.padding":[7, 0],
1625 "Efl.Gfx.Base.visible":[true] 1632 "Efl.Gfx.Base.visible":[true]
1626 }, 1633 },
1627 "Contains":["fctr_label_image", "fctr_label_label"] 1634 "Contains":["fctr_label_image"]
1628 }, 1635 },
1629 "fctr_label_image": 1636 "fctr_label_image":
1630 { 1637 {
1631 "Desc": 1638 "Desc":
1632 { 1639 {
1633 "parent":"fctr_label_it", 1640 "parent":"fctr_label_it",
1634 "class":"Elm.Image" 1641 "class":"Evas.Image",
1635 }, 1642 "public":true
1636 "Properties":
1637 {
1638 "Evas.Object.size_hint_min":[25, 25],
1639 "Elm.Image.resizable":[true, true],
1640 "Efl.Gfx.Base.visible":[true]
1641 }
1642 },
1643 "fctr_label_label":
1644 {
1645 "Desc":
1646 {
1647 "parent":"fctr_label_it",
1648 "class":"Elm.Label"
1649 }, 1643 },
1650 "Properties": 1644 "Properties":
1651 { 1645 {
1652 "Elm.Widget.part_text":[null, "Label"], 1646 "Evas.Object.size_hint_weight":[1, 1],
1653 "Efl.Gfx.Base.visible":[true] 1647 "Efl.Gfx.Base.visible":[true],
1648 "Evas.Object.size_hint_min":[100, 30],
1649 "Evas.Image.filled":[true],
1650 "Evas.Image.source":["fctr_label_element"],
1651 "Evas.Object.size_hint_align":[-1, -1],
1652 "Evas.Image.source_visible":[false]
1654 } 1653 }
1655 }, 1654 },
1656 "fctr_check_it": 1655 "fctr_check_it":
@@ -1667,33 +1666,25 @@
1667 "Elm.Box.padding":[7, 0], 1666 "Elm.Box.padding":[7, 0],
1668 "Efl.Gfx.Base.visible":[true] 1667 "Efl.Gfx.Base.visible":[true]
1669 }, 1668 },
1670 "Contains":["fctr_check_image", "fctr_check_label"] 1669 "Contains":["fctr_check_image"]
1671 }, 1670 },
1672 "fctr_check_image": 1671 "fctr_check_image":
1673 { 1672 {
1674 "Desc": 1673 "Desc":
1675 { 1674 {
1676 "parent":"fctr_check_it", 1675 "parent":"fctr_check_it",
1677 "class":"Elm.Image" 1676 "class":"Evas.Image",
1678 }, 1677 "public":true
1679 "Properties":
1680 {
1681 "Evas.Object.size_hint_min":[25, 25],
1682 "Elm.Image.resizable":[true, true],
1683 "Efl.Gfx.Base.visible":[true]
1684 }
1685 },
1686 "fctr_check_label":
1687 {
1688 "Desc":
1689 {
1690 "parent":"fctr_check_it",
1691 "class":"Elm.Label"
1692 }, 1678 },
1693 "Properties": 1679 "Properties":
1694 { 1680 {
1695 "Elm.Widget.part_text":[null, "Check"], 1681 "Evas.Object.size_hint_weight":[1, 1],
1696 "Efl.Gfx.Base.visible":[true] 1682 "Efl.Gfx.Base.visible":[true],
1683 "Evas.Object.size_hint_min":[80, 30],
1684 "Evas.Image.filled":[true],
1685 "Evas.Image.source":["fctr_check_element"],
1686 "Evas.Object.size_hint_align":[-1, -1],
1687 "Evas.Image.source_visible":[false]
1697 } 1688 }
1698 }, 1689 },
1699 "fctr_radio_it": 1690 "fctr_radio_it":
@@ -1710,33 +1701,25 @@
1710 "Elm.Box.padding":[7, 0], 1701 "Elm.Box.padding":[7, 0],
1711 "Efl.Gfx.Base.visible":[true] 1702 "Efl.Gfx.Base.visible":[true]
1712 }, 1703 },
1713 "Contains":["fctr_radio_image", "fctr_radio_label"] 1704 "Contains":["fctr_radio_image"]
1714 }, 1705 },
1715 "fctr_radio_image": 1706 "fctr_radio_image":
1716 { 1707 {
1717 "Desc": 1708 "Desc":
1718 { 1709 {
1719 "parent":"fctr_radio_it", 1710 "parent":"fctr_radio_it",
1720 "class":"Elm.Image" 1711 "class":"Evas.Image",
1721 }, 1712 "public":true
1722 "Properties":
1723 {
1724 "Evas.Object.size_hint_min":[25, 25],
1725 "Elm.Image.resizable":[true, true],
1726 "Efl.Gfx.Base.visible":[true]
1727 }
1728 },
1729 "fctr_radio_label":
1730 {
1731 "Desc":
1732 {
1733 "parent":"fctr_radio_it",
1734 "class":"Elm.Label"
1735 }, 1713 },
1736 "Properties": 1714 "Properties":
1737 { 1715 {
1738 "Elm.Widget.part_text":[null, "Radio"], 1716 "Evas.Object.size_hint_weight":[1, 1],
1739 "Efl.Gfx.Base.visible":[true] 1717 "Efl.Gfx.Base.visible":[true],
1718 "Evas.Object.size_hint_min":[80, 30],
1719 "Evas.Image.filled":[true],
1720 "Evas.Image.source":["fctr_radio_element"],
1721 "Evas.Object.size_hint_align":[-1, -1],
1722 "Evas.Image.source_visible":[false]
1740 } 1723 }
1741 }, 1724 },
1742 "fctr_icon_it": 1725 "fctr_icon_it":
@@ -1753,33 +1736,25 @@
1753 "Elm.Box.padding":[7, 0], 1736 "Elm.Box.padding":[7, 0],
1754 "Efl.Gfx.Base.visible":[true] 1737 "Efl.Gfx.Base.visible":[true]
1755 }, 1738 },
1756 "Contains":["fctr_icon_image", "fctr_icon_label"] 1739 "Contains":["fctr_icon_image"]
1757 }, 1740 },
1758 "fctr_icon_image": 1741 "fctr_icon_image":
1759 { 1742 {
1760 "Desc": 1743 "Desc":
1761 { 1744 {
1762 "parent":"fctr_icon_it", 1745 "parent":"fctr_icon_it",
1763 "class":"Elm.Image" 1746 "class":"Evas.Image",
1764 }, 1747 "public":true
1765 "Properties":
1766 {
1767 "Evas.Object.size_hint_min":[25, 25],
1768 "Elm.Image.resizable":[true, true],
1769 "Efl.Gfx.Base.visible":[true]
1770 }
1771 },
1772 "fctr_icon_label":
1773 {
1774 "Desc":
1775 {
1776 "parent":"fctr_icon_it",
1777 "class":"Elm.Label"
1778 }, 1748 },
1779 "Properties": 1749 "Properties":
1780 { 1750 {
1781 "Elm.Widget.part_text":[null, "Icon"], 1751 "Evas.Object.size_hint_weight":[1, 1],
1782 "Efl.Gfx.Base.visible":[true] 1752 "Efl.Gfx.Base.visible":[true],
1753 "Evas.Object.size_hint_min":[40, 40],
1754 "Evas.Image.filled":[true],
1755 "Evas.Image.source":["fctr_icon_element"],
1756 "Evas.Object.size_hint_align":[-1, -1],
1757 "Evas.Image.source_visible":[false]
1783 } 1758 }
1784 }, 1759 },
1785 "fctr_image_it": 1760 "fctr_image_it":
@@ -1796,33 +1771,25 @@
1796 "Elm.Box.padding":[7, 0], 1771 "Elm.Box.padding":[7, 0],
1797 "Efl.Gfx.Base.visible":[true] 1772 "Efl.Gfx.Base.visible":[true]
1798 }, 1773 },
1799 "Contains":["fctr_image_image", "fctr_image_label"] 1774 "Contains":["fctr_image_image"]
1800 }, 1775 },
1801 "fctr_image_image": 1776 "fctr_image_image":
1802 { 1777 {
1803 "Desc": 1778 "Desc":
1804 { 1779 {
1805 "parent":"fctr_image_it", 1780 "parent":"fctr_image_it",
1806 "class":"Elm.Image" 1781 "class":"Evas.Image",
1807 }, 1782 "public":true
1808 "Properties":
1809 {
1810 "Evas.Object.size_hint_min":[25, 25],
1811 "Elm.Image.resizable":[true, true],
1812 "Efl.Gfx.Base.visible":[true]
1813 }
1814 },
1815 "fctr_image_label":
1816 {
1817 "Desc":
1818 {
1819 "parent":"fctr_image_it",
1820 "class":"Elm.Label"
1821 }, 1783 },
1822 "Properties": 1784 "Properties":
1823 { 1785 {
1824 "Elm.Widget.part_text":[null, "Image"], 1786 "Evas.Object.size_hint_weight":[1, 1],
1825 "Efl.Gfx.Base.visible":[true] 1787 "Efl.Gfx.Base.visible":[true],
1788 "Evas.Object.size_hint_min":[40, 40],
1789 "Evas.Image.filled":[true],
1790 "Evas.Image.source":["fctr_image_element"],
1791 "Evas.Object.size_hint_align":[-1, -1],
1792 "Evas.Image.source_visible":[false]
1826 } 1793 }
1827 }, 1794 },
1828 "fctr_actionslider_it": 1795 "fctr_actionslider_it":
@@ -1839,33 +1806,24 @@
1839 "Elm.Box.padding":[7, 0], 1806 "Elm.Box.padding":[7, 0],
1840 "Efl.Gfx.Base.visible":[true] 1807 "Efl.Gfx.Base.visible":[true]
1841 }, 1808 },
1842 "Contains":["fctr_actionslider_image", "fctr_actionslider_label"] 1809 "Contains":["fctr_actionslider_image"]
1843 }, 1810 },
1844 "fctr_actionslider_image": 1811 "fctr_actionslider_image":
1845 { 1812 {
1846 "Desc": 1813 "Desc":
1847 { 1814 {
1848 "parent":"fctr_actionslider_it", 1815 "parent":"fctr_actionslider_it",
1849 "class":"Elm.Image" 1816 "class":"Evas.Image",
1850 }, 1817 "public":true
1851 "Properties":
1852 {
1853 "Evas.Object.size_hint_min":[25, 25],
1854 "Elm.Image.resizable":[true, true],
1855 "Efl.Gfx.Base.visible":[true]
1856 }
1857 },
1858 "fctr_actionslider_label":
1859 {
1860 "Desc":
1861 {
1862 "parent":"fctr_actionslider_it",
1863 "class":"Elm.Label"
1864 }, 1818 },
1865 "Properties": 1819 "Properties":
1866 { 1820 {
1867 "Elm.Widget.part_text":[null, "Actionslider"], 1821 "Evas.Object.size_hint_weight":[1, 1],
1868 "Efl.Gfx.Base.visible":[true] 1822 "Efl.Gfx.Base.visible":[true],
1823 "Evas.Object.size_hint_min":[180, 30],
1824 "Evas.Image.filled":[true],
1825 "Evas.Image.source":["fctr_actionslider_element"],
1826 "Evas.Image.source_visible":[false]
1869 } 1827 }
1870 }, 1828 },
1871 "fctr_bubble_it": 1829 "fctr_bubble_it":
@@ -1882,33 +1840,24 @@
1882 "Elm.Box.padding":[7, 0], 1840 "Elm.Box.padding":[7, 0],
1883 "Efl.Gfx.Base.visible":[true] 1841 "Efl.Gfx.Base.visible":[true]
1884 }, 1842 },
1885 "Contains":["fctr_bubble_image", "fctr_bubble_label"] 1843 "Contains":["fctr_bubble_image"]
1886 }, 1844 },
1887 "fctr_bubble_image": 1845 "fctr_bubble_image":
1888 { 1846 {
1889 "Desc": 1847 "Desc":
1890 { 1848 {
1891 "parent":"fctr_bubble_it", 1849 "parent":"fctr_bubble_it",
1892 "class":"Elm.Image" 1850 "class":"Evas.Image",
1893 }, 1851 "public":true
1894 "Properties":
1895 {
1896 "Evas.Object.size_hint_min":[25, 25],
1897 "Elm.Image.resizable":[true, true],
1898 "Efl.Gfx.Base.visible":[true]
1899 }
1900 },
1901 "fctr_bubble_label":
1902 {
1903 "Desc":
1904 {
1905 "parent":"fctr_bubble_it",
1906 "class":"Elm.Label"
1907 }, 1852 },
1908 "Properties": 1853 "Properties":
1909 { 1854 {
1855 "Evas.Object.size_hint_weight":[1, 1],
1910 "Efl.Gfx.Base.visible":[true], 1856 "Efl.Gfx.Base.visible":[true],
1911 "Elm.Widget.part_text":[null, "Bubble"] 1857 "Evas.Object.size_hint_min":[70, 50],
1858 "Evas.Image.filled":[true],
1859 "Evas.Image.source":["fctr_bubble_element"],
1860 "Evas.Image.source_visible":[false]
1912 } 1861 }
1913 }, 1862 },
1914 "fctr_calendar_it": 1863 "fctr_calendar_it":
@@ -1925,33 +1874,25 @@
1925 "Elm.Box.padding":[7, 0], 1874 "Elm.Box.padding":[7, 0],
1926 "Efl.Gfx.Base.visible":[true] 1875 "Efl.Gfx.Base.visible":[true]
1927 }, 1876 },
1928 "Contains":["fctr_calendar_image", "fctr_calendar_label"] 1877 "Contains":["fctr_calendar_image"]
1929 }, 1878 },
1930 "fctr_calendar_image": 1879 "fctr_calendar_image":
1931 { 1880 {
1932 "Desc": 1881 "Desc":
1933 { 1882 {
1934 "parent":"fctr_calendar_it", 1883 "parent":"fctr_calendar_it",
1935 "class":"Elm.Image" 1884 "class":"Evas.Image",
1936 }, 1885 "public":true
1937 "Properties":
1938 {
1939 "Evas.Object.size_hint_min":[25, 25],
1940 "Elm.Image.resizable":[true, true],
1941 "Efl.Gfx.Base.visible":[true]
1942 }
1943 },
1944 "fctr_calendar_label":
1945 {
1946 "Desc":
1947 {
1948 "parent":"fctr_calendar_it",
1949 "class":"Elm.Label"
1950 }, 1886 },
1951 "Properties": 1887 "Properties":
1952 { 1888 {
1953 "Elm.Widget.part_text":[null, "Calendar"], 1889 "Evas.Object.size_hint_weight":[1, 1],
1954 "Efl.Gfx.Base.visible":[true] 1890 "Efl.Gfx.Base.visible":[true],
1891 "Evas.Object.size_hint_min":[60, 60],
1892 "Evas.Image.filled":[true],
1893 "Evas.Image.source":["fctr_calendar_element"],
1894 "Evas.Object.size_hint_align":[-1, -1],
1895 "Evas.Image.source_visible":[false]
1955 } 1896 }
1956 }, 1897 },
1957 "fctr_colorselector_it": 1898 "fctr_colorselector_it":
@@ -1968,33 +1909,24 @@
1968 "Elm.Box.padding":[7, 0], 1909 "Elm.Box.padding":[7, 0],
1969 "Efl.Gfx.Base.visible":[true] 1910 "Efl.Gfx.Base.visible":[true]
1970 }, 1911 },
1971 "Contains":["fctr_colorselector_image", "fctr_colorselector_label"] 1912 "Contains":["fctr_colorselector_image"]
1972 }, 1913 },
1973 "fctr_colorselector_image": 1914 "fctr_colorselector_image":
1974 { 1915 {
1975 "Desc": 1916 "Desc":
1976 { 1917 {
1977 "parent":"fctr_colorselector_it", 1918 "parent":"fctr_colorselector_it",
1978 "class":"Elm.Image" 1919 "class":"Evas.Image",
1979 }, 1920 "public":true
1980 "Properties":
1981 {
1982 "Evas.Object.size_hint_min":[25, 25],
1983 "Elm.Image.resizable":[true, true],
1984 "Efl.Gfx.Base.visible":[true]
1985 }
1986 },
1987 "fctr_colorselector_label":
1988 {
1989 "Desc":
1990 {
1991 "parent":"fctr_colorselector_it",
1992 "class":"Elm.Label"
1993 }, 1921 },
1994 "Properties": 1922 "Properties":
1995 { 1923 {
1996 "Elm.Widget.part_text":[null, "Colorselector"], 1924 "Evas.Object.size_hint_weight":[1, 1],
1997 "Efl.Gfx.Base.visible":[true] 1925 "Efl.Gfx.Base.visible":[true],
1926 "Evas.Object.size_hint_min":[60, 60],
1927 "Evas.Image.filled":[true],
1928 "Evas.Image.source":["fctr_colorselector_element"],
1929 "Evas.Image.source_visible":[false]
1998 } 1930 }
1999 }, 1931 },
2000 "fctr_dayselector_it": 1932 "fctr_dayselector_it":
@@ -2011,33 +1943,24 @@
2011 "Elm.Box.padding":[7, 0], 1943 "Elm.Box.padding":[7, 0],
2012 "Efl.Gfx.Base.visible":[true] 1944 "Efl.Gfx.Base.visible":[true]
2013 }, 1945 },
2014 "Contains":["fctr_dayselector_image", "fctr_dayselector_label"] 1946 "Contains":["fctr_dayselector_image"]
2015 }, 1947 },
2016 "fctr_dayselector_image": 1948 "fctr_dayselector_image":
2017 { 1949 {
2018 "Desc": 1950 "Desc":
2019 { 1951 {
2020 "parent":"fctr_dayselector_it", 1952 "parent":"fctr_dayselector_it",
2021 "class":"Elm.Image" 1953 "class":"Evas.Image",
2022 }, 1954 "public":true
2023 "Properties":
2024 {
2025 "Evas.Object.size_hint_min":[25, 25],
2026 "Elm.Image.resizable":[true, true],
2027 "Efl.Gfx.Base.visible":[true]
2028 }
2029 },
2030 "fctr_dayselector_label":
2031 {
2032 "Desc":
2033 {
2034 "parent":"fctr_dayselector_it",
2035 "class":"Elm.Label"
2036 }, 1955 },
2037 "Properties": 1956 "Properties":
2038 { 1957 {
2039 "Elm.Widget.part_text":[null, "Dayselector"], 1958 "Evas.Object.size_hint_weight":[1, 1],
2040 "Efl.Gfx.Base.visible":[true] 1959 "Efl.Gfx.Base.visible":[true],
1960 "Evas.Object.size_hint_min":[290, 20],
1961 "Evas.Image.filled":[true],
1962 "Evas.Image.source":["fctr_dayselector_element"],
1963 "Evas.Image.source_visible":[false]
2041 } 1964 }
2042 }, 1965 },
2043 "fctr_clock_it": 1966 "fctr_clock_it":
@@ -2054,33 +1977,24 @@
2054 "Elm.Box.padding":[7, 0], 1977 "Elm.Box.padding":[7, 0],
2055 "Efl.Gfx.Base.visible":[true] 1978 "Efl.Gfx.Base.visible":[true]
2056 }, 1979 },
2057 "Contains":["fctr_clock_image", "fctr_clock_label"] 1980 "Contains":["fctr_clock_image"]
2058 }, 1981 },
2059 "fctr_clock_image": 1982 "fctr_clock_image":
2060 { 1983 {
2061 "Desc": 1984 "Desc":
2062 { 1985 {
2063 "parent":"fctr_clock_it", 1986 "parent":"fctr_clock_it",
2064 "class":"Elm.Image" 1987 "class":"Evas.Image",
2065 }, 1988 "public":true
2066 "Properties":
2067 {
2068 "Evas.Object.size_hint_min":[25, 25],
2069 "Elm.Image.resizable":[true, true],
2070 "Efl.Gfx.Base.visible":[true]
2071 }
2072 },
2073 "fctr_clock_label":
2074 {
2075 "Desc":
2076 {
2077 "parent":"fctr_clock_it",
2078 "class":"Elm.Label"
2079 }, 1989 },
2080 "Properties": 1990 "Properties":
2081 { 1991 {
2082 "Elm.Widget.part_text":[null, "Clock"], 1992 "Evas.Object.size_hint_weight":[1, 1],
2083 "Efl.Gfx.Base.visible":[true] 1993 "Efl.Gfx.Base.visible":[true],
1994 "Evas.Object.size_hint_min":[65, 35],
1995 "Evas.Image.filled":[true],
1996 "Evas.Image.source":["fctr_clock_element"],
1997 "Evas.Image.source_visible":[false]
2084 } 1998 }
2085 }, 1999 },
2086 "fctr_entry_it": 2000 "fctr_entry_it":
@@ -2097,33 +2011,24 @@
2097 "Elm.Box.padding":[7, 0], 2011 "Elm.Box.padding":[7, 0],
2098 "Efl.Gfx.Base.visible":[true] 2012 "Efl.Gfx.Base.visible":[true]
2099 }, 2013 },
2100 "Contains":["fctr_entry_image", "fctr_entry_label"] 2014 "Contains":["fctr_entry_image"]
2101 }, 2015 },
2102 "fctr_entry_image": 2016 "fctr_entry_image":
2103 { 2017 {
2104 "Desc": 2018 "Desc":
2105 { 2019 {
2106 "parent":"fctr_entry_it", 2020 "parent":"fctr_entry_it",
2107 "class":"Elm.Image" 2021 "class":"Evas.Image",
2108 }, 2022 "public":true
2109 "Properties":
2110 {
2111 "Evas.Object.size_hint_min":[25, 25],
2112 "Elm.Image.resizable":[true, true],
2113 "Efl.Gfx.Base.visible":[true]
2114 }
2115 },
2116 "fctr_entry_label":
2117 {
2118 "Desc":
2119 {
2120 "parent":"fctr_entry_it",
2121 "class":"Elm.Label"
2122 }, 2023 },
2123 "Properties": 2024 "Properties":
2124 { 2025 {
2125 "Elm.Widget.part_text":[null, "Entry"], 2026 "Evas.Object.size_hint_weight":[1, 1],
2126 "Efl.Gfx.Base.visible":[true] 2027 "Efl.Gfx.Base.visible":[true],
2028 "Evas.Object.size_hint_min":[65, 35],
2029 "Evas.Image.filled":[true],
2030 "Evas.Image.source":["fctr_entry_element"],
2031 "Evas.Image.source_visible":[false]
2127 } 2032 }
2128 }, 2033 },
2129 "fctr_flip_it": 2034 "fctr_flip_it":
@@ -2140,7 +2045,7 @@
2140 "Elm.Box.padding":[7, 0], 2045 "Elm.Box.padding":[7, 0],
2141 "Efl.Gfx.Base.visible":[true] 2046 "Efl.Gfx.Base.visible":[true]
2142 }, 2047 },
2143 "Contains":["fctr_flip_image", "fctr_flip_label"] 2048 "Contains":["fctr_flip_image"]
2144 }, 2049 },
2145 "fctr_flip_image": 2050 "fctr_flip_image":
2146 { 2051 {
@@ -2151,24 +2056,11 @@
2151 }, 2056 },
2152 "Properties": 2057 "Properties":
2153 { 2058 {
2154 "Evas.Object.size_hint_min":[25, 25], 2059 "Evas.Object.size_hint_min":[75, 75],
2155 "Elm.Image.resizable":[true, true], 2060 "Elm.Image.resizable":[true, true],
2156 "Efl.Gfx.Base.visible":[true] 2061 "Efl.Gfx.Base.visible":[true]
2157 } 2062 }
2158 }, 2063 },
2159 "fctr_flip_label":
2160 {
2161 "Desc":
2162 {
2163 "parent":"fctr_flip_it",
2164 "class":"Elm.Label"
2165 },
2166 "Properties":
2167 {
2168 "Elm.Widget.part_text":[null, "Flip"],
2169 "Efl.Gfx.Base.visible":[true]
2170 }
2171 },
2172 "fctr_genlist_it": 2064 "fctr_genlist_it":
2173 { 2065 {
2174 "Desc": 2066 "Desc":
@@ -2183,33 +2075,40 @@
2183 "Elm.Box.padding":[7, 0], 2075 "Elm.Box.padding":[7, 0],
2184 "Efl.Gfx.Base.visible":[true] 2076 "Efl.Gfx.Base.visible":[true]
2185 }, 2077 },
2186 "Contains":["fctr_genlist_image", "fctr_genlist_label"] 2078 "Contains":["fctr_genlist_image"]
2187 }, 2079 },
2188 "fctr_genlist_image": 2080 "fctr_genlist_image":
2189 { 2081 {
2190 "Desc": 2082 "Desc":
2191 { 2083 {
2192 "parent":"fctr_genlist_it", 2084 "parent":"fctr_genlist_it",
2193 "class":"Elm.Image" 2085 "class":"Evas.Image",
2086 "public":true
2194 }, 2087 },
2195 "Properties": 2088 "Properties":
2196 { 2089 {
2197 "Evas.Object.size_hint_min":[25, 25], 2090 "Evas.Object.size_hint_weight":[1, 1],
2198 "Elm.Image.resizable":[true, true], 2091 "Efl.Gfx.Base.visible":[true],
2199 "Efl.Gfx.Base.visible":[true] 2092 "Evas.Object.size_hint_min":[80, 80],
2093 "Evas.Image.filled":[true],
2094 "Evas.Image.source":["fctr_genlist_element"],
2095 "Evas.Image.source_visible":[false]
2200 } 2096 }
2201 }, 2097 },
2202 "fctr_genlist_label": 2098 "fctr_genlist_element":
2203 { 2099 {
2204 "Desc": 2100 "Desc":
2205 { 2101 {
2206 "parent":"fctr_genlist_it", 2102 "parent":"main_win",
2207 "class":"Elm.Label" 2103 "class":"Elm.Genlist",
2104 "public":true
2208 }, 2105 },
2209 "Properties": 2106 "Properties":
2210 { 2107 {
2211 "Elm.Widget.part_text":[null, "Genlist"], 2108 "Efl.Gfx.Base.visible":[true],
2212 "Efl.Gfx.Base.visible":[true] 2109 "Efl.Gfx.Base.size":[80, 80],
2110 "Evas.Object.size_hint_weight":[1, 1],
2111 "Evas.Object.size_hint_align":[-1, -1]
2213 } 2112 }
2214 }, 2113 },
2215 "fctr_gengrid_it": 2114 "fctr_gengrid_it":
@@ -2226,7 +2125,7 @@
2226 "Elm.Box.padding":[7, 0], 2125 "Elm.Box.padding":[7, 0],
2227 "Efl.Gfx.Base.visible":[true] 2126 "Efl.Gfx.Base.visible":[true]
2228 }, 2127 },
2229 "Contains":["fctr_gengrid_image", "fctr_gengrid_label"] 2128 "Contains":["fctr_gengrid_image"]
2230 }, 2129 },
2231 "fctr_gengrid_image": 2130 "fctr_gengrid_image":
2232 { 2131 {
@@ -2237,24 +2136,11 @@
2237 }, 2136 },
2238 "Properties": 2137 "Properties":
2239 { 2138 {
2240 "Evas.Object.size_hint_min":[25, 25], 2139 "Evas.Object.size_hint_min":[75, 75],
2241 "Elm.Image.resizable":[true, true], 2140 "Elm.Image.resizable":[true, true],
2242 "Efl.Gfx.Base.visible":[true] 2141 "Efl.Gfx.Base.visible":[true]
2243 } 2142 }
2244 }, 2143 },
2245 "fctr_gengrid_label":
2246 {
2247 "Desc":
2248 {
2249 "parent":"fctr_gengrid_it",
2250 "class":"Elm.Label"
2251 },
2252 "Properties":
2253 {
2254 "Elm.Widget.part_text":[null, "Gengrid"],
2255 "Efl.Gfx.Base.visible":[true]
2256 }
2257 },
2258 "fctr_naviframe_it": 2144 "fctr_naviframe_it":
2259 { 2145 {
2260 "Desc": 2146 "Desc":
@@ -2269,7 +2155,7 @@
2269 "Elm.Box.padding":[7, 0], 2155 "Elm.Box.padding":[7, 0],
2270 "Efl.Gfx.Base.visible":[true] 2156 "Efl.Gfx.Base.visible":[true]
2271 }, 2157 },
2272 "Contains":["fctr_naviframe_image", "fctr_naviframe_label"] 2158 "Contains":["fctr_naviframe_image"]
2273 }, 2159 },
2274 "fctr_naviframe_image": 2160 "fctr_naviframe_image":
2275 { 2161 {
@@ -2280,24 +2166,73 @@
2280 }, 2166 },
2281 "Properties": 2167 "Properties":
2282 { 2168 {
2283 "Evas.Object.size_hint_min":[25, 25], 2169 "Evas.Object.size_hint_min":[75, 75],
2284 "Elm.Image.resizable":[true, true], 2170 "Elm.Image.resizable":[true, true],
2285 "Efl.Gfx.Base.visible":[true] 2171 "Efl.Gfx.Base.visible":[true]
2286 } 2172 }
2287 }, 2173 },
2288 "fctr_naviframe_label": 2174 "fctr_table_element":
2289 { 2175 {
2290 "Desc": 2176 "Desc":
2291 { 2177 {
2292 "parent":"fctr_naviframe_it", 2178 "parent":"main_win",
2293 "class":"Elm.Label" 2179 "class":"Elm.Table",
2180 "public":true
2294 }, 2181 },
2295 "Properties": 2182 "Properties":
2296 { 2183 {
2297 "Elm.Widget.part_text":[null, "Naviframe"], 2184 "Evas.Object.size_hint_weight":[1, 1],
2298 "Efl.Gfx.Base.visible":[true] 2185 "Efl.Gfx.Base.visible":[true]
2186 },
2187 "Contains":
2188 {
2189 "fctr_table_element_button_1":[0, 0, 1, 1],
2190 "fctr_table_element_button_2":[1, 1, 1, 1],
2191 "fctr_table_element_button_3":[2, 0, 1, 1]
2299 } 2192 }
2300 }, 2193 },
2194 "fctr_table_element_button_1":
2195 {
2196 "Desc":
2197 {
2198 "parent":"fctr_table_element",
2199 "class":"Elm.Button",
2200 "public":true
2201 },
2202 "Properties":
2203 {
2204 "Elm.Widget.part_text":[null, "Ta"],
2205 "Efl.Gfx.Base.visible":[true]
2206 }
2207 },
2208 "fctr_table_element_button_2":
2209 {
2210 "Desc":
2211 {
2212 "parent":"fctr_table_element",
2213 "class":"Elm.Button",
2214 "public":true
2215 },
2216 "Properties":
2217 {
2218 "Elm.Widget.part_text":[null, "b"],
2219 "Efl.Gfx.Base.visible":[true]
2220 }
2221 },
2222 "fctr_table_element_button_3":
2223 {
2224 "Desc":
2225 {
2226 "parent":"fctr_table_element",
2227 "class":"Elm.Button",
2228 "public":true
2229 },
2230 "Properties":
2231 {
2232 "Elm.Widget.part_text":[null, "le"],
2233 "Efl.Gfx.Base.visible":[true]
2234 }
2235 },
2301 "fctr_table_it": 2236 "fctr_table_it":
2302 { 2237 {
2303 "Desc": 2238 "Desc":
@@ -2312,33 +2247,24 @@
2312 "Elm.Box.padding":[7, 0], 2247 "Elm.Box.padding":[7, 0],
2313 "Efl.Gfx.Base.visible":[true] 2248 "Efl.Gfx.Base.visible":[true]
2314 }, 2249 },
2315 "Contains":["fctr_table_image", "fctr_table_label"] 2250 "Contains":["fctr_table_image"]
2316 }, 2251 },
2317 "fctr_table_image": 2252 "fctr_table_image":
2318 { 2253 {
2319 "Desc": 2254 "Desc":
2320 { 2255 {
2321 "parent":"fctr_table_it", 2256 "parent":"fctr_table_it",
2322 "class":"Elm.Image" 2257 "class":"Evas.Image",
2323 }, 2258 "public":true
2324 "Properties":
2325 {
2326 "Evas.Object.size_hint_min":[25, 25],
2327 "Elm.Image.resizable":[true, true],
2328 "Efl.Gfx.Base.visible":[true]
2329 }
2330 },
2331 "fctr_table_label":
2332 {
2333 "Desc":
2334 {
2335 "parent":"fctr_table_it",
2336 "class":"Elm.Label"
2337 }, 2259 },
2338 "Properties": 2260 "Properties":
2339 { 2261 {
2340 "Elm.Widget.part_text":[null, "Table"], 2262 "Evas.Object.size_hint_weight":[1, 1],
2341 "Efl.Gfx.Base.visible":[true] 2263 "Efl.Gfx.Base.visible":[true],
2264 "Evas.Object.size_hint_min":[60, 50],
2265 "Evas.Image.filled":[true],
2266 "Evas.Image.source":["fctr_table_element"],
2267 "Evas.Image.source_visible":[false]
2342 } 2268 }
2343 }, 2269 },
2344 "fctr_menu_it": 2270 "fctr_menu_it":
@@ -2355,7 +2281,7 @@
2355 "Elm.Box.padding":[7, 0], 2281 "Elm.Box.padding":[7, 0],
2356 "Efl.Gfx.Base.visible":[true] 2282 "Efl.Gfx.Base.visible":[true]
2357 }, 2283 },
2358 "Contains":["fctr_menu_image", "fctr_menu_label"] 2284 "Contains":["fctr_menu_image"]
2359 }, 2285 },
2360 "fctr_menu_image": 2286 "fctr_menu_image":
2361 { 2287 {
@@ -2366,25 +2292,46 @@
2366 }, 2292 },
2367 "Properties": 2293 "Properties":
2368 { 2294 {
2369 "Evas.Object.size_hint_min":[25, 25], 2295 "Evas.Object.size_hint_min":[100, 100],
2370 "Elm.Image.resizable":[true, true], 2296 "Elm.Image.resizable":[true, true],
2371 "Efl.Gfx.Base.visible":[true] 2297 "Efl.Gfx.Base.visible":[true]
2372 } 2298 }
2373 }, 2299 },
2374 "fctr_menu_label": 2300 "fctr_diskselector_it":
2375 { 2301 {
2376 "Desc": 2302 "Desc":
2377 { 2303 {
2378 "parent":"fctr_menu_it", 2304 "parent":"fctr_table_item_widgets",
2379 "class":"Elm.Label" 2305 "class":"Elm.Box",
2306 "public":true
2380 }, 2307 },
2381 "Properties": 2308 "Properties":
2382 { 2309 {
2383 "Elm.Widget.part_text":[null, "Menu"], 2310 "Elm.Box.horizontal":[true],
2311 "Elm.Box.padding":[7, 0],
2384 "Efl.Gfx.Base.visible":[true] 2312 "Efl.Gfx.Base.visible":[true]
2313 },
2314 "Contains":["fctr_diskselector_image"]
2315 },
2316 "fctr_diskselector_image":
2317 {
2318 "Desc":
2319 {
2320 "parent":"fctr_diskselector_it",
2321 "class":"Evas.Image",
2322 "public":true
2323 },
2324 "Properties":
2325 {
2326 "Evas.Object.size_hint_weight":[1, 1],
2327 "Efl.Gfx.Base.visible":[true],
2328 "Evas.Object.size_hint_min":[105, 22],
2329 "Evas.Image.filled":[true],
2330 "Evas.Image.source":["fctr_diskselector_element"],
2331 "Evas.Image.source_visible":[false]
2385 } 2332 }
2386 }, 2333 },
2387 "fctr_diskselector_it": 2334 "fctr_ctxpopup_it":
2388 { 2335 {
2389 "Desc": 2336 "Desc":
2390 { 2337 {
@@ -2398,40 +2345,61 @@
2398 "Elm.Box.padding":[7, 0], 2345 "Elm.Box.padding":[7, 0],
2399 "Efl.Gfx.Base.visible":[true] 2346 "Efl.Gfx.Base.visible":[true]
2400 }, 2347 },
2401 "Contains":["fctr_diskselector_image", "fctr_diskselector_label"] 2348 "Contains":["fctr_ctxpopup_image"]
2402 }, 2349 },
2403 "fctr_diskselector_image": 2350 "fctr_ctxpopup_image":
2404 { 2351 {
2405 "Desc": 2352 "Desc":
2406 { 2353 {
2407 "parent":"fctr_diskselector_it", 2354 "parent":"fctr_ctxpopup_it",
2408 "class":"Elm.Image" 2355 "class":"Elm.Image"
2409 }, 2356 },
2410 "Properties": 2357 "Properties":
2411 { 2358 {
2412 "Evas.Object.size_hint_min":[25, 25], 2359 "Evas.Object.size_hint_min":[100, 100],
2413 "Elm.Image.resizable":[true, true], 2360 "Elm.Image.resizable":[true, true],
2414 "Efl.Gfx.Base.visible":[true] 2361 "Efl.Gfx.Base.visible":[true]
2415 } 2362 }
2416 }, 2363 },
2417 "fctr_diskselector_label": 2364 "fctr_toolbar_it":
2418 { 2365 {
2419 "Desc": 2366 "Desc":
2420 { 2367 {
2421 "parent":"fctr_diskselector_it", 2368 "parent":"fctr_table_item_widgets",
2422 "class":"Elm.Label" 2369 "class":"Elm.Box",
2370 "public":true
2423 }, 2371 },
2424 "Properties": 2372 "Properties":
2425 { 2373 {
2426 "Elm.Widget.part_text":[null, "Diskselector"], 2374 "Elm.Box.horizontal":[true],
2375 "Elm.Box.padding":[7, 0],
2427 "Efl.Gfx.Base.visible":[true] 2376 "Efl.Gfx.Base.visible":[true]
2377 },
2378 "Contains":["fctr_toolbar_image"]
2379 },
2380 "fctr_toolbar_image":
2381 {
2382 "Desc":
2383 {
2384 "parent":"fctr_toolbar_it",
2385 "class":"Evas.Image",
2386 "public":true
2387 },
2388 "Properties":
2389 {
2390 "Evas.Object.size_hint_weight":[1, 1],
2391 "Efl.Gfx.Base.visible":[true],
2392 "Evas.Object.size_hint_min":[95, 22],
2393 "Evas.Image.filled":[true],
2394 "Evas.Image.source":["fctr_toolbar_element"],
2395 "Evas.Image.source_visible":[false]
2428 } 2396 }
2429 }, 2397 },
2430 "fctr_ctxpopup_it": 2398 "fctr_layout_it":
2431 { 2399 {
2432 "Desc": 2400 "Desc":
2433 { 2401 {
2434 "parent":"fctr_table_item_widgets", 2402 "parent":"fctr_table_containers",
2435 "class":"Elm.Box", 2403 "class":"Elm.Box",
2436 "public":true 2404 "public":true
2437 }, 2405 },
@@ -2441,83 +2409,94 @@
2441 "Elm.Box.padding":[7, 0], 2409 "Elm.Box.padding":[7, 0],
2442 "Efl.Gfx.Base.visible":[true] 2410 "Efl.Gfx.Base.visible":[true]
2443 }, 2411 },
2444 "Contains":["fctr_ctxpopup_image", "fctr_ctxpopup_label"] 2412 "Contains":["fctr_layout_image"]
2445 }, 2413 },
2446 "fctr_ctxpopup_image": 2414 "fctr_layout_image":
2447 { 2415 {
2448 "Desc": 2416 "Desc":
2449 { 2417 {
2450 "parent":"fctr_ctxpopup_it", 2418 "parent":"fctr_layout_it",
2451 "class":"Elm.Image" 2419 "class":"Elm.Image"
2452 }, 2420 },
2453 "Properties": 2421 "Properties":
2454 { 2422 {
2455 "Evas.Object.size_hint_min":[25, 25], 2423 "Evas.Object.size_hint_min":[75, 75],
2456 "Elm.Image.resizable":[true, true], 2424 "Elm.Image.resizable":[true, true],
2457 "Efl.Gfx.Base.visible":[true] 2425 "Efl.Gfx.Base.visible":[true]
2458 } 2426 }
2459 }, 2427 },
2460 "fctr_ctxpopup_label": 2428 "fctr_separator_it":
2461 { 2429 {
2462 "Desc": 2430 "Desc":
2463 { 2431 {
2464 "parent":"fctr_ctxpopup_it", 2432 "parent":"fctr_table",
2465 "class":"Elm.Label" 2433 "class":"Elm.Box",
2434 "public":true
2466 }, 2435 },
2467 "Properties": 2436 "Properties":
2468 { 2437 {
2469 "Elm.Widget.part_text":[null, "Ctxpopup"], 2438 "Elm.Box.horizontal":[true],
2439 "Elm.Box.padding":[7, 0],
2470 "Efl.Gfx.Base.visible":[true] 2440 "Efl.Gfx.Base.visible":[true]
2471 } 2441 },
2442 "Contains":["fctr_separator_image"]
2472 }, 2443 },
2473 "fctr_toolbar_it": 2444 "fctr_separator_image":
2474 { 2445 {
2475 "Desc": 2446 "Desc":
2476 { 2447 {
2477 "parent":"fctr_table_item_widgets", 2448 "parent":"fctr_separator_it",
2478 "class":"Elm.Box", 2449 "class":"Evas.Image",
2479 "public":true 2450 "public":true
2480 }, 2451 },
2481 "Properties": 2452 "Properties":
2482 { 2453 {
2483 "Elm.Box.horizontal":[true], 2454 "Efl.Gfx.Base.visible":[true],
2484 "Elm.Box.padding":[7, 0], 2455 "Evas.Object.size_hint_min":[4, 40],
2485 "Efl.Gfx.Base.visible":[true] 2456 "Evas.Image.filled":[true],
2486 }, 2457 "Evas.Image.source":["fctr_separator_element"],
2487 "Contains":["fctr_toolbar_image", "fctr_toolbar_label"] 2458 "Evas.Image.source_visible":[false]
2459 }
2488 }, 2460 },
2489 "fctr_toolbar_image": 2461 "fctr_frame_it":
2490 { 2462 {
2491 "Desc": 2463 "Desc":
2492 { 2464 {
2493 "parent":"fctr_toolbar_it", 2465 "parent":"fctr_table",
2494 "class":"Elm.Image" 2466 "class":"Elm.Box",
2467 "public":true
2495 }, 2468 },
2496 "Properties": 2469 "Properties":
2497 { 2470 {
2498 "Evas.Object.size_hint_min":[25, 25], 2471 "Elm.Box.horizontal":[true],
2499 "Elm.Image.resizable":[true, true], 2472 "Elm.Box.padding":[7, 0],
2500 "Efl.Gfx.Base.visible":[true] 2473 "Efl.Gfx.Base.visible":[true]
2501 } 2474 },
2475 "Contains":["fctr_frame_image"]
2502 }, 2476 },
2503 "fctr_toolbar_label": 2477 "fctr_frame_image":
2504 { 2478 {
2505 "Desc": 2479 "Desc":
2506 { 2480 {
2507 "parent":"fctr_toolbar_it", 2481 "parent":"fctr_frame_it",
2508 "class":"Elm.Label" 2482 "class":"Evas.Image",
2483 "public":true
2509 }, 2484 },
2510 "Properties": 2485 "Properties":
2511 { 2486 {
2512 "Elm.Widget.part_text":[null, "Toolbar"], 2487 "Evas.Object.size_hint_weight":[1, 1],
2513 "Efl.Gfx.Base.visible":[true] 2488 "Efl.Gfx.Base.visible":[true],
2489 "Evas.Object.size_hint_min":[60, 60],
2490 "Evas.Image.filled":[true],
2491 "Evas.Image.source":["fctr_frame_element"],
2492 "Evas.Image.source_visible":[false]
2514 } 2493 }
2515 }, 2494 },
2516 "fctr_layout_it": 2495 "fctr_evas_image_it":
2517 { 2496 {
2518 "Desc": 2497 "Desc":
2519 { 2498 {
2520 "parent":"fctr_table_containers", 2499 "parent":"fctr_table_evas",
2521 "class":"Elm.Box", 2500 "class":"Elm.Box",
2522 "public":true 2501 "public":true
2523 }, 2502 },
@@ -2527,36 +2506,61 @@
2527 "Elm.Box.padding":[7, 0], 2506 "Elm.Box.padding":[7, 0],
2528 "Efl.Gfx.Base.visible":[true] 2507 "Efl.Gfx.Base.visible":[true]
2529 }, 2508 },
2530 "Contains":["fctr_layout_image", "fctr_layout_label"] 2509 "Contains":["fctr_evas_image_image"]
2531 }, 2510 },
2532 "fctr_layout_image": 2511 "fctr_evas_image_image":
2533 { 2512 {
2534 "Desc": 2513 "Desc":
2535 { 2514 {
2536 "parent":"fctr_layout_it", 2515 "parent":"fctr_evas_image_it",
2537 "class":"Elm.Image" 2516 "class":"Evas.Image",
2517 "public":true
2538 }, 2518 },
2539 "Properties": 2519 "Properties":
2540 { 2520 {
2541 "Evas.Object.size_hint_min":[25, 25], 2521 "Evas.Object.size_hint_weight":[1, 1],
2542 "Elm.Image.resizable":[true, true], 2522 "Efl.Gfx.Base.visible":[true],
2543 "Efl.Gfx.Base.visible":[true] 2523 "Evas.Object.size_hint_min":[40, 40],
2524 "Evas.Image.filled":[true],
2525 "Evas.Image.source":["fctr_evas_image_element"],
2526 "Evas.Image.source_visible":[false]
2544 } 2527 }
2545 }, 2528 },
2546 "fctr_layout_label": 2529 "fctr_fileselector_it":
2547 { 2530 {
2548 "Desc": 2531 "Desc":
2549 { 2532 {
2550 "parent":"fctr_layout_it", 2533 "parent":"fctr_table",
2551 "class":"Elm.Label" 2534 "class":"Elm.Box",
2535 "public":true
2552 }, 2536 },
2553 "Properties": 2537 "Properties":
2554 { 2538 {
2555 "Elm.Widget.part_text":[null, "Layout"], 2539 "Elm.Box.horizontal":[true],
2540 "Elm.Box.padding":[7, 0],
2556 "Efl.Gfx.Base.visible":[true] 2541 "Efl.Gfx.Base.visible":[true]
2542 },
2543 "Contains":["fctr_fileselector_image"]
2544 },
2545 "fctr_fileselector_image":
2546 {
2547 "Desc":
2548 {
2549 "parent":"fctr_fileselector_it",
2550 "class":"Evas.Image",
2551 "public":true
2552 },
2553 "Properties":
2554 {
2555 "Evas.Object.size_hint_weight":[1, 1],
2556 "Efl.Gfx.Base.visible":[true],
2557 "Evas.Object.size_hint_min":[82, 100],
2558 "Evas.Image.filled":[true],
2559 "Evas.Image.source":["fctr_fileselector_element"],
2560 "Evas.Image.source_visible":[false]
2557 } 2561 }
2558 }, 2562 },
2559 "fctr_separator_it": 2563 "fctr_fileselector_entry_it":
2560 { 2564 {
2561 "Desc": 2565 "Desc":
2562 { 2566 {
@@ -2570,36 +2574,61 @@
2570 "Elm.Box.padding":[7, 0], 2574 "Elm.Box.padding":[7, 0],
2571 "Efl.Gfx.Base.visible":[true] 2575 "Efl.Gfx.Base.visible":[true]
2572 }, 2576 },
2573 "Contains":["fctr_separator_image", "fctr_separator_label"] 2577 "Contains":["fctr_fileselector_entry_image"]
2574 }, 2578 },
2575 "fctr_separator_image": 2579 "fctr_fileselector_entry_image":
2576 { 2580 {
2577 "Desc": 2581 "Desc":
2578 { 2582 {
2579 "parent":"fctr_separator_it", 2583 "parent":"fctr_fileselector_entry_it",
2580 "class":"Elm.Image" 2584 "class":"Evas.Image",
2585 "public":true
2581 }, 2586 },
2582 "Properties": 2587 "Properties":
2583 { 2588 {
2584 "Evas.Object.size_hint_min":[25, 25], 2589 "Evas.Object.size_hint_weight":[1, 1],
2585 "Elm.Image.resizable":[true, true], 2590 "Efl.Gfx.Base.visible":[true],
2586 "Efl.Gfx.Base.visible":[true] 2591 "Evas.Object.size_hint_min":[165, 30],
2592 "Evas.Image.filled":[true],
2593 "Evas.Image.source":["fctr_fileselector_entry_element"],
2594 "Evas.Image.source_visible":[false]
2587 } 2595 }
2588 }, 2596 },
2589 "fctr_separator_label": 2597 "fctr_fileselector_button_it":
2590 { 2598 {
2591 "Desc": 2599 "Desc":
2592 { 2600 {
2593 "parent":"fctr_separator_it", 2601 "parent":"fctr_table",
2594 "class":"Elm.Label" 2602 "class":"Elm.Box",
2603 "public":true
2595 }, 2604 },
2596 "Properties": 2605 "Properties":
2597 { 2606 {
2598 "Elm.Widget.part_text":[null, "Separator"], 2607 "Elm.Box.horizontal":[true],
2608 "Elm.Box.padding":[7, 0],
2599 "Efl.Gfx.Base.visible":[true] 2609 "Efl.Gfx.Base.visible":[true]
2610 },
2611 "Contains":["fctr_fileselector_button_image"]
2612 },
2613 "fctr_fileselector_button_image":
2614 {
2615 "Desc":
2616 {
2617 "parent":"fctr_fileselector_button_it",
2618 "class":"Evas.Image",
2619 "public":true
2620 },
2621 "Properties":
2622 {
2623 "Evas.Object.size_hint_weight":[1, 1],
2624 "Efl.Gfx.Base.visible":[true],
2625 "Evas.Object.size_hint_min":[165, 30],
2626 "Evas.Image.filled":[true],
2627 "Evas.Image.source":["fctr_fileselector_button_element"],
2628 "Evas.Image.source_visible":[false]
2600 } 2629 }
2601 }, 2630 },
2602 "fctr_frame_it": 2631 "fctr_slider_it":
2603 { 2632 {
2604 "Desc": 2633 "Desc":
2605 { 2634 {
@@ -2613,40 +2642,65 @@
2613 "Elm.Box.padding":[7, 0], 2642 "Elm.Box.padding":[7, 0],
2614 "Efl.Gfx.Base.visible":[true] 2643 "Efl.Gfx.Base.visible":[true]
2615 }, 2644 },
2616 "Contains":["fctr_frame_image", "fctr_frame_label"] 2645 "Contains":["fctr_slider_image"]
2617 }, 2646 },
2618 "fctr_frame_image": 2647 "fctr_slider_image":
2619 { 2648 {
2620 "Desc": 2649 "Desc":
2621 { 2650 {
2622 "parent":"fctr_frame_it", 2651 "parent":"fctr_slider_it",
2623 "class":"Elm.Image" 2652 "class":"Evas.Image",
2653 "public":true
2624 }, 2654 },
2625 "Properties": 2655 "Properties":
2626 { 2656 {
2627 "Evas.Object.size_hint_min":[25, 25], 2657 "Evas.Object.size_hint_weight":[1, 1],
2628 "Elm.Image.resizable":[true, true], 2658 "Efl.Gfx.Base.visible":[true],
2629 "Efl.Gfx.Base.visible":[true] 2659 "Evas.Object.size_hint_min":[165, 30],
2660 "Evas.Image.filled":[true],
2661 "Evas.Image.source":["fctr_slider_element"],
2662 "Evas.Image.source_visible":[false]
2630 } 2663 }
2631 }, 2664 },
2632 "fctr_frame_label": 2665 "fctr_progressbar_it":
2633 { 2666 {
2634 "Desc": 2667 "Desc":
2635 { 2668 {
2636 "parent":"fctr_frame_it", 2669 "parent":"fctr_table",
2637 "class":"Elm.Label" 2670 "class":"Elm.Box",
2671 "public":true
2638 }, 2672 },
2639 "Properties": 2673 "Properties":
2640 { 2674 {
2641 "Elm.Widget.part_text":[null, "Frame"], 2675 "Elm.Box.horizontal":[true],
2676 "Elm.Box.padding":[7, 0],
2642 "Efl.Gfx.Base.visible":[true] 2677 "Efl.Gfx.Base.visible":[true]
2678 },
2679 "Contains":["fctr_progressbar_image"]
2680 },
2681 "fctr_progressbar_image":
2682 {
2683 "Desc":
2684 {
2685 "parent":"fctr_progressbar_it",
2686 "class":"Evas.Image",
2687 "public":true
2688 },
2689 "Properties":
2690 {
2691 "Evas.Object.size_hint_weight":[1, 1],
2692 "Efl.Gfx.Base.visible":[true],
2693 "Evas.Object.size_hint_min":[165, 30],
2694 "Evas.Image.filled":[true],
2695 "Evas.Image.source":["fctr_progressbar_element"],
2696 "Evas.Image.source_visible":[false]
2643 } 2697 }
2644 }, 2698 },
2645 "fctr_evas_image_it": 2699 "fctr_hoversel_it":
2646 { 2700 {
2647 "Desc": 2701 "Desc":
2648 { 2702 {
2649 "parent":"fctr_table_evas", 2703 "parent":"fctr_table",
2650 "class":"Elm.Box", 2704 "class":"Elm.Box",
2651 "public":true 2705 "public":true
2652 }, 2706 },
@@ -2656,40 +2710,44 @@
2656 "Elm.Box.padding":[7, 0], 2710 "Elm.Box.padding":[7, 0],
2657 "Efl.Gfx.Base.visible":[true] 2711 "Efl.Gfx.Base.visible":[true]
2658 }, 2712 },
2659 "Contains":["fctr_evas_image_image", "fctr_evas_image_label"] 2713 "Contains":["fctr_hoversel_image"]
2660 }, 2714 },
2661 "fctr_evas_image_image": 2715 "fctr_hoversel_image":
2662 { 2716 {
2663 "Desc": 2717 "Desc":
2664 { 2718 {
2665 "parent":"fctr_evas_image_it", 2719 "parent":"fctr_hoversel_it",
2666 "class":"Elm.Image" 2720 "class":"Evas.Image",
2721 "public":true
2667 }, 2722 },
2668 "Properties": 2723 "Properties":
2669 { 2724 {
2670 "Evas.Object.size_hint_min":[25, 25], 2725 "Evas.Object.size_hint_weight":[1, 1],
2671 "Elm.Image.resizable":[true, true], 2726 "Efl.Gfx.Base.visible":[true],
2672 "Efl.Gfx.Base.visible":[true] 2727 "Evas.Object.size_hint_min":[60, 40],
2728 "Evas.Image.filled":[true],
2729 "Evas.Image.source":["fctr_hoversel_element"],
2730 "Evas.Image.source_visible":[false]
2673 } 2731 }
2674 }, 2732 },
2675 "fctr_evas_image_label": 2733 "fctr_hoversel_label":
2676 { 2734 {
2677 "Desc": 2735 "Desc":
2678 { 2736 {
2679 "parent":"fctr_evas_image_it", 2737 "parent":"fctr_hoversel_it",
2680 "class":"Elm.Label" 2738 "class":"Elm.Label"
2681 }, 2739 },
2682 "Properties": 2740 "Properties":
2683 { 2741 {
2684 "Elm.Widget.part_text":[null, "Evas Image"], 2742 "Elm.Widget.part_text":[null, "Hoversel"],
2685 "Efl.Gfx.Base.visible":[true] 2743 "Efl.Gfx.Base.visible":[true]
2686 } 2744 }
2687 }, 2745 },
2688 "fctr_fileselector_it": 2746 "fctr_panes_it":
2689 { 2747 {
2690 "Desc": 2748 "Desc":
2691 { 2749 {
2692 "parent":"fctr_table", 2750 "parent":"fctr_table_containers",
2693 "class":"Elm.Box", 2751 "class":"Elm.Box",
2694 "public":true 2752 "public":true
2695 }, 2753 },
@@ -2699,40 +2757,61 @@
2699 "Elm.Box.padding":[7, 0], 2757 "Elm.Box.padding":[7, 0],
2700 "Efl.Gfx.Base.visible":[true] 2758 "Efl.Gfx.Base.visible":[true]
2701 }, 2759 },
2702 "Contains":["fctr_fileselector_image", "fctr_fileselector_label"] 2760 "Contains":["fctr_panes_image"]
2703 }, 2761 },
2704 "fctr_fileselector_image": 2762 "fctr_panes_image":
2705 { 2763 {
2706 "Desc": 2764 "Desc":
2707 { 2765 {
2708 "parent":"fctr_fileselector_it", 2766 "parent":"fctr_panes_it",
2709 "class":"Elm.Image" 2767 "class":"Evas.Image",
2768 "public":true
2710 }, 2769 },
2711 "Properties": 2770 "Properties":
2712 { 2771 {
2713 "Evas.Object.size_hint_min":[25, 25], 2772 "Evas.Object.size_hint_weight":[1, 1],
2714 "Elm.Image.resizable":[true, true], 2773 "Efl.Gfx.Base.visible":[true],
2715 "Efl.Gfx.Base.visible":[true] 2774 "Evas.Object.size_hint_min":[75, 75],
2775 "Evas.Image.filled":[true],
2776 "Evas.Image.source":["fctr_panes_element"],
2777 "Evas.Image.source_visible":[false]
2716 } 2778 }
2717 }, 2779 },
2718 "fctr_fileselector_label": 2780 "fctr_conformant_it":
2719 { 2781 {
2720 "Desc": 2782 "Desc":
2721 { 2783 {
2722 "parent":"fctr_fileselector_it", 2784 "parent":"fctr_table_containers",
2723 "class":"Elm.Label" 2785 "class":"Elm.Box",
2786 "public":true
2787 },
2788 "Properties":
2789 {
2790 "Elm.Box.horizontal":[true],
2791 "Elm.Box.padding":[7, 0],
2792 "Efl.Gfx.Base.visible":[true]
2793 },
2794 "Contains":["fctr_conformant_image"]
2795 },
2796 "fctr_conformant_image":
2797 {
2798 "Desc":
2799 {
2800 "parent":"fctr_conformant_it",
2801 "class":"Elm.Image"
2724 }, 2802 },
2725 "Properties": 2803 "Properties":
2726 { 2804 {
2727 "Elm.Widget.part_text":[null, "Fileselector"], 2805 "Evas.Object.size_hint_min":[75, 75],
2806 "Elm.Image.resizable":[true, true],
2728 "Efl.Gfx.Base.visible":[true] 2807 "Efl.Gfx.Base.visible":[true]
2729 } 2808 }
2730 }, 2809 },
2731 "fctr_fileselector_entry_it": 2810 "fctr_grid_it":
2732 { 2811 {
2733 "Desc": 2812 "Desc":
2734 { 2813 {
2735 "parent":"fctr_table", 2814 "parent":"fctr_table_containers",
2736 "class":"Elm.Box", 2815 "class":"Elm.Box",
2737 "public":true 2816 "public":true
2738 }, 2817 },
@@ -2742,336 +2821,485 @@
2742 "Elm.Box.padding":[7, 0], 2821 "Elm.Box.padding":[7, 0],
2743 "Efl.Gfx.Base.visible":[true] 2822 "Efl.Gfx.Base.visible":[true]
2744 }, 2823 },
2745 "Contains":["fctr_fileselector_entry_image", "fctr_fileselector_entry_label"] 2824 "Contains":["fctr_grid_image"]
2746 }, 2825 },
2747 "fctr_fileselector_entry_image": 2826 "fctr_grid_image":
2748 { 2827 {
2749 "Desc": 2828 "Desc":
2750 { 2829 {
2751 "parent":"fctr_fileselector_entry_it", 2830 "parent":"fctr_grid_it",
2752 "class":"Elm.Image" 2831 "class":"Elm.Image"
2753 }, 2832 },
2754 "Properties": 2833 "Properties":
2755 { 2834 {
2756 "Evas.Object.size_hint_min":[25, 25], 2835 "Evas.Object.size_hint_min":[75, 75],
2757 "Elm.Image.resizable":[true, true], 2836 "Elm.Image.resizable":[true, true],
2758 "Efl.Gfx.Base.visible":[true] 2837 "Efl.Gfx.Base.visible":[true]
2759 } 2838 }
2760 }, 2839 },
2761 "fctr_fileselector_entry_label": 2840 "fctr_button_element":
2841 {
2842 "Desc":
2843 {
2844 "parent":"main_win",
2845 "class":"Elm.Button",
2846 "public":true
2847 },
2848 "Properties":
2849 {
2850 "Elm.Widget.part_text":[null, "Button"],
2851 "Efl.Gfx.Base.visible":[true],
2852 "Efl.Gfx.Base.size":[80, 30]
2853 }
2854 },
2855 "fctr_label_element":
2856 {
2857 "Desc":
2858 {
2859 "parent":"main_win",
2860 "class":"Elm.Label",
2861 "public":true
2862 },
2863 "Properties":
2864 {
2865 "Elm.Widget.part_text":[null, "Label"],
2866 "Efl.Gfx.Base.visible":[true],
2867 "Efl.Gfx.Base.size":[80, 30]
2868 }
2869 },
2870 "fctr_check_element":
2871 {
2872 "Desc":
2873 {
2874 "parent":"main_win",
2875 "class":"Elm.Check",
2876 "public":true
2877 },
2878 "Properties":
2879 {
2880 "Elm.Widget.part_text":[null, "Check"],
2881 "Efl.Gfx.Base.visible":[true],
2882 "Efl.Gfx.Base.size":[80, 30]
2883 }
2884 },
2885 "fctr_radio_element":
2762 { 2886 {
2763 "Desc": 2887 "Desc":
2764 { 2888 {
2765 "parent":"fctr_fileselector_entry_it", 2889 "parent":"main_win",
2766 "class":"Elm.Label" 2890 "class":"Elm.Radio",
2891 "public":true
2767 }, 2892 },
2768 "Properties": 2893 "Properties":
2769 { 2894 {
2770 "Elm.Widget.part_text":[null, "Fileselector Entry"], 2895 "Elm.Widget.part_text":[null, "Radio"],
2771 "Efl.Gfx.Base.visible":[true] 2896 "Efl.Gfx.Base.visible":[true],
2897 "Elm.Radio.state_value":[0],
2898 "Efl.Gfx.Base.size":[80, 30]
2772 } 2899 }
2773 }, 2900 },
2774 "fctr_fileselector_button_it": 2901 "fctr_actionslider_element":
2775 { 2902 {
2776 "Desc": 2903 "Desc":
2777 { 2904 {
2778 "parent":"fctr_table", 2905 "parent":"main_win",
2779 "class":"Elm.Box", 2906 "class":"Elm.Actionslider",
2780 "public":true 2907 "public":true
2781 }, 2908 },
2782 "Properties": 2909 "Properties":
2783 { 2910 {
2784 "Elm.Box.horizontal":[true], 2911 "Elm.Widget.part_text":["left", "Action"],
2785 "Elm.Box.padding":[7, 0], 2912 "Elm.Widget.part_text":["center", null],
2786 "Efl.Gfx.Base.visible":[true] 2913 "Elm.Widget.part_text":["right", "slider"],
2787 }, 2914 "Elm.Actionslider.indicator_pos":["ELM_ACTIONSLIDER_CENTER"],
2788 "Contains":["fctr_fileselector_button_image", "fctr_fileselector_button_label"] 2915 "Efl.Gfx.Base.visible":[true],
2916 "Efl.Gfx.Base.size":[180, 30]
2917 }
2789 }, 2918 },
2790 "fctr_fileselector_button_image": 2919 "fctr_calendar_element":
2791 { 2920 {
2792 "Desc": 2921 "Desc":
2793 { 2922 {
2794 "parent":"fctr_fileselector_button_it", 2923 "parent":"main_win",
2795 "class":"Elm.Image" 2924 "class":"Elm.Calendar",
2925 "public":true
2796 }, 2926 },
2797 "Properties": 2927 "Properties":
2798 { 2928 {
2799 "Evas.Object.size_hint_min":[25, 25], 2929 "Efl.Gfx.Base.visible":[true],
2800 "Elm.Image.resizable":[true, true], 2930 "Efl.Gfx.Base.size":[120, 120]
2801 "Efl.Gfx.Base.visible":[true]
2802 } 2931 }
2803 }, 2932 },
2804 "fctr_fileselector_button_label": 2933 "fctr_dayselector_element":
2805 { 2934 {
2806 "Desc": 2935 "Desc":
2807 { 2936 {
2808 "parent":"fctr_fileselector_button_it", 2937 "parent":"main_win",
2809 "class":"Elm.Label" 2938 "class":"Elm.Dayselector",
2939 "public":true
2810 }, 2940 },
2811 "Properties": 2941 "Properties":
2812 { 2942 {
2813 "Elm.Widget.part_text":[null, "Fileselector Button"], 2943 "Efl.Gfx.Base.visible":[true],
2814 "Efl.Gfx.Base.visible":[true] 2944 "Efl.Gfx.Base.size":[290, 20]
2815 } 2945 }
2816 }, 2946 },
2817 "fctr_slider_it": 2947 "fctr_separator_element":
2818 { 2948 {
2819 "Desc": 2949 "Desc":
2820 { 2950 {
2821 "parent":"fctr_table", 2951 "parent":"main_win",
2822 "class":"Elm.Box", 2952 "class":"Elm.Separator",
2823 "public":true 2953 "public":true
2824 }, 2954 },
2825 "Properties": 2955 "Properties":
2826 { 2956 {
2827 "Elm.Box.horizontal":[true], 2957 "Efl.Gfx.Base.visible":[true],
2828 "Elm.Box.padding":[7, 0], 2958 "Efl.Gfx.Base.size":[4, 40]
2829 "Efl.Gfx.Base.visible":[true] 2959 }
2830 },
2831 "Contains":["fctr_slider_image", "fctr_slider_label"]
2832 }, 2960 },
2833 "fctr_slider_image": 2961 "fctr_clock_element":
2834 { 2962 {
2835 "Desc": 2963 "Desc":
2836 { 2964 {
2837 "parent":"fctr_slider_it", 2965 "parent":"main_win",
2838 "class":"Elm.Image" 2966 "class":"Elm.Clock",
2967 "public":true
2839 }, 2968 },
2840 "Properties": 2969 "Properties":
2841 { 2970 {
2842 "Evas.Object.size_hint_min":[25, 25], 2971 "Efl.Gfx.Base.visible":[true],
2843 "Elm.Image.resizable":[true, true], 2972 "Efl.Gfx.Base.size":[65, 35]
2844 "Efl.Gfx.Base.visible":[true]
2845 } 2973 }
2846 }, 2974 },
2847 "fctr_slider_label": 2975 "fctr_entry_element":
2848 { 2976 {
2849 "Desc": 2977 "Desc":
2850 { 2978 {
2851 "parent":"fctr_slider_it", 2979 "parent":"main_win",
2852 "class":"Elm.Label" 2980 "class":"Elm.Entry",
2981 "public":true
2853 }, 2982 },
2854 "Properties": 2983 "Properties":
2855 { 2984 {
2856 "Elm.Widget.part_text":[null, "Slider"], 2985 "Elm.Entry.scrollable":[true],
2857 "Efl.Gfx.Base.visible":[true] 2986 "Efl.Gfx.Base.visible":[true],
2987 "Elm.Widget.part_text":[null, "Entry"],
2988 "Efl.Gfx.Base.size":[65, 35]
2858 } 2989 }
2859 }, 2990 },
2860 "fctr_progressbar_it": 2991 "fctr_colorselector_element":
2861 { 2992 {
2862 "Desc": 2993 "Desc":
2863 { 2994 {
2864 "parent":"fctr_table", 2995 "parent":"main_win",
2865 "class":"Elm.Box", 2996 "class":"Elm.Colorselector",
2866 "public":true 2997 "public":true
2867 }, 2998 },
2868 "Properties": 2999 "Properties":
2869 { 3000 {
2870 "Elm.Box.horizontal":[true], 3001 "Elm.Colorselector.mode":["ELM_COLORSELECTOR_COMPONENTS"],
2871 "Elm.Box.padding":[7, 0], 3002 "Elm.Colorselector.color":[255, 0, 0, 255],
2872 "Efl.Gfx.Base.visible":[true] 3003 "Efl.Gfx.Base.visible":[true],
2873 }, 3004 "Efl.Gfx.Base.size":[165, 165]
2874 "Contains":["fctr_progressbar_image", "fctr_progressbar_label"] 3005 }
2875 }, 3006 },
2876 "fctr_progressbar_image": 3007 "fctr_slider_element":
2877 { 3008 {
2878 "Desc": 3009 "Desc":
2879 { 3010 {
2880 "parent":"fctr_progressbar_it", 3011 "parent":"main_win",
2881 "class":"Elm.Image" 3012 "class":"Elm.Slider",
3013 "public":true
2882 }, 3014 },
2883 "Properties": 3015 "Properties":
2884 { 3016 {
2885 "Evas.Object.size_hint_min":[25, 25], 3017 "Efl.Gfx.Base.visible":[true],
2886 "Elm.Image.resizable":[true, true], 3018 "Efl.Gfx.Base.size":[165, 30]
2887 "Efl.Gfx.Base.visible":[true]
2888 } 3019 }
2889 }, 3020 },
2890 "fctr_progressbar_label": 3021 "fctr_progressbar_element":
2891 { 3022 {
2892 "Desc": 3023 "Desc":
2893 { 3024 {
2894 "parent":"fctr_progressbar_it", 3025 "parent":"main_win",
2895 "class":"Elm.Label" 3026 "class":"Elm.Progressbar",
3027 "public":true
2896 }, 3028 },
2897 "Properties": 3029 "Properties":
2898 { 3030 {
2899 "Elm.Widget.part_text":[null, "Progress Bar"], 3031 "Elm.Progressbar.value":[0.35],
2900 "Efl.Gfx.Base.visible":[true] 3032 "Efl.Gfx.Base.visible":[true],
3033 "Efl.Gfx.Base.size":[165, 30]
2901 } 3034 }
2902 }, 3035 },
2903 "fctr_hoversel_it": 3036 "fctr_fileselector_entry_element":
2904 { 3037 {
2905 "Desc": 3038 "Desc":
2906 { 3039 {
2907 "parent":"fctr_table", 3040 "parent":"main_win",
2908 "class":"Elm.Box", 3041 "class":"Elm.Fileselector_Entry",
2909 "public":true 3042 "public":true
2910 }, 3043 },
2911 "Properties": 3044 "Properties":
2912 { 3045 {
2913 "Elm.Box.horizontal":[true], 3046 "Elm.Widget.part_text":[null, "Select a file"],
2914 "Elm.Box.padding":[7, 0], 3047 "Elm_Interface_Fileselector.path":["/home"],
2915 "Efl.Gfx.Base.visible":[true] 3048 "Efl.Gfx.Base.visible":[true],
2916 }, 3049 "Efl.Gfx.Base.size":[165, 30]
2917 "Contains":["fctr_hoversel_image", "fctr_hoversel_label"] 3050 }
2918 }, 3051 },
2919 "fctr_hoversel_image": 3052 "fctr_fileselector_button_element":
2920 { 3053 {
2921 "Desc": 3054 "Desc":
2922 { 3055 {
2923 "parent":"fctr_hoversel_it", 3056 "parent":"main_win",
2924 "class":"Elm.Image" 3057 "class":"Elm.Fileselector_Button",
3058 "public":true
2925 }, 3059 },
2926 "Properties": 3060 "Properties":
2927 { 3061 {
2928 "Evas.Object.size_hint_min":[25, 25], 3062 "Elm.Widget.part_text":[null, "Select a file"],
2929 "Elm.Image.resizable":[true, true], 3063 "Efl.Gfx.Base.visible":[true],
2930 "Efl.Gfx.Base.visible":[true] 3064 "Efl.Gfx.Base.size":[165, 30]
2931 } 3065 }
2932 }, 3066 },
2933 "fctr_hoversel_label": 3067 "fctr_fileselector_element":
2934 { 3068 {
2935 "Desc": 3069 "Desc":
2936 { 3070 {
2937 "parent":"fctr_hoversel_it", 3071 "parent":"main_win",
2938 "class":"Elm.Label" 3072 "class":"Elm.Fileselector",
3073 "public":true
2939 }, 3074 },
2940 "Properties": 3075 "Properties":
2941 { 3076 {
2942 "Elm.Widget.part_text":[null, "Hoversel"], 3077 "Elm_Interface_Fileselector.path":["/home"],
2943 "Efl.Gfx.Base.visible":[true] 3078 "Efl.Gfx.Base.visible":[true],
3079 "Efl.Gfx.Base.size":[165, 200]
2944 } 3080 }
2945 }, 3081 },
2946 "fctr_panes_it": 3082 "fctr_icon_element":
2947 { 3083 {
2948 "Desc": 3084 "Desc":
2949 { 3085 {
2950 "parent":"fctr_table_containers", 3086 "parent":"main_win",
2951 "class":"Elm.Box", 3087 "class":"Elm.Icon",
2952 "public":true 3088 "public":true
2953 }, 3089 },
2954 "Properties": 3090 "Properties":
2955 { 3091 {
2956 "Elm.Box.horizontal":[true], 3092 "Efl.File.file":["erigo_icon", null],
2957 "Elm.Box.padding":[7, 0], 3093 "Efl.Gfx.Base.visible":[true],
2958 "Efl.Gfx.Base.visible":[true] 3094 "Efl.Gfx.Base.size":[40, 40]
2959 }, 3095 }
2960 "Contains":["fctr_panes_image", "fctr_panes_label"]
2961 }, 3096 },
2962 "fctr_panes_image": 3097 "fctr_image_element":
2963 { 3098 {
2964 "Desc": 3099 "Desc":
2965 { 3100 {
2966 "parent":"fctr_panes_it", 3101 "parent":"main_win",
2967 "class":"Elm.Image" 3102 "class":"Elm.Image",
3103 "public":true
2968 }, 3104 },
2969 "Properties": 3105 "Properties":
2970 { 3106 {
2971 "Evas.Object.size_hint_min":[25, 25], 3107 "Efl.File.file":["factory_image", null],
2972 "Elm.Image.resizable":[true, true], 3108 "Efl.Gfx.Base.visible":[true],
2973 "Efl.Gfx.Base.visible":[true] 3109 "Efl.Gfx.Base.size":[40, 40]
2974 } 3110 }
2975 }, 3111 },
2976 "fctr_panes_label": 3112 "fctr_bubble_element":
2977 { 3113 {
2978 "Desc": 3114 "Desc":
2979 { 3115 {
2980 "parent":"fctr_panes_it", 3116 "parent":"main_win",
2981 "class":"Elm.Label" 3117 "class":"Elm.Bubble",
3118 "public":true
2982 }, 3119 },
2983 "Properties": 3120 "Properties":
2984 { 3121 {
2985 "Elm.Widget.part_text":[null, "Panes"], 3122 "Elm.Widget.part_text":[null, "Bubble"],
2986 "Efl.Gfx.Base.visible":[true] 3123 "Efl.Gfx.Base.visible":[true],
3124 "Efl.Gfx.Base.size":[70, 50]
2987 } 3125 }
2988 }, 3126 },
2989 "fctr_conformant_it": 3127 "fctr_hoversel_element":
2990 { 3128 {
2991 "Desc": 3129 "Desc":
2992 { 3130 {
2993 "parent":"fctr_table_containers", 3131 "parent":"main_win",
2994 "class":"Elm.Box", 3132 "class":"Elm.Hoversel",
2995 "public":true 3133 "public":true
2996 }, 3134 },
2997 "Properties": 3135 "Properties":
2998 { 3136 {
2999 "Elm.Box.horizontal":[true], 3137 "Elm.Widget.part_text":[null, "Hoversel"],
3000 "Elm.Box.padding":[7, 0], 3138 "Efl.Gfx.Base.visible":[true],
3001 "Efl.Gfx.Base.visible":[true] 3139 "Efl.Gfx.Base.size":[60, 40]
3140 }
3141 },
3142 "fctr_frame_element":
3143 {
3144 "Desc":
3145 {
3146 "parent":"main_win",
3147 "class":"Elm.Frame",
3148 "public":true
3002 }, 3149 },
3003 "Contains":["fctr_conformant_image", "fctr_conformant_label"] 3150 "Properties":
3151 {
3152 "Elm.Widget.part_text":[null, "Frame"],
3153 "Efl.Gfx.Base.visible":[true],
3154 "Efl.Gfx.Base.size":[60, 60]
3155 }
3004 }, 3156 },
3005 "fctr_conformant_image": 3157 "fctr_win_frame_element":
3006 { 3158 {
3007 "Desc": 3159 "Desc":
3008 { 3160 {
3009 "parent":"fctr_conformant_it", 3161 "parent":"main_win",
3010 "class":"Elm.Image" 3162 "class":"Elm.Frame",
3163 "public":true
3011 }, 3164 },
3012 "Properties": 3165 "Properties":
3013 { 3166 {
3014 "Evas.Object.size_hint_min":[25, 25], 3167 "Elm.Widget.part_text":[null, "Window"],
3015 "Elm.Image.resizable":[true, true], 3168 "Efl.Gfx.Base.visible":[true],
3016 "Efl.Gfx.Base.visible":[true] 3169 "Efl.Gfx.Base.size":[60, 60]
3017 } 3170 }
3018 }, 3171 },
3019 "fctr_conformant_label": 3172 "fctr_toolbar_element":
3020 { 3173 {
3021 "Desc": 3174 "Desc":
3022 { 3175 {
3023 "parent":"fctr_conformant_it", 3176 "parent":"main_win",
3024 "class":"Elm.Label" 3177 "class":"Elm.Toolbar",
3178 "public":true
3025 }, 3179 },
3026 "Properties": 3180 "Properties":
3027 { 3181 {
3028 "Elm.Widget.part_text":[null, "Conformant"], 3182 "Elm.Widget.style":["item_horizontal"],
3183 "Elm.Toolbar.icon_size":[16],
3184 "Evas.Object.size_hint_weight":[1, 1],
3185 "Evas.Object.size_hint_align":[-1, -1],
3186 "Efl.Gfx.Base.size":[95, 22],
3029 "Efl.Gfx.Base.visible":[true] 3187 "Efl.Gfx.Base.visible":[true]
3188 },
3189 "Items":
3190 {
3191 "fctr_toolbar_element_it0":
3192 {
3193 "type":"regular",
3194 "icon":"file",
3195 "label":"File"
3196 },
3197 "fctr_toolbar_element_it1":
3198 {
3199 "type":"regular",
3200 "icon":"edit",
3201 "label":"Edit"
3202 }
3030 } 3203 }
3031 }, 3204 },
3032 "fctr_grid_it": 3205 "fctr_diskselector_element":
3033 { 3206 {
3034 "Desc": 3207 "Desc":
3035 { 3208 {
3036 "parent":"fctr_table_containers", 3209 "parent":"main_win",
3037 "class":"Elm.Box", 3210 "class":"Elm.Diskselector",
3038 "public":true 3211 "public":true
3039 }, 3212 },
3040 "Properties": 3213 "Properties":
3041 { 3214 {
3042 "Elm.Box.horizontal":[true], 3215 "Elm.Widget.style":["item_horizontal"],
3043 "Elm.Box.padding":[7, 0], 3216 "Evas.Object.size_hint_weight":[1, 1],
3044 "Efl.Gfx.Base.visible":[false] 3217 "Evas.Object.size_hint_align":[-1, -1],
3218 "Efl.Gfx.Base.size":[105, 22],
3219 "Efl.Gfx.Base.visible":[true]
3045 }, 3220 },
3046 "Contains":["fctr_grid_image", "fctr_grid_label"] 3221 "Items":
3222 {
3223 "fctr_diskselector_element_it0":
3224 {
3225 "type":"regular",
3226 "label":"2015"
3227 },
3228 "fctr_diskselector_element_it1":
3229 {
3230 "type":"regular",
3231 "label":"2016"
3232 }
3233 }
3047 }, 3234 },
3048 "fctr_grid_image": 3235 "fctr_evas_image_element":
3049 { 3236 {
3050 "Desc": 3237 "Desc":
3051 { 3238 {
3052 "parent":"fctr_grid_it", 3239 "parent":"main_win",
3053 "class":"Elm.Image" 3240 "class":"Evas.Image",
3241 "public":true
3054 }, 3242 },
3055 "Properties": 3243 "Properties":
3056 { 3244 {
3057 "Evas.Object.size_hint_min":[25, 25], 3245 "Efl.File.file":["factory_image", null],
3058 "Elm.Image.resizable":[true, true], 3246 "Evas.Image.filled":[true],
3059 "Efl.Gfx.Base.visible":[true] 3247 "Efl.Gfx.Base.visible":[true],
3248 "Efl.Gfx.Base.size":[40, 40]
3060 } 3249 }
3061 }, 3250 },
3062 "fctr_grid_label": 3251 "fctr_panes_element":
3063 { 3252 {
3064 "Desc": 3253 "Desc":
3065 { 3254 {
3066 "parent":"fctr_grid_it", 3255 "parent":"main_win",
3067 "class":"Elm.Label" 3256 "class":"Elm.Panes",
3257 "public":true
3068 }, 3258 },
3069 "Properties": 3259 "Properties":
3070 { 3260 {
3071 "Elm.Widget.part_text":[null, "Grid"], 3261 "Evas.Object.size_hint_weight":[1, 1],
3262 "Evas.Object.size_hint_align":[1, -1],
3263 "Elm.Panes.content_right_size":[0.70],
3264 "Efl.Gfx.Base.size":[75, 75],
3072 "Efl.Gfx.Base.visible":[true] 3265 "Efl.Gfx.Base.visible":[true]
3266 },
3267 "Contains":
3268 {
3269 "fctr_panes_element_button" : ["left"],
3270 "fctr_panes_element_label" : ["right"]
3073 } 3271 }
3074 }, 3272 },
3273 "fctr_panes_element_button":
3274 {
3275 "Desc":
3276 {
3277 "parent":"fctr_panes_element",
3278 "class":"Elm.Button",
3279 "public":true
3280 },
3281 "Properties":
3282 {
3283 "Elm.Widget.part_text":[null, "B"],
3284 "Efl.Gfx.Base.visible":[true],
3285 "Efl.Gfx.Base.size":[80, 30]
3286 }
3287 },
3288 "fctr_panes_element_label":
3289 {
3290 "Desc":
3291 {
3292 "parent":"fctr_panes_element",
3293 "class":"Elm.Label",
3294 "public":true
3295 },
3296 "Properties":
3297 {
3298 "Elm.Widget.part_text":[null, "Label"],
3299 "Efl.Gfx.Base.visible":[true],
3300 "Efl.Gfx.Base.size":[80, 30]
3301 }
3302 },
3075 "right_panes": 3303 "right_panes":
3076 { 3304 {
3077 "Desc": 3305 "Desc":
@@ -3756,7 +3984,7 @@
3756 "public":true 3984 "public":true
3757 }, 3985 },
3758 "Properties": 3986 "Properties":
3759 { 3987 {
3760 "Elm.Widget.part_text":[null, "Add Separator"], 3988 "Elm.Widget.part_text":[null, "Add Separator"],
3761 "Efl.Gfx.Base.visible":[true] 3989 "Efl.Gfx.Base.visible":[true]
3762 }, 3990 },
diff --git a/src/bin/gui/egui_logic.c b/src/bin/gui/egui_logic.c
index d46482c..732a4b6 100644
--- a/src/bin/gui/egui_logic.c
+++ b/src/bin/gui/egui_logic.c
@@ -57,8 +57,7 @@ enum
57 WDG_DELETE, 57 WDG_DELETE,
58 OBJTREE_VIEW, 58 OBJTREE_VIEW,
59 PROPERTIES_VIEW, 59 PROPERTIES_VIEW,
60 FACTORY_VIEW, 60 FACTORY_VIEW
61 FACTORY_VIEW_SWITCH
62}; 61};
63 62
64Eo * 63Eo *
@@ -383,9 +382,6 @@ _fs_mode_open(int fs_mode)
383 evas_object_smart_callback_add(fs_win->fileselector, "done", _on_fs_done, (void *)(intptr_t) fs_mode); 382 evas_object_smart_callback_add(fs_win->fileselector, "done", _on_fs_done, (void *)(intptr_t) fs_mode);
384} 383}
385 384
386static void
387_factory_vertical_pack(Eina_Bool vertical_pack);
388
389/* FIXME: need to change signature to Eo_Callback, when it will be supported. 385/* FIXME: need to change signature to Eo_Callback, when it will be supported.
390 * This callback is used in Egui Layout JSON. */ 386 * This callback is used in Egui Layout JSON. */
391void 387void
@@ -515,18 +511,11 @@ _sub_wins_hide_show_cb(void *data, Evas_Object *_obj EINA_UNUSED, void *event_in
515{ 511{
516 Eo *obj = NULL; 512 Eo *obj = NULL;
517 intptr_t action = (intptr_t) data; 513 intptr_t action = (intptr_t) data;
518 static Eina_Bool fctr_table_vertical = EINA_FALSE;
519 switch (action) 514 switch (action)
520 { 515 {
521 case FACTORY_VIEW: 516 case FACTORY_VIEW:
522 obj = g_main_wdgs->main_win->fctr_table; 517 obj = g_main_wdgs->main_win->fctr_table;
523 break; 518 break;
524 case FACTORY_VIEW_SWITCH:
525 {
526 _factory_vertical_pack(fctr_table_vertical);
527 fctr_table_vertical = !fctr_table_vertical;
528 break;
529 }
530 case OBJTREE_VIEW: 519 case OBJTREE_VIEW:
531 obj = g_main_wdgs->main_win->objtree_table; 520 obj = g_main_wdgs->main_win->objtree_table;
532 break; 521 break;
@@ -756,7 +745,7 @@ _factory_tt_mouse_down(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descripti
756} 745}
757 746
758static void 747static void
759_factory_item_finalize(Eo *item_box, char *image_name, const char *egui_class_name, Eina_Bool drag_image) 748_factory_item_finalize(Eo *item_box, char *image_name, Eina_Bool use_image, const char *egui_class_name, Eina_Bool drag_image)
760{ 749{
761 if (!item_box) return; 750 if (!item_box) return;
762 evas_object_size_hint_align_set(item_box, 0, EVAS_HINT_FILL); 751 evas_object_size_hint_align_set(item_box, 0, EVAS_HINT_FILL);
@@ -769,136 +758,18 @@ _factory_item_finalize(Eo *item_box, char *image_name, const char *egui_class_na
769 // update of the image icon 758 // update of the image icon
770 Eo *o = eina_list_data_get(lst); 759 Eo *o = eina_list_data_get(lst);
771 char path[100] = {'\0'}; 760 char path[100] = {'\0'};
772 sprintf(path, "%s/%s", EGUI_LAYOUT_IMAGES_PATH, image_name); 761 if (use_image)
773 eo_do(o, efl_file_set(path, NULL));
774 drag_add(item_box, drag_image ? o : NULL, egui_class_name);
775
776 eina_list_free(lst);
777}
778
779static void
780_factory_vertical_pack(Eina_Bool vertical_pack)
781{
782 elm_table_clear(g_main_wdgs->main_win->fctr_table, EINA_FALSE);
783 elm_table_clear(g_main_wdgs->main_win->fctr_table_containers, EINA_FALSE);
784 elm_table_clear(g_main_wdgs->main_win->fctr_table_item_widgets, EINA_FALSE);
785 elm_table_clear(g_main_wdgs->main_win->fctr_table_evas, EINA_FALSE);
786 if (vertical_pack)
787 { 762 {
788 //elm_table_homogeneous_set(g_main_wdgs->main_win->fctr_table, EINA_TRUE); 763 sprintf(path, "%s/%s", EGUI_LAYOUT_IMAGES_PATH, image_name);
789 evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table, 0.1, -1); 764 eo_do(o, efl_file_set(path, NULL));
790 evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_containers, 0.1, -1);
791 evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_item_widgets, 0.1, -1);
792 evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_evas, 0.1, -1);
793
794 elm_table_padding_set(g_main_wdgs->main_win->fctr_table, 6, 7);
795 elm_table_padding_set(g_main_wdgs->main_win->fctr_table_containers, 6, 7);
796 elm_table_padding_set(g_main_wdgs->main_win->fctr_table_item_widgets, 6, 7);
797 elm_table_padding_set(g_main_wdgs->main_win->fctr_table_evas, 6, 7);
798
799 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_win_it, 0, 0, 1, 1);
800 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_bg_it, 0, 1, 1, 1);
801 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_button_it, 0, 2, 1, 1);
802 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_label_it, 0, 3, 1, 1);
803 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_check_it, 0, 4, 1, 1);
804 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_radio_it, 0, 5, 1, 1);
805 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_icon_it, 0, 6, 1, 1);
806 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_image_it, 0, 7, 1, 1);
807 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_actionslider_it, 0, 8, 1, 1);
808 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_clock_it, 0, 9, 1, 1);
809 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_dayselector_it, 0, 10, 1, 1);
810 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_calendar_it, 0, 11, 1, 1);
811 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_bubble_it, 0, 12, 1, 1);
812 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_colorselector_it, 0, 13, 1, 1);
813 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_entry_it, 0, 14, 1, 1);
814 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_flip_it, 0, 15, 1, 1);
815 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_separator_it, 0, 16, 1, 1);
816 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_frame_it, 0, 17, 1, 1);
817 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_it, 0, 18, 1, 1);
818 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_entry_it, 0, 19, 1, 1);
819 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_button_it, 0, 20, 1, 1);
820 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_slider_it, 0, 21, 1, 1);
821 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_progressbar_it, 0, 22, 1, 1);
822 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_hoversel_it, 0, 23, 1, 1);
823
824 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_box_it, 0, 0, 1, 1);
825 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_table_it, 0, 1, 1, 1);
826 //elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_grid_it, 0, 2, 1, 1);
827 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_layout_it, 0, 3, 1, 1);
828 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_naviframe_it, 0, 4, 1, 1);
829 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_panes_it, 0, 5, 1, 1);
830 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_conformant_it, 0, 6, 1, 1);
831 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_genlist_it, 0, 7, 1, 1);
832 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_gengrid_it, 0, 8, 1, 1);
833
834 elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets, g_main_wdgs->main_win->fctr_menu_it, 0, 0, 1, 1);
835 elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets, g_main_wdgs->main_win->fctr_toolbar_it, 0, 1, 1, 1);
836 elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets, g_main_wdgs->main_win->fctr_diskselector_it, 0, 2, 1, 1);
837 elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets, g_main_wdgs->main_win->fctr_ctxpopup_it, 0, 3, 1, 1);
838
839 elm_table_pack(g_main_wdgs->main_win->fctr_table_evas, g_main_wdgs->main_win->fctr_evas_image_it, 0, 0, 1, 1);
840 } 765 }
841 else 766 if (drag_image)
842 { 767 {
843 elm_table_padding_set(g_main_wdgs->main_win->fctr_table, 2, 2); 768 sprintf(path, "%s/%s", EGUI_LAYOUT_IMAGES_PATH, image_name);
844 elm_table_padding_set(g_main_wdgs->main_win->fctr_table_containers, 2, 2);
845 elm_table_padding_set(g_main_wdgs->main_win->fctr_table_item_widgets, 2, 2);
846 elm_table_padding_set(g_main_wdgs->main_win->fctr_table_evas, 2, 2);
847
848 /*
849 evas_object_size_hint_weight_set(g_main_wdgs->main_win->fctr_table, EVAS_HINT_EXPAND, 0);
850 evas_object_size_hint_weight_set(g_main_wdgs->main_win->fctr_table_containers, EVAS_HINT_EXPAND, 0);
851 evas_object_size_hint_weight_set(g_main_wdgs->main_win->fctr_table_item_widgets, EVAS_HINT_EXPAND, 0);
852 evas_object_size_hint_weight_set(g_main_wdgs->main_win->fctr_table_evas, EVAS_HINT_EXPAND, 0);
853
854 evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table, EVAS_HINT_FILL, EVAS_HINT_FILL);
855 evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_containers, EVAS_HINT_FILL, EVAS_HINT_FILL);
856 evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_item_widgets, EVAS_HINT_FILL, EVAS_HINT_FILL);
857 evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_evas, EVAS_HINT_FILL, EVAS_HINT_FILL);
858 */
859
860 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_win_it, 0, 0, 1, 1);
861 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_bg_it, 1, 0, 1, 1);
862 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_button_it, 2, 0, 1, 1);
863 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_label_it, 0, 1, 1, 1);
864 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_check_it, 1, 1, 1, 1);
865 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_radio_it, 2, 1, 1, 1);
866 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_icon_it, 0, 2, 1, 1);
867 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_image_it, 1, 2, 1, 1);
868 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_actionslider_it, 2, 2, 1, 1);
869 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_clock_it, 0, 3, 1, 1);
870 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_dayselector_it, 1, 3, 1, 1);
871 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_calendar_it, 2, 3, 1, 1);
872 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_bubble_it, 0, 4, 1, 1);
873 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_colorselector_it, 1, 4, 1, 1);
874 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_entry_it, 2, 4, 1, 1);
875 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_flip_it, 0, 5, 1, 1);
876 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_separator_it, 1, 5, 1, 1);
877 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_frame_it, 2, 5, 1, 1);
878 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_it, 0, 6, 1, 1);
879 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_entry_it, 1, 6, 1, 1);
880 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_fileselector_button_it, 2, 6, 1, 1);
881 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_slider_it, 0, 7, 1, 1);
882 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_progressbar_it, 1, 7, 1, 1);
883 elm_table_pack(g_main_wdgs->main_win->fctr_table, g_main_wdgs->main_win->fctr_hoversel_it, 2, 7, 1, 1);
884
885 elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets, g_main_wdgs->main_win->fctr_menu_it, 0, 0, 1, 1);
886 elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets, g_main_wdgs->main_win->fctr_toolbar_it, 1, 0, 1, 1);
887 elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets, g_main_wdgs->main_win->fctr_diskselector_it, 2, 0, 1, 1);
888 elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets, g_main_wdgs->main_win->fctr_ctxpopup_it, 0, 1, 1, 1);
889
890 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_box_it, 0, 0, 1, 1);
891 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_table_it, 1, 0, 1, 1);
892 //elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_grid_it, 2, 0, 1, 1);
893 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_layout_it, 0, 1, 1, 1);
894 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_naviframe_it, 1, 1, 1, 1);
895 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_panes_it, 2, 1, 1, 1);
896 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_conformant_it, 0, 2, 1, 1);
897 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_genlist_it, 1, 2, 1, 1);
898 elm_table_pack(g_main_wdgs->main_win->fctr_table_containers, g_main_wdgs->main_win->fctr_gengrid_it, 2, 2, 1, 1);
899
900 elm_table_pack(g_main_wdgs->main_win->fctr_table_evas, g_main_wdgs->main_win->fctr_evas_image_it, 0, 0, 1, 1);
901 } 769 }
770 drag_add(item_box, drag_image ? path : NULL, egui_class_name);
771
772 eina_list_free(lst);
902} 773}
903 774
904/* Filter function to be called, when Filter entry is changed. */ 775/* Filter function to be called, when Filter entry is changed. */
@@ -988,6 +859,16 @@ _egui_project_open(const char *path)
988 } 859 }
989} 860}
990 861
862static char *
863gl_text_get1(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED)
864{
865 char buf[256];
866 int num = (int)(uintptr_t)data;
867 snprintf(buf, sizeof(buf), "Item # %i", num);
868 return strdup(buf);
869}
870
871
991void 872void
992egui_start(const char *filename) 873egui_start(const char *filename)
993{ 874{
@@ -1060,7 +941,6 @@ egui_start(const char *filename)
1060 menu = elm_toolbar_item_menu_get(g_main_wdgs->main_win->toolbar_view_it); 941 menu = elm_toolbar_item_menu_get(g_main_wdgs->main_win->toolbar_view_it);
1061 it = elm_menu_item_add(menu, NULL, "window-new", "Factory show/hide", _sub_wins_hide_show_cb,(void *) (intptr_t) FACTORY_VIEW); 942 it = elm_menu_item_add(menu, NULL, "window-new", "Factory show/hide", _sub_wins_hide_show_cb,(void *) (intptr_t) FACTORY_VIEW);
1062 elm_object_item_disabled_set(it, EINA_TRUE); 943 elm_object_item_disabled_set(it, EINA_TRUE);
1063 it = elm_menu_item_add(menu, NULL, "window-new", "Factory vert/hor", _sub_wins_hide_show_cb,(void *) (intptr_t) FACTORY_VIEW_SWITCH);
1064 it = elm_menu_item_add(menu, NULL, "window-new", "Objects Tree", _sub_wins_hide_show_cb,(void *) (intptr_t) OBJTREE_VIEW); 944 it = elm_menu_item_add(menu, NULL, "window-new", "Objects Tree", _sub_wins_hide_show_cb,(void *) (intptr_t) OBJTREE_VIEW);
1065 elm_object_item_disabled_set(it, EINA_TRUE); 945 elm_object_item_disabled_set(it, EINA_TRUE);
1066 it = elm_menu_item_add(menu, NULL, "window-new", "Properties", _sub_wins_hide_show_cb,(void *) (intptr_t) PROPERTIES_VIEW); 946 it = elm_menu_item_add(menu, NULL, "window-new", "Properties", _sub_wins_hide_show_cb,(void *) (intptr_t) PROPERTIES_VIEW);
@@ -1085,49 +965,90 @@ egui_start(const char *filename)
1085 elm_object_item_disabled_set(g_main_wdgs->main_win->toolbar_graph_it, EINA_TRUE); 965 elm_object_item_disabled_set(g_main_wdgs->main_win->toolbar_graph_it, EINA_TRUE);
1086#endif 966#endif
1087 967
968 static Elm_Genlist_Item_Class *_itc_ctn = NULL;
969 _itc_ctn = elm_genlist_item_class_new();
970 _itc_ctn->item_style = "default";
971 _itc_ctn->func.text_get = gl_text_get1;
972 _itc_ctn->func.content_get = NULL;
973 _itc_ctn->func.state_get = NULL;
974 _itc_ctn->func.del = NULL;
975
976 eo_do(g_main_wdgs->main_win->fctr_genlist_element, elm_obj_genlist_item_append(_itc_ctn, (void *)(uintptr_t)1, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL));
977 eo_do(g_main_wdgs->main_win->fctr_genlist_element, elm_obj_genlist_item_append(_itc_ctn, (void *)(uintptr_t)2, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL));
978 elm_genlist_item_class_free(_itc_ctn);
979
1088 /* Last parameter: EINA_TRUE if drag factory image, EINA_FALSE - to create and drag real object. */ 980 /* Last parameter: EINA_TRUE if drag factory image, EINA_FALSE - to create and drag real object. */
1089 _factory_item_finalize(g_main_wdgs->main_win->fctr_actionslider_it, "factory_actionslider.png", DB_DEF_ACTIONSLIDER_CLASS, EINA_TRUE); 981 _factory_item_finalize(g_main_wdgs->main_win->fctr_actionslider_it, NULL, EINA_FALSE, DB_DEF_ACTIONSLIDER_CLASS, EINA_FALSE);
1090 _factory_item_finalize(g_main_wdgs->main_win->fctr_bg_it, "factory_bg.png", DB_DEF_BG_CLASS, EINA_TRUE); 982 _factory_item_finalize(g_main_wdgs->main_win->fctr_bg_it, "factory_bg.png", EINA_TRUE, DB_DEF_BG_CLASS, EINA_TRUE);
1091 _factory_item_finalize(g_main_wdgs->main_win->fctr_box_it, "factory_box.png", DB_DEF_BOX_CLASS, EINA_TRUE); 983 _factory_item_finalize(g_main_wdgs->main_win->fctr_box_it, "factory_layout.png" , EINA_FALSE, DB_DEF_BOX_CLASS, EINA_TRUE);
1092 _factory_item_finalize(g_main_wdgs->main_win->fctr_bubble_it, "factory_bubble.png", DB_DEF_BUBBLE_CLASS, EINA_TRUE); 984 _factory_item_finalize(g_main_wdgs->main_win->fctr_bubble_it, NULL, EINA_FALSE, DB_DEF_BUBBLE_CLASS, EINA_FALSE);
1093 _factory_item_finalize(g_main_wdgs->main_win->fctr_button_it, "factory_button.png", DB_DEF_BUTTON_CLASS, EINA_FALSE); 985 _factory_item_finalize(g_main_wdgs->main_win->fctr_button_it, NULL, EINA_FALSE, DB_DEF_BUTTON_CLASS, EINA_FALSE);
1094 _factory_item_finalize(g_main_wdgs->main_win->fctr_calendar_it, "factory_calendar.png", DB_DEF_CALENDAR_CLASS, EINA_TRUE); 986 _factory_item_finalize(g_main_wdgs->main_win->fctr_calendar_it, NULL, EINA_FALSE, DB_DEF_CALENDAR_CLASS, EINA_FALSE);
1095 _factory_item_finalize(g_main_wdgs->main_win->fctr_check_it, "factory_check.png", DB_DEF_CHECK_CLASS, EINA_FALSE); 987 _factory_item_finalize(g_main_wdgs->main_win->fctr_check_it, NULL, EINA_FALSE, DB_DEF_CHECK_CLASS, EINA_FALSE);
1096 _factory_item_finalize(g_main_wdgs->main_win->fctr_radio_it, "factory_radio.png", DB_DEF_RADIO_CLASS, EINA_TRUE); 988 _factory_item_finalize(g_main_wdgs->main_win->fctr_radio_it, NULL, EINA_FALSE, DB_DEF_RADIO_CLASS, EINA_FALSE);
1097 _factory_item_finalize(g_main_wdgs->main_win->fctr_clock_it, "factory_clock.png", DB_DEF_CLOCK_CLASS, EINA_TRUE); 989 _factory_item_finalize(g_main_wdgs->main_win->fctr_clock_it, NULL, EINA_FALSE, DB_DEF_CLOCK_CLASS, EINA_FALSE);
1098 _factory_item_finalize(g_main_wdgs->main_win->fctr_colorselector_it, "factory_colorselector.png", DB_DEF_COLORSELECTOR_CLASS, EINA_TRUE); 990 _factory_item_finalize(g_main_wdgs->main_win->fctr_colorselector_it, NULL, EINA_FALSE, DB_DEF_COLORSELECTOR_CLASS, EINA_FALSE);
1099 _factory_item_finalize(g_main_wdgs->main_win->fctr_dayselector_it, "factory_dayselector.png", DB_DEF_DAYSELECTOR_CLASS, EINA_TRUE); 991 _factory_item_finalize(g_main_wdgs->main_win->fctr_dayselector_it, NULL, EINA_FALSE, DB_DEF_DAYSELECTOR_CLASS, EINA_FALSE);
1100 _factory_item_finalize(g_main_wdgs->main_win->fctr_image_it, "factory_image.png", DB_DEF_IMAGE_CLASS, EINA_TRUE); 992 _factory_item_finalize(g_main_wdgs->main_win->fctr_image_it, "factory_image.png", EINA_FALSE, DB_DEF_IMAGE_CLASS, EINA_TRUE);
1101 _factory_item_finalize(g_main_wdgs->main_win->fctr_icon_it, "factory_icon.png", DB_DEF_ICON_CLASS, EINA_TRUE); 993 _factory_item_finalize(g_main_wdgs->main_win->fctr_icon_it, "erigo_icon.png", EINA_FALSE, DB_DEF_ICON_CLASS, EINA_TRUE);
1102 _factory_item_finalize(g_main_wdgs->main_win->fctr_label_it, "factory_label.png", DB_DEF_LABEL_CLASS, EINA_FALSE); 994 _factory_item_finalize(g_main_wdgs->main_win->fctr_label_it, NULL, EINA_FALSE, DB_DEF_LABEL_CLASS, EINA_FALSE);
1103 _factory_item_finalize(g_main_wdgs->main_win->fctr_win_it, "factory_win.png", DB_DEF_WIN_CLASS, EINA_TRUE); 995 _factory_item_finalize(g_main_wdgs->main_win->fctr_win_it, "factory_layout.png", EINA_FALSE, DB_DEF_WIN_CLASS, EINA_TRUE);
1104 _factory_item_finalize(g_main_wdgs->main_win->fctr_entry_it, "factory_entry.png", DB_DEF_ENTRY_CLASS, EINA_TRUE); 996 _factory_item_finalize(g_main_wdgs->main_win->fctr_entry_it, NULL, EINA_FALSE, DB_DEF_ENTRY_CLASS, EINA_FALSE);
1105 _factory_item_finalize(g_main_wdgs->main_win->fctr_flip_it, "factory_flip.png", DB_DEF_FLIP_CLASS, EINA_TRUE); 997 _factory_item_finalize(g_main_wdgs->main_win->fctr_flip_it, "factory_flip.png", EINA_TRUE, DB_DEF_FLIP_CLASS, EINA_TRUE);
1106 _factory_item_finalize(g_main_wdgs->main_win->fctr_genlist_it, "factory_genlist.png", DB_DEF_GENLIST_CLASS, EINA_TRUE); 998 _factory_item_finalize(g_main_wdgs->main_win->fctr_genlist_it, "factory_genlist.png", EINA_FALSE, DB_DEF_GENLIST_CLASS, EINA_TRUE);
1107 _factory_item_finalize(g_main_wdgs->main_win->fctr_gengrid_it, "factory_gengrid.png", DB_DEF_GENGRID_CLASS, EINA_TRUE); 999 _factory_item_finalize(g_main_wdgs->main_win->fctr_gengrid_it, "factory_gengrid.png", EINA_TRUE, DB_DEF_GENGRID_CLASS, EINA_TRUE);
1108 _factory_item_finalize(g_main_wdgs->main_win->fctr_table_it, "factory_table.png", DB_DEF_TABLE_CLASS, EINA_TRUE); 1000 _factory_item_finalize(g_main_wdgs->main_win->fctr_table_it, NULL, EINA_FALSE, DB_DEF_TABLE_CLASS, EINA_TRUE);
1109 _factory_item_finalize(g_main_wdgs->main_win->fctr_menu_it, "factory_menu.png", DB_DEF_MENU_CLASS, EINA_TRUE); 1001 _factory_item_finalize(g_main_wdgs->main_win->fctr_menu_it, "factory_menu.png", EINA_TRUE, DB_DEF_MENU_CLASS, EINA_TRUE);
1110 _factory_item_finalize(g_main_wdgs->main_win->fctr_diskselector_it, "factory_diskselector.png", DB_DEF_DISKSELECTOR_CLASS, EINA_TRUE); 1002 _factory_item_finalize(g_main_wdgs->main_win->fctr_diskselector_it, NULL, EINA_FALSE, DB_DEF_DISKSELECTOR_CLASS, EINA_FALSE);
1111 _factory_item_finalize(g_main_wdgs->main_win->fctr_ctxpopup_it, "factory_ctxpopup.png", DB_DEF_CTXPOPUP_CLASS, EINA_TRUE); 1003 _factory_item_finalize(g_main_wdgs->main_win->fctr_ctxpopup_it, "factory_ctxpopup.png", EINA_TRUE, DB_DEF_CTXPOPUP_CLASS, EINA_TRUE);
1112 _factory_item_finalize(g_main_wdgs->main_win->fctr_toolbar_it, "factory_toolbar.png", DB_DEF_TOOLBAR_CLASS, EINA_TRUE); 1004 _factory_item_finalize(g_main_wdgs->main_win->fctr_toolbar_it, "factory_toolbar.png", EINA_FALSE, DB_DEF_TOOLBAR_CLASS, EINA_TRUE);
1113 _factory_item_finalize(g_main_wdgs->main_win->fctr_layout_it, "factory_layout.png", DB_DEF_LAYOUT_CLASS, EINA_TRUE); 1005 _factory_item_finalize(g_main_wdgs->main_win->fctr_layout_it, "factory_layout.png", EINA_TRUE, DB_DEF_LAYOUT_CLASS, EINA_TRUE);
1114 _factory_item_finalize(g_main_wdgs->main_win->fctr_naviframe_it, "factory_naviframe.png", DB_DEF_NAVIFRAME_CLASS, EINA_TRUE); 1006 _factory_item_finalize(g_main_wdgs->main_win->fctr_naviframe_it, "factory_naviframe.png", EINA_TRUE, DB_DEF_NAVIFRAME_CLASS, EINA_TRUE);
1115 _factory_item_finalize(g_main_wdgs->main_win->fctr_separator_it, "factory_dayselector.png", DB_DEF_SEPARATOR_CLASS, EINA_TRUE); 1007 _factory_item_finalize(g_main_wdgs->main_win->fctr_separator_it, NULL, EINA_FALSE, DB_DEF_SEPARATOR_CLASS, EINA_FALSE);
1116 _factory_item_finalize(g_main_wdgs->main_win->fctr_frame_it, "factory_frame.png", DB_DEF_FRAME_CLASS, EINA_TRUE); 1008 _factory_item_finalize(g_main_wdgs->main_win->fctr_frame_it, NULL, EINA_FALSE, DB_DEF_FRAME_CLASS, EINA_FALSE);
1117 _factory_item_finalize(g_main_wdgs->main_win->fctr_evas_image_it, "factory_image.png", DB_DEF_EVAS_IMAGE_CLASS, EINA_TRUE); 1009 _factory_item_finalize(g_main_wdgs->main_win->fctr_evas_image_it, "factory_image.png", EINA_FALSE, DB_DEF_EVAS_IMAGE_CLASS, EINA_TRUE);
1118 _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_it, "factory_image.png", DB_DEF_FILESELECTOR_CLASS, EINA_TRUE); 1010 _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_it, NULL, EINA_FALSE, DB_DEF_FILESELECTOR_CLASS, EINA_FALSE);
1119 _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_entry_it, "factory_image.png", DB_DEF_FILESELECTOR_ENTRY_CLASS, EINA_TRUE); 1011 _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_entry_it, NULL, EINA_FALSE, DB_DEF_FILESELECTOR_ENTRY_CLASS, EINA_FALSE);
1120 _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_button_it, "factory_image.png", DB_DEF_FILESELECTOR_BUTTON_CLASS, EINA_TRUE); 1012 _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_button_it, NULL, EINA_FALSE, DB_DEF_FILESELECTOR_BUTTON_CLASS, EINA_FALSE);
1121 _factory_item_finalize(g_main_wdgs->main_win->fctr_slider_it, "factory_image.png", DB_DEF_SLIDER_CLASS, EINA_TRUE); 1013 _factory_item_finalize(g_main_wdgs->main_win->fctr_slider_it, NULL, EINA_FALSE, DB_DEF_SLIDER_CLASS, EINA_FALSE);
1122 _factory_item_finalize(g_main_wdgs->main_win->fctr_progressbar_it, "factory_image.png", DB_DEF_PROGRESSBAR_CLASS, EINA_TRUE); 1014 _factory_item_finalize(g_main_wdgs->main_win->fctr_progressbar_it, NULL, EINA_FALSE, DB_DEF_PROGRESSBAR_CLASS, EINA_FALSE);
1123 _factory_item_finalize(g_main_wdgs->main_win->fctr_panes_it, "factory_image.png", DB_DEF_PANES_CLASS, EINA_TRUE); 1015 _factory_item_finalize(g_main_wdgs->main_win->fctr_panes_it, "factory_layout.png", EINA_FALSE, DB_DEF_PANES_CLASS, EINA_TRUE);
1124 _factory_item_finalize(g_main_wdgs->main_win->fctr_conformant_it, "factory_image.png", DB_DEF_CONFORMANT_CLASS, EINA_TRUE); 1016 _factory_item_finalize(g_main_wdgs->main_win->fctr_conformant_it, "factory_conformant.png", EINA_TRUE, DB_DEF_CONFORMANT_CLASS, EINA_TRUE);
1125 _factory_item_finalize(g_main_wdgs->main_win->fctr_grid_it, "factory_image.png", DB_DEF_GRID_CLASS, EINA_TRUE); 1017 _factory_item_finalize(g_main_wdgs->main_win->fctr_grid_it, "factory_grid.png", EINA_TRUE, DB_DEF_GRID_CLASS, EINA_TRUE);
1126 _factory_item_finalize(g_main_wdgs->main_win->fctr_hoversel_it, "factory_image.png", DB_DEF_HOVERSEL_CLASS, EINA_TRUE); 1018 _factory_item_finalize(g_main_wdgs->main_win->fctr_hoversel_it, NULL, EINA_FALSE, DB_DEF_HOVERSEL_CLASS, EINA_FALSE);
1019
1020 eo_do(g_main_wdgs->main_win->fctr_button_image, evas_obj_image_source_visible_set(EINA_FALSE));
1021 eo_do(g_main_wdgs->main_win->fctr_label_image, evas_obj_image_source_visible_set(EINA_FALSE));
1022 eo_do(g_main_wdgs->main_win->fctr_box_image, evas_obj_image_source_visible_set(EINA_FALSE));
1023 eo_do(g_main_wdgs->main_win->fctr_table_image, evas_obj_image_source_visible_set(EINA_FALSE));
1024 eo_do(g_main_wdgs->main_win->fctr_check_image, evas_obj_image_source_visible_set(EINA_FALSE));
1025 eo_do(g_main_wdgs->main_win->fctr_radio_image, evas_obj_image_source_visible_set(EINA_FALSE));
1026 eo_do(g_main_wdgs->main_win->fctr_actionslider_image, evas_obj_image_source_visible_set(EINA_FALSE));
1027 eo_do(g_main_wdgs->main_win->fctr_calendar_image, evas_obj_image_source_visible_set(EINA_FALSE));
1028 eo_do(g_main_wdgs->main_win->fctr_dayselector_image, evas_obj_image_source_visible_set(EINA_FALSE));
1029 eo_do(g_main_wdgs->main_win->fctr_separator_image, evas_obj_image_source_visible_set(EINA_FALSE));
1030 eo_do(g_main_wdgs->main_win->fctr_clock_image, evas_obj_image_source_visible_set(EINA_FALSE));
1031 eo_do(g_main_wdgs->main_win->fctr_entry_image, evas_obj_image_source_visible_set(EINA_FALSE));
1032 eo_do(g_main_wdgs->main_win->fctr_colorselector_image, evas_obj_image_source_visible_set(EINA_FALSE));
1033 eo_do(g_main_wdgs->main_win->fctr_slider_image, evas_obj_image_source_visible_set(EINA_FALSE));
1034 eo_do(g_main_wdgs->main_win->fctr_progressbar_image, evas_obj_image_source_visible_set(EINA_FALSE));
1035 eo_do(g_main_wdgs->main_win->fctr_fileselector_entry_image, evas_obj_image_source_visible_set(EINA_FALSE));
1036 eo_do(g_main_wdgs->main_win->fctr_fileselector_button_image, evas_obj_image_source_visible_set(EINA_FALSE));
1037 eo_do(g_main_wdgs->main_win->fctr_fileselector_image, evas_obj_image_source_visible_set(EINA_FALSE));
1038 eo_do(g_main_wdgs->main_win->fctr_icon_image, evas_obj_image_source_visible_set(EINA_FALSE));
1039 eo_do(g_main_wdgs->main_win->fctr_image_image, evas_obj_image_source_visible_set(EINA_FALSE));
1040 eo_do(g_main_wdgs->main_win->fctr_bubble_image, evas_obj_image_source_visible_set(EINA_FALSE));
1041 eo_do(g_main_wdgs->main_win->fctr_hoversel_image, evas_obj_image_source_visible_set(EINA_FALSE));
1042 eo_do(g_main_wdgs->main_win->fctr_frame_image, evas_obj_image_source_visible_set(EINA_FALSE));
1043 eo_do(g_main_wdgs->main_win->fctr_win_image, evas_obj_image_source_visible_set(EINA_FALSE));
1044 eo_do(g_main_wdgs->main_win->fctr_toolbar_image, evas_obj_image_source_visible_set(EINA_FALSE));
1045 eo_do(g_main_wdgs->main_win->fctr_diskselector_image, evas_obj_image_source_visible_set(EINA_FALSE));
1046 eo_do(g_main_wdgs->main_win->fctr_evas_image_image, evas_obj_image_source_visible_set(EINA_FALSE));
1047 eo_do(g_main_wdgs->main_win->fctr_panes_image, evas_obj_image_source_visible_set(EINA_FALSE));
1048 eo_do(g_main_wdgs->main_win->fctr_genlist_image, evas_obj_image_source_visible_set(EINA_FALSE));
1127 1049
1128 /*FIXME: Need to unpack inline image, so pass it into delete callback*/ 1050 /*FIXME: Need to unpack inline image, so pass it into delete callback*/
1129 evas_object_smart_callback_add(g_main_wdgs->main_win->main_win, "delete,request", _main_win_del_cb, NULL); 1051 evas_object_smart_callback_add(g_main_wdgs->main_win->main_win, "delete,request", _main_win_del_cb, NULL);
1130 _factory_vertical_pack(EINA_FALSE);
1131 _egui_project_open(filename); 1052 _egui_project_open(filename);
1132} 1053}
1133 1054
diff --git a/src/bin/gui/images/CMakeLists.txt b/src/bin/gui/images/CMakeLists.txt
index a575591..cdb034c 100644
--- a/src/bin/gui/images/CMakeLists.txt
+++ b/src/bin/gui/images/CMakeLists.txt
@@ -1,33 +1,20 @@
1cmake_minimum_required(VERSION 2.8.1) 1cmake_minimum_required(VERSION 2.8.1)
2 2
3LIST(APPEND FACTORY_IMAGES 3LIST(APPEND FACTORY_IMAGES
4 factory_actionslider.png
5 factory_bg.png 4 factory_bg.png
6 factory_box.png
7 factory_bubble.png
8 factory_button.png
9 factory_calendar.png
10 factory_check.png
11 factory_radio.png
12 factory_clock.png
13 factory_colorselector.png
14 factory_dayselector.png
15 factory_icon.png 5 factory_icon.png
16 factory_image.png 6 factory_image.png
17 factory_label.png
18 factory_win.png
19 factory_entry.png
20 factory_flip.png 7 factory_flip.png
21 factory_genlist.png 8 factory_genlist.png
22 factory_gengrid.png 9 factory_gengrid.png
23 factory_table.png
24 factory_menu.png 10 factory_menu.png
25 factory_diskselector.png
26 factory_ctxpopup.png 11 factory_ctxpopup.png
27 factory_toolbar.png 12 factory_toolbar.png
28 factory_layout.png 13 factory_layout.png
29 factory_naviframe.png 14 factory_naviframe.png
30 factory_frame.png 15 factory_frame.png
16 factory_conformant.png
17 factory_grid.png
31 resize_red.png 18 resize_red.png
32 canvas_bg.jpg 19 canvas_bg.jpg
33 icon_up_arrow.png 20 icon_up_arrow.png
diff --git a/src/bin/gui/images/factory_actionslider.png b/src/bin/gui/images/factory_actionslider.png
deleted file mode 100644
index efa5a85..0000000
--- a/src/bin/gui/images/factory_actionslider.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_box.png b/src/bin/gui/images/factory_box.png
deleted file mode 100644
index 33e74ed..0000000
--- a/src/bin/gui/images/factory_box.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_bubble.png b/src/bin/gui/images/factory_bubble.png
deleted file mode 100644
index 3fd912b..0000000
--- a/src/bin/gui/images/factory_bubble.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_button.png b/src/bin/gui/images/factory_button.png
deleted file mode 100644
index 00c2ed9..0000000
--- a/src/bin/gui/images/factory_button.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_calendar.png b/src/bin/gui/images/factory_calendar.png
deleted file mode 100644
index 2fc7f81..0000000
--- a/src/bin/gui/images/factory_calendar.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_check.png b/src/bin/gui/images/factory_check.png
deleted file mode 100644
index ac37112..0000000
--- a/src/bin/gui/images/factory_check.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_clock.png b/src/bin/gui/images/factory_clock.png
deleted file mode 100644
index 2dfaec3..0000000
--- a/src/bin/gui/images/factory_clock.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_colorselector.png b/src/bin/gui/images/factory_colorselector.png
deleted file mode 100644
index 8efed53..0000000
--- a/src/bin/gui/images/factory_colorselector.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_conformant.png b/src/bin/gui/images/factory_conformant.png
new file mode 100644
index 0000000..40d2325
--- /dev/null
+++ b/src/bin/gui/images/factory_conformant.png
Binary files differ
diff --git a/src/bin/gui/images/factory_ctxpopup.png b/src/bin/gui/images/factory_ctxpopup.png
index c74c0b1..4af1c22 100644
--- a/src/bin/gui/images/factory_ctxpopup.png
+++ b/src/bin/gui/images/factory_ctxpopup.png
Binary files differ
diff --git a/src/bin/gui/images/factory_dayselector.png b/src/bin/gui/images/factory_dayselector.png
deleted file mode 100644
index 2422931..0000000
--- a/src/bin/gui/images/factory_dayselector.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_diskselector.png b/src/bin/gui/images/factory_diskselector.png
deleted file mode 100644
index d637eed..0000000
--- a/src/bin/gui/images/factory_diskselector.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_entry.png b/src/bin/gui/images/factory_entry.png
deleted file mode 100644
index ae46944..0000000
--- a/src/bin/gui/images/factory_entry.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_flip.png b/src/bin/gui/images/factory_flip.png
index d246d7b..d34abc5 100644
--- a/src/bin/gui/images/factory_flip.png
+++ b/src/bin/gui/images/factory_flip.png
Binary files differ
diff --git a/src/bin/gui/images/factory_gengrid.png b/src/bin/gui/images/factory_gengrid.png
index e4a20e2..ee5a206 100644
--- a/src/bin/gui/images/factory_gengrid.png
+++ b/src/bin/gui/images/factory_gengrid.png
Binary files differ
diff --git a/src/bin/gui/images/factory_genlist.png b/src/bin/gui/images/factory_genlist.png
index 7b0e762..ca6d37f 100644
--- a/src/bin/gui/images/factory_genlist.png
+++ b/src/bin/gui/images/factory_genlist.png
Binary files differ
diff --git a/src/bin/gui/images/factory_grid.png b/src/bin/gui/images/factory_grid.png
new file mode 100644
index 0000000..d4f432a
--- /dev/null
+++ b/src/bin/gui/images/factory_grid.png
Binary files differ
diff --git a/src/bin/gui/images/factory_image.png b/src/bin/gui/images/factory_image.png
index 6806884..7dbae67 100644
--- a/src/bin/gui/images/factory_image.png
+++ b/src/bin/gui/images/factory_image.png
Binary files differ
diff --git a/src/bin/gui/images/factory_label.png b/src/bin/gui/images/factory_label.png
deleted file mode 100644
index ed726e8..0000000
--- a/src/bin/gui/images/factory_label.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_menu.png b/src/bin/gui/images/factory_menu.png
index f83e52b..6851c18 100644
--- a/src/bin/gui/images/factory_menu.png
+++ b/src/bin/gui/images/factory_menu.png
Binary files differ
diff --git a/src/bin/gui/images/factory_radio.png b/src/bin/gui/images/factory_radio.png
deleted file mode 100644
index 594afbe..0000000
--- a/src/bin/gui/images/factory_radio.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_table.png b/src/bin/gui/images/factory_table.png
deleted file mode 100644
index 336709e..0000000
--- a/src/bin/gui/images/factory_table.png
+++ /dev/null
Binary files differ
diff --git a/src/bin/gui/images/factory_win.png b/src/bin/gui/images/factory_win.png
deleted file mode 100644
index 27969f3..0000000
--- a/src/bin/gui/images/factory_win.png
+++ /dev/null
Binary files differ
diff --git a/src/lib/generator.c b/src/lib/generator.c
index 38550fb..68d637d 100644
--- a/src/lib/generator.c
+++ b/src/lib/generator.c
@@ -883,6 +883,7 @@ _ctx_generate(Global_Gen_Context *gl_ctx)
883 "#include <Elementary.h>\n" 883 "#include <Elementary.h>\n"
884 "#include \"elm_widget_container.h\"\n" 884 "#include \"elm_widget_container.h\"\n"
885 "#include \"elm_interface_scrollable.h\"\n" 885 "#include \"elm_interface_scrollable.h\"\n"
886 "#include \"elm_interface_fileselector.h\"\n"
886 "#include \"%s\"\n\n", gui_context_export_h_filename_get(ctx)); 887 "#include \"%s\"\n\n", gui_context_export_h_filename_get(ctx));
887 888
888 eina_strbuf_append_printf(gl_ctx->c_buf, 889 eina_strbuf_append_printf(gl_ctx->c_buf,