Fixed for multi language support

Change-Id: I293faa3cdd0fc76568eeec5c55e7057751771971
Signed-off-by: Younho Park <younho.park@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index b13f753..4a3b075
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,98 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(my-account C)
 
-MESSAGE("build account setting menu")
+SET(APPDIR /usr/apps/org.tizen.my-account)
+SET(LIBDIR ${APPDIR}/lib/ug)
+SET(BINDIR ${APPDIR}/bin)
+SET(RESDIR ${APPDIR}/res)
+SET(SHAREDDIR ${APPDIR}/shared)
+SET(DATADIR ${APPDIR}/shared/trusted)
 
-IF(TIZEN_WEARABLE)
-MESSAGE("profile : wearable")
-ADD_SUBDIRECTORY(wearable)
-ENDIF(TIZEN_WEARABLE)
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+#SET(BINDIR "${PREFIX}/bin")
+#SET(RESDIR "${PREFIX}/res")
+SET(LOCALEDIR "${RESDIR}/locale")
+SET(IMGDIR "${RESDIR}/images")
+SET(EDJDIR "${RESDIR}/edje")
+SET(ICONDIR "${CMAKE_SHARE_PREFIX}/icons/default/small")
+SET(XMLDIR "${CMAKE_SHARE_PREFIX}/packages")
+#SET(DATADIR "${CMAKE_DATA_PREFIX}")
+SET(TABLEDIR "${PREFIX}/shared/res/tables")
 
+ADD_DEFINITIONS("-DPACKAGE=\"my-account\"")
+ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
+ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
+ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
+ADD_DEFINITIONS("-DIMGDIR=\"${IMGDIR}\"")
+ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"")
+ADD_DEFINITIONS("-DICONDIR=\"${ICONDIR}\"")
+ADD_DEFINITIONS("-DDATADIR=\"${DATADIR}\"")
+ADD_DEFINITIONS("-DTABLEDIR=\"${TABLEDIR}\"")
+
+ADD_DEFINITIONS("-DMA_LOG_LEVEL_2")
+
+
+SET(SRCS
+src/my-account-main.c
+src/my-account-ui-widget.c
+src/my-account-view-main.c
+)
+
+IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
+       SET(CMAKE_BUILD_TYPE "Release")
+ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
+MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(/usr/include)
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(pkgs REQUIRED
+       glib-2.0
+       elementary
+       accounts-svc
+       dlog
+       vconf
+       capi-appfw-application
+       efl-extension
+)
+
+FOREACH(flag ${pkgs_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fpie")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+SET(CMAKE_C_FLAGS_RELEASE "-O2")
+
+FIND_PROGRAM(UNAME NAMES uname)
+EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
+IF("${ARCH}" STREQUAL "arm")
+       ADD_DEFINITIONS("-DTARGET")
+       MESSAGE("add -DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-D_A_PROJECT_")
+
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.0.1)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} accounts-svc)
+
+ADD_CUSTOM_TARGET(my-account.edj
+               COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/data/images
+               ${CMAKE_SOURCE_DIR}/data/edc/my-account.edc ${CMAKE_BINARY_DIR}/my-account.edj
+               DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/my-account.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} my-account.edj)
+
+SET(COLORTABLEDIR "${CMAKE_BINARY_DIR}/")
+
+INSTALL(FILES ${CMAKE_BINARY_DIR}/org.tizen.my-account.xml DESTINATION /usr/share/packages)
+
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/images/tw_ic_popup_btn_check.png DESTINATION ${SHAREDDIR}/res)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/my-account.edj DESTINATION ${RESDIR}/edje/${PROJECT_NAME})
+
+# i18n
+ADD_SUBDIRECTORY(po)
\ No newline at end of file

diff --git a/INSTALL b/INSTALL
new file mode 100644 (file)
index 0000000..b4c30f0
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,34 @@
+1. make the build directory
+
+  ex)
+
+   $ mkdir build
+
+
+2. change the working directory to the build directory
+
+  ex)
+
+   $ cd build
+
+
+3. run 'cmake'
+
+  $ cmake ${SOURCE_DIR} -DCMAKE_INSTALL_PREFIX=/usr
+
+  ex)
+
+   $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+
+   or
+
+   $ cmake ..
+
+
+4. make & make install
+
+  ex)
+
+   $ make -j 2 && make install
+
+

diff --git a/wearable/app/data/edc/my-account.edc b/data/edc/my-account.edc
similarity index 100%
rename from wearable/app/data/edc/my-account.edc
rename to data/edc/my-account.edc

diff --git a/wearable/app/data/images/tw_ic_popup_btn_check.png b/data/images/tw_ic_popup_btn_check.png
similarity index 100%
rename from wearable/app/data/images/tw_ic_popup_btn_check.png
rename to data/images/tw_ic_popup_btn_check.png

diff --git a/wearable/app/data/images/tw_list_fadeout_right_masking.#.png b/data/images/tw_list_fadeout_right_masking.#.png
similarity index 100%
rename from wearable/app/data/images/tw_list_fadeout_right_masking.#.png
rename to data/images/tw_list_fadeout_right_masking.#.png

diff --git a/wearable/app/include/my-account-debug.h b/include/my-account-debug.h
similarity index 98%
rename from wearable/app/include/my-account-debug.h
rename to include/my-account-debug.h
index 58598ac..08f4eae 100644 (file)
--- a/wearable/app/include/my-account-debug.h
+++ b/include/my-account-debug.h
@@ -41,8 +41,7 @@ extern "C"
 #undef LOG_TAG
 #endif
 
-#define LOG_TAG        "MYACCOUNT_SETTING_APP"
-
+#define LOG_TAG        "MYACCOUNT"
 #define MA_ENABLE_DLOG
 
 #ifdef MA_ENABLE_DLOG

diff --git a/wearable/app/include/my-account-main.h b/include/my-account-main.h
old mode 100644 (file)
new mode 100755 (executable)
similarity index 97%
rename from wearable/app/include/my-account-main.h
rename to include/my-account-main.h
index e2fefce..eed5a95
--- a/wearable/app/include/my-account-main.h
+++ b/include/my-account-main.h
@@ -42,7 +42,7 @@ extern "C"
 #define IMAGES_PATH    IMGDIR
 #define TABLE_PATH     TABLEDIR
 #define EDJ_FILE       EDJDIR"/"APPNAME".edj"
-#define MA_UG_NAME "setting-myaccount-efl"
+#define MA_UG_NAME "my-account"
 
 enum {
        VIEW_MAIN = 0,

diff --git a/wearable/app/include/my-account-ui-widget.h b/include/my-account-ui-widget.h
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from wearable/app/include/my-account-ui-widget.h
rename to include/my-account-ui-widget.h

diff --git a/wearable/app/include/my-account-util.h b/include/my-account-util.h
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from wearable/app/include/my-account-util.h
rename to include/my-account-util.h

diff --git a/wearable/app/include/my-account-view.h b/include/my-account-view.h
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from wearable/app/include/my-account-view.h
rename to include/my-account-view.h

diff --git a/my-account.manifest b/my-account.manifest
new file mode 100644 (file)
index 0000000..a76fdba
--- /dev/null
+++ b/my-account.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>

diff --git a/wearable/org.tizen.my-account.xml b/org.tizen.my-account.xml
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wearable/org.tizen.my-account.xml
rename to org.tizen.my-account.xml

diff --git a/packaging/my-account.spec b/packaging/my-account.spec
index 54a2018..7435d88 100644 (file)
--- a/packaging/my-account.spec
+++ b/packaging/my-account.spec
@@ -1,3 +1,11 @@
+Name:       my-account
+Summary:    My account application
+Version:    0.0.1
+Release:    0
+Group:      main/devel
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+
 %if "%{?profile}" == "wearable"
 %global PREFIX  %{_prefix}/apps/org.tizen.my-account/
 %endif
@@ -6,21 +14,6 @@
 ExcludeArch: %{arm} %ix86 x86_64
 %endif
 
-%if "%{?profile}" == "tv"
-ExcludeArch: %{arm} %ix86 x86_64
-%endif
-
-%if "%{?profile}" == "common"
-ExcludeArch: %{arm} %ix86 x86_64
-%endif
-
-Name:       my-account
-Summary:    My account application
-Version:    0.0.1
-Release:    0
-Group:      main/devel
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(syspopup)
 BuildRequires:  pkgconfig(accounts-svc)
@@ -41,7 +34,17 @@ Accounts ug of setting application.
 %prep
 %setup -q
 
+%define APPDIR /usr/apps/org.tizen.my-account
+%define BINDIR %{APPDIR}/bin
+%define LIBDIR %{APPDIR}/lib/ug
+%define RESDIR %{APPDIR}/res
+%define SHAREDDIR %{APPDIR}/shared
+%define DATADIR %{APPDIR}/shared/trusted
+
 %build
+export CFLAGS="${CFLAGS} -fPIC -fvisibility=hidden"
+
+%define PREFIX    "/usr"
 cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} \
 %if "%{?profile}" == "wearable"
        -DTIZEN_WEARABLE=1
@@ -50,18 +53,19 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} \
 make %{?jobs:-j%jobs}
 
 %install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/share/license
+cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license/%{name}
 %make_install
 
-mkdir -p %{buildroot}/usr/share/license
-cp -af %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/
+%files
+%manifest my-account.manifest
+%defattr(-,root,root,-)
+/usr/share/license/%{name}
+%{LIBDIR}/*
+%{RESDIR}/*
+%{SHAREDDIR}/*
+/usr/share/packages/*.xml
 
 %post
 /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_datadir}/license/LICENSE.APLv2
-%{_datadir}/packages/*
-%{PREFIX}/*

diff --git a/wearable/po/CMakeLists.txt b/po/CMakeLists.txt
similarity index 90%
rename from wearable/po/CMakeLists.txt
rename to po/CMakeLists.txt
index 37ae7c9..3f36237 100644 (file)
--- a/wearable/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,5 +1,4 @@
 # for i18n
-PROJECT(my-account C)
 
 SET(POFILES
 ar.po
@@ -68,7 +67,7 @@ FOREACH(pofile ${POFILES})
                        DEPENDS ${absPofile}
        )
        INSTALL(FILES ${moFile}
-                       DESTINATION ${LOCALEDIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+                       DESTINATION ${RESDIR}/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
        SET(moFiles ${moFiles} ${moFile})
 ENDFOREACH(pofile)
 

diff --git a/wearable/po/ar.po b/po/ar.po
similarity index 100%
rename from wearable/po/ar.po
rename to po/ar.po

diff --git a/wearable/po/az.po b/po/az.po
similarity index 100%
rename from wearable/po/az.po
rename to po/az.po

diff --git a/wearable/po/bg.po b/po/bg.po
similarity index 100%
rename from wearable/po/bg.po
rename to po/bg.po

diff --git a/wearable/po/ca.po b/po/ca.po
similarity index 100%
rename from wearable/po/ca.po
rename to po/ca.po

diff --git a/wearable/po/cs.po b/po/cs.po
similarity index 100%
rename from wearable/po/cs.po
rename to po/cs.po

diff --git a/wearable/po/da.po b/po/da.po
similarity index 100%
rename from wearable/po/da.po
rename to po/da.po

diff --git a/wearable/po/de.po b/po/de.po
similarity index 100%
rename from wearable/po/de.po
rename to po/de.po

diff --git a/wearable/po/el_GR.po b/po/el_GR.po
similarity index 100%
rename from wearable/po/el_GR.po
rename to po/el_GR.po

diff --git a/wearable/po/en.po b/po/en.po
similarity index 100%
rename from wearable/po/en.po
rename to po/en.po

diff --git a/wearable/po/en_PH.po b/po/en_PH.po
similarity index 100%
rename from wearable/po/en_PH.po
rename to po/en_PH.po

diff --git a/wearable/po/en_US.po b/po/en_US.po
similarity index 100%
rename from wearable/po/en_US.po
rename to po/en_US.po

diff --git a/wearable/po/es_ES.po b/po/es_ES.po
similarity index 100%
rename from wearable/po/es_ES.po
rename to po/es_ES.po

diff --git a/wearable/po/es_US.po b/po/es_US.po
similarity index 100%
rename from wearable/po/es_US.po
rename to po/es_US.po

diff --git a/wearable/po/et.po b/po/et.po
similarity index 100%
rename from wearable/po/et.po
rename to po/et.po

diff --git a/wearable/po/eu.po b/po/eu.po
similarity index 100%
rename from wearable/po/eu.po
rename to po/eu.po

diff --git a/wearable/po/fi.po b/po/fi.po
similarity index 100%
rename from wearable/po/fi.po
rename to po/fi.po

diff --git a/wearable/po/fr.po b/po/fr.po
similarity index 100%
rename from wearable/po/fr.po
rename to po/fr.po

diff --git a/wearable/po/fr_CA.po b/po/fr_CA.po
similarity index 100%
rename from wearable/po/fr_CA.po
rename to po/fr_CA.po

diff --git a/wearable/po/ga.po b/po/ga.po
similarity index 100%
rename from wearable/po/ga.po
rename to po/ga.po

diff --git a/wearable/po/gl.po b/po/gl.po
similarity index 100%
rename from wearable/po/gl.po
rename to po/gl.po

diff --git a/wearable/po/hi.po b/po/hi.po
similarity index 100%
rename from wearable/po/hi.po
rename to po/hi.po

diff --git a/wearable/po/hr.po b/po/hr.po
similarity index 100%
rename from wearable/po/hr.po
rename to po/hr.po

diff --git a/wearable/po/hu.po b/po/hu.po
similarity index 100%
rename from wearable/po/hu.po
rename to po/hu.po

diff --git a/wearable/po/hy.po b/po/hy.po
similarity index 100%
rename from wearable/po/hy.po
rename to po/hy.po

diff --git a/wearable/po/is.po b/po/is.po
similarity index 100%
rename from wearable/po/is.po
rename to po/is.po

diff --git a/wearable/po/it_IT.po b/po/it_IT.po
similarity index 100%
rename from wearable/po/it_IT.po
rename to po/it_IT.po

diff --git a/wearable/po/ja_JP.po b/po/ja_JP.po
similarity index 100%
rename from wearable/po/ja_JP.po
rename to po/ja_JP.po

diff --git a/wearable/po/ka.po b/po/ka.po
similarity index 100%
rename from wearable/po/ka.po
rename to po/ka.po

diff --git a/wearable/po/kk.po b/po/kk.po
similarity index 100%
rename from wearable/po/kk.po
rename to po/kk.po

diff --git a/wearable/po/ko_KR.po b/po/ko_KR.po
similarity index 100%
rename from wearable/po/ko_KR.po
rename to po/ko_KR.po

diff --git a/wearable/po/lt.po b/po/lt.po
similarity index 100%
rename from wearable/po/lt.po
rename to po/lt.po

diff --git a/wearable/po/lv.po b/po/lv.po
similarity index 100%
rename from wearable/po/lv.po
rename to po/lv.po

diff --git a/wearable/po/mk.po b/po/mk.po
similarity index 100%
rename from wearable/po/mk.po
rename to po/mk.po

diff --git a/wearable/po/nb.po b/po/nb.po
similarity index 100%
rename from wearable/po/nb.po
rename to po/nb.po

diff --git a/wearable/po/nl.po b/po/nl.po
similarity index 100%
rename from wearable/po/nl.po
rename to po/nl.po

diff --git a/wearable/po/pl.po b/po/pl.po
similarity index 100%
rename from wearable/po/pl.po
rename to po/pl.po

diff --git a/wearable/po/pt_BR.po b/po/pt_BR.po
similarity index 100%
rename from wearable/po/pt_BR.po
rename to po/pt_BR.po

diff --git a/wearable/po/pt_PT.po b/po/pt_PT.po
similarity index 100%
rename from wearable/po/pt_PT.po
rename to po/pt_PT.po

diff --git a/wearable/po/ro.po b/po/ro.po
similarity index 100%
rename from wearable/po/ro.po
rename to po/ro.po

diff --git a/wearable/po/ru_RU.po b/po/ru_RU.po
similarity index 100%
rename from wearable/po/ru_RU.po
rename to po/ru_RU.po

diff --git a/wearable/po/sk.po b/po/sk.po
similarity index 100%
rename from wearable/po/sk.po
rename to po/sk.po

diff --git a/wearable/po/sl.po b/po/sl.po
similarity index 100%
rename from wearable/po/sl.po
rename to po/sl.po

diff --git a/wearable/po/sr.po b/po/sr.po
similarity index 100%
rename from wearable/po/sr.po
rename to po/sr.po

diff --git a/wearable/po/sv.po b/po/sv.po
similarity index 100%
rename from wearable/po/sv.po
rename to po/sv.po

diff --git a/wearable/po/tr_TR.po b/po/tr_TR.po
similarity index 100%
rename from wearable/po/tr_TR.po
rename to po/tr_TR.po

diff --git a/wearable/po/uk.po b/po/uk.po
similarity index 100%
rename from wearable/po/uk.po
rename to po/uk.po

diff --git a/wearable/po/uz.po b/po/uz.po
similarity index 100%
rename from wearable/po/uz.po
rename to po/uz.po

diff --git a/wearable/po/zh_CN.po b/po/zh_CN.po
similarity index 100%
rename from wearable/po/zh_CN.po
rename to po/zh_CN.po

diff --git a/wearable/po/zh_HK.po b/po/zh_HK.po
similarity index 100%
rename from wearable/po/zh_HK.po
rename to po/zh_HK.po

diff --git a/wearable/po/zh_TW.po b/po/zh_TW.po
similarity index 100%
rename from wearable/po/zh_TW.po
rename to po/zh_TW.po

diff --git a/wearable/app/src/my-account-main.c b/src/my-account-main.c
similarity index 100%
rename from wearable/app/src/my-account-main.c
rename to src/my-account-main.c

diff --git a/wearable/app/src/my-account-ui-widget.c b/src/my-account-ui-widget.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wearable/app/src/my-account-ui-widget.c
rename to src/my-account-ui-widget.c

diff --git a/wearable/app/src/my-account-view-main.c b/src/my-account-view-main.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from wearable/app/src/my-account-view-main.c
rename to src/my-account-view-main.c
index a1e64e4..387ce90
--- a/wearable/app/src/my-account-view-main.c
+++ b/src/my-account-view-main.c
@@ -499,7 +499,7 @@ void __myaccount_genlist_account_list_item_append(appdata *ad, Evas_Object *genl
 static char *__gl_text_get_registered_account_list_title(void *data, Evas_Object *obj, const char *part)
 {
        if (!strcmp(part, "elm.text"))
-               return strdup("Accounts");
+               return strdup(dgettext(MA_UG_NAME, "IDS_MA_HEADER_ACCOUNTS"));
        else
                return NULL;
 }
@@ -507,7 +507,7 @@ static char *__gl_text_get_registered_account_list_title(void *data, Evas_Object
 static char *__gl_text_get_add_account_title(void *data, Evas_Object *obj, const char *part)
 {
        if (!strcmp(part, "elm.text"))
-               return strdup("Add Accounts");
+               return strdup(dgettext(MA_UG_NAME, "IDS_MA_HEADER_ADD_ACCOUNT"));
        else
                return NULL;
 }
@@ -702,7 +702,7 @@ static char *__gl_text_get_no_content_label(void *data, Evas_Object *obj, const
        MA_DEBUG("__gl_text_get_no_content_label start");
        if (!strcmp(part, "elm.text")) {
                MA_DEBUG("__gl_text_get_no_content_label elm.text");
-               return strdup("No Account Provider");
+               return strdup(dgettext(MA_UG_NAME, "IDS_MA_NPBODY_NO_ACCOUNT_PROVIDER_APPS_INSTALLED"));
        } else {
                return NULL;
        }
@@ -797,7 +797,7 @@ void __create_genlist_add_account(void *data, Evas_Object *obj, void *event_info
 
        evas_object_show(genlist);
 
-       elm_naviframe_item_push(ad->navi_frame, "Add Accounts", NULL, NULL, genlist, "empty");
+       elm_naviframe_item_push(ad->navi_frame, dgettext(MA_UG_NAME, "IDS_MA_HEADER_ADD_ACCOUNT"), NULL, NULL, genlist, "empty");
        elm_naviframe_item_pop_cb_set(ad->navi_frame, naviframe_pop_cb, ad);
 }
 
@@ -847,7 +847,7 @@ static Evas_Object *__create_genlist_account_list(void *data)
        elm_layout_theme_set(genlist, "layout", "bottom_button", "default");
        add_button = elm_button_add(genlist);
        elm_object_style_set(add_button, "bottom");
-       elm_object_text_set(add_button, "ADD");
+       elm_object_text_set(add_button, dgettext(MA_UG_NAME, "IDS_MA_HEADER_ADD_ACCOUNT"));
        elm_object_part_content_set(genlist, "elm.swallow.button", add_button);
        evas_object_smart_callback_add(add_button, "clicked", __create_genlist_add_account, ad);
 
@@ -870,7 +870,7 @@ bool _myaccount_view_main_create(void *data)
        /* Draw UI */
        ad->main_genlist = __create_genlist_account_list(ad);
 
-       elm_naviframe_item_push(ad->navi_frame, "Accounts", NULL, NULL, ad->main_genlist, "empty");
+       elm_naviframe_item_push(ad->navi_frame, dgettext(MA_UG_NAME, "IDS_MA_HEADER_ACCOUNTS"), NULL, NULL, ad->main_genlist, "empty");
 
        return true;
 }

diff --git a/wearable/CMakeLists.txt b/wearable/CMakeLists.txt
deleted file mode 100755 (executable)
index 4272a4a..0000000
--- a/wearable/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(BINDIR "${PREFIX}/bin")
-SET(RESDIR "${PREFIX}/res")
-SET(LOCALEDIR "${RESDIR}/locale")
-SET(IMGDIR "${RESDIR}/images")
-SET(EDJDIR "${RESDIR}/edje")
-SET(ICONDIR "${CMAKE_SHARE_PREFIX}/icons/default/small")
-SET(XMLDIR "${CMAKE_SHARE_PREFIX}/packages")
-SET(DATADIR "${CMAKE_DATA_PREFIX}")
-SET(TABLEDIR "${PREFIX}/shared/res/tables")
-
-ADD_DEFINITIONS("-DPACKAGE=\"my-account\"")
-ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
-ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
-ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
-ADD_DEFINITIONS("-DIMGDIR=\"${IMGDIR}\"")
-ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"")
-ADD_DEFINITIONS("-DICONDIR=\"${ICONDIR}\"")
-ADD_DEFINITIONS("-DDATADIR=\"${DATADIR}\"")
-ADD_DEFINITIONS("-DTABLEDIR=\"${TABLEDIR}\"")
-
-IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-        SET(CMAKE_BUILD_TYPE "Debug")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
-
-#------- for development --------
-ADD_DEFINITIONS("-DMA_LOG_LEVEL_2")
-#--------------------------------
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
-SET(CMAKE_C_FLAGS_RELEASE "-O2")
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.my-account.xml DESTINATION /usr/share/packages/)
-
-# source file
-ADD_SUBDIRECTORY(app)
-ADD_SUBDIRECTORY(po)
-
-# End of a file

diff --git a/wearable/app/CMakeLists.txt b/wearable/app/CMakeLists.txt
deleted file mode 100644 (file)
index 2dfa95c..0000000
--- a/wearable/app/CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(my-account C)
-
-SET(SRCS
-src/my-account-main.c
-src/my-account-ui-widget.c
-src/my-account-view-main.c
-)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-# include library +
-SET(dependents "glib-2.0 elementary efl-extension dlog vconf capi-appfw-application accounts-svc")
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_app REQUIRED
-${dependents}
-)
-# include library -
-
-FOREACH(flag ${pkgs_app_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE -Wl,-rpath,${LIBDIR}")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-IF("${ARCH}" STREQUAL "arm")
-       ADD_DEFINITIONS("-DTARGET")
-       MESSAGE("add -DTARGET")
-ENDIF("${ARCH}" STREQUAL "arm")
-ADD_DEFINITIONS("-fpie")
-MESSAGE("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
-ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
-
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
-
-ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_app_LDFLAGS} "-pie")
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
-
-# install image
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/tw_ic_popup_btn_check.png DESTINATION ${IMGDIR})
-
-ADD_SUBDIRECTORY(data)

diff --git a/wearable/app/data/CMakeLists.txt b/wearable/app/data/CMakeLists.txt
deleted file mode 100644 (file)
index 915c822..0000000
--- a/wearable/app/data/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ADD_CUSTOM_TARGET(${PROJECT_NAME}.edj
-               COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images
-               ${CMAKE_CURRENT_SOURCE_DIR}/edc/${PROJECT_NAME}.edc ${PROJECT_NAME}.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edc/${PROJECT_NAME}.edc
-)
-ADD_DEPENDENCIES(${PROJECT_NAME} ${PROJECT_NAME}.edj)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.edj DESTINATION ${EDJDIR})
-
-# End of a file