Change image path to res/data

Change-Id: I74b8ca6508f8a84fad72d7501de288858e5b285d
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

4 files changed, 12 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3251307..7ec57aa 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,7 @@ FIND_LIBRARY(LIB_M m)
 #Icon - app
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.watch-setting.png DESTINATION ${ICONDIR})
 
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION ${TZ_SYS_RO_APP}/org.tizen.watch-setting/data/images FILES_MATCHING PATTERN "*")
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION ${TZ_SYS_RO_APP}/org.tizen.watch-setting/res/images FILES_MATCHING PATTERN "*")
 
 # install media-data
 	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/media-data-sdk/settings/ DESTINATION ${TZ_SYS_GLOBALUSER_DATA}/settings PATTERN "*")
diff --git a/include/util.h b/include/util.h
index 7b52657..233ecdd 100644
--- a/include/util.h
+++ b/include/util.h
@@ -27,7 +27,7 @@
 
 #define SETTING_TELEPHONY_PATH	"tizen.org/feature/network.telephony"
 
-#define IMG_DIR		TZ_SYS_RO_APP_D"/org.tizen.watch-setting/data/images/"
+#define IMG_DIR		TZ_SYS_RO_APP_D"/org.tizen.watch-setting/res/images/"
 #define EDJE_PATH	TZ_SYS_RO_APP_D"/org.tizen.watch-setting/res/edje/watch-setting.edj"
 
 #ifndef FEATURE_SETTING_CHANGEABLE
diff --git a/packaging/org.tizen.watch-setting.spec b/packaging/org.tizen.watch-setting.spec
index 10e6c5b..ae203ed 100644
--- a/packaging/org.tizen.watch-setting.spec
+++ b/packaging/org.tizen.watch-setting.spec
@@ -117,7 +117,7 @@ rm -rf %{buildroot}
 
 %make_install
 mkdir -p %{buildroot}/%{TZ_SYS_RW_APPS}/org.tizen.watch-setting
-mkdir -p %{buildroot}/%{TZ_SYS_RW_APPS}/org.tizen.watch-setting/data/images
+mkdir -p %{buildroot}/%{TZ_SYS_RW_APPS}/org.tizen.watch-setting/res/images
 
 %clean
 
diff --git a/src/setting-volume-page.c b/src/setting-volume-page.c
index f8fb9d5..4e53145 100644
--- a/src/setting-volume-page.c
+++ b/src/setting-volume-page.c
@@ -284,13 +284,13 @@ _index_refresh(void *data)
 	elm_index_item_clear(pd->index);
 	if (pd->cur_page < pd->min_page) {
 		for (i = pd->cur_page ; i < pd->cur_page + num_index ; i++) {
-			printf("Added : %d\n", i);
+			DBG("Added : %d\n", i);
 			elm_index_item_append(pd->index, NULL, NULL, (void *)(uintptr_t)i);
 		}
 		pd->min_page = pd->cur_page + num_index - 1;
 	} else {
 		for (i = pd->cur_page - num_index + 1; i < pd->cur_page + 1 ; i++) {
-			printf("Added : %d\n", i);
+			DBG("Added : %d\n", i);
 			elm_index_item_append(pd->index, NULL, NULL, (void *)(uintptr_t)i);
 		}
 		pd->min_page = pd->cur_page - 1;
@@ -347,9 +347,9 @@ _scroll(void *data, Evas_Object *obj, void *ei)
 	page_data *pd = (page_data *)data;
 	elm_scroller_current_page_get(pd->scroller, &cur_page, NULL);
 	if (cur_page != pd->cur_page) {
-		printf("scroll: %d\n", pd->cur_page);
 		pd->prev_page = pd->cur_page;
 		pd->cur_page = cur_page;
+		DBG("scroll page cur(%d), prev(%d)\n", pd->cur_page, pd->prev_page);
 		if ((pd->cur_page >= NUM_ITEMS_CIRCLE) || (pd->prev_page >= NUM_ITEMS_CIRCLE))
 			return;
 		elm_object_signal_emit(pd->page_layout[pd->cur_page], "elm,state,thumbnail,select", "elm");
@@ -361,8 +361,9 @@ _scroll(void *data, Evas_Object *obj, void *ei)
 		}
 
 		stop_wav();
+		evas_object_hide(pd->slider[pd->prev_page]);
 
-		ERR("STOP sound player and wav ");
+		DBG("STOP sound player and wav ");
 		/*change sound mode */
 		int page_idx = cur_page;
 		if (!is_telephony_enable()) {
@@ -392,6 +393,8 @@ _scroll(void *data, Evas_Object *obj, void *ei)
 
 		eext_circle_object_value_set(pd->slider[cur_page], (float)pd->slider_value[cur_page]);
 		eext_rotary_object_event_activated_set(pd->slider[cur_page], EINA_TRUE);
+		DBG("show slider: %d\n", pd->cur_page);
+		evas_object_show(pd->slider[pd->cur_page]);
 	}
 }
 
@@ -819,7 +822,8 @@ Evas_Object *_create_volume_page(void *data)
 		/* Activate Circle slider's rotary object event.
 		Its value increases/decreases its value by 0.5 to clockwise/counter clockwise
 		rotary event. */
-		/*eext_rotary_object_event_activated_set(slider, EINA_TRUE); */
+		eext_rotary_object_event_activated_set(slider, EINA_FALSE);
+		evas_object_hide(slider);
 		eext_circle_object_slider_step_set(slider, 1.0);
 
 		char buf[__SETTING_BUF_SIZE__] = {0,};