yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=4d9cff57c396eb6a73b46d0334a4be9fde88a64e
commit 4d9cff57c396eb6a73b46d0334a4be9fde88a64e
Author: Yakov Goldberg <yako...@samsung.com>
Date: Mon Jun 29 17:30:36 2015 +0300
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
---
data/config/func_names.json | 18 +-
src/bin/gui/dnd.c | 22 +-
src/bin/gui/dnd.h | 4 +-
src/bin/gui/editor.c | 62 +-
src/bin/gui/egui_layout.json | 1520 +++++++++++++++-----------
src/bin/gui/egui_logic.c | 279 ++---
src/bin/gui/images/CMakeLists.txt | 17 +-
src/bin/gui/images/factory_actionslider.png | Bin 3728 -> 0 bytes
src/bin/gui/images/factory_box.png | Bin 8403 -> 0 bytes
src/bin/gui/images/factory_bubble.png | Bin 6080 -> 0 bytes
src/bin/gui/images/factory_button.png | Bin 2307 -> 0 bytes
src/bin/gui/images/factory_calendar.png | Bin 27226 -> 0 bytes
src/bin/gui/images/factory_check.png | Bin 825 -> 0 bytes
src/bin/gui/images/factory_clock.png | Bin 6884 -> 0 bytes
src/bin/gui/images/factory_colorselector.png | Bin 27693 -> 0 bytes
src/bin/gui/images/factory_conformant.png | Bin 0 -> 9805 bytes
src/bin/gui/images/factory_ctxpopup.png | Bin 12135 -> 6646 bytes
src/bin/gui/images/factory_dayselector.png | Bin 6038 -> 0 bytes
src/bin/gui/images/factory_diskselector.png | Bin 5215 -> 0 bytes
src/bin/gui/images/factory_entry.png | Bin 4610 -> 0 bytes
src/bin/gui/images/factory_flip.png | Bin 4266 -> 110461 bytes
src/bin/gui/images/factory_gengrid.png | Bin 9505 -> 221945 bytes
src/bin/gui/images/factory_genlist.png | Bin 14784 -> 31597 bytes
src/bin/gui/images/factory_grid.png | Bin 0 -> 22623 bytes
src/bin/gui/images/factory_image.png | Bin 3798 -> 81162 bytes
src/bin/gui/images/factory_label.png | Bin 1139 -> 0 bytes
src/bin/gui/images/factory_menu.png | Bin 9553 -> 4365 bytes
src/bin/gui/images/factory_radio.png | Bin 2031 -> 0 bytes
src/bin/gui/images/factory_table.png | Bin 11285 -> 0 bytes
src/bin/gui/images/factory_win.png | Bin 114252 -> 0 bytes
src/lib/generator.c | 1 +
31 files changed, 1059 insertions(+), 864 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 @@
"Elm.Entry":
{
"Elm.Widget.part_text":[null, "Entry"],
+ "Elm.Entry.scrollable":[true],
"Efl.Gfx.Base.size":[60, 30]
},
"Elm.Flip":
@@ -123,6 +124,10 @@
"Elm.Fileselector_Entry":
{
"Efl.Gfx.Base.size":[100, 22]
+ },
+ "Elm.Separator":
+ {
+ "Efl.Gfx.Base.size":[4, 100]
}
},
"OPERATIONS" :
@@ -394,7 +399,18 @@
{
"class" : "Elm.Grid",
"name" : "pack",
- "display_name" : "Pack"
+ "display_name" : "Pack",
+ "container_behavior_data":["OBJ_CONTAINER", "CONTAINER_PACK"]
+ },
+ {
+ "class" : "Elm.Grid",
+ "name" : "unpack",
+ "container_behavior_data":["OBJ_CONTAINER", "CONTAINER_UNPACK"]
+ },
+ {
+ "class" : "Elm.Grid",
+ "name" : "clear",
+ "container_behavior_data":["OBJ_CONTAINER", "CONTAINER_UNPACK_ALL"]
},
{
"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 @@
typedef struct
{
const char *data; /*DnD data*/
- Eo *image; /* image for DnD icon. */
+ char *image_path; /* image for DnD icon. */
Eo *obj; /*object, where drag starts */
Eo *drag_window_obj; /* Object inside drag window. neede to hide it. */
Eo *drag_window_obj_wref;
@@ -301,14 +301,10 @@ _drag_factory_image_icon_create(void *data, Evas_Object
*parent, Evas_Coord *xof
{
Drag_Info *di = data;
Evas_Object *ic = NULL;
- Evas_Object *io = di->image;
- const char *f, *g;
- Evas_Coord x, y, w, h, xm, ym;
+ Evas_Coord xm, ym;
- elm_image_file_get(io, &f, &g);
ic = elm_image_add(parent);
- elm_image_file_set(ic, f, g);
- evas_object_geometry_get(io, &x, &y, &w, &h);
+ elm_image_file_set(ic, di->image_path, NULL);
evas_object_resize(ic, 40, 40);
evas_object_show(ic);
@@ -454,7 +450,7 @@ _drag_start_from_factory(void *data)
Drag_Info *di = data;
Evas_Object *(*image_create_icon_f)(void *data, Evas_Object *parent,
Evas_Coord *xoff, Evas_Coord *yoff) = NULL;
- image_create_icon_f = (di->image) ? _drag_factory_image_icon_create :
_drag_factory_real_object_create;
+ image_create_icon_f = (di->image_path) ? _drag_factory_image_icon_create :
_drag_factory_real_object_create;
_drag_factory_timer = NULL;
_dnd_info.drag_info = di;
@@ -496,6 +492,7 @@ static Eina_Bool
_drag_data_free(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
Drag_Info *di = data;
+ if (di->image_path) free(di->image_path);
free(di);
_dnd_info.drag_info = NULL;
return EO_CALLBACK_CONTINUE;
@@ -504,10 +501,11 @@ _drag_data_free(void *data, Eo *obj EINA_UNUSED, const
Eo_Event_Description *des
/* Function to make Eo object draggable, when mouse down/up are handled inside.
* Dragging from factory. */
void
-drag_add(Eo *obj, Eo *image, const char *data)
+drag_add(Eo *obj, const char *image_path, const char *data)
{
Drag_Info *di = calloc(1, sizeof(Drag_Info));
- di->image = image;
+ if (image_path)
+ di->image_path = strdup(image_path);
di->data = data;
di->obj = obj;
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)
/* Function to start dragging, when mouse down/up are handled outside.
* Dragging widgets. */
void
-drag_start(Eo *obj, Eo *image, const char *data, const Gui_Widget *wdg, void
(*cb)(const Gui_Widget *, const Eo *))
+drag_start(Eo *obj, const char *data, const Gui_Widget *wdg, void (*cb)(const
Gui_Widget *, const Eo *))
{
Drag_Info *di = calloc(1, sizeof(Drag_Info));
- di->image = image;
+ di->image_path = NULL;
di->data = data;
di->obj = obj;
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 @@
#define _DND_H
void
-drag_add(Eo *obj, Eo *image, const char *data);
+drag_add(Eo *obj, const char *image_path, const char *data);
void
-drag_start(Eo *obj, Eo *image, const char *data, const Gui_Widget *wdg, void
(*cb)(const Gui_Widget *, const Eo *));
+drag_start(Eo *obj, const char *data, const Gui_Widget *wdg, void (*cb)(const
Gui_Widget *, const Eo *));
void
drag_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;
Eina_Bool
_canvas_resize_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description
*desc EINA_UNUSED, void *event_info EINA_UNUSED);
+Eina_Bool
+_theme_selector_hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info);
+
void
_active_context_set(Gui_Context *ctx)
{
@@ -603,7 +606,7 @@ _drag_widget_start(void *data)
const Gui_Session *session =
gui_context_editor_session_get(wdg_context_get(wdg));
Eo *wdg_eo = session_eo_get(session, wdg);
- drag_start(wdg_eo, NULL, EDITOR_DRAG_DATA, wdg, _drag_start_cb);
+ drag_start(wdg_eo, EDITOR_DRAG_DATA, wdg, _drag_start_cb);
drag_started = EINA_TRUE;
_drag_timer_start = NULL;
return ECORE_CALLBACK_CANCEL;
@@ -4364,11 +4367,12 @@ _content_change_from_propview(void *data EINA_UNUSED,
Eo *obj, const Eo_Event_De
eo_do(obj, entry_data = elm_obj_layout_text_get(NULL));
/* Run CONTENT_PACK for table in order to reset with new coordinates.
*/
- if (!strcmp(container_class_name, DB_DEF_TABLE_CLASS))
+ if (!strcmp(container_class_name, DB_DEF_TABLE_CLASS) ||
+ !strcmp(container_class_name, DB_DEF_GRID_CLASS))
{
int number = atoi(entry_data);
- /* Value can't be less then 1 for width and height params. */
- if ((par_idx >= 3) && (number < 1))
+ /* For table value can't be less then 1 for width and height
params. */
+ if (!strcmp(container_class_name, DB_DEF_TABLE_CLASS) && (par_idx
>= 3) && (number < 1))
{
char str[12];
number = INT_GET(val);
@@ -4549,6 +4553,9 @@ _switch_to_context(Gui_Context *ctx)
objtree_item_selected_set(wdg);
_canvas_resize_cb(NULL, g->main_win->canvas_scroller, NULL, NULL);
_canvas_name_update(ctx);
+ Eina_Stringshare *theme_name =
gui_context_edit_theme_name_get(_active_context_get());
+ eo_do(g->main_win->theme_selector_hoversel,
elm_obj_widget_part_text_set(NULL, theme_name));
+ _theme_selector_hover_selected_cb(NULL, NULL, NULL, NULL);
}
static void
@@ -4768,14 +4775,49 @@ _key_binding_zoom_cb(void *data)
_canvas_resize_cb(NULL, g->main_win->canvas_scroller, NULL, NULL);
}
+static void
+_factory_theme_apply(Elm_Theme *theme)
+{
+ elm_object_theme_set(g->main_win->fctr_button_element, theme);
+ elm_object_theme_set(g->main_win->fctr_label_element, theme);
+ elm_object_theme_set(g->main_win->fctr_box_element, theme);
+ elm_object_theme_set(g->main_win->fctr_table_element, theme);
+ elm_object_theme_set(g->main_win->fctr_check_element, theme);
+ elm_object_theme_set(g->main_win->fctr_radio_element, theme);
+ elm_object_theme_set(g->main_win->fctr_actionslider_element, theme);
+ elm_object_theme_set(g->main_win->fctr_calendar_element, theme);
+ elm_object_theme_set(g->main_win->fctr_dayselector_element, theme);
+ elm_object_theme_set(g->main_win->fctr_separator_element, theme);
+ elm_object_theme_set(g->main_win->fctr_clock_element, theme);
+ elm_object_theme_set(g->main_win->fctr_entry_element, theme);
+ elm_object_theme_set(g->main_win->fctr_colorselector_element, theme);
+ elm_object_theme_set(g->main_win->fctr_slider_element, theme);
+ elm_object_theme_set(g->main_win->fctr_progressbar_element, theme);
+ elm_object_theme_set(g->main_win->fctr_fileselector_element, theme);
+ elm_object_theme_set(g->main_win->fctr_fileselector_entry_element, theme);
+ elm_object_theme_set(g->main_win->fctr_fileselector_button_element, theme);
+ elm_object_theme_set(g->main_win->fctr_icon_element, theme);
+ elm_object_theme_set(g->main_win->fctr_image_element, theme);
+ elm_object_theme_set(g->main_win->fctr_bubble_element, theme);
+ elm_object_theme_set(g->main_win->fctr_hoversel_element, theme);
+ elm_object_theme_set(g->main_win->fctr_frame_element, theme);
+ elm_object_theme_set(g->main_win->fctr_win_frame_element, theme);
+ elm_object_theme_set(g->main_win->fctr_toolbar_element, theme);
+ elm_object_theme_set(g->main_win->fctr_diskselector_element, theme);
+ elm_object_theme_set(g->main_win->fctr_panes_element, theme);
+ elm_object_theme_set(g->main_win->fctr_genlist_element, theme);
+}
+
Eina_Bool
_theme_selector_hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
{
- const char *choosen_value;
- eo_do(event_info, choosen_value = elm_wdg_item_part_text_get(NULL));
- eo_do(obj, elm_obj_widget_part_text_set(NULL, choosen_value));
-
- gui_context_edit_theme_name_set(_active_context_get(), choosen_value);
+ if (event_info)
+ {
+ const char *choosen_value;
+ eo_do(event_info, choosen_value = elm_wdg_item_part_text_get(NULL));
+ eo_do(obj, elm_obj_widget_part_text_set(NULL, choosen_value));
+ gui_context_edit_theme_name_set(_active_context_get(), choosen_value);
+ }
/* Apply theme to main widgets. */
Eid *wdg_id;
@@ -4800,6 +4842,8 @@ _theme_selector_hover_selected_cb(void *data EINA_UNUSED,
Eo *obj, const Eo_Even
elm_object_theme_set(fr, theme);
}
+ _factory_theme_apply(theme);
+
elm_theme_free(theme);
return EO_CALLBACK_CONTINUE;
}
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 @@
"res_canvas_bg":"images/canvas_bg.jpg",
"erigo_icon":"images/erigo_icon.png",
"move_up_icon":"images/icon_up_arrow.png",
- "move_down_icon":"images/icon_down_arrow.png"
+ "move_down_icon":"images/icon_down_arrow.png",
+ "factory_image":"images/factory_image.png"
},
"Eo_Callbacks":
{
@@ -1220,35 +1221,35 @@
"Properties":
{
"Evas.Object.size_hint_align":[0.05, -1],
- "Elm.Table.padding":[6, 7],
+ "Elm.Table.padding":[2, 2],
"Efl.Gfx.Base.visible":[true]
},
"Contains":
{
"fctr_win_it":[0, 0, 1, 1],
- "fctr_bg_it":[0, 1, 1, 1],
- "fctr_button_it":[0, 2, 1, 1],
- "fctr_label_it":[0, 3, 1, 1],
- "fctr_check_it":[0, 4, 1, 1],
- "fctr_radio_it":[0, 5, 1, 1],
- "fctr_icon_it":[0, 6, 1, 1],
- "fctr_image_it":[0, 7, 1, 1],
- "fctr_actionslider_it":[0, 8, 1, 1],
- "fctr_clock_it":[0, 9, 1, 1],
- "fctr_dayselector_it":[0, 10, 1, 1],
- "fctr_calendar_it":[0, 11, 1, 1],
- "fctr_bubble_it":[0, 12, 1, 1],
- "fctr_colorselector_it":[0, 13, 1, 1],
- "fctr_entry_it":[0, 14, 1, 1],
- "fctr_flip_it":[0, 15, 1, 1],
- "fctr_separator_it":[0, 16, 1, 1],
- "fctr_frame_it":[0, 17, 1, 1],
- "fctr_fileselector_it":[0, 18, 1, 1],
- "fctr_fileselector_entry_it":[0, 19, 1, 1],
- "fctr_fileselector_button_it":[0, 20, 1, 1],
- "fctr_slider_it":[0, 21, 1, 1],
- "fctr_progressbar_it":[0, 22, 1, 1],
- "fctr_hoversel_it":[0, 23, 1, 1]
+ "fctr_bg_it":[1, 0, 1, 1],
+ "fctr_button_it":[2, 0, 1, 1],
+ "fctr_label_it":[0, 1, 1, 1],
+ "fctr_check_it":[1, 1, 1, 1],
+ "fctr_radio_it":[2, 1, 1, 1],
+ "fctr_icon_it":[0, 2, 1, 1],
+ "fctr_image_it":[1, 2, 1, 1],
+ "fctr_entry_it":[2, 2, 1, 1],
+ "fctr_clock_it":[0, 3, 1, 1],
+ "fctr_colorselector_it":[1, 3, 1, 1],
+ "fctr_calendar_it":[2, 3, 1, 1],
+ "fctr_bubble_it":[0, 4, 1, 1],
+ "fctr_flip_it":[1, 4, 1, 1],
+ "fctr_frame_it":[2, 4, 1, 1],
+ "fctr_fileselector_it":[0, 5, 1, 2],
+ "fctr_fileselector_entry_it":[1, 5, 2, 1],
+ "fctr_fileselector_button_it":[1, 6, 2, 1],
+ "fctr_actionslider_it":[0, 7, 2, 1],
+ "fctr_hoversel_it":[2, 7, 1, 1],
+ "fctr_progressbar_it":[0, 8, 2, 1],
+ "fctr_separator_it":[2, 8, 1, 1],
+ "fctr_slider_it":[0, 9, 3, 1],
+ "fctr_dayselector_it":[0, 10, 3, 1]
}
},
"fctr_table_sep_2":
@@ -1302,19 +1303,20 @@
"Properties":
{
"Evas.Object.size_hint_align":[0.05, -1],
- "Elm.Table.padding":[6, 7],
+ "Elm.Table.padding":[2, 2],
"Efl.Gfx.Base.visible":[true]
},
"Contains":
{
"fctr_box_it":[0, 0, 1, 1],
- "fctr_table_it":[0, 1, 1, 1],
- "fctr_layout_it":[0, 3, 1, 1],
- "fctr_naviframe_it":[0, 4, 1, 1],
- "fctr_panes_it":[0, 5, 1, 1],
- "fctr_conformant_it":[0, 6, 1, 1],
- "fctr_genlist_it":[0, 7, 1, 1],
- "fctr_gengrid_it":[0, 8, 1, 1]
+ "fctr_table_it":[1, 0, 1, 1],
+ "fctr_grid_it":[2, 0, 1, 1],
+ "fctr_layout_it":[0, 1, 1, 1],
+ "fctr_naviframe_it":[1, 1, 1, 1],
+ "fctr_panes_it":[2, 1, 1, 1],
+ "fctr_conformant_it":[0, 2, 1, 1],
+ "fctr_genlist_it":[1, 2, 1, 1],
+ "fctr_gengrid_it":[2, 2, 1, 1]
}
},
"fctr_table_sep_4":
@@ -1368,15 +1370,15 @@
"Properties":
{
"Evas.Object.size_hint_align":[0.05, -1],
- "Elm.Table.padding":[6, 7],
+ "Elm.Table.padding":[2, 2],
"Efl.Gfx.Base.visible":[true]
},
"Contains":
{
- "fctr_menu_it":[0, 0, 1, 1],
- "fctr_toolbar_it":[0, 1, 1, 1],
- "fctr_diskselector_it":[0, 2, 1, 1],
- "fctr_ctxpopup_it":[0, 3, 1, 1]
+ "fctr_toolbar_it":[0, 0, 1, 1],
+ "fctr_diskselector_it":[1, 0, 1, 1],
+ "fctr_ctxpopup_it":[0, 1, 1, 1],
+ "fctr_menu_it":[1, 1, 1, 1]
}
},
"fctr_table_sep_6":
@@ -1430,7 +1432,7 @@
"Properties":
{
"Evas.Object.size_hint_align":[0.05, -1],
- "Elm.Table.padding":[6, 7],
+ "Elm.Table.padding":[2, 2],
"Efl.Gfx.Base.visible":[true]
},
"Contains":
@@ -1452,33 +1454,25 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_win_image", "fctr_win_label"]
+ "Contains":["fctr_win_image"]
},
"fctr_win_image":
{
"Desc":
{
- "parent":"fctr_win_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_win_label":
- {
- "Desc":
- {
- "parent":"fctr_win_it",
- "class":"Elm.Label"
+ "parent":"fctr_frame_it",
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Window"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[60, 60],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_win_frame_element"],
+ "Evas.Object.size_hint_align":[-1, -1],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_bg_it":
@@ -1495,7 +1489,7 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_bg_image", "fctr_bg_label"]
+ "Contains":["fctr_bg_image"]
},
"fctr_bg_image":
{
@@ -1506,23 +1500,55 @@
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
+ "Evas.Object.size_hint_min":[55, 55],
"Elm.Image.resizable":[true, true],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_bg_label":
+ "fctr_box_element":
{
"Desc":
{
- "parent":"fctr_bg_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Background"],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
- }
+ },
+ "Contains":["fctr_box_element_button_1", "fctr_box_element_button_2"]
+ },
+ "fctr_box_element_button_1":
+ {
+ "Desc":
+ {
+ "parent":"fctr_box_element",
+ "class":"Elm.Button",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "Box with"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[80, 30]
+ }
+ },
+ "fctr_box_element_button_2":
+ {
+ "Desc":
+ {
+ "parent":"fctr_box_element",
+ "class":"Elm.Button",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "Buttons"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[80, 30]
+ }
},
"fctr_box_it":
{
@@ -1538,33 +1564,24 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_box_image", "fctr_box_label"]
+ "Contains":["fctr_box_image"]
},
"fctr_box_image":
{
"Desc":
{
"parent":"fctr_box_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_box_label":
- {
- "Desc":
- {
- "parent":"fctr_box_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Box"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[60, 50],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_box_element"],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_button_it":
@@ -1581,33 +1598,23 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_button_image", "fctr_button_label"]
+ "Contains":["fctr_button_image"]
},
"fctr_button_image":
{
"Desc":
{
"parent":"fctr_button_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_button_label":
- {
- "Desc":
- {
- "parent":"fctr_button_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Button"],
- "Efl.Gfx.Base.visible":[true]
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[70, 30],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_button_element"],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_label_it":
@@ -1624,33 +1631,25 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_label_image", "fctr_label_label"]
+ "Contains":["fctr_label_image"]
},
"fctr_label_image":
{
"Desc":
{
"parent":"fctr_label_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_label_label":
- {
- "Desc":
- {
- "parent":"fctr_label_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Label"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[100, 30],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_label_element"],
+ "Evas.Object.size_hint_align":[-1, -1],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_check_it":
@@ -1667,33 +1666,25 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_check_image", "fctr_check_label"]
+ "Contains":["fctr_check_image"]
},
"fctr_check_image":
{
"Desc":
{
"parent":"fctr_check_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_check_label":
- {
- "Desc":
- {
- "parent":"fctr_check_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Check"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[80, 30],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_check_element"],
+ "Evas.Object.size_hint_align":[-1, -1],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_radio_it":
@@ -1710,33 +1701,25 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_radio_image", "fctr_radio_label"]
+ "Contains":["fctr_radio_image"]
},
"fctr_radio_image":
{
"Desc":
{
"parent":"fctr_radio_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_radio_label":
- {
- "Desc":
- {
- "parent":"fctr_radio_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Radio"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[80, 30],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_radio_element"],
+ "Evas.Object.size_hint_align":[-1, -1],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_icon_it":
@@ -1753,33 +1736,25 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_icon_image", "fctr_icon_label"]
+ "Contains":["fctr_icon_image"]
},
"fctr_icon_image":
{
"Desc":
{
"parent":"fctr_icon_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_icon_label":
- {
- "Desc":
- {
- "parent":"fctr_icon_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Icon"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[40, 40],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_icon_element"],
+ "Evas.Object.size_hint_align":[-1, -1],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_image_it":
@@ -1796,33 +1771,25 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_image_image", "fctr_image_label"]
+ "Contains":["fctr_image_image"]
},
"fctr_image_image":
{
"Desc":
{
"parent":"fctr_image_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_image_label":
- {
- "Desc":
- {
- "parent":"fctr_image_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Image"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[40, 40],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_image_element"],
+ "Evas.Object.size_hint_align":[-1, -1],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_actionslider_it":
@@ -1839,33 +1806,24 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_actionslider_image", "fctr_actionslider_label"]
+ "Contains":["fctr_actionslider_image"]
},
"fctr_actionslider_image":
{
"Desc":
{
"parent":"fctr_actionslider_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_actionslider_label":
- {
- "Desc":
- {
- "parent":"fctr_actionslider_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Actionslider"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[180, 30],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_actionslider_element"],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_bubble_it":
@@ -1882,33 +1840,24 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_bubble_image", "fctr_bubble_label"]
+ "Contains":["fctr_bubble_image"]
},
"fctr_bubble_image":
{
"Desc":
{
"parent":"fctr_bubble_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_bubble_label":
- {
- "Desc":
- {
- "parent":"fctr_bubble_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
+ "Evas.Object.size_hint_weight":[1, 1],
"Efl.Gfx.Base.visible":[true],
- "Elm.Widget.part_text":[null, "Bubble"]
+ "Evas.Object.size_hint_min":[70, 50],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_bubble_element"],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_calendar_it":
@@ -1925,33 +1874,25 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_calendar_image", "fctr_calendar_label"]
+ "Contains":["fctr_calendar_image"]
},
"fctr_calendar_image":
{
"Desc":
{
"parent":"fctr_calendar_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_calendar_label":
- {
- "Desc":
- {
- "parent":"fctr_calendar_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Calendar"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[60, 60],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_calendar_element"],
+ "Evas.Object.size_hint_align":[-1, -1],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_colorselector_it":
@@ -1968,33 +1909,24 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_colorselector_image", "fctr_colorselector_label"]
+ "Contains":["fctr_colorselector_image"]
},
"fctr_colorselector_image":
{
"Desc":
{
"parent":"fctr_colorselector_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_colorselector_label":
- {
- "Desc":
- {
- "parent":"fctr_colorselector_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Colorselector"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[60, 60],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_colorselector_element"],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_dayselector_it":
@@ -2011,76 +1943,58 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_dayselector_image", "fctr_dayselector_label"]
+ "Contains":["fctr_dayselector_image"]
},
"fctr_dayselector_image":
{
"Desc":
{
"parent":"fctr_dayselector_it",
- "class":"Elm.Image"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[290, 20],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_dayselector_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_dayselector_label":
+ "fctr_clock_it":
{
"Desc":
{
- "parent":"fctr_dayselector_it",
- "class":"Elm.Label"
+ "parent":"fctr_table",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Dayselector"],
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_clock_it":
- {
- "Desc":
- {
- "parent":"fctr_table",
- "class":"Elm.Box",
- "public":true
- },
- "Properties":
- {
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[true]
- },
- "Contains":["fctr_clock_image", "fctr_clock_label"]
+ },
+ "Contains":["fctr_clock_image"]
},
"fctr_clock_image":
{
"Desc":
{
"parent":"fctr_clock_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_clock_label":
- {
- "Desc":
- {
- "parent":"fctr_clock_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Clock"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[65, 35],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_clock_element"],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_entry_it":
@@ -2097,33 +2011,24 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_entry_image", "fctr_entry_label"]
+ "Contains":["fctr_entry_image"]
},
"fctr_entry_image":
{
"Desc":
{
"parent":"fctr_entry_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_entry_label":
- {
- "Desc":
- {
- "parent":"fctr_entry_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Entry"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[65, 35],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_entry_element"],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_flip_it":
@@ -2140,7 +2045,7 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_flip_image", "fctr_flip_label"]
+ "Contains":["fctr_flip_image"]
},
"fctr_flip_image":
{
@@ -2151,24 +2056,11 @@
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
+ "Evas.Object.size_hint_min":[75, 75],
"Elm.Image.resizable":[true, true],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_flip_label":
- {
- "Desc":
- {
- "parent":"fctr_flip_it",
- "class":"Elm.Label"
- },
- "Properties":
- {
- "Elm.Widget.part_text":[null, "Flip"],
- "Efl.Gfx.Base.visible":[true]
- }
- },
"fctr_genlist_it":
{
"Desc":
@@ -2183,33 +2075,40 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_genlist_image", "fctr_genlist_label"]
+ "Contains":["fctr_genlist_image"]
},
"fctr_genlist_image":
{
"Desc":
{
"parent":"fctr_genlist_it",
- "class":"Elm.Image"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[80, 80],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_genlist_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_genlist_label":
+ "fctr_genlist_element":
{
"Desc":
{
- "parent":"fctr_genlist_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Genlist",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Genlist"],
- "Efl.Gfx.Base.visible":[true]
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[80, 80],
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Evas.Object.size_hint_align":[-1, -1]
}
},
"fctr_gengrid_it":
@@ -2226,7 +2125,7 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_gengrid_image", "fctr_gengrid_label"]
+ "Contains":["fctr_gengrid_image"]
},
"fctr_gengrid_image":
{
@@ -2237,24 +2136,11 @@
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
+ "Evas.Object.size_hint_min":[75, 75],
"Elm.Image.resizable":[true, true],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_gengrid_label":
- {
- "Desc":
- {
- "parent":"fctr_gengrid_it",
- "class":"Elm.Label"
- },
- "Properties":
- {
- "Elm.Widget.part_text":[null, "Gengrid"],
- "Efl.Gfx.Base.visible":[true]
- }
- },
"fctr_naviframe_it":
{
"Desc":
@@ -2269,7 +2155,7 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_naviframe_image", "fctr_naviframe_label"]
+ "Contains":["fctr_naviframe_image"]
},
"fctr_naviframe_image":
{
@@ -2280,24 +2166,73 @@
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
+ "Evas.Object.size_hint_min":[75, 75],
"Elm.Image.resizable":[true, true],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_naviframe_label":
+ "fctr_table_element":
{
"Desc":
{
- "parent":"fctr_naviframe_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Table",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Naviframe"],
+ "Evas.Object.size_hint_weight":[1, 1],
"Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":
+ {
+ "fctr_table_element_button_1":[0, 0, 1, 1],
+ "fctr_table_element_button_2":[1, 1, 1, 1],
+ "fctr_table_element_button_3":[2, 0, 1, 1]
}
},
+ "fctr_table_element_button_1":
+ {
+ "Desc":
+ {
+ "parent":"fctr_table_element",
+ "class":"Elm.Button",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "Ta"],
+ "Efl.Gfx.Base.visible":[true]
+ }
+ },
+ "fctr_table_element_button_2":
+ {
+ "Desc":
+ {
+ "parent":"fctr_table_element",
+ "class":"Elm.Button",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "b"],
+ "Efl.Gfx.Base.visible":[true]
+ }
+ },
+ "fctr_table_element_button_3":
+ {
+ "Desc":
+ {
+ "parent":"fctr_table_element",
+ "class":"Elm.Button",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "le"],
+ "Efl.Gfx.Base.visible":[true]
+ }
+ },
"fctr_table_it":
{
"Desc":
@@ -2312,33 +2247,24 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_table_image", "fctr_table_label"]
+ "Contains":["fctr_table_image"]
},
"fctr_table_image":
{
"Desc":
{
"parent":"fctr_table_it",
- "class":"Elm.Image"
- },
- "Properties":
- {
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_table_label":
- {
- "Desc":
- {
- "parent":"fctr_table_it",
- "class":"Elm.Label"
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Table"],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[60, 50],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_table_element"],
+ "Evas.Image.source_visible":[false]
}
},
"fctr_menu_it":
@@ -2355,7 +2281,7 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_menu_image", "fctr_menu_label"]
+ "Contains":["fctr_menu_image"]
},
"fctr_menu_image":
{
@@ -2366,25 +2292,46 @@
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
+ "Evas.Object.size_hint_min":[100, 100],
"Elm.Image.resizable":[true, true],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_menu_label":
+ "fctr_diskselector_it":
{
"Desc":
{
- "parent":"fctr_menu_it",
- "class":"Elm.Label"
+ "parent":"fctr_table_item_widgets",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Menu"],
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":["fctr_diskselector_image"]
+ },
+ "fctr_diskselector_image":
+ {
+ "Desc":
+ {
+ "parent":"fctr_diskselector_it",
+ "class":"Evas.Image",
+ "public":true
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[105, 22],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_diskselector_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_diskselector_it":
+ "fctr_ctxpopup_it":
{
"Desc":
{
@@ -2398,40 +2345,61 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_diskselector_image", "fctr_diskselector_label"]
+ "Contains":["fctr_ctxpopup_image"]
},
- "fctr_diskselector_image":
+ "fctr_ctxpopup_image":
{
"Desc":
{
- "parent":"fctr_diskselector_it",
+ "parent":"fctr_ctxpopup_it",
"class":"Elm.Image"
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
+ "Evas.Object.size_hint_min":[100, 100],
"Elm.Image.resizable":[true, true],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_diskselector_label":
+ "fctr_toolbar_it":
{
"Desc":
{
- "parent":"fctr_diskselector_it",
- "class":"Elm.Label"
+ "parent":"fctr_table_item_widgets",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Diskselector"],
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":["fctr_toolbar_image"]
+ },
+ "fctr_toolbar_image":
+ {
+ "Desc":
+ {
+ "parent":"fctr_toolbar_it",
+ "class":"Evas.Image",
+ "public":true
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[95, 22],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_toolbar_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_ctxpopup_it":
+ "fctr_layout_it":
{
"Desc":
{
- "parent":"fctr_table_item_widgets",
+ "parent":"fctr_table_containers",
"class":"Elm.Box",
"public":true
},
@@ -2441,40 +2409,60 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_ctxpopup_image", "fctr_ctxpopup_label"]
+ "Contains":["fctr_layout_image"]
},
- "fctr_ctxpopup_image":
+ "fctr_layout_image":
{
"Desc":
{
- "parent":"fctr_ctxpopup_it",
+ "parent":"fctr_layout_it",
"class":"Elm.Image"
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
+ "Evas.Object.size_hint_min":[75, 75],
"Elm.Image.resizable":[true, true],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_ctxpopup_label":
+ "fctr_separator_it":
{
"Desc":
{
- "parent":"fctr_ctxpopup_it",
- "class":"Elm.Label"
+ "parent":"fctr_table",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Ctxpopup"],
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":["fctr_separator_image"]
+ },
+ "fctr_separator_image":
+ {
+ "Desc":
+ {
+ "parent":"fctr_separator_it",
+ "class":"Evas.Image",
+ "public":true
+ },
+ "Properties":
+ {
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[4, 40],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_separator_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_toolbar_it":
+ "fctr_frame_it":
{
"Desc":
{
- "parent":"fctr_table_item_widgets",
+ "parent":"fctr_table",
"class":"Elm.Box",
"public":true
},
@@ -2484,40 +2472,65 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_toolbar_image", "fctr_toolbar_label"]
+ "Contains":["fctr_frame_image"]
},
- "fctr_toolbar_image":
+ "fctr_frame_image":
{
"Desc":
{
- "parent":"fctr_toolbar_it",
- "class":"Elm.Image"
+ "parent":"fctr_frame_it",
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[60, 60],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_frame_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_toolbar_label":
+ "fctr_evas_image_it":
{
"Desc":
{
- "parent":"fctr_toolbar_it",
- "class":"Elm.Label"
+ "parent":"fctr_table_evas",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Toolbar"],
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":["fctr_evas_image_image"]
+ },
+ "fctr_evas_image_image":
+ {
+ "Desc":
+ {
+ "parent":"fctr_evas_image_it",
+ "class":"Evas.Image",
+ "public":true
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[40, 40],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_evas_image_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_layout_it":
+ "fctr_fileselector_it":
{
"Desc":
{
- "parent":"fctr_table_containers",
+ "parent":"fctr_table",
"class":"Elm.Box",
"public":true
},
@@ -2527,36 +2540,61 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_layout_image", "fctr_layout_label"]
+ "Contains":["fctr_fileselector_image"]
},
- "fctr_layout_image":
+ "fctr_fileselector_image":
{
"Desc":
{
- "parent":"fctr_layout_it",
- "class":"Elm.Image"
+ "parent":"fctr_fileselector_it",
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[82, 100],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_fileselector_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_layout_label":
+ "fctr_fileselector_entry_it":
{
"Desc":
{
- "parent":"fctr_layout_it",
- "class":"Elm.Label"
+ "parent":"fctr_table",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Layout"],
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":["fctr_fileselector_entry_image"]
+ },
+ "fctr_fileselector_entry_image":
+ {
+ "Desc":
+ {
+ "parent":"fctr_fileselector_entry_it",
+ "class":"Evas.Image",
+ "public":true
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[165, 30],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_fileselector_entry_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_separator_it":
+ "fctr_fileselector_button_it":
{
"Desc":
{
@@ -2570,36 +2608,61 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_separator_image", "fctr_separator_label"]
+ "Contains":["fctr_fileselector_button_image"]
},
- "fctr_separator_image":
+ "fctr_fileselector_button_image":
{
"Desc":
{
- "parent":"fctr_separator_it",
- "class":"Elm.Image"
+ "parent":"fctr_fileselector_button_it",
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[165, 30],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_fileselector_button_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_separator_label":
+ "fctr_slider_it":
{
"Desc":
{
- "parent":"fctr_separator_it",
- "class":"Elm.Label"
+ "parent":"fctr_table",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Separator"],
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":["fctr_slider_image"]
+ },
+ "fctr_slider_image":
+ {
+ "Desc":
+ {
+ "parent":"fctr_slider_it",
+ "class":"Evas.Image",
+ "public":true
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[165, 30],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_slider_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_frame_it":
+ "fctr_progressbar_it":
{
"Desc":
{
@@ -2613,83 +2676,112 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_frame_image", "fctr_frame_label"]
+ "Contains":["fctr_progressbar_image"]
},
- "fctr_frame_image":
+ "fctr_progressbar_image":
{
"Desc":
{
- "parent":"fctr_frame_it",
- "class":"Elm.Image"
+ "parent":"fctr_progressbar_it",
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[165, 30],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_progressbar_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_frame_label":
+ "fctr_hoversel_it":
{
"Desc":
{
- "parent":"fctr_frame_it",
- "class":"Elm.Label"
+ "parent":"fctr_table",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Frame"],
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
- }
+ },
+ "Contains":["fctr_hoversel_image"]
},
- "fctr_evas_image_it":
+ "fctr_hoversel_image":
{
"Desc":
{
- "parent":"fctr_table_evas",
- "class":"Elm.Box",
+ "parent":"fctr_hoversel_it",
+ "class":"Evas.Image",
"public":true
},
"Properties":
{
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[true]
- },
- "Contains":["fctr_evas_image_image", "fctr_evas_image_label"]
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[60, 40],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_hoversel_element"],
+ "Evas.Image.source_visible":[false]
+ }
},
- "fctr_evas_image_image":
+ "fctr_hoversel_label":
{
"Desc":
{
- "parent":"fctr_evas_image_it",
- "class":"Elm.Image"
+ "parent":"fctr_hoversel_it",
+ "class":"Elm.Label"
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
+ "Elm.Widget.part_text":[null, "Hoversel"],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_evas_image_label":
+ "fctr_panes_it":
{
"Desc":
{
- "parent":"fctr_evas_image_it",
- "class":"Elm.Label"
+ "parent":"fctr_table_containers",
+ "class":"Elm.Box",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Evas Image"],
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":["fctr_panes_image"]
+ },
+ "fctr_panes_image":
+ {
+ "Desc":
+ {
+ "parent":"fctr_panes_it",
+ "class":"Evas.Image",
+ "public":true
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Efl.Gfx.Base.visible":[true],
+ "Evas.Object.size_hint_min":[75, 75],
+ "Evas.Image.filled":[true],
+ "Evas.Image.source":["fctr_panes_element"],
+ "Evas.Image.source_visible":[false]
}
},
- "fctr_fileselector_it":
+ "fctr_conformant_it":
{
"Desc":
{
- "parent":"fctr_table",
+ "parent":"fctr_table_containers",
"class":"Elm.Box",
"public":true
},
@@ -2699,379 +2791,515 @@
"Elm.Box.padding":[7, 0],
"Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_fileselector_image", "fctr_fileselector_label"]
+ "Contains":["fctr_conformant_image"]
},
- "fctr_fileselector_image":
+ "fctr_conformant_image":
{
"Desc":
{
- "parent":"fctr_fileselector_it",
+ "parent":"fctr_conformant_it",
"class":"Elm.Image"
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
+ "Evas.Object.size_hint_min":[75, 75],
"Elm.Image.resizable":[true, true],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_fileselector_label":
+ "fctr_grid_it":
{
"Desc":
{
- "parent":"fctr_fileselector_it",
- "class":"Elm.Label"
+ "parent":"fctr_table_containers",
+ "class":"Elm.Box",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Box.horizontal":[true],
+ "Elm.Box.padding":[7, 0],
+ "Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":["fctr_grid_image"]
+ },
+ "fctr_grid_image":
+ {
+ "Desc":
+ {
+ "parent":"fctr_grid_it",
+ "class":"Elm.Image"
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Fileselector"],
+ "Evas.Object.size_hint_min":[75, 75],
+ "Elm.Image.resizable":[true, true],
"Efl.Gfx.Base.visible":[true]
}
},
- "fctr_fileselector_entry_it":
+ "fctr_button_element":
+ {
+ "Desc":
+ {
+ "parent":"main_win",
+ "class":"Elm.Button",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "Button"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[80, 30]
+ }
+ },
+ "fctr_label_element":
+ {
+ "Desc":
+ {
+ "parent":"main_win",
+ "class":"Elm.Label",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "Label"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[80, 30]
+ }
+ },
+ "fctr_check_element":
+ {
+ "Desc":
+ {
+ "parent":"main_win",
+ "class":"Elm.Check",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "Check"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[80, 30]
+ }
+ },
+ "fctr_radio_element":
{
"Desc":
{
- "parent":"fctr_table",
- "class":"Elm.Box",
+ "parent":"main_win",
+ "class":"Elm.Radio",
"public":true
},
"Properties":
{
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[true]
- },
- "Contains":["fctr_fileselector_entry_image",
"fctr_fileselector_entry_label"]
+ "Elm.Widget.part_text":[null, "Radio"],
+ "Efl.Gfx.Base.visible":[true],
+ "Elm.Radio.state_value":[0],
+ "Efl.Gfx.Base.size":[80, 30]
+ }
},
- "fctr_fileselector_entry_image":
+ "fctr_actionslider_element":
{
"Desc":
{
- "parent":"fctr_fileselector_entry_it",
- "class":"Elm.Image"
+ "parent":"main_win",
+ "class":"Elm.Actionslider",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Elm.Widget.part_text":["left", "Action"],
+ "Elm.Widget.part_text":["center", null],
+ "Elm.Widget.part_text":["right", "slider"],
+ "Elm.Actionslider.indicator_pos":["ELM_ACTIONSLIDER_CENTER"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[180, 30]
}
},
- "fctr_fileselector_entry_label":
+ "fctr_calendar_element":
{
"Desc":
{
- "parent":"fctr_fileselector_entry_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Calendar",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Fileselector Entry"],
- "Efl.Gfx.Base.visible":[true]
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[120, 120]
}
},
- "fctr_fileselector_button_it":
+ "fctr_dayselector_element":
{
"Desc":
{
- "parent":"fctr_table",
- "class":"Elm.Box",
+ "parent":"main_win",
+ "class":"Elm.Dayselector",
"public":true
},
"Properties":
{
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[true]
- },
- "Contains":["fctr_fileselector_button_image",
"fctr_fileselector_button_label"]
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[290, 20]
+ }
},
- "fctr_fileselector_button_image":
+ "fctr_separator_element":
{
"Desc":
{
- "parent":"fctr_fileselector_button_it",
- "class":"Elm.Image"
+ "parent":"main_win",
+ "class":"Elm.Separator",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[4, 40]
}
},
- "fctr_fileselector_button_label":
+ "fctr_clock_element":
{
"Desc":
{
- "parent":"fctr_fileselector_button_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Clock",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Fileselector Button"],
- "Efl.Gfx.Base.visible":[true]
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[65, 35]
}
},
- "fctr_slider_it":
+ "fctr_entry_element":
{
"Desc":
{
- "parent":"fctr_table",
- "class":"Elm.Box",
+ "parent":"main_win",
+ "class":"Elm.Entry",
"public":true
},
"Properties":
{
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[true]
- },
- "Contains":["fctr_slider_image", "fctr_slider_label"]
+ "Elm.Entry.scrollable":[true],
+ "Efl.Gfx.Base.visible":[true],
+ "Elm.Widget.part_text":[null, "Entry"],
+ "Efl.Gfx.Base.size":[65, 35]
+ }
},
- "fctr_slider_image":
+ "fctr_colorselector_element":
{
"Desc":
{
- "parent":"fctr_slider_it",
- "class":"Elm.Image"
+ "parent":"main_win",
+ "class":"Elm.Colorselector",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Elm.Colorselector.mode":["ELM_COLORSELECTOR_COMPONENTS"],
+ "Elm.Colorselector.color":[255, 0, 0, 255],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[165, 165]
}
},
- "fctr_slider_label":
+ "fctr_slider_element":
{
"Desc":
{
- "parent":"fctr_slider_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Slider",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Slider"],
- "Efl.Gfx.Base.visible":[true]
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[165, 30]
}
},
- "fctr_progressbar_it":
+ "fctr_progressbar_element":
{
"Desc":
{
- "parent":"fctr_table",
- "class":"Elm.Box",
+ "parent":"main_win",
+ "class":"Elm.Progressbar",
"public":true
},
"Properties":
{
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[true]
- },
- "Contains":["fctr_progressbar_image", "fctr_progressbar_label"]
+ "Elm.Progressbar.value":[0.35],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[165, 30]
+ }
},
- "fctr_progressbar_image":
+ "fctr_fileselector_entry_element":
{
"Desc":
{
- "parent":"fctr_progressbar_it",
- "class":"Elm.Image"
+ "parent":"main_win",
+ "class":"Elm.Fileselector_Entry",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Elm.Widget.part_text":[null, "Select a file"],
+ "Elm_Interface_Fileselector.path":["/home"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[165, 30]
}
},
- "fctr_progressbar_label":
+ "fctr_fileselector_button_element":
{
"Desc":
{
- "parent":"fctr_progressbar_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Fileselector_Button",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Progress Bar"],
- "Efl.Gfx.Base.visible":[true]
+ "Elm.Widget.part_text":[null, "Select a file"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[165, 30]
}
},
- "fctr_hoversel_it":
+ "fctr_fileselector_element":
{
"Desc":
{
- "parent":"fctr_table",
- "class":"Elm.Box",
+ "parent":"main_win",
+ "class":"Elm.Fileselector",
"public":true
},
"Properties":
{
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[true]
- },
- "Contains":["fctr_hoversel_image", "fctr_hoversel_label"]
+ "Elm_Interface_Fileselector.path":["/home"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[165, 200]
+ }
},
- "fctr_hoversel_image":
+ "fctr_icon_element":
{
"Desc":
{
- "parent":"fctr_hoversel_it",
- "class":"Elm.Image"
+ "parent":"main_win",
+ "class":"Elm.Icon",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Efl.File.file":["erigo_icon", null],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[40, 40]
}
},
- "fctr_hoversel_label":
+ "fctr_image_element":
{
"Desc":
{
- "parent":"fctr_hoversel_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Image",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Hoversel"],
- "Efl.Gfx.Base.visible":[true]
+ "Efl.File.file":["factory_image", null],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[40, 40]
}
},
- "fctr_panes_it":
+ "fctr_bubble_element":
{
"Desc":
{
- "parent":"fctr_table_containers",
- "class":"Elm.Box",
+ "parent":"main_win",
+ "class":"Elm.Bubble",
"public":true
},
"Properties":
{
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[true]
- },
- "Contains":["fctr_panes_image", "fctr_panes_label"]
+ "Elm.Widget.part_text":[null, "Bubble"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[70, 50]
+ }
},
- "fctr_panes_image":
+ "fctr_hoversel_element":
{
"Desc":
{
- "parent":"fctr_panes_it",
- "class":"Elm.Image"
+ "parent":"main_win",
+ "class":"Elm.Hoversel",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Elm.Widget.part_text":[null, "Hoversel"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[60, 40]
}
},
- "fctr_panes_label":
+ "fctr_frame_element":
{
"Desc":
{
- "parent":"fctr_panes_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Frame",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Panes"],
- "Efl.Gfx.Base.visible":[true]
+ "Elm.Widget.part_text":[null, "Frame"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[60, 60]
}
},
- "fctr_conformant_it":
+ "fctr_win_frame_element":
{
"Desc":
{
- "parent":"fctr_table_containers",
- "class":"Elm.Box",
+ "parent":"main_win",
+ "class":"Elm.Frame",
"public":true
},
"Properties":
{
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[true]
- },
- "Contains":["fctr_conformant_image", "fctr_conformant_label"]
+ "Elm.Widget.part_text":[null, "Window"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[60, 60]
+ }
},
- "fctr_conformant_image":
+ "fctr_toolbar_element":
{
"Desc":
{
- "parent":"fctr_conformant_it",
- "class":"Elm.Image"
+ "parent":"main_win",
+ "class":"Elm.Toolbar",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
+ "Elm.Widget.style":["item_horizontal"],
+ "Elm.Toolbar.icon_size":[16],
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Evas.Object.size_hint_align":[-1, -1],
+ "Efl.Gfx.Base.size":[95, 22],
"Efl.Gfx.Base.visible":[true]
- }
- },
- "fctr_conformant_label":
- {
- "Desc":
- {
- "parent":"fctr_conformant_it",
- "class":"Elm.Label"
},
- "Properties":
+ "Items":
{
- "Elm.Widget.part_text":[null, "Conformant"],
- "Efl.Gfx.Base.visible":[true]
+ "fctr_toolbar_element_it0":
+ {
+ "type":"regular",
+ "icon":"file",
+ "label":"File"
+ },
+ "fctr_toolbar_element_it1":
+ {
+ "type":"regular",
+ "icon":"edit",
+ "label":"Edit"
+ }
}
},
- "fctr_grid_it":
+ "fctr_diskselector_element":
{
"Desc":
{
- "parent":"fctr_table_containers",
- "class":"Elm.Box",
+ "parent":"main_win",
+ "class":"Elm.Diskselector",
"public":true
},
"Properties":
{
- "Elm.Box.horizontal":[true],
- "Elm.Box.padding":[7, 0],
- "Efl.Gfx.Base.visible":[false]
+ "Elm.Widget.style":["item_horizontal"],
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Evas.Object.size_hint_align":[-1, -1],
+ "Efl.Gfx.Base.size":[105, 22],
+ "Efl.Gfx.Base.visible":[true]
},
- "Contains":["fctr_grid_image", "fctr_grid_label"]
+ "Items":
+ {
+ "fctr_diskselector_element_it0":
+ {
+ "type":"regular",
+ "label":"2015"
+ },
+ "fctr_diskselector_element_it1":
+ {
+ "type":"regular",
+ "label":"2016"
+ }
+ }
},
- "fctr_grid_image":
+ "fctr_evas_image_element":
{
"Desc":
{
- "parent":"fctr_grid_it",
- "class":"Elm.Image"
+ "parent":"main_win",
+ "class":"Evas.Image",
+ "public":true
},
"Properties":
{
- "Evas.Object.size_hint_min":[25, 25],
- "Elm.Image.resizable":[true, true],
- "Efl.Gfx.Base.visible":[true]
+ "Efl.File.file":["factory_image", null],
+ "Evas.Image.filled":[true],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[40, 40]
}
},
- "fctr_grid_label":
+ "fctr_panes_element":
{
"Desc":
{
- "parent":"fctr_grid_it",
- "class":"Elm.Label"
+ "parent":"main_win",
+ "class":"Elm.Panes",
+ "public":true
},
"Properties":
{
- "Elm.Widget.part_text":[null, "Grid"],
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Evas.Object.size_hint_align":[1, -1],
+ "Elm.Panes.content_right_size":[0.70],
+ "Efl.Gfx.Base.size":[75, 75],
"Efl.Gfx.Base.visible":[true]
+ },
+ "Contains":
+ {
+ "fctr_panes_element_button" : ["left"],
+ "fctr_panes_element_label" : ["right"]
}
},
+ "fctr_panes_element_button":
+ {
+ "Desc":
+ {
+ "parent":"fctr_panes_element",
+ "class":"Elm.Button",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "B"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[80, 30]
+ }
+ },
+ "fctr_panes_element_label":
+ {
+ "Desc":
+ {
+ "parent":"fctr_panes_element",
+ "class":"Elm.Label",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm.Widget.part_text":[null, "Label"],
+ "Efl.Gfx.Base.visible":[true],
+ "Efl.Gfx.Base.size":[80, 30]
+ }
+ },
"right_panes":
{
"Desc":
@@ -3756,7 +3984,7 @@
"public":true
},
"Properties":
- {
+ {
"Elm.Widget.part_text":[null, "Add Separator"],
"Efl.Gfx.Base.visible":[true]
},
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
WDG_DELETE,
OBJTREE_VIEW,
PROPERTIES_VIEW,
- FACTORY_VIEW,
- FACTORY_VIEW_SWITCH
+ FACTORY_VIEW
};
Eo *
@@ -383,9 +382,6 @@ _fs_mode_open(int fs_mode)
evas_object_smart_callback_add(fs_win->fileselector, "done", _on_fs_done,
(void *)(intptr_t) fs_mode);
}
-static void
-_factory_vertical_pack(Eina_Bool vertical_pack);
-
/* FIXME: need to change signature to Eo_Callback, when it will be supported.
* This callback is used in Egui Layout JSON. */
void
@@ -515,18 +511,11 @@ _sub_wins_hide_show_cb(void *data, Evas_Object *_obj
EINA_UNUSED, void *event_in
{
Eo *obj = NULL;
intptr_t action = (intptr_t) data;
- static Eina_Bool fctr_table_vertical = EINA_FALSE;
switch (action)
{
case FACTORY_VIEW:
obj = g_main_wdgs->main_win->fctr_table;
break;
- case FACTORY_VIEW_SWITCH:
- {
- _factory_vertical_pack(fctr_table_vertical);
- fctr_table_vertical = !fctr_table_vertical;
- break;
- }
case OBJTREE_VIEW:
obj = g_main_wdgs->main_win->objtree_table;
break;
@@ -756,7 +745,7 @@ _factory_tt_mouse_down(void *data EINA_UNUSED, Eo *obj,
const Eo_Event_Descripti
}
static void
-_factory_item_finalize(Eo *item_box, char *image_name, const char
*egui_class_name, Eina_Bool drag_image)
+_factory_item_finalize(Eo *item_box, char *image_name, Eina_Bool use_image,
const char *egui_class_name, Eina_Bool drag_image)
{
if (!item_box) return;
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
// update of the image icon
Eo *o = eina_list_data_get(lst);
char path[100] = {'\0'};
- sprintf(path, "%s/%s", EGUI_LAYOUT_IMAGES_PATH, image_name);
- eo_do(o, efl_file_set(path, NULL));
- drag_add(item_box, drag_image ? o : NULL, egui_class_name);
-
- eina_list_free(lst);
-}
-
-static void
-_factory_vertical_pack(Eina_Bool vertical_pack)
-{
- elm_table_clear(g_main_wdgs->main_win->fctr_table, EINA_FALSE);
- elm_table_clear(g_main_wdgs->main_win->fctr_table_containers, EINA_FALSE);
- elm_table_clear(g_main_wdgs->main_win->fctr_table_item_widgets, EINA_FALSE);
- elm_table_clear(g_main_wdgs->main_win->fctr_table_evas, EINA_FALSE);
- if (vertical_pack)
+ if (use_image)
{
- //elm_table_homogeneous_set(g_main_wdgs->main_win->fctr_table,
EINA_TRUE);
- evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table,
0.1, -1);
-
evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_containers,
0.1, -1);
-
evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_item_widgets,
0.1, -1);
-
evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_evas, 0.1,
-1);
-
- elm_table_padding_set(g_main_wdgs->main_win->fctr_table, 6, 7);
- elm_table_padding_set(g_main_wdgs->main_win->fctr_table_containers, 6,
7);
- elm_table_padding_set(g_main_wdgs->main_win->fctr_table_item_widgets,
6, 7);
- elm_table_padding_set(g_main_wdgs->main_win->fctr_table_evas, 6, 7);
-
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_win_it, 0, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_bg_it, 0, 1, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_button_it, 0, 2, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_label_it, 0, 3, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_check_it, 0, 4, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_radio_it, 0, 5, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_icon_it, 0, 6, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_image_it, 0, 7, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_actionslider_it, 0, 8, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_clock_it, 0, 9, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_dayselector_it, 0, 10, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_calendar_it, 0, 11, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_bubble_it, 0, 12, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_colorselector_it, 0, 13, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_entry_it, 0, 14, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_flip_it, 0, 15, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_separator_it, 0, 16, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_frame_it, 0, 17, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_it, 0, 18, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_entry_it, 0, 19, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_button_it, 0, 20, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_slider_it, 0, 21, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_progressbar_it, 0, 22, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_hoversel_it, 0, 23, 1, 1);
-
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_box_it, 0, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_table_it, 0, 1, 1, 1);
- //elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_grid_it, 0, 2, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_layout_it, 0, 3, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_naviframe_it, 0, 4, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_panes_it, 0, 5, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_conformant_it, 0, 6, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_genlist_it, 0, 7, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_gengrid_it, 0, 8, 1, 1);
-
- elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets,
g_main_wdgs->main_win->fctr_menu_it, 0, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets,
g_main_wdgs->main_win->fctr_toolbar_it, 0, 1, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets,
g_main_wdgs->main_win->fctr_diskselector_it, 0, 2, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets,
g_main_wdgs->main_win->fctr_ctxpopup_it, 0, 3, 1, 1);
-
- elm_table_pack(g_main_wdgs->main_win->fctr_table_evas,
g_main_wdgs->main_win->fctr_evas_image_it, 0, 0, 1, 1);
+ sprintf(path, "%s/%s", EGUI_LAYOUT_IMAGES_PATH, image_name);
+ eo_do(o, efl_file_set(path, NULL));
}
- else
+ if (drag_image)
{
- elm_table_padding_set(g_main_wdgs->main_win->fctr_table, 2, 2);
- elm_table_padding_set(g_main_wdgs->main_win->fctr_table_containers, 2,
2);
- elm_table_padding_set(g_main_wdgs->main_win->fctr_table_item_widgets,
2, 2);
- elm_table_padding_set(g_main_wdgs->main_win->fctr_table_evas, 2, 2);
-
- /*
- evas_object_size_hint_weight_set(g_main_wdgs->main_win->fctr_table,
EVAS_HINT_EXPAND, 0);
-
evas_object_size_hint_weight_set(g_main_wdgs->main_win->fctr_table_containers,
EVAS_HINT_EXPAND, 0);
-
evas_object_size_hint_weight_set(g_main_wdgs->main_win->fctr_table_item_widgets,
EVAS_HINT_EXPAND, 0);
-
evas_object_size_hint_weight_set(g_main_wdgs->main_win->fctr_table_evas,
EVAS_HINT_EXPAND, 0);
-
- evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table,
EVAS_HINT_FILL, EVAS_HINT_FILL);
-
evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_containers,
EVAS_HINT_FILL, EVAS_HINT_FILL);
-
evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_item_widgets,
EVAS_HINT_FILL, EVAS_HINT_FILL);
-
evas_object_size_hint_align_set(g_main_wdgs->main_win->fctr_table_evas,
EVAS_HINT_FILL, EVAS_HINT_FILL);
- */
-
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_win_it, 0, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_bg_it, 1, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_button_it, 2, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_label_it, 0, 1, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_check_it, 1, 1, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_radio_it, 2, 1, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_icon_it, 0, 2, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_image_it, 1, 2, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_actionslider_it, 2, 2, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_clock_it, 0, 3, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_dayselector_it, 1, 3, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_calendar_it, 2, 3, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_bubble_it, 0, 4, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_colorselector_it, 1, 4, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_entry_it, 2, 4, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_flip_it, 0, 5, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_separator_it, 1, 5, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_frame_it, 2, 5, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_it, 0, 6, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_entry_it, 1, 6, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_button_it, 2, 6, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_slider_it, 0, 7, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_progressbar_it, 1, 7, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_hoversel_it, 2, 7, 1, 1);
-
- elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets,
g_main_wdgs->main_win->fctr_menu_it, 0, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets,
g_main_wdgs->main_win->fctr_toolbar_it, 1, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets,
g_main_wdgs->main_win->fctr_diskselector_it, 2, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_item_widgets,
g_main_wdgs->main_win->fctr_ctxpopup_it, 0, 1, 1, 1);
-
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_box_it, 0, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_table_it, 1, 0, 1, 1);
- //elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_grid_it, 2, 0, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_layout_it, 0, 1, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_naviframe_it, 1, 1, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_panes_it, 2, 1, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_conformant_it, 0, 2, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_genlist_it, 1, 2, 1, 1);
- elm_table_pack(g_main_wdgs->main_win->fctr_table_containers,
g_main_wdgs->main_win->fctr_gengrid_it, 2, 2, 1, 1);
-
- elm_table_pack(g_main_wdgs->main_win->fctr_table_evas,
g_main_wdgs->main_win->fctr_evas_image_it, 0, 0, 1, 1);
+ sprintf(path, "%s/%s", EGUI_LAYOUT_IMAGES_PATH, image_name);
}
+ drag_add(item_box, drag_image ? path : NULL, egui_class_name);
+
+ eina_list_free(lst);
}
/* Filter function to be called, when Filter entry is changed. */
@@ -988,6 +859,16 @@ _egui_project_open(const char *path)
}
}
+static char *
+gl_text_get1(void *data, Evas_Object *obj EINA_UNUSED, const char *part
EINA_UNUSED)
+{
+ char buf[256];
+ int num = (int)(uintptr_t)data;
+ snprintf(buf, sizeof(buf), "Item # %i", num);
+ return strdup(buf);
+}
+
+
void
egui_start(const char *filename)
{
@@ -1060,7 +941,6 @@ egui_start(const char *filename)
menu = elm_toolbar_item_menu_get(g_main_wdgs->main_win->toolbar_view_it);
it = elm_menu_item_add(menu, NULL, "window-new", "Factory show/hide",
_sub_wins_hide_show_cb,(void *) (intptr_t) FACTORY_VIEW);
elm_object_item_disabled_set(it, EINA_TRUE);
- it = elm_menu_item_add(menu, NULL, "window-new", "Factory vert/hor",
_sub_wins_hide_show_cb,(void *) (intptr_t) FACTORY_VIEW_SWITCH);
it = elm_menu_item_add(menu, NULL, "window-new", "Objects Tree",
_sub_wins_hide_show_cb,(void *) (intptr_t) OBJTREE_VIEW);
elm_object_item_disabled_set(it, EINA_TRUE);
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)
elm_object_item_disabled_set(g_main_wdgs->main_win->toolbar_graph_it,
EINA_TRUE);
#endif
+ static Elm_Genlist_Item_Class *_itc_ctn = NULL;
+ _itc_ctn = elm_genlist_item_class_new();
+ _itc_ctn->item_style = "default";
+ _itc_ctn->func.text_get = gl_text_get1;
+ _itc_ctn->func.content_get = NULL;
+ _itc_ctn->func.state_get = NULL;
+ _itc_ctn->func.del = NULL;
+
+ 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));
+ 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));
+ elm_genlist_item_class_free(_itc_ctn);
+
/* Last parameter: EINA_TRUE if drag factory image, EINA_FALSE - to create
and drag real object. */
- _factory_item_finalize(g_main_wdgs->main_win->fctr_actionslider_it,
"factory_actionslider.png", DB_DEF_ACTIONSLIDER_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_bg_it, "factory_bg.png",
DB_DEF_BG_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_box_it,
"factory_box.png", DB_DEF_BOX_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_bubble_it,
"factory_bubble.png", DB_DEF_BUBBLE_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_button_it,
"factory_button.png", DB_DEF_BUTTON_CLASS, EINA_FALSE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_calendar_it,
"factory_calendar.png", DB_DEF_CALENDAR_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_check_it,
"factory_check.png", DB_DEF_CHECK_CLASS, EINA_FALSE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_radio_it,
"factory_radio.png", DB_DEF_RADIO_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_clock_it,
"factory_clock.png", DB_DEF_CLOCK_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_colorselector_it,
"factory_colorselector.png", DB_DEF_COLORSELECTOR_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_dayselector_it,
"factory_dayselector.png", DB_DEF_DAYSELECTOR_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_image_it,
"factory_image.png", DB_DEF_IMAGE_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_icon_it,
"factory_icon.png", DB_DEF_ICON_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_label_it,
"factory_label.png", DB_DEF_LABEL_CLASS, EINA_FALSE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_win_it,
"factory_win.png", DB_DEF_WIN_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_entry_it,
"factory_entry.png", DB_DEF_ENTRY_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_flip_it,
"factory_flip.png", DB_DEF_FLIP_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_genlist_it,
"factory_genlist.png", DB_DEF_GENLIST_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_gengrid_it,
"factory_gengrid.png", DB_DEF_GENGRID_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_table_it,
"factory_table.png", DB_DEF_TABLE_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_menu_it,
"factory_menu.png", DB_DEF_MENU_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_diskselector_it,
"factory_diskselector.png", DB_DEF_DISKSELECTOR_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_ctxpopup_it,
"factory_ctxpopup.png", DB_DEF_CTXPOPUP_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_toolbar_it,
"factory_toolbar.png", DB_DEF_TOOLBAR_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_layout_it,
"factory_layout.png", DB_DEF_LAYOUT_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_naviframe_it,
"factory_naviframe.png", DB_DEF_NAVIFRAME_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_separator_it,
"factory_dayselector.png", DB_DEF_SEPARATOR_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_frame_it,
"factory_frame.png", DB_DEF_FRAME_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_evas_image_it,
"factory_image.png", DB_DEF_EVAS_IMAGE_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_it,
"factory_image.png", DB_DEF_FILESELECTOR_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_entry_it,
"factory_image.png", DB_DEF_FILESELECTOR_ENTRY_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_button_it,
"factory_image.png", DB_DEF_FILESELECTOR_BUTTON_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_slider_it,
"factory_image.png", DB_DEF_SLIDER_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_progressbar_it,
"factory_image.png", DB_DEF_PROGRESSBAR_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_panes_it,
"factory_image.png", DB_DEF_PANES_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_conformant_it,
"factory_image.png", DB_DEF_CONFORMANT_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_grid_it,
"factory_image.png", DB_DEF_GRID_CLASS, EINA_TRUE);
- _factory_item_finalize(g_main_wdgs->main_win->fctr_hoversel_it,
"factory_image.png", DB_DEF_HOVERSEL_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_actionslider_it, NULL,
EINA_FALSE, DB_DEF_ACTIONSLIDER_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_bg_it, "factory_bg.png",
EINA_TRUE, DB_DEF_BG_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_box_it,
"factory_layout.png" , EINA_FALSE, DB_DEF_BOX_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_bubble_it, NULL,
EINA_FALSE, DB_DEF_BUBBLE_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_button_it, NULL,
EINA_FALSE, DB_DEF_BUTTON_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_calendar_it, NULL,
EINA_FALSE, DB_DEF_CALENDAR_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_check_it, NULL,
EINA_FALSE, DB_DEF_CHECK_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_radio_it, NULL,
EINA_FALSE, DB_DEF_RADIO_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_clock_it, NULL,
EINA_FALSE, DB_DEF_CLOCK_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_colorselector_it, NULL,
EINA_FALSE, DB_DEF_COLORSELECTOR_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_dayselector_it, NULL,
EINA_FALSE, DB_DEF_DAYSELECTOR_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_image_it,
"factory_image.png", EINA_FALSE, DB_DEF_IMAGE_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_icon_it,
"erigo_icon.png", EINA_FALSE, DB_DEF_ICON_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_label_it, NULL,
EINA_FALSE, DB_DEF_LABEL_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_win_it,
"factory_layout.png", EINA_FALSE, DB_DEF_WIN_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_entry_it, NULL,
EINA_FALSE, DB_DEF_ENTRY_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_flip_it,
"factory_flip.png", EINA_TRUE, DB_DEF_FLIP_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_genlist_it,
"factory_genlist.png", EINA_FALSE, DB_DEF_GENLIST_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_gengrid_it,
"factory_gengrid.png", EINA_TRUE, DB_DEF_GENGRID_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_table_it, NULL,
EINA_FALSE, DB_DEF_TABLE_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_menu_it,
"factory_menu.png", EINA_TRUE, DB_DEF_MENU_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_diskselector_it, NULL,
EINA_FALSE, DB_DEF_DISKSELECTOR_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_ctxpopup_it,
"factory_ctxpopup.png", EINA_TRUE, DB_DEF_CTXPOPUP_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_toolbar_it,
"factory_toolbar.png", EINA_FALSE, DB_DEF_TOOLBAR_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_layout_it,
"factory_layout.png", EINA_TRUE, DB_DEF_LAYOUT_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_naviframe_it,
"factory_naviframe.png", EINA_TRUE, DB_DEF_NAVIFRAME_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_separator_it, NULL,
EINA_FALSE, DB_DEF_SEPARATOR_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_frame_it, NULL,
EINA_FALSE, DB_DEF_FRAME_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_evas_image_it,
"factory_image.png", EINA_FALSE, DB_DEF_EVAS_IMAGE_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_it, NULL,
EINA_FALSE, DB_DEF_FILESELECTOR_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_entry_it,
NULL, EINA_FALSE, DB_DEF_FILESELECTOR_ENTRY_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_button_it,
NULL, EINA_FALSE, DB_DEF_FILESELECTOR_BUTTON_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_slider_it, NULL,
EINA_FALSE, DB_DEF_SLIDER_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_progressbar_it, NULL,
EINA_FALSE, DB_DEF_PROGRESSBAR_CLASS, EINA_FALSE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_panes_it,
"factory_layout.png", EINA_FALSE, DB_DEF_PANES_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_conformant_it,
"factory_conformant.png", EINA_TRUE, DB_DEF_CONFORMANT_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_grid_it,
"factory_grid.png", EINA_TRUE, DB_DEF_GRID_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_hoversel_it, NULL,
EINA_FALSE, DB_DEF_HOVERSEL_CLASS, EINA_FALSE);
+
+ eo_do(g_main_wdgs->main_win->fctr_button_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_label_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_box_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_table_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_check_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_radio_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_actionslider_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_calendar_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_dayselector_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_separator_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_clock_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_entry_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_colorselector_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_slider_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_progressbar_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_fileselector_entry_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_fileselector_button_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_fileselector_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_icon_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_image_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_bubble_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_hoversel_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_frame_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_win_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_toolbar_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_diskselector_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_evas_image_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_panes_image,
evas_obj_image_source_visible_set(EINA_FALSE));
+ eo_do(g_main_wdgs->main_win->fctr_genlist_image,
evas_obj_image_source_visible_set(EINA_FALSE));
/*FIXME: Need to unpack inline image, so pass it into delete callback*/
evas_object_smart_callback_add(g_main_wdgs->main_win->main_win,
"delete,request", _main_win_del_cb, NULL);
- _factory_vertical_pack(EINA_FALSE);
_egui_project_open(filename);
}
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 @@
cmake_minimum_required(VERSION 2.8.1)
LIST(APPEND FACTORY_IMAGES
- factory_actionslider.png
factory_bg.png
- factory_box.png
- factory_bubble.png
- factory_button.png
- factory_calendar.png
- factory_check.png
- factory_radio.png
- factory_clock.png
- factory_colorselector.png
- factory_dayselector.png
factory_icon.png
factory_image.png
- factory_label.png
- factory_win.png
- factory_entry.png
factory_flip.png
factory_genlist.png
factory_gengrid.png
- factory_table.png
factory_menu.png
- factory_diskselector.png
factory_ctxpopup.png
factory_toolbar.png
factory_layout.png
factory_naviframe.png
factory_frame.png
+ factory_conformant.png
+ factory_grid.png
resize_red.png
canvas_bg.jpg
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
Binary files a/src/bin/gui/images/factory_actionslider.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_box.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_bubble.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_button.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_calendar.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_check.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_clock.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_colorselector.png and /dev/null 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
Binary files /dev/null and b/src/bin/gui/images/factory_conformant.png differ
diff --git a/src/bin/gui/images/factory_ctxpopup.png
b/src/bin/gui/images/factory_ctxpopup.png
index c74c0b1..4af1c22 100644
Binary files a/src/bin/gui/images/factory_ctxpopup.png and
b/src/bin/gui/images/factory_ctxpopup.png 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
Binary files a/src/bin/gui/images/factory_dayselector.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_diskselector.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_entry.png and /dev/null differ
diff --git a/src/bin/gui/images/factory_flip.png
b/src/bin/gui/images/factory_flip.png
index d246d7b..d34abc5 100644
Binary files a/src/bin/gui/images/factory_flip.png and
b/src/bin/gui/images/factory_flip.png differ
diff --git a/src/bin/gui/images/factory_gengrid.png
b/src/bin/gui/images/factory_gengrid.png
index e4a20e2..ee5a206 100644
Binary files a/src/bin/gui/images/factory_gengrid.png and
b/src/bin/gui/images/factory_gengrid.png differ
diff --git a/src/bin/gui/images/factory_genlist.png
b/src/bin/gui/images/factory_genlist.png
index 7b0e762..ca6d37f 100644
Binary files a/src/bin/gui/images/factory_genlist.png and
b/src/bin/gui/images/factory_genlist.png 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
Binary files /dev/null and b/src/bin/gui/images/factory_grid.png differ
diff --git a/src/bin/gui/images/factory_image.png
b/src/bin/gui/images/factory_image.png
index 6806884..7dbae67 100644
Binary files a/src/bin/gui/images/factory_image.png and
b/src/bin/gui/images/factory_image.png 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
Binary files a/src/bin/gui/images/factory_label.png and /dev/null differ
diff --git a/src/bin/gui/images/factory_menu.png
b/src/bin/gui/images/factory_menu.png
index f83e52b..6851c18 100644
Binary files a/src/bin/gui/images/factory_menu.png and
b/src/bin/gui/images/factory_menu.png 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
Binary files a/src/bin/gui/images/factory_radio.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_table.png and /dev/null 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
Binary files a/src/bin/gui/images/factory_win.png and /dev/null 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)
"#include <Elementary.h>\n"
"#include \"elm_widget_container.h\"\n"
"#include \"elm_interface_scrollable.h\"\n"
+ "#include \"elm_interface_fileselector.h\"\n"
"#include \"%s\"\n\n", gui_context_export_h_filename_get(ctx));
eina_strbuf_append_printf(gl_ctx->c_buf,
--
