summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-01-08 16:51:00 +0200
committerYakov Goldberg <yakov.g@samsung.com>2015-01-08 16:51:00 +0200
commit8534210d613885a3f2314c3ee9437995699bd01a (patch)
treee50f96911283860fb7e8d5dfd3ba51d49bb1e121
parentde128b3f608005af7f1a387d1b6d996abff1d717 (diff)
Fix paths of images
-rw-r--r--src/bin/egui_gui/editor.c5
-rw-r--r--src/bin/egui_gui/egui_logic.c11
-rw-r--r--src/bin/egui_gui/propview.c2
-rw-r--r--src/bin/egui_gui/rmview.c2
4 files changed, 7 insertions, 13 deletions
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 98c2de5..14566b8 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -909,10 +909,7 @@ _marker_mouse_in(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Des
909 cur_logo = eo_add(ELM_IMAGE_CLASS, (Eo *) base_obj); 909 cur_logo = eo_add(ELM_IMAGE_CLASS, (Eo *) base_obj);
910 eo_do(cur_logo, evas_obj_size_set(sz, sz)); 910 eo_do(cur_logo, evas_obj_size_set(sz, sz));
911 eo_do(cur_logo, elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE)); 911 eo_do(cur_logo, elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE));
912 char path[100]; 912 eo_do(cur_logo, efl_file_set(PACKAGE_DATA_IMAGES"/resize_red.png", NULL));
913 getcwd(path, sizeof(path));
914 sprintf(path, "%s/data/images/resize_red.png", path);
915 eo_do(cur_logo, efl_file_set(path, NULL));
916 eo_do(base_obj, eo_key_data_set("cursor", cur_logo, NULL)); 913 eo_do(base_obj, eo_key_data_set("cursor", cur_logo, NULL));
917 914
918 Elm_Transit *trans; 915 Elm_Transit *trans;
diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c
index 18934c8..a8a7385 100644
--- a/src/bin/egui_gui/egui_logic.c
+++ b/src/bin/egui_gui/egui_logic.c
@@ -27,9 +27,6 @@
27#include "settings_view.h" 27#include "settings_view.h"
28#include "rmview.h" 28#include "rmview.h"
29 29
30#define _PATH_ICON_UP_ARROW PACKAGE_DATA_DIR"/images/icon_up_arrow.png"
31#define _PATH_ICON_DOWN_ARROW PACKAGE_DATA_DIR"/images/icon_down_arrow.png"
32
33static const Egui_Layout_Widgets *g_main_wdgs = NULL; 30static const Egui_Layout_Widgets *g_main_wdgs = NULL;
34static Egui_Layout_Fs_Win_Widgets *fs_win = NULL; 31static Egui_Layout_Fs_Win_Widgets *fs_win = NULL;
35 32
@@ -961,10 +958,10 @@ egui_start()
961#endif 958#endif
962 959
963 // Put signs on up down buttons 960 // Put signs on up down buttons
964 _assign_image_to_button(g_main_wdgs->main_win->contentview_down_btn, _PATH_ICON_DOWN_ARROW); 961 _assign_image_to_button(g_main_wdgs->main_win->contentview_down_btn, PACKAGE_DATA_IMAGES"/icon_down_arrow.png");
965 _assign_image_to_button(g_main_wdgs->main_win->contentview_up_btn, _PATH_ICON_UP_ARROW); 962 _assign_image_to_button(g_main_wdgs->main_win->contentview_up_btn, PACKAGE_DATA_IMAGES"/icon_up_arrow.png");
966 _assign_image_to_button(g_main_wdgs->main_win->callbacksview_down_btn, _PATH_ICON_DOWN_ARROW); 963 _assign_image_to_button(g_main_wdgs->main_win->callbacksview_down_btn, PACKAGE_DATA_IMAGES"/icon_down_arrow.png");
967 _assign_image_to_button(g_main_wdgs->main_win->callbacksview_up_btn, _PATH_ICON_UP_ARROW); 964 _assign_image_to_button(g_main_wdgs->main_win->callbacksview_up_btn, PACKAGE_DATA_IMAGES"/icon_up_arrow.png");
968 965
969 _factory_item_finalize(g_main_wdgs->main_win->fctr_actionslider_it, "factory_actionslider.png", DB_DEF_ACTIONSLIDER_CLASS); 966 _factory_item_finalize(g_main_wdgs->main_win->fctr_actionslider_it, "factory_actionslider.png", DB_DEF_ACTIONSLIDER_CLASS);
970 _factory_item_finalize(g_main_wdgs->main_win->fctr_bg_it, "factory_bg.png", DB_DEF_BG_CLASS); 967 _factory_item_finalize(g_main_wdgs->main_win->fctr_bg_it, "factory_bg.png", DB_DEF_BG_CLASS);
diff --git a/src/bin/egui_gui/propview.c b/src/bin/egui_gui/propview.c
index 66255dd..3df9a4d 100644
--- a/src/bin/egui_gui/propview.c
+++ b/src/bin/egui_gui/propview.c
@@ -173,7 +173,7 @@ _prop_item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *par
173 eo_do(prop_menu_button, eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _view_cbs->property_ctx_menu_cb_func, NULL)); 173 eo_do(prop_menu_button, eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _view_cbs->property_ctx_menu_cb_func, NULL));
174 174
175 Eo *ic = eo_add(ELM_ICON_CLASS, it_box); 175 Eo *ic = eo_add(ELM_ICON_CLASS, it_box);
176 eo_do(ic, efl_file_set(PACKAGE_DATA_DIR"/images/icon_prop_menu2.png", NULL)); 176 eo_do(ic, efl_file_set(PACKAGE_DATA_IMAGES"/icon_prop_menu2.png", NULL));
177 eo_do(prop_menu_button, elm_obj_container_content_set("icon", ic)); 177 eo_do(prop_menu_button, elm_obj_container_content_set("icon", ic));
178 178
179 eo_ref(it_box); 179 eo_ref(it_box);
diff --git a/src/bin/egui_gui/rmview.c b/src/bin/egui_gui/rmview.c
index bfb8263..e8fa03f 100644
--- a/src/bin/egui_gui/rmview.c
+++ b/src/bin/egui_gui/rmview.c
@@ -523,7 +523,7 @@ _rmview_build(Rmview_Resource_Type type)
523 { 523 {
524 Eo *icon = elm_image_add(g_rm_win->rm_table); 524 Eo *icon = elm_image_add(g_rm_win->rm_table);
525 eo_do(icon, 525 eo_do(icon,
526 efl_file_set(PACKAGE_DATA_DIR"/images/enventor_icon.png", NULL), 526 efl_file_set(PACKAGE_DATA_IMAGES"/enventor_icon.png", NULL),
527 evas_obj_size_hint_min_set(25, 25), 527 evas_obj_size_hint_min_set(25, 25),
528 elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE), 528 elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE),
529 evas_obj_visibility_set(EINA_TRUE) 529 evas_obj_visibility_set(EINA_TRUE)