Changed the res directiory location

Change-Id: I266f36c478756c74caa4c8e492fec3050e313807
Signed-off-by: min7.choi <min7.choi@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b8464f..35928fb 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ SET(PACKAGE ${PROJ_NAME})
 SET(PKGNAME "org.${VENDOR}.${PACKAGE}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(BINDIR "${PREFIX}/bin")
-SET(RESDIR "${PREFIX}/res")
+SET(RESDIR "${PREFIX}/shared/res")
 IF(TIZEN_2_3_UX)
 SET(EDJEDIR "${RESDIR}/edje")
 SET(TABLEDIR "${RESDIR}/tables")
@@ -22,7 +22,7 @@ ENDIF(TIZEN_2_3_UX)
 SET(IMAGEDIR "${RESDIR}/images")
 SET(DATADIR "${PREFIX}/data")
 SET(DBDATADIR "/home/owner/apps_rw/${PKGNAME}/data")
-SET(LOCALEDIR "${PREFIX}/shared/res/locale")
+SET(LOCALEDIR "${RESDIR}/locale")
 SET(ICONDIR "/usr/share/icons/default/small/")
 SET(HISTORYDB ".download-history.db")
 

diff --git a/packaging/org.tizen.download-manager.spec b/packaging/org.tizen.download-manager.spec
index c434532..0190495 100755 (executable)
--- a/packaging/org.tizen.download-manager.spec
+++ b/packaging/org.tizen.download-manager.spec
@@ -1,7 +1,7 @@
 %define _ux_define tizen2.3
 Name:  org.tizen.download-manager
 Summary:       Application for support of the content download
-Version:       0.3.6
+Version:       0.3.7
 Release:       1
 License:       Flora-1.1
 Group:         misc
@@ -44,13 +44,13 @@ Application for support of the content download
 
 %define _default_path /usr/apps/%{name}
 %define _bin_path %{_default_path}/bin
-%define _res_path %{_default_path}/res
+%define _res_path %{_default_path}/shared/res
 %define _imagedir %{_res_path}/images
 %if "%{?_ux_define}" == "tizen2.3"
 %define _edjedir %{_res_path}/edje
 %define _tabledir %{_res_path}/tables
 %endif
-%define _localedir %{_default_path}/shared/res/locale
+%define _localedir %{_res_path}/locale
 %define _pkgxmldir /usr/share/packages
 %define _icondir /usr/share/icons/default/small
 %define _licensedir /usr/share/license

diff --git a/src/download-manager-notification.cpp b/src/download-manager-notification.cpp
index 35e7329..ad780e5 100755 (executable)
--- a/src/download-manager-notification.cpp
+++ b/src/download-manager-notification.cpp
@@ -375,10 +375,10 @@ notification_h DownloadNoti::createNoti(NOTIFICATION_TYPE::TYPE type)
 
        if (NOTIFICATION_TYPE::NOTI_COMPLETED == type) {
                statusText = DM_POP_TEXT_DOWNLOAD_COMPLETE;
-               statusTextId = "IDS_DM_HEADER_DOWNLOAD_COMPLETE";
+               statusTextId = __("IDS_DM_HEADER_DOWNLOAD_COMPLETE");
        } else if (NOTIFICATION_TYPE::NOTI_FAILED == type) {
                statusText = DM_POP_TEXT_DOWNLOAD_FAILED;
-               statusTextId = "IDS_DM_BODY_DOWNLOAD_FAILED_M_STATUS_ABB";
+               statusTextId = __("IDS_DM_BODY_DOWNLOAD_FAILED_M_STATUS_ABB");
        }
 
 #ifdef _TIZEN_2_3_UX

diff --git a/src/download-manager-view.cpp b/src/download-manager-view.cpp
index 16ae41d..8b82366 100755 (executable)
--- a/src/download-manager-view.cpp
+++ b/src/download-manager-view.cpp
@@ -330,9 +330,10 @@ void DownloadView::setIndicator(Evas_Object *window)
 
 Evas_Object *DownloadView::createWindow(const char *windowName)
 {
+    bindtextdomain(PROJ_NAME, LOCALEDIR);
        eoWindow = elm_win_add(NULL, windowName, ELM_WIN_BASIC);
        if (eoWindow) {
-               elm_win_title_set(eoWindow, __("IDS_DM_HEADER_DOWNLOAD_MANAGER_ABB"));
+               elm_win_title_set(eoWindow, DM_HEADER_DOWNLOAD_MANAGER);
                elm_win_conformant_set(eoWindow, 1);
                evas_object_smart_callback_add(eoWindow, "delete,request",
                                destroy_window_cb,      static_cast<void*>(this));
@@ -431,7 +432,7 @@ void DownloadView::createNaviBar()
                        eext_naviframe_back_cb, NULL);
        createBox();
        eoNaviBarItem = elm_naviframe_item_push(eoNaviBar,
-               __("IDS_DM_HEADER_DOWNLOAD_MANAGER_ABB"),NULL, NULL, eoBox, NULL);
+               DM_HEADER_DOWNLOAD_MANAGER ,NULL, NULL, eoBox, NULL);
        if (!eoNaviBarItem)
                DM_LOGE("Null Check:eoNaviBarItem");
 #ifdef _TIZEN_2_3_UX
@@ -985,7 +986,7 @@ void DownloadView::updateLang()
                        elm_object_text_set(buttonObj, DM_OPT_TEXT_DELETE);
 #endif
                        elm_object_item_text_set(eoNaviBarItem,
-                                       __("IDS_DM_HEADER_DOWNLOAD_MANAGER_ABB"));
+                               DM_HEADER_DOWNLOAD_MANAGER);
                }
        }
        if (eoEmptyNoContent) {
@@ -1357,7 +1358,7 @@ void DownloadView::hideGenlistEditMode()
 
        removePopup();
        elm_object_item_text_set(eoNaviBarItem,
-                       __("IDS_DM_HEADER_DOWNLOAD_MANAGER_ABB"));
+               DM_HEADER_DOWNLOAD_MANAGER);
 #ifdef _TIZEN_2_3_UX
        m_isEditMode = false;
        deleteSelectAllLayout();

diff --git a/src/include/download-manager-common.h b/src/include/download-manager-common.h
index d91b5ea..6650166 100755 (executable)
--- a/src/include/download-manager-common.h
+++ b/src/include/download-manager-common.h
@@ -57,6 +57,7 @@
 #define DM_BODY_TEXT_TODAY __("IDS_DM_HEADER_TODAY")
 #define DM_BODY_TEXT_YESTERDAY __("IDS_DM_HEADER_YESTERDAY")
 #define DM_POP_TEXT_FAILED __("IDS_DM_BODY_DOWNLOAD_FAILED_M_STATUS_ABB")
+#define DM_HEADER_DOWNLOAD_MANAGER __("IDS_DM_HEADER_DOWNLOAD_MANAGER_ABB")
 #else
 #define DM_POP_TEXT_ERROR S_("IDS_COM_POP_ERROR")
 #define DM_BODY_TEXT_NO_NAME S_("IDS_COM_BODY_NO_NAME")