From 036cc4e44f01355db0352a23e6475d13d06b0c45 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Sun, 22 Oct 2017 10:55:02 +0900 Subject: Change comments into English for Japanese These is some comments write in Janpanese at RC1, Now change these comments into English. Change-Id: Ib520d39ede23cb0059f303c6e38090c9ed65a45b Signed-off-by: zheng_wenlong --- libhomescreen/libhomescreen.cpp | 14 +++++++------- src/CMakeLists.txt | 28 ++++++++++++++-------------- src/homescreen.c | 19 +++++++++---------- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/libhomescreen/libhomescreen.cpp b/libhomescreen/libhomescreen.cpp index eb059a1..ef73cbc 100644 --- a/libhomescreen/libhomescreen.cpp +++ b/libhomescreen/libhomescreen.cpp @@ -269,12 +269,12 @@ int LibHomeScreen::tapShortcut(const char* application_name) } /** - * HomeScreenアプリに表示するメッセージイベントの発行 + * Sending onScreen message event * - * 各アプリからHomeScreenアプリケーションのOnScreenに表示するイベントを発行する + * Sending OnScreen message event to HomeScreen from applications * * #### Parameters - * - display_message [in] : 表示するメッセージ + * - display_message [in] : message for display * * #### Return * - Returns 0 on success or -1 in case of error. @@ -293,13 +293,13 @@ int LibHomeScreen::onScreenMessage(const char* display_message) } /** - * イベントハンドラの登録 + * Setting Event Handler * - * 各アプリからHomeScreenアプリケーションのOnScreenに表示するイベントを発行する + * Setting event handler for Homescreen * * #### Parameters - * - et [in] : 対象のイベント - * - f [in] : イベントハンドラ + * - et [in] : event name + * - f [in] : event handler * * #### Return * Nothing diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5dcc0a5..363cdae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 2.8) -set(TARGETS_SMBINDER homescreen-service) +set(TARGETS_HSBINDER homescreen-service) INCLUDE(FindThreads) FIND_PACKAGE(Threads) @@ -27,41 +27,41 @@ set(binding_hs_sources hs-helper.c) link_libraries(-Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined) +include_directories(${PROJECT_SOURCE_DIR}/include) +add_library(${TARGETS_HSBINDER} MODULE ${binding_hs_sources}) -add_library(${TARGETS_SMBINDER} MODULE ${binding_hs_sources}) - -target_compile_options(${TARGETS_SMBINDER} PRIVATE ${hs_binding_depends_CFLAGS}) +target_compile_options(${TARGETS_HSBINDER} PRIVATE ${hs_binding_depends_CFLAGS}) if(DEFINED DEBUGMODE) - target_compile_options(${TARGETS_SMBINDER} PRIVATE -g -O0) + target_compile_options(${TARGETS_HSBINDER} PRIVATE -g -O0) else(DEFINED DEBUGMODE) - target_compile_options(${TARGETS_SMBINDER} PRIVATE -g -O2) + target_compile_options(${TARGETS_HSBINDER} PRIVATE -g -O2) endif(DEFINED DEBUGMODE) -target_include_directories(${TARGETS_SMBINDER} PRIVATE ${hs_binding_depends_INCLUDE_DIRS}) -target_link_libraries(${TARGETS_SMBINDER} ${CMAKE_THREAD_LIBS_INIT} ${link_libraries} ${hs_binding_depends_LIBRARIES}) +target_include_directories(${TARGETS_HSBINDER} PRIVATE ${hs_binding_depends_INCLUDE_DIRS}) +target_link_libraries(${TARGETS_HSBINDER} ${CMAKE_THREAD_LIBS_INIT} ${link_libraries} ${hs_binding_depends_LIBRARIES}) # Binder exposes a unique public entry point -set_target_properties(${TARGETS_SMBINDER} PROPERTIES +set_target_properties(${TARGETS_HSBINDER} PROPERTIES PREFIX "" LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map" ) # installation directory -#INSTALL(TARGETS ${TARGETS_SMBINDER} +#INSTALL(TARGETS ${TARGETS_HSBINDER} # LIBRARY DESTINATION ${binding_install_dir}) if(NOT EXISTS ${PROJECT_BINARY_DIR}/package) - add_custom_command(TARGET ${TARGETS_SMBINDER} POST_BUILD + add_custom_command(TARGET ${TARGETS_HSBINDER} POST_BUILD COMMAND cp -rf ${PROJECT_SOURCE_DIR}/package ${PROJECT_BINARY_DIR} ) endif() -add_custom_command(TARGET ${TARGETS_SMBINDER} POST_BUILD +add_custom_command(TARGET ${TARGETS_HSBINDER} POST_BUILD COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib - COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_SMBINDER}.so ${PROJECT_BINARY_DIR}/package/root/lib + COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_HSBINDER}.so ${PROJECT_BINARY_DIR}/package/root/lib ) add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root - COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${TARGETS_SMBINDER}-2017.wgt ${PROJECT_BINARY_DIR}/package/root + COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${TARGETS_HSBINDER}-2017.wgt ${PROJECT_BINARY_DIR}/package/root ) diff --git a/src/homescreen.c b/src/homescreen.c index 4a15861..98631c8 100644 --- a/src/homescreen.c +++ b/src/homescreen.c @@ -61,13 +61,12 @@ static void pingSample(struct afb_req request) } /** - * HomeScreenから呼ばれる - * ショートカットがタップされたことをアプリケーションに通知するために使用する - * アプリケーションからは使用されない - * + * tap_shortcut notify for homescreen + * When Shortcut area is tapped, notify these applciations + * * #### Parameters * Request key - * - application_name : アプリケーション名 + * - application_name : application name * * #### Return * Nothing @@ -92,7 +91,7 @@ static void tap_shortcut (struct afb_req request) return; } - // HomeScreenに返すレスポンス + // response to HomeScreen struct json_object *res = json_object_new_object(); hs_add_object_to_json_object_func(res, __FUNCTION__, 2, _error, ret); @@ -100,12 +99,12 @@ static void tap_shortcut (struct afb_req request) } /** - * HomeScreenのOnScreenを表示する + * HomeScreen OnScreen message * * #### Parameters * Request key - * - display_message : 表示したい文字列 - * + * - display_message : message for display + * * #### Return * Nothing * @@ -129,7 +128,7 @@ static void on_screen_message (struct afb_req request) return; } - // HomeScreenに返すレスポンス + // response to HomeScreen struct json_object *res = json_object_new_object(); hs_add_object_to_json_object_func(res, __FUNCTION__, 2, _error, ret); -- cgit 1.2.3-korg