Removed hardcoded paths for EDJ loading

Change-Id: Ic78c4408fbf6c9ee13935b971fa8c19c6be4e237
Signed-off-by: Chandan <ch.kumar@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 223b6c1..3b49d76 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,9 +24,8 @@ ADD_DEFINITIONS("-D_USE_DLOG_")
 ADD_DEFINITIONS("-D_USE_SECURE_LOG_")
 ADD_DEFINITIONS("-D_USE_ROTATE_BG_GE")
 ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
-#ADD_DEFINITIONS("-D_USE_CUSTOMIZED_GENGRID_STYLE")
-#ADD_DEFINITIONS("-D_USE_SHOW_SELECTED_COUNT_IN_TITLE")
-#ADD_DEFINITIONS("-D_USE_ADD_TO_HOME_FOR_IMAGES")
+ADD_DEFINITIONS("-DPACKAGE=\"${PROJECT_NAME}\"")
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src MAIN_UG_SRCS)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src/data DATA_UG_SRCS)

diff --git a/include/gallery-efl.h b/include/gallery-efl.h
index 0970014..442ed75 100644 (file)
--- a/include/gallery-efl.h
+++ b/include/gallery-efl.h
@@ -25,9 +25,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define GALLERY_APP_ICON_DIR "/usr/share/icons/default/small/"
-#define GE_UG_RES_DIR "/usr/ug/res/"
-#define GE_IMAGES_DIR GE_UG_RES_DIR"images/attach-panel-gallery/images/"
-#define GE_EDJ_DIR GE_UG_RES_DIR"edje/attach-panel-gallery/"
+#define GE_UG_RES_DIR PREFIX"/res/"
+#define GE_IMAGES_DIR GE_UG_RES_DIR"images/"PACKAGE"/images/"
+#define GE_EDJ_DIR GE_UG_RES_DIR"edje/"PACKAGE"/"
 #define GE_EDJ_FILE GE_EDJ_DIR"attach-panel-gallery.edj"
 #ifdef _USE_CUSTOMIZED_GENGRID_STYLE
 #define GE_GENGRID_STYLE_GALLERY "gallery_efl"

diff --git a/include/ge-icon.h b/include/ge-icon.h
index be8d578..cef4c47 100644 (file)
--- a/include/ge-icon.h
+++ b/include/ge-icon.h
@@ -38,7 +38,7 @@
 #define GE_ICON_PANORAMA "T01_icon_panorama.png"
 #define GE_ICON_NO_THUMBNAIL GE_IMAGES_DIR"No_thumbnail_351X261.png"
 #define GE_ICON_CONTENTS_BROKEN GE_IMAGES_DIR"Contents_broken_351X261.png"
-#define GE_ICON_MEMORY_CARD "/usr/ug/res/images/attach-panel-gallery/images/T01_album_icon_sd_card.png"
+#define GE_ICON_MEMORY_CARD PREFIX"/res/images/attach-panel-gallery/images/T01_album_icon_sd_card.png"
 
 #endif //__GE_ICON_H__