diff options
-rw-r--r--[-rwxr-xr-x] | CMakeLists.txt | 95 | ||||
-rw-r--r-- | INSTALL | 34 | ||||
-rw-r--r-- | data/edc/my-account.edc (renamed from wearable/app/data/edc/my-account.edc) | 0 | ||||
-rw-r--r-- | data/images/tw_ic_popup_btn_check.png (renamed from wearable/app/data/images/tw_ic_popup_btn_check.png) | bin | 1331 -> 1331 bytes | |||
-rw-r--r-- | data/images/tw_list_fadeout_right_masking.#.png (renamed from wearable/app/data/images/tw_list_fadeout_right_masking.#.png) | bin | 1059 -> 1059 bytes | |||
-rw-r--r-- | include/my-account-debug.h (renamed from wearable/app/include/my-account-debug.h) | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | include/my-account-main.h (renamed from wearable/app/include/my-account-main.h) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | include/my-account-ui-widget.h (renamed from wearable/app/include/my-account-ui-widget.h) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | include/my-account-util.h (renamed from wearable/app/include/my-account-util.h) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | include/my-account-view.h (renamed from wearable/app/include/my-account-view.h) | 0 | ||||
-rw-r--r-- | my-account.manifest | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | org.tizen.my-account.xml (renamed from wearable/org.tizen.my-account.xml) | 0 | ||||
-rw-r--r-- | packaging/my-account.spec | 22 | ||||
-rw-r--r-- | po/CMakeLists.txt (renamed from wearable/po/CMakeLists.txt) | 1 | ||||
-rwxr-xr-x | po/ar.po (renamed from wearable/po/ar.po) | 0 | ||||
-rwxr-xr-x | po/az.po (renamed from wearable/po/az.po) | 0 | ||||
-rwxr-xr-x | po/bg.po (renamed from wearable/po/bg.po) | 0 | ||||
-rwxr-xr-x | po/ca.po (renamed from wearable/po/ca.po) | 0 | ||||
-rwxr-xr-x | po/cs.po (renamed from wearable/po/cs.po) | 0 | ||||
-rwxr-xr-x | po/da.po (renamed from wearable/po/da.po) | 0 | ||||
-rw-r--r-- | po/de.po (renamed from wearable/po/de.po) | 0 | ||||
-rwxr-xr-x | po/el_GR.po (renamed from wearable/po/el_GR.po) | 0 | ||||
-rwxr-xr-x | po/en.po (renamed from wearable/po/en.po) | 0 | ||||
-rwxr-xr-x | po/en_PH.po (renamed from wearable/po/en_PH.po) | 0 | ||||
-rwxr-xr-x | po/en_US.po (renamed from wearable/po/en_US.po) | 0 | ||||
-rwxr-xr-x | po/es_ES.po (renamed from wearable/po/es_ES.po) | 0 | ||||
-rw-r--r-- | po/es_US.po (renamed from wearable/po/es_US.po) | 0 | ||||
-rwxr-xr-x | po/et.po (renamed from wearable/po/et.po) | 0 | ||||
-rwxr-xr-x | po/eu.po (renamed from wearable/po/eu.po) | 0 | ||||
-rwxr-xr-x | po/fi.po (renamed from wearable/po/fi.po) | 0 | ||||
-rw-r--r-- | po/fr.po (renamed from wearable/po/fr.po) | 0 | ||||
-rwxr-xr-x | po/fr_CA.po (renamed from wearable/po/fr_CA.po) | 0 | ||||
-rwxr-xr-x | po/ga.po (renamed from wearable/po/ga.po) | 0 | ||||
-rwxr-xr-x | po/gl.po (renamed from wearable/po/gl.po) | 0 | ||||
-rwxr-xr-x | po/hi.po (renamed from wearable/po/hi.po) | 0 | ||||
-rwxr-xr-x | po/hr.po (renamed from wearable/po/hr.po) | 0 | ||||
-rwxr-xr-x | po/hu.po (renamed from wearable/po/hu.po) | 0 | ||||
-rwxr-xr-x | po/hy.po (renamed from wearable/po/hy.po) | 0 | ||||
-rwxr-xr-x | po/is.po (renamed from wearable/po/is.po) | 0 | ||||
-rwxr-xr-x | po/it_IT.po (renamed from wearable/po/it_IT.po) | 0 | ||||
-rwxr-xr-x | po/ja_JP.po (renamed from wearable/po/ja_JP.po) | 0 | ||||
-rwxr-xr-x | po/ka.po (renamed from wearable/po/ka.po) | 0 | ||||
-rwxr-xr-x | po/kk.po (renamed from wearable/po/kk.po) | 0 | ||||
-rwxr-xr-x | po/ko_KR.po (renamed from wearable/po/ko_KR.po) | 0 | ||||
-rwxr-xr-x | po/lt.po (renamed from wearable/po/lt.po) | 0 | ||||
-rwxr-xr-x | po/lv.po (renamed from wearable/po/lv.po) | 0 | ||||
-rwxr-xr-x | po/mk.po (renamed from wearable/po/mk.po) | 0 | ||||
-rwxr-xr-x | po/nb.po (renamed from wearable/po/nb.po) | 0 | ||||
-rw-r--r-- | po/nl.po (renamed from wearable/po/nl.po) | 0 | ||||
-rwxr-xr-x | po/pl.po (renamed from wearable/po/pl.po) | 0 | ||||
-rwxr-xr-x | po/pt_BR.po (renamed from wearable/po/pt_BR.po) | 0 | ||||
-rwxr-xr-x | po/pt_PT.po (renamed from wearable/po/pt_PT.po) | 0 | ||||
-rwxr-xr-x | po/ro.po (renamed from wearable/po/ro.po) | 0 | ||||
-rwxr-xr-x | po/ru_RU.po (renamed from wearable/po/ru_RU.po) | 0 | ||||
-rwxr-xr-x | po/sk.po (renamed from wearable/po/sk.po) | 0 | ||||
-rwxr-xr-x | po/sl.po (renamed from wearable/po/sl.po) | 0 | ||||
-rwxr-xr-x | po/sr.po (renamed from wearable/po/sr.po) | 0 | ||||
-rwxr-xr-x | po/sv.po (renamed from wearable/po/sv.po) | 0 | ||||
-rwxr-xr-x | po/tr_TR.po (renamed from wearable/po/tr_TR.po) | 0 | ||||
-rwxr-xr-x | po/uk.po (renamed from wearable/po/uk.po) | 0 | ||||
-rwxr-xr-x | po/uz.po (renamed from wearable/po/uz.po) | 0 | ||||
-rwxr-xr-x | po/zh_CN.po (renamed from wearable/po/zh_CN.po) | 0 | ||||
-rwxr-xr-x | po/zh_HK.po (renamed from wearable/po/zh_HK.po) | 0 | ||||
-rwxr-xr-x | po/zh_TW.po (renamed from wearable/po/zh_TW.po) | 0 | ||||
-rwxr-xr-x | src/my-account-main.c (renamed from wearable/app/src/my-account-main.c) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/my-account-ui-widget.c (renamed from wearable/app/src/my-account-ui-widget.c) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/my-account-view-main.c (renamed from wearable/app/src/my-account-view-main.c) | 12 | ||||
-rwxr-xr-x | wearable/CMakeLists.txt | 41 | ||||
-rw-r--r-- | wearable/app/CMakeLists.txt | 47 | ||||
-rw-r--r-- | wearable/app/data/CMakeLists.txt | 9 |
70 files changed, 141 insertions, 130 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b13f753..14dca73 100755..100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,96 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(my-account C) MESSAGE("build account setting menu") -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}\"") + +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/) + +SET(SRCS +src/my-account-main.c +src/my-account-ui-widget.c +src/my-account-view-main.c +) + +INCLUDE_DIRECTORIES(${CMAKE_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 REQUIRED +${dependents} +) +# include library - + +FOREACH(flag ${pkgs_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_LDFLAGS} "-pie") +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) + +# install image +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/images/tw_ic_popup_btn_check.png DESTINATION ${IMGDIR}) + +ADD_CUSTOM_TARGET(${PROJECT_NAME}.edj + COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/data/images + ${CMAKE_SOURCE_DIR}/data/edc/${PROJECT_NAME}.edc ${PROJECT_NAME}.edj + DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/${PROJECT_NAME}.edc +) +ADD_DEPENDENCIES(${PROJECT_NAME} ${PROJECT_NAME}.edj) +INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.edj DESTINATION ${EDJDIR}) + + + +# i18n +ADD_SUBDIRECTORY(po)
\ No newline at end of file @@ -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 index ca863c1..ca863c1 100644 --- a/wearable/app/data/edc/my-account.edc +++ b/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 Binary files differindex 3dce121..3dce121 100644 --- a/wearable/app/data/images/tw_ic_popup_btn_check.png +++ b/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 Binary files differindex ab615ca..ab615ca 100644 --- a/wearable/app/data/images/tw_list_fadeout_right_masking.#.png +++ b/data/images/tw_list_fadeout_right_masking.#.png diff --git a/wearable/app/include/my-account-debug.h b/include/my-account-debug.h index 58598ac..08f4eae 100644 --- 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 index e2fefce..eed5a95 100644..100755 --- 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 index 862ba39..862ba39 100644..100755 --- a/wearable/app/include/my-account-ui-widget.h +++ b/include/my-account-ui-widget.h diff --git a/wearable/app/include/my-account-util.h b/include/my-account-util.h index d97fc4c..d97fc4c 100644..100755 --- a/wearable/app/include/my-account-util.h +++ b/include/my-account-util.h diff --git a/wearable/app/include/my-account-view.h b/include/my-account-view.h index 5ab4693..5ab4693 100644..100755 --- a/wearable/app/include/my-account-view.h +++ b/include/my-account-view.h diff --git a/my-account.manifest b/my-account.manifest new file mode 100644 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 index 20da2db..20da2db 100755..100644 --- a/wearable/org.tizen.my-account.xml +++ b/org.tizen.my-account.xml diff --git a/packaging/my-account.spec b/packaging/my-account.spec index 54a2018..2d45404 100644 --- a/packaging/my-account.spec +++ b/packaging/my-account.spec @@ -1,19 +1,3 @@ -%if "%{?profile}" == "wearable" -%global PREFIX %{_prefix}/apps/org.tizen.my-account/ -%endif - -%if "%{?profile}" == "mobile" -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 @@ -21,6 +5,9 @@ Release: 0 Group: main/devel License: Apache-2.0 Source0: %{name}-%{version}.tar.gz + +%global PREFIX %{_prefix}/apps/org.tizen.my-account/ + BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(syspopup) BuildRequires: pkgconfig(accounts-svc) @@ -43,9 +30,6 @@ Accounts ug of setting application. %build cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} \ -%if "%{?profile}" == "wearable" - -DTIZEN_WEARABLE=1 -%endif make %{?jobs:-j%jobs} diff --git a/wearable/po/CMakeLists.txt b/po/CMakeLists.txt index 37ae7c9..d574f4d 100644 --- a/wearable/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -1,5 +1,4 @@ # for i18n -PROJECT(my-account C) SET(POFILES ar.po diff --git a/wearable/po/ar.po b/po/ar.po index 786aaa6..786aaa6 100755 --- a/wearable/po/ar.po +++ b/po/ar.po diff --git a/wearable/po/az.po b/po/az.po index fe56381..fe56381 100755 --- a/wearable/po/az.po +++ b/po/az.po diff --git a/wearable/po/bg.po b/po/bg.po index 9664411..9664411 100755 --- a/wearable/po/bg.po +++ b/po/bg.po diff --git a/wearable/po/ca.po b/po/ca.po index d0fb041..d0fb041 100755 --- a/wearable/po/ca.po +++ b/po/ca.po diff --git a/wearable/po/cs.po b/po/cs.po index bbbc788..bbbc788 100755 --- a/wearable/po/cs.po +++ b/po/cs.po diff --git a/wearable/po/da.po b/po/da.po index 9f807cd..9f807cd 100755 --- a/wearable/po/da.po +++ b/po/da.po diff --git a/wearable/po/de.po b/po/de.po index 927ac49..927ac49 100644 --- a/wearable/po/de.po +++ b/po/de.po diff --git a/wearable/po/el_GR.po b/po/el_GR.po index 06e434a..06e434a 100755 --- a/wearable/po/el_GR.po +++ b/po/el_GR.po diff --git a/wearable/po/en.po b/po/en.po index 73e4a5d..73e4a5d 100755 --- a/wearable/po/en.po +++ b/po/en.po diff --git a/wearable/po/en_PH.po b/po/en_PH.po index c56a19e..c56a19e 100755 --- a/wearable/po/en_PH.po +++ b/po/en_PH.po diff --git a/wearable/po/en_US.po b/po/en_US.po index 73e4a5d..73e4a5d 100755 --- a/wearable/po/en_US.po +++ b/po/en_US.po diff --git a/wearable/po/es_ES.po b/po/es_ES.po index 2d54798..2d54798 100755 --- a/wearable/po/es_ES.po +++ b/po/es_ES.po diff --git a/wearable/po/es_US.po b/po/es_US.po index 209d291..209d291 100644 --- a/wearable/po/es_US.po +++ b/po/es_US.po diff --git a/wearable/po/et.po b/po/et.po index 1e83070..1e83070 100755 --- a/wearable/po/et.po +++ b/po/et.po diff --git a/wearable/po/eu.po b/po/eu.po index 8ebd09a..8ebd09a 100755 --- a/wearable/po/eu.po +++ b/po/eu.po diff --git a/wearable/po/fi.po b/po/fi.po index 386487a..386487a 100755 --- a/wearable/po/fi.po +++ b/po/fi.po diff --git a/wearable/po/fr.po b/po/fr.po index 6e8c980..6e8c980 100644 --- a/wearable/po/fr.po +++ b/po/fr.po diff --git a/wearable/po/fr_CA.po b/po/fr_CA.po index 2e694de..2e694de 100755 --- a/wearable/po/fr_CA.po +++ b/po/fr_CA.po diff --git a/wearable/po/ga.po b/po/ga.po index 10bdb50..10bdb50 100755 --- a/wearable/po/ga.po +++ b/po/ga.po diff --git a/wearable/po/gl.po b/po/gl.po index 55f7224..55f7224 100755 --- a/wearable/po/gl.po +++ b/po/gl.po diff --git a/wearable/po/hi.po b/po/hi.po index 18cb51c..18cb51c 100755 --- a/wearable/po/hi.po +++ b/po/hi.po diff --git a/wearable/po/hr.po b/po/hr.po index 2daaf12..2daaf12 100755 --- a/wearable/po/hr.po +++ b/po/hr.po diff --git a/wearable/po/hu.po b/po/hu.po index 815f7cc..815f7cc 100755 --- a/wearable/po/hu.po +++ b/po/hu.po diff --git a/wearable/po/hy.po b/po/hy.po index cf29894..cf29894 100755 --- a/wearable/po/hy.po +++ b/po/hy.po diff --git a/wearable/po/is.po b/po/is.po index e7bd55b..e7bd55b 100755 --- a/wearable/po/is.po +++ b/po/is.po diff --git a/wearable/po/it_IT.po b/po/it_IT.po index b3d600c..b3d600c 100755 --- a/wearable/po/it_IT.po +++ b/po/it_IT.po diff --git a/wearable/po/ja_JP.po b/po/ja_JP.po index 96ba288..96ba288 100755 --- a/wearable/po/ja_JP.po +++ b/po/ja_JP.po diff --git a/wearable/po/ka.po b/po/ka.po index 87e1af0..87e1af0 100755 --- a/wearable/po/ka.po +++ b/po/ka.po diff --git a/wearable/po/kk.po b/po/kk.po index a4b87c9..a4b87c9 100755 --- a/wearable/po/kk.po +++ b/po/kk.po diff --git a/wearable/po/ko_KR.po b/po/ko_KR.po index 90b55f4..90b55f4 100755 --- a/wearable/po/ko_KR.po +++ b/po/ko_KR.po diff --git a/wearable/po/lt.po b/po/lt.po index abd1410..abd1410 100755 --- a/wearable/po/lt.po +++ b/po/lt.po diff --git a/wearable/po/lv.po b/po/lv.po index 41681bb..41681bb 100755 --- a/wearable/po/lv.po +++ b/po/lv.po diff --git a/wearable/po/mk.po b/po/mk.po index d5d0cad..d5d0cad 100755 --- a/wearable/po/mk.po +++ b/po/mk.po diff --git a/wearable/po/nb.po b/po/nb.po index 5f1bbc9..5f1bbc9 100755 --- a/wearable/po/nb.po +++ b/po/nb.po diff --git a/wearable/po/nl.po b/po/nl.po index 0e781e1..0e781e1 100644 --- a/wearable/po/nl.po +++ b/po/nl.po diff --git a/wearable/po/pl.po b/po/pl.po index 2997747..2997747 100755 --- a/wearable/po/pl.po +++ b/po/pl.po diff --git a/wearable/po/pt_BR.po b/po/pt_BR.po index 60bc36c..60bc36c 100755 --- a/wearable/po/pt_BR.po +++ b/po/pt_BR.po diff --git a/wearable/po/pt_PT.po b/po/pt_PT.po index 0a15b9c..0a15b9c 100755 --- a/wearable/po/pt_PT.po +++ b/po/pt_PT.po diff --git a/wearable/po/ro.po b/po/ro.po index 6669779..6669779 100755 --- a/wearable/po/ro.po +++ b/po/ro.po diff --git a/wearable/po/ru_RU.po b/po/ru_RU.po index e0821a5..e0821a5 100755 --- a/wearable/po/ru_RU.po +++ b/po/ru_RU.po diff --git a/wearable/po/sk.po b/po/sk.po index 16eae5a..16eae5a 100755 --- a/wearable/po/sk.po +++ b/po/sk.po diff --git a/wearable/po/sl.po b/po/sl.po index 8eb5a10..8eb5a10 100755 --- a/wearable/po/sl.po +++ b/po/sl.po diff --git a/wearable/po/sr.po b/po/sr.po index 96d1bfc..96d1bfc 100755 --- a/wearable/po/sr.po +++ b/po/sr.po diff --git a/wearable/po/sv.po b/po/sv.po index 9c3684c..9c3684c 100755 --- a/wearable/po/sv.po +++ b/po/sv.po diff --git a/wearable/po/tr_TR.po b/po/tr_TR.po index f07255c..f07255c 100755 --- a/wearable/po/tr_TR.po +++ b/po/tr_TR.po diff --git a/wearable/po/uk.po b/po/uk.po index 3b47989..3b47989 100755 --- a/wearable/po/uk.po +++ b/po/uk.po diff --git a/wearable/po/uz.po b/po/uz.po index 01a7415..01a7415 100755 --- a/wearable/po/uz.po +++ b/po/uz.po diff --git a/wearable/po/zh_CN.po b/po/zh_CN.po index 4ffe8c3..4ffe8c3 100755 --- a/wearable/po/zh_CN.po +++ b/po/zh_CN.po diff --git a/wearable/po/zh_HK.po b/po/zh_HK.po index e5c869e..e5c869e 100755 --- a/wearable/po/zh_HK.po +++ b/po/zh_HK.po diff --git a/wearable/po/zh_TW.po b/po/zh_TW.po index b769efa..b769efa 100755 --- a/wearable/po/zh_TW.po +++ b/po/zh_TW.po diff --git a/wearable/app/src/my-account-main.c b/src/my-account-main.c index 4a8cc14..4a8cc14 100755 --- a/wearable/app/src/my-account-main.c +++ b/src/my-account-main.c diff --git a/wearable/app/src/my-account-ui-widget.c b/src/my-account-ui-widget.c index c4a9a3a..c4a9a3a 100755..100644 --- a/wearable/app/src/my-account-ui-widget.c +++ b/src/my-account-ui-widget.c diff --git a/wearable/app/src/my-account-view-main.c b/src/my-account-view-main.c index a1e64e4..387ce90 100755..100644 --- 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 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 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 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 |