diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | inc/main.h | 1 | ||||
| -rw-r--r-- | packaging/elm-demo-tizen-mobile.spec | 1 | ||||
| -rw-r--r-- | src/accessibility/screen_reader.c | 46 | ||||
| -rw-r--r-- | src/ctxpopup.c | 5 | ||||
| -rw-r--r-- | src/main.c | 6 | ||||
| -rw-r--r-- | src/progressbar.c | 4 |
7 files changed, 18 insertions, 47 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d1634b3..d137fb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ FOREACH(flag ${BASE_PKG_LDFLAGS}) SET(PKG_LDFLAGS "${PKG_LDFLAGS} ${flag}") ENDFOREACH(flag) -pkg_check_modules(TIZEN_PKG REQUIRED capi-appfw-application capi-system-system-settings appcore-efl capi-appfw-app-manager dlog) +pkg_check_modules(TIZEN_PKG REQUIRED capi-appfw-application capi-system-system-settings appcore-efl capi-appfw-app-manager dlog vconf) FOREACH(flag ${TIZEN_PKG_CFLAGS}) SET(PKG_CFLAGS "${PKG_CFLAGS} ${flag}") ENDFOREACH(flag) @@ -24,6 +24,7 @@ #define TIZEN_ENGINEER_MODE #endif #include <dlog.h> +#include <vconf.h> #ifdef LOG_TAG #undef LOG_TAG diff --git a/packaging/elm-demo-tizen-mobile.spec b/packaging/elm-demo-tizen-mobile.spec index 6b716da..3bedb22 100644 --- a/packaging/elm-demo-tizen-mobile.spec +++ b/packaging/elm-demo-tizen-mobile.spec @@ -16,6 +16,7 @@ BuildRequires: cmake BuildRequires: edje-bin BuildRequires: gettext-tools BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(vconf) %description Tizen mobile theme demo diff --git a/src/accessibility/screen_reader.c b/src/accessibility/screen_reader.c index eca3015..847c435 100644 --- a/src/accessibility/screen_reader.c +++ b/src/accessibility/screen_reader.c @@ -21,9 +21,9 @@ static bool is_screen_reader_running() { - bool running = false; - int ret = app_manager_is_running("org.tizen.screen-reader", &running); - return (ret == APP_MANAGER_ERROR_NONE) && running; + int screen_reader = 0; + vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &screen_reader); + return screen_reader; } static Eina_Bool screen_reader_on = EINA_FALSE; @@ -35,48 +35,13 @@ void launch_reply_callback(app_control_h request, app_control_h reply, app_contr void screen_reader_launch(void) { - if (!screen_reader_on) - return; - if (is_screen_reader_running()) { - dlog_print(DLOG_DEBUG, LOG_TAG, "screen reader already running"); - return; - } - app_control_h app_control; - int ret = app_control_create(&app_control); - dlog_print(DLOG_DEBUG, LOG_TAG, "app_control_create: %i", ret); - - if (ret == APP_CONTROL_ERROR_NONE) { - ret = app_control_set_app_id(app_control, "org.tizen.screen-reader"); - dlog_print(DLOG_DEBUG, LOG_TAG, "app_control_set_app_id: %i", ret); - } - - if (ret == APP_CONTROL_ERROR_NONE) { - ret = app_control_send_launch_request(app_control, launch_reply_callback, NULL); - dlog_print(DLOG_DEBUG, LOG_TAG, "app_control_send_launch_request: %i", ret); - } - - screen_reader_on = ret == APP_CONTROL_ERROR_NONE; - - app_control_destroy(app_control); + vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, 1); } void screen_reader_terminate(void) { - app_context_h app_context = NULL; - int res = app_manager_get_app_context("org.tizen.screen-reader", &app_context); - - if (res != APP_MANAGER_ERROR_NONE) { - dlog_print(DLOG_ERROR, LOG_TAG, "Can't get screen reader app context - error code: %i", res); - return; - } - dlog_print(DLOG_DEBUG, LOG_TAG, "app_context: %p", app_context); - res = app_manager_request_terminate_bg_app(app_context); - - if (res != APP_MANAGER_ERROR_NONE) { - dlog_print(DLOG_ERROR, LOG_TAG, "Can't terminate screen reader app - error code: %i", res); - return; - } + vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, 0); } static void @@ -103,7 +68,6 @@ check_changed_cb(void *data, Evas_Object *obj, void *event_info) screen_reader_launch(); else screen_reader_terminate(); - } static void diff --git a/src/ctxpopup.c b/src/ctxpopup.c index 6bcb2b4..26497cc 100644 --- a/src/ctxpopup.c +++ b/src/ctxpopup.c @@ -148,14 +148,19 @@ btn_icon_only_cb(void *data, Evas_Object *obj, void *event_info) evas_object_size_hint_min_set(img, ELM_SCALE_SIZE(46), ELM_SCALE_SIZE(46)); elm_image_file_set(img, ICON_DIR"/contacts_ic_circle_btn_call.png", NULL); elm_ctxpopup_item_append(ctxpopup, NULL, img, ctxpopup_item_select_cb, NULL); + elm_atspi_accessible_name_set(img, "Call"); + img = elm_image_add(ctxpopup); evas_object_size_hint_min_set(img, ELM_SCALE_SIZE(46), ELM_SCALE_SIZE(46)); elm_image_file_set(img, ICON_DIR"/contacts_ic_circle_btn_email.png", NULL); elm_ctxpopup_item_append(ctxpopup, NULL, img, ctxpopup_item_select_cb, NULL); + elm_atspi_accessible_name_set(img, "E-mail"); + img = elm_image_add(ctxpopup); evas_object_size_hint_min_set(img, ELM_SCALE_SIZE(46), ELM_SCALE_SIZE(46)); elm_image_file_set(img, ICON_DIR"/contacts_ic_circle_btn_note.png", NULL); elm_ctxpopup_item_append(ctxpopup, NULL, img, ctxpopup_item_select_cb, NULL); + elm_atspi_accessible_name_set(img, "Note"); move_ctxpopup(ctxpopup, obj); evas_object_show(ctxpopup); @@ -212,19 +212,19 @@ app_control(app_control_h app_control, void *data) static void app_pause(void *data) { - screen_reader_terminate(); + dlog_print(DLOG_DEBUG, LOG_TAG, "paused"); } static void app_resume(void *data) { - screen_reader_launch(); + dlog_print(DLOG_DEBUG, LOG_TAG, "resumed"); } static void app_terminate(void *data) { - screen_reader_terminate(); + dlog_print(DLOG_DEBUG, LOG_TAG, "terminated"); } static void diff --git a/src/progressbar.c b/src/progressbar.c index 870de49..f725eac 100644 --- a/src/progressbar.c +++ b/src/progressbar.c @@ -134,8 +134,8 @@ create_process_progressbar(Evas_Object *parent, const char *style) progressbar = elm_progressbar_add(parent); elm_object_style_set(progressbar, style); - evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5); - evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(progressbar, 0.5, 0.5); + evas_object_size_hint_weight_set(progressbar, 0, 0); elm_progressbar_pulse_set(progressbar, EINA_TRUE); elm_progressbar_pulse(progressbar, EINA_TRUE); evas_object_show(progressbar); |