change genlist items with slider

- use full style layout
- Sounds & Display(brightness)

Change-Id: Ibe15768b62a546a8bed029a91547e057edb1dd1f
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-display/include/setting-display.h b/setting-display/include/setting-display.h
index 5b8948dd8a29079a670ae79c5393cd09d266251e..9bf382a17d84296835831ac96217e01d47ef1702 100644 (file)
--- a/setting-display/include/setting-display.h
+++ b/setting-display/include/setting-display.h
@@ -101,7 +101,7 @@ typedef struct _SettingDisplay {
 
        Setting_GenGroupItem_Data *data_screen_mode;
        Setting_GenGroupItem_Data *data_br;
-       Setting_GenGroupItem_Data *data_br_header;
+
        Setting_GenGroupItem_Data *data_font;
        Setting_GenGroupItem_Data *data_back;
        /*Setting_GenGroupItem_Data *data_touchkey_light_duration; */

diff --git a/setting-display/src/setting-display-brightness.c b/setting-display/src/setting-display-brightness.c
index 312aa0636a2461e6bfeee08e267bd4cccdf9649c..fd58058bda1a23a3107387676fdc17fbff45044d 100755 (executable)
--- a/setting-display/src/setting-display-brightness.c
+++ b/setting-display/src/setting-display-brightness.c
@@ -641,6 +641,9 @@ static Evas_Object *__setting_brightness_add_slider(void *data,
        evas_object_propagate_events_set(slider, EINA_FALSE);
        item_data->eo_check = slider;
 
+       if (item_data->keyStr)
+               elm_object_part_text_set(layout, "elm.text", _(item_data->keyStr));
+
        if (item_data->item) {
                /* convey highlight to its content */
                items = eina_list_append(items, slider);
@@ -663,25 +666,6 @@ void construct_brightness(void *data, Evas_Object *genlist)
        SETTING_TRACE_BEGIN;
        ret_if(data == NULL);
 
-       /* Brightness header */
-       ad->data_br_header = setting_create_Gendial_field_def(
-                                                                                       ad->md.genlist,
-                                                                                       &(ad->itc_1line),
-                                                                                       NULL,
-                                                                                       NULL,
-                                                                                       SWALLOW_Type_1ICON_1IMAGE,
-                                                                                       NULL,
-                                                                                       NULL,
-                                                                                       0,
-                                                                                       _("IDS_ST_BODY_BRIGHTNESS_M_POWER_SAVING"),
-                                                                                       NULL,
-                                                                                       NULL);
-       if (ad->data_br_header == NULL) {
-               SETTING_TRACE_ERROR("ad->data_br_header is NULL");
-               return;
-       }
-       ad->data_br_header->hide_bottom_line = TRUE;
-
        ad->itc_full.func.content_get = __setting_brightness_add_slider;
        ad->last_requested_level = -1;
 
@@ -715,7 +699,7 @@ void construct_brightness(void *data, Evas_Object *genlist)
                        (char *)left_icon,
                        NULL,
                        value,
-                       NULL,
+                       _("IDS_ST_BODY_BRIGHTNESS_M_POWER_SAVING"),
                        NULL,
                        setting_display_birghtness_bright_slider_value_change_cb);
 
@@ -737,7 +721,6 @@ void construct_brightness(void *data, Evas_Object *genlist)
                if (!setting_display_brightness_change_is_supported())
                {
                        elm_object_item_disabled_set(ad->data_br_sli->item, EINA_TRUE);
-                       elm_object_item_disabled_set(ad->data_br_header->item, EINA_TRUE);
                }
                __BACK_POINTER_SET(ad->data_br_sli);
        } else {

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index fe4e8f1e49da57a680ddd484a6502d5e8f75e63e..36d2bf7e2160a9c3f1107114bba9f13e237b9d9b 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -466,7 +466,6 @@ static void _get_lite_main_list(void *data)
        ret_if(!data);
        SettingSoundData *ad = (SettingSoundData *)data;
 
-       Setting_GenGroupItem_Data *group_item_data;
        char *app_id = NULL;
        const char *left_icon = NULL;
        int mm_value = 0;
@@ -567,23 +566,6 @@ static void _get_lite_main_list(void *data)
                        NULL);
 
        /* Media group*/
-       group_item_data = setting_create_Gendial_field_def(
-                                                                                       ad->md.genlist,
-                                                                                       &(ad->itc_1line),
-                                                                                       NULL,
-                                                                                       NULL,
-                                                                                       SWALLOW_Type_1ICON_1IMAGE,
-                                                                                       NULL,
-                                                                                       NULL,
-                                                                                       0,
-                                                                                       _("IDS_ST_BODY_MEDIA"),
-                                                                                       NULL,
-                                                                                       NULL);
-       if (group_item_data)
-               group_item_data->hide_bottom_line = TRUE;
-       else
-               SETTING_TRACE_ERROR("group_item_data is NULL");
-
        /* 5.media volume */
        if (sound_manager_get_volume(SOUND_TYPE_MEDIA, &mm_value)
                        != SOUND_MANAGER_ERROR_NONE)
@@ -597,7 +579,7 @@ static void _get_lite_main_list(void *data)
                        left_icon, /*IMG_SLIDER_BTN_VOLUME02*/
                        NULL,
                        mm_value,
-                       "",
+                       _("IDS_ST_BODY_MEDIA"),
                        ad,
                        _media_slider_change_cb,
                        max_media_vol,
@@ -621,6 +603,7 @@ static void _get_lite_main_list(void *data)
                        NULL);
 
        /* Notifications group */
+/*
        group_item_data = setting_create_Gendial_field_def(
                                                                                        ad->md.genlist,
                                                                                        &(ad->itc_1line),
@@ -637,7 +620,7 @@ static void _get_lite_main_list(void *data)
                group_item_data->hide_bottom_line = TRUE;
        else
                SETTING_TRACE_ERROR("group_item_data is NULL");
-
+*/
        /* 4.noti volumn */
        if (sound_manager_get_volume(SOUND_TYPE_NOTIFICATION, &mm_value)
                        != SOUND_MANAGER_ERROR_NONE)
@@ -653,7 +636,7 @@ static void _get_lite_main_list(void *data)
                        left_icon,
                        NULL,
                        mm_value,
-                       "",
+                       _("IDS_ST_BODY_NOTIFICATIONS"),
                        ad,
                        _noti_slider_change_cb,
                        max_noti_vol,
@@ -669,28 +652,13 @@ static void _get_lite_main_list(void *data)
                        NULL);
 
        /* System group*/
-       group_item_data = setting_create_Gendial_field_def(
-                                                                                       ad->md.genlist,
-                                                                                       &(ad->itc_1line),
-                                                                                       NULL,
-                                                                                       NULL,
-                                                                                       SWALLOW_Type_1ICON_1IMAGE,
-                                                                                       NULL,
-                                                                                       NULL,
-                                                                                       0,
-                                                                                       _("IDS_ST_BODY_SYSTEM"),
-                                                                                       NULL,
-                                                                                       NULL);
-       if (group_item_data)
-               group_item_data->hide_bottom_line = TRUE;
-       else
-               SETTING_TRACE_ERROR("group_item_data is NULL");
-
        left_icon = setting_sound_get_slider_icon(SND_SLIDER_SYSTEM, mm_value);
        ADD_SOUND_SLIDER(
                        ad->data_touch_volume, genlist, ad->itc_full,
                        left_icon, NULL/*IMG_SLIDER_BTN_SYSTEM_VOLUME*/,
-                       mm_value, "", ad,
+                       mm_value,
+                       _("IDS_ST_BODY_SYSTEM"),
+                       ad,
                        _sys_slider_change_cb,
                        max_system_vol,
                        _start_change_cb, _stop_system_change_cb);