yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=5a8ec13800d24f3d8fb7d06cdc37d59d2bcfaca5
commit 5a8ec13800d24f3d8fb7d06cdc37d59d2bcfaca5
Author: Yakov Goldberg <yako...@samsung.com>
Date: Sun Feb 8 16:17:41 2015 +0200
Add up/down images for reorder buttons into layout
---
src/bin/egui_gui/egui_layout.json | 80 ++++++++++++++++++++++++++++++++++++++-
src/bin/egui_gui/egui_logic.c | 14 -------
2 files changed, 79 insertions(+), 15 deletions(-)
diff --git a/src/bin/egui_gui/egui_layout.json
b/src/bin/egui_gui/egui_layout.json
index 17c7b7a..7eded62 100644
--- a/src/bin/egui_gui/egui_layout.json
+++ b/src/bin/egui_gui/egui_layout.json
@@ -10,7 +10,9 @@
"Images":
{
"res_canvas_bg":"data/images/canvas_bg.jpg",
- "erigo_icon":"data/images/erigo_icon.png"
+ "erigo_icon":"data/images/erigo_icon.png",
+ "move_up_icon":"/home/yakov/erigo/data/images/icon_up_arrow.png",
+ "move_down_icon":"/home/yakov/erigo/data/images/icon_down_arrow.png"
},
"Eo_Callbacks":
{
@@ -2739,6 +2741,10 @@
"Callbacks":
{
"clicked":["Invoke", "_callbacksview_up_btn_clicked", null]
+ },
+ "Contains":
+ {
+ "callbacksview_up_btn_icon":[null]
}
},
"callbacksview_down_btn":
@@ -2756,6 +2762,10 @@
"Callbacks":
{
"clicked":["Invoke", "_callbacksview_down_btn_clicked", null]
+ },
+ "Contains":
+ {
+ "callbacksview_down_btn_icon":[null]
}
},
"callbacksview_del_btn":
@@ -2857,6 +2867,10 @@
"Callbacks":
{
"clicked":["Invoke", "_contentview_down_btn_clicked", null]
+ },
+ "Contains":
+ {
+ "contentview_down_btn_icon":[null]
}
},
"contentview_up_btn":
@@ -2874,6 +2888,10 @@
"Callbacks":
{
"clicked":["Invoke", "_contentview_up_btn_clicked", null]
+ },
+ "Contains":
+ {
+ "contentview_up_btn_icon":[null]
}
},
"itemview_box":
@@ -2993,6 +3011,66 @@
{
"clicked":["Invoke", "_itemview_item_del_but_clicked_cb", null]
}
+ },
+ "contentview_up_btn_icon":
+ {
+ "Desc":
+ {
+ "parent":"contentview_up_btn",
+ "class":"Elm_Icon"
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Evas.Object.visibility":[true],
+ "Evas.Object.size":[40, 40],
+ "Efl.File.file":["move_up_icon", null]
+ }
+ },
+ "contentview_down_btn_icon":
+ {
+ "Desc":
+ {
+ "parent":"contentview_down_btn",
+ "class":"Elm_Icon"
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Evas.Object.visibility":[true],
+ "Evas.Object.size":[40, 40],
+ "Efl.File.file":["move_down_icon", null]
+ }
+ },
+ "callbacksview_up_btn_icon":
+ {
+ "Desc":
+ {
+ "parent":"callbacksview_up_btn",
+ "class":"Elm_Icon"
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Evas.Object.visibility":[true],
+ "Evas.Object.size":[40, 40],
+ "Efl.File.file":["move_up_icon", null]
+ }
+ },
+ "callbacksview_down_btn_icon":
+ {
+ "Desc":
+ {
+ "parent":"callbacksview_down_btn",
+ "class":"Elm_Icon"
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_weight":[1, 1],
+ "Evas.Object.visibility":[true],
+ "Evas.Object.size":[40, 40],
+ "Efl.File.file":["move_down_icon", null]
+ }
}
}
}
diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c
index 637316e..61234f0 100644
--- a/src/bin/egui_gui/egui_logic.c
+++ b/src/bin/egui_gui/egui_logic.c
@@ -838,14 +838,6 @@ _canvas_bg_show_on_idle(void *data EINA_UNUSED)
}
static void
-_assign_image_to_button(Eo *btn, const char* path)
-{
- Eo *ic = eo_add(ELM_ICON_CLASS, btn);
- eo_do(ic, efl_file_set(path, NULL));
- eo_do(btn, elm_obj_container_content_set("icon", ic));
-}
-
-static void
_key_binding_save_cb(void *data)
{
intptr_t action = (intptr_t) data;
@@ -974,12 +966,6 @@ egui_start()
elm_object_item_disabled_set(g_main_wdgs->main_win->toolbar_graph_it,
EINA_TRUE);
#endif
- // Put signs on up down buttons
- _assign_image_to_button(g_main_wdgs->main_win->contentview_down_btn,
EGUI_LAYOUT_IMAGES_PATH"/icon_down_arrow.png");
- _assign_image_to_button(g_main_wdgs->main_win->contentview_up_btn,
EGUI_LAYOUT_IMAGES_PATH"/icon_up_arrow.png");
- _assign_image_to_button(g_main_wdgs->main_win->callbacksview_down_btn,
EGUI_LAYOUT_IMAGES_PATH"/icon_down_arrow.png");
- _assign_image_to_button(g_main_wdgs->main_win->callbacksview_up_btn,
EGUI_LAYOUT_IMAGES_PATH"/icon_up_arrow.png");
-
/* 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);
--
