From 3a0e7002da49ec7be2e4d415bcfed73b646d0223 Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Tue, 2 Aug 2016 14:48:40 +0300 Subject: [PATCH] Removed unused resources from edc. Optimized path utils. Change-Id: I4155277b1a9d869e129fe1828d9dfca810492eb8 Signed-off-by: Denis Dolzhenko --- .cproject | 2 +- .project | 1 + res/edje/image_macros.inl | 26 ++-------- res/edje/images.edc | 86 +++---------------------------- src/Common/Utils/src/PathUtils.cpp | 28 +++++++--- src/MsgThread/Controller/inc/MsgThread.h | 1 - src/MsgThread/View/src/FloatingButton.cpp | 2 +- 7 files changed, 38 insertions(+), 108 deletions(-) diff --git a/.cproject b/.cproject index a728278..8d8a04f 100644 --- a/.cproject +++ b/.cproject @@ -373,7 +373,7 @@ - + diff --git a/.project b/.project index 395d27f..46dfba2 100644 --- a/.project +++ b/.project @@ -12,6 +12,7 @@ org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, ?name? diff --git a/res/edje/image_macros.inl b/res/edje/image_macros.inl index 2229237..ee328b5 100755 --- a/res/edje/image_macros.inl +++ b/res/edje/image_macros.inl @@ -1,7 +1,7 @@ #define RESOURCE_IMAGE( FILE_NAME ) \ group { \ name: FILE_NAME; \ - images.image: FILE_NAME COMP; \ + images.image: FILE_NAME RAW; \ parts { \ part { name: "image"; \ description { \ @@ -17,7 +17,7 @@ #define RESOURCE_IMAGE_COLOR( FILE_NAME, COLOR ) \ group { \ name: FILE_NAME; \ - images.image: FILE_NAME COMP; \ + images.image: FILE_NAME RAW; \ parts { \ part { name: "image"; \ description { \ @@ -34,7 +34,7 @@ #define RESOURCE_IMAGE_NO_ASPECT( FILE_NAME ) \ group { \ name: FILE_NAME; \ - images.image: FILE_NAME COMP; \ + images.image: FILE_NAME RAW; \ parts { \ part { name: "image"; \ description { \ @@ -45,27 +45,11 @@ } \ } -#define RESOURCE_IMAGE_LOSSY( FILE_NAME ) \ - group { \ - name: FILE_NAME; \ - images.image: FILE_NAME LOSSY 85; \ - parts { \ - part { name: "image"; \ - description { \ - state: "default" 0.0; \ - image.normal: FILE_NAME; \ - aspect: 1 1; \ - aspect_preference: BOTH; \ - } \ - } \ - } \ - } - #define RESOURCE_OVERLAP_IMAGE( GROUP_NAME, BG_FILE_NAME, BG_COLOR_R, BG_COLOR_G, BG_COLOR_B, BG_COLOR_A, ICON_FILE_NAME, ICON_COLOR_R, ICON_COLOR_G, ICON_COLOR_B, ICON_COLOR_A) \ group { \ name: GROUP_NAME; \ - images.image: BG_FILE_NAME COMP; \ - images.image: ICON_FILE_NAME COMP; \ + images.image: BG_FILE_NAME RAW; \ + images.image: ICON_FILE_NAME RAW; \ parts { \ part { \ name: "bg"; \ diff --git a/res/edje/images.edc b/res/edje/images.edc index 3c73760..d9f0e8b 100755 --- a/res/edje/images.edc +++ b/res/edje/images.edc @@ -1,84 +1,14 @@ #include "image_macros.inl" collections { - RESOURCE_IMAGE("60_myfiles_file_etc.png"); - RESOURCE_IMAGE("attach_icon.png"); - RESOURCE_IMAGE("M01_icon_message_status_mms_read_n.png"); - RESOURCE_IMAGE("M01_icon_message_status_mms_sent_n.png"); - RESOURCE_IMAGE("M01_icon_message_status_mms_unread_n.png"); - RESOURCE_IMAGE("M01_icon_message_status_sms_read_n.png"); - RESOURCE_IMAGE("M01_icon_message_status_sms_sent_n.png"); - RESOURCE_IMAGE("M01_icon_message_status_sms_unread_n.png"); - RESOURCE_IMAGE("M01_icon_composer.png"); - RESOURCE_IMAGE("masking_message_list.png"); - RESOURCE_IMAGE("U01_icon_excel.png"); - RESOURCE_IMAGE("U01_icon_html.png"); - RESOURCE_IMAGE("U01_list_icon_image.png"); - RESOURCE_IMAGE("U01_list_icon_amr.png"); - RESOURCE_IMAGE("U01_list_icon_mp3.png"); - RESOURCE_IMAGE("U01_icon_pdf.png"); - RESOURCE_IMAGE("U01_icon_ppt.png"); - RESOURCE_IMAGE("U01_icon_rss.png"); - RESOURCE_IMAGE("U01_icon_vcf.png"); - RESOURCE_IMAGE("U01_icon_svg.png"); - RESOURCE_IMAGE("U01_icon_swf.png"); - RESOURCE_IMAGE("U01_icon_text.png"); - RESOURCE_IMAGE("U01_list_icon_mp4.png"); - RESOURCE_IMAGE("U01_icon_word.png"); - RESOURCE_IMAGE("U01_icon_drm.png"); - RESOURCE_IMAGE("U01_icon_eml.png"); - RESOURCE_IMAGE("U01_icon_hwp.png"); - RESOURCE_IMAGE("U01_icon_file_zip.png"); - RESOURCE_IMAGE("U01_icon_tpk.png"); - RESOURCE_IMAGE("M01_icon_Unsupported.png"); - RESOURCE_IMAGE("M01_title_icon_compose.png"); - RESOURCE_IMAGE("00_icon_select_all.png"); - RESOURCE_IMAGE("M01_btn_add_plus.png"); - RESOURCE_IMAGE("btn_conversation_add.png"); - RESOURCE_IMAGE("btn_conversation_emotion.png"); - RESOURCE_IMAGE("icon_btn_contact.png"); - RESOURCE_IMAGE("core_button_add.png"); - RESOURCE_IMAGE_NO_ASPECT("btn_conversation_message_sending.png"); - RESOURCE_IMAGE_NO_ASPECT("btn_conversation_mms_message_sending.png"); - RESOURCE_IMAGE("M01_icon_send_schedule.png"); - RESOURCE_IMAGE("M01_icon_send_translator.png"); - RESOURCE_IMAGE("M01_button_contact.png"); - RESOURCE_IMAGE("M01_button_recent.png"); - RESOURCE_IMAGE("M01_btn_location.png"); - RESOURCE_IMAGE("M01_attach_icon_dcm_contacts.png"); - RESOURCE_IMAGE("M01_attach_icon_recorded_video.png"); - RESOURCE_IMAGE("M01_attach_icon_text_templates.png"); - RESOURCE_IMAGE("M02_icon_invalid.png"); - RESOURCE_IMAGE("M01_icon_bubble_drm.png"); - RESOURCE_IMAGE("M01_btn_all.png"); - RESOURCE_IMAGE("M01_btn_sender.png"); - RESOURCE_IMAGE("M01_btn_message.png"); - RESOURCE_IMAGE("icon_emotion_happy.png"); - RESOURCE_IMAGE("icon_emotion_sad.png"); - RESOURCE_IMAGE("icon_emotion_wink.png"); - RESOURCE_IMAGE("icon_emotion_stick_out_tongue.png"); - RESOURCE_IMAGE("icon_emotion_surprised.png"); - RESOURCE_IMAGE("icon_emotion_kiss.png"); - RESOURCE_IMAGE("icon_emotion_yelling.png"); - RESOURCE_IMAGE("icon_emotion_sunglasses.png"); - RESOURCE_IMAGE("icon_emotion_embarrassed.png"); - RESOURCE_IMAGE("icon_emotion_disappointed.png"); - RESOURCE_IMAGE("icon_emotion_crying.png"); - RESOURCE_IMAGE("icon_emotion_no_speak.png"); - RESOURCE_IMAGE("icon_emotion_laughing.png"); - RESOURCE_IMAGE("icon_emotion_confused.png"); - RESOURCE_IMAGE("icon_emotion_heart.png"); - RESOURCE_IMAGE("icon_emotion_angry.png"); - RESOURCE_IMAGE("icon_emotion_raised_eyebrow.png"); - RESOURCE_IMAGE("icon_emotion_pokerface.png"); - RESOURCE_IMAGE("badge_icon_draft_pencil.png"); - RESOURCE_IMAGE("icon_soft_search_back.png"); - RESOURCE_IMAGE("list_ic_user_thumb_masking.png"); - RESOURCE_IMAGE("messages_attach_ic_music.png"); - RESOURCE_IMAGE("messages_attach_ic_calendar.png"); + RESOURCE_IMAGE("attach_icon.png"); + RESOURCE_IMAGE("btn_conversation_add.png"); + RESOURCE_IMAGE("icon_btn_contact.png"); + RESOURCE_IMAGE("core_button_add.png"); + RESOURCE_IMAGE_NO_ASPECT("btn_conversation_message_sending.png"); + RESOURCE_IMAGE("icon_soft_search_back.png"); + RESOURCE_IMAGE("messages_attach_ic_music.png"); + RESOURCE_IMAGE("messages_attach_ic_calendar.png"); RESOURCE_IMAGE("messages_attach_ic_contact.png"); RESOURCE_IMAGE("U01_icon_etc.png"); - - RESOURCE_OVERLAP_IMAGE("title/thumb/contact", "title_thumbnail_image_bg.png", 255, 255, 255, 255, "title_thumbnail_image.png", 2, 61, 132, 255); - RESOURCE_OVERLAP_IMAGE("title/thumb/group", "title_thumbnail_image_bg.png", 255, 255, 255, 255, "title_thumbnail_image_group.png", 2, 61, 132, 255); } diff --git a/src/Common/Utils/src/PathUtils.cpp b/src/Common/Utils/src/PathUtils.cpp index 0e8a3cd..c244e0f 100644 --- a/src/Common/Utils/src/PathUtils.cpp +++ b/src/Common/Utils/src/PathUtils.cpp @@ -27,11 +27,19 @@ using namespace Msg; std::string PathUtils::getResourcePath(const std::string &filePath) { std::string res; - char *absolutePath = app_get_resource_path(); + static std::string basePath; + if(basePath.empty()) + { + char *path = app_get_resource_path(); + if(path) + { + basePath = path; + free(path); + } + } - res += absolutePath; + res += basePath; res += filePath; - free(absolutePath); return res; } @@ -39,11 +47,19 @@ std::string PathUtils::getResourcePath(const std::string &filePath) std::string PathUtils::getDataPath(const std::string &filePath) { std::string res; - char *absolutePath = app_get_data_path(); + static std::string basePath; + if(basePath.empty()) + { + char *path = app_get_data_path(); + if(path) + { + basePath = path; + free(path); + } + } - res += absolutePath; + res += basePath; res += filePath; - free(absolutePath); return res; } diff --git a/src/MsgThread/Controller/inc/MsgThread.h b/src/MsgThread/Controller/inc/MsgThread.h index 7d9a8f1..0319cca 100644 --- a/src/MsgThread/Controller/inc/MsgThread.h +++ b/src/MsgThread/Controller/inc/MsgThread.h @@ -121,7 +121,6 @@ namespace Msg ThreadSearchList *m_pSearchList; MsgThreadSearchPanel *m_pSearchPanel; Mode m_Mode; - FloatingButton *m_pFloatingBtn; }; } diff --git a/src/MsgThread/View/src/FloatingButton.cpp b/src/MsgThread/View/src/FloatingButton.cpp index 8f3dc1e..b59f3e2 100644 --- a/src/MsgThread/View/src/FloatingButton.cpp +++ b/src/MsgThread/View/src/FloatingButton.cpp @@ -29,7 +29,7 @@ FloatingButton::FloatingButton(Evas_Object *parent) setEo(eext_floatingbutton_add(parent)); Evas_Object *composeBtn = elm_button_add(getEo()); - Evas_Object *icon = elm_image_add(getEo()); + Evas_Object *icon = elm_image_add(composeBtn); std::string resPath = PathUtils::getResourcePath(MSG_THREAD_FLOATING_BTN_ICON); elm_image_file_set(icon, resPath.c_str(), NULL); evas_object_size_hint_min_set(icon, COMPOSE_BUTTON_ICON_SIZE, COMPOSE_BUTTON_ICON_SIZE); -- 2.7.4