setting-time: adjust to new guide

* properly wrap options in groups
* change checkboxes to toggle
* change button styles
* apply multiline style
* det "set date and time" header
* the button layout was not updated

Change-Id: Ib2d9f7e0922a040ffe54224618446f961a8f1367

diff --git a/resource/po/en_US.po b/resource/po/en_US.po
index 8bb8c5f1f77a10797d5196131b602f526ebcdd3d..851aa97ada28d5b2c87aeeee7386f36cda60d4b3 100755 (executable)
--- a/resource/po/en_US.po
+++ b/resource/po/en_US.po
@@ -2740,4 +2740,7 @@ msgid "IDS_ST_BODY_THE_APPLICATIONS_BELOW_WERE_STARTED_BY_PS_STOPPING_THESE_APPL
 msgstr "The apps below were started by %s. Stopping these apps may cause %s to fail."
 
 msgid "IDS_ST_BODY_SOFTKEY"
-msgstr "Soft Keys"
\ No newline at end of file
+msgstr "Soft Keys"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Set date and time"

diff --git a/resource/po/ko_KR.po b/resource/po/ko_KR.po
index 6ab85a77b79bff5d357e4b566d83ef2c2ca2a73a..5437bfb6fef68fc7d7f611944da2871a91e4bedb 100644 (file)
--- a/resource/po/ko_KR.po
+++ b/resource/po/ko_KR.po
@@ -2740,3 +2740,5 @@ msgstr "삼성 Kies(PC 소프트웨어)나 올바른 드라이버가 컴퓨터
 msgid "IDS_ST_BODY_THE_APPLICATIONS_BELOW_WERE_STARTED_BY_PS_STOPPING_THESE_APPLICATIONS_MAY_CAUSE_PS_TO_FAIL"
 msgstr "아래는 %s 앱에서 실행한 앱입니다. 이 앱을 중지하면 %s 앱에 문제가 발생할 수 있습니다."
 
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "날짜 및 시간 설정"

diff --git a/resource/setting-theme.edc b/resource/setting-theme.edc
index 96577679ad7a020765ffd37d9e6f1ae2e621450e..0f6ad6281971b3db57a209eeae57eb2608574fd9 100644 (file)
--- a/resource/setting-theme.edc
+++ b/resource/setting-theme.edc
@@ -1679,7 +1679,6 @@ collections
                                {
                                        color: 0 0 0 0;
                                        state: "default" 0.0;
-                                       fixed: 1 1;
                                        rel1
                                        {       relative: 0.0 0.0;}
                                        rel2
@@ -1695,7 +1694,6 @@ collections
                                {
                                        color: 0 0 0 0;
                                        state: "default" 0.0;
-                                       fixed: 1 1;
                                        rel1
                                        {       relative: 0.0 0.2;}
                                        rel2
@@ -1710,7 +1708,6 @@ collections
                                description
                                {
                                        state: "default" 0.0;
-                                       fixed: 1 1;
                                        rel1
                                        {       relative: 0.1 0.2;}
                                        rel2
@@ -1726,7 +1723,6 @@ collections
                                {
                                        color: 0 0 0 0;
                                        state: "default" 0.0;
-                                       fixed: 1 1;
                                        rel1
                                        {       relative: 0.5 0.2;}
                                        rel2
@@ -1741,7 +1737,6 @@ collections
                                description
                                {
                                        state: "default" 0.0;
-                                       fixed: 1 1;
                                        rel1
                                        {       relative: 0.55 0.2;}
                                        rel2
@@ -1757,7 +1752,6 @@ collections
                                {
                                        color: 0 0 0 0;
                                        state: "default" 0.0;
-                                       fixed: 1 1;
                                        rel1
                                        {       relative: 0.9 0.2;}
                                        rel2

diff --git a/setting-common/src/setting-common-draw-genlist.c b/setting-common/src/setting-common-draw-genlist.c
index e2a3d9218754101cb3400d2fb995c88a05a2490b..6f86db8d7174ccf7a8c5b33976fa95cb8f9dd6f3 100755 (executable)
--- a/setting-common/src/setting-common-draw-genlist.c
+++ b/setting-common/src/setting-common-draw-genlist.c
@@ -216,12 +216,10 @@ static char *_gl_Gendial_new_text_get(void *data, Evas_Object *obj,
        /*                                               "elm.text.sub" */
        /*------------------------------------------------------------- */
        if (!safeStrCmp(item_data->itc, "multiline")) {
-
-               if (!safeStrCmp(part, "elm.text.multiline")) {
-                       if (item_data->keyStr) {
-                               ret_str = (char *)g_strdup(
-                                               _(item_data->keyStr));
-                       }
+               if (!safeStrCmp(part, "elm.text")) {
+                       ret_str = item_data->keyStr ? (char *)g_strdup(_(item_data->keyStr)) : NULL;
+               } else if (!safeStrCmp(part, "elm.text.multiline")) {
+                       ret_str = item_data->sub_desc ? (char *)g_strdup(_(item_data->sub_desc)) : NULL;
                }
        } else {
                if (!safeStrCmp(part, "elm.text")) {
@@ -1346,7 +1344,8 @@ bool setting_genlist_item_1line_style_auto_apply_substyle(Elm_Object_Item *item)
 
        if (!setting_genlist_item_have_item_style(item, SETTING_GENLIST_ICON_1LINE_STYLE) &&
                !setting_genlist_item_have_item_style(item, SETTING_GENLIST_2LINE_STYLE) &&
-               !setting_genlist_item_have_item_style(item, SETTING_GENLIST_1ICON_STYLE))
+               !setting_genlist_item_have_item_style(item, SETTING_GENLIST_1ICON_STYLE) &&
+               !setting_genlist_item_have_item_style(item, SETTING_GENLIST_MULTILINE_STYLE))
                return false;
 
        Elm_Object_Item *previous = elm_genlist_item_prev_get(item);

diff --git a/setting-time/include/setting-time.h b/setting-time/include/setting-time.h
index 5579ad9d0f254f3833be6ba035f2b5be7dcbc3f0..dd3f3e3da28b68d164084242113dfb6254a6a348 100644 (file)
--- a/setting-time/include/setting-time.h
+++ b/setting-time/include/setting-time.h
@@ -81,6 +81,7 @@ struct _SettingTimeData {
        Setting_GenGroupItem_Data *data_time;
        Setting_GenGroupItem_Data *data_time_fmt;
        Setting_GenGroupItem_Data *data_date_fmt;
+       Setting_GenGroupItem_Data *data_set_date_header;
 
        /*Evas_Object *chk_dst; */
        /*Evas_Object *chk_auto; */
@@ -92,6 +93,9 @@ struct _SettingTimeData {
        Elm_Genlist_Item_Class itc_layout_time;
        Elm_Genlist_Item_Class itc_2text_3_parent;
        Elm_Genlist_Item_Class itc_1icon_1text_sub;
+       Elm_Genlist_Item_Class itc_group;
+       Elm_Genlist_Item_Class itc_multiline;
+       Elm_Genlist_Item_Class itc_1line;
 
        Ecore_Idler *update_timezone_idler;
        Ecore_Idler *refresh_time_idler;

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 9d703df4246e6b1a11751f95f8bf5e5e59e45688..2d3aa8eb67aa4f2ffb490a590861782ded101d8a 100755 (executable)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -340,6 +340,8 @@ static void setting_time_main_bool_vconf_change_cb(keynode_t *key, void *data)
                                                                                                EINA_FALSE);
                                        elm_object_item_disabled_set(ad->data_time->item,
                                                                                                EINA_FALSE);
+                                       elm_object_item_disabled_set(ad->data_set_date_header->item,
+                                                                                               EINA_FALSE);
                                }
                        } else {
                                if (ad->data_tz)
@@ -353,6 +355,8 @@ static void setting_time_main_bool_vconf_change_cb(keynode_t *key, void *data)
                                                                                                EINA_TRUE);
                                        elm_object_item_disabled_set(ad->data_time->item,
                                                                                                EINA_TRUE);
+                                       elm_object_item_disabled_set(ad->data_set_date_header->item,
+                                                                                               EINA_TRUE);
                                }
 
                                __update_time_via_sim_card(ad);
@@ -388,8 +392,10 @@ static void __sim_time_info_chg_cb(keynode_t *key, void *data)
                                        elm_object_item_disabled_set(ad->data_auto->item, EINA_TRUE);
                                if (ad->data_tz)
                                        elm_object_item_disabled_set(ad->data_tz->item, EINA_FALSE);
-                               if (ad->data_time)
+                               if (ad->data_time) {
                                        elm_object_item_disabled_set(ad->data_time->item, EINA_FALSE);
+                                       elm_object_item_disabled_set(ad->data_set_date_header->item, EINA_FALSE);
+                               }
                                FREE(tzpath);
                                return;
                        }
@@ -399,8 +405,10 @@ static void __sim_time_info_chg_cb(keynode_t *key, void *data)
                                elm_object_item_disabled_set(ad->data_auto->item, EINA_FALSE);
                        if (ad->data_tz)
                                elm_object_item_disabled_set(ad->data_tz->item, EINA_TRUE);
-                       if (ad->data_time)
+                       if (ad->data_time) {
                                elm_object_item_disabled_set(ad->data_time->item, EINA_TRUE);
+                               elm_object_item_disabled_set(ad->data_set_date_header->item, EINA_TRUE);
+                       }
 
                        __update_time_via_sim_card(ad);
                }
@@ -692,7 +700,7 @@ static Evas_Object *_add_datefield_new(Setting_GenGroupItem_Data *item_data,
        }
 
        Evas_Object *btn_left = elm_button_add(parent);
-       elm_object_style_set(btn_left, "datetime");
+       elm_object_style_set(btn_left, "border");
        evas_object_size_hint_weight_set(btn_left, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(btn_left, EVAS_HINT_FILL, 0.5);
@@ -703,7 +711,7 @@ static Evas_Object *_add_datefield_new(Setting_GenGroupItem_Data *item_data,
        evas_object_show(btn_left);
 
        Evas_Object *btn_right = elm_button_add(parent);
-       elm_object_style_set(btn_right, "datetime");
+       elm_object_style_set(btn_right, "border");
        evas_object_size_hint_weight_set(btn_right, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(btn_right, EVAS_HINT_FILL, 0.5);
@@ -717,6 +725,7 @@ static Evas_Object *_add_datefield_new(Setting_GenGroupItem_Data *item_data,
        param->item_data->btn_left = btn_left;
        param->item_data->btn_right = btn_right;
 #endif
+
        Evas_Object *box = elm_box_add(parent);
        evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);
@@ -730,9 +739,8 @@ static Evas_Object *_add_datefield_new(Setting_GenGroupItem_Data *item_data,
        elm_box_align_set(box1, 0.5, 0.0);
        elm_box_padding_set(box1, ELM_SCALE_SIZE(15), ELM_SCALE_SIZE(5));
 
-       Evas_Object *layout = elm_layout_add(box1);
-       Eina_Bool
-       ret = elm_layout_file_set(layout, EDJDIR"/setting-theme.edj",
+       Evas_Object *layout = elm_layout_add(parent);
+       Eina_Bool ret = elm_layout_file_set(layout, EDJDIR"/setting-theme.edj",
                        "date_time_layout");
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);
@@ -761,13 +769,11 @@ static Evas_Object *_add_datefield_new(Setting_GenGroupItem_Data *item_data,
 
 static Evas_Object *_date_and_time_genlist_content_get(void *data, Evas_Object *genlist, const char *part)
 {
-       if (!safeStrCmp(part, "elm.icon.entry"))
-                       return _add_datefield_new((Setting_GenGroupItem_Data *)data, genlist);
-
+       if (!safeStrCmp(part, "elm.swallow.content"))
+               return _add_datefield_new((Setting_GenGroupItem_Data *)data, genlist);
        return NULL;
 }
 
-
 static void _softkey_back_click_cb(void *priv, Evas_Object *obj, void *event_info)
 {
        MainData *md = (MainData *)priv;
@@ -864,7 +870,7 @@ static int setting_time_main_create(void *cb)
                setting_create_Gendial_field_def(ad->md.genlist,
                                &(ad->itc_1text_1icon),
                                setting_time_main_mouse_up_Gendial_list_cb,
-                               ad, SWALLOW_Type_1CHECK, NULL,
+                               ad, SWALLOW_Type_1TOGGLE, NULL,
                                NULL, value,
                                DATE_TIME_STR_AUTOMATIC_UPDATE, NULL,
                                setting_time_main_chk_btn_cb);
@@ -874,6 +880,27 @@ static int setting_time_main_create(void *cb)
        else
                SETTING_TRACE_ERROR("ad->data_auto is NULL");
 
+       /* separator */
+       setting_create_Gendial_field_titleItem(
+                       ad->md.genlist,
+                       &(ad->itc_group),
+                       NULL,
+                       NULL);
+
+       ad->data_set_date_header = setting_create_Gendial_field_def(
+                                                                       ad->md.genlist,
+                                                                       &(ad->itc_1line),
+                                                                       NULL,
+                                                                       NULL,
+                                                                       SWALLOW_Type_1ICON_1IMAGE,
+                                                                       NULL,
+                                                                       NULL,
+                                                                       0,
+                                                                       _("IDS_ST_BODY_SET_DATE_AND_TIME"),
+                                                                       NULL,
+                                                                       NULL);
+       ad->data_set_date_header->hide_bottom_line = TRUE;
+
        /* create DATE_AND_TIME */
        ad->itc_layout.func.content_get = _date_and_time_genlist_content_get;
        ad->data_time =
@@ -888,7 +915,7 @@ static int setting_time_main_create(void *cb)
        if (ad->data_time) {
                ad->data_time->userdata = ad;
                ad->data_time->nf = ad->md.naviframe;
-               ad->data_time->isItemDisableFlag = auto_flag;
+               ad->data_time->isItemDisableFlag = ad->data_set_date_header->isItemDisableFlag = auto_flag;
                ad->data_time->activated_cb = setting_time_main_datefield_set_cb;
                elm_genlist_item_select_mode_set(ad->data_time->item,
                                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
@@ -896,6 +923,13 @@ static int setting_time_main_create(void *cb)
                SETTING_TRACE_ERROR("ad->data_time is NULL");
        }
 
+       /* separator */
+       setting_create_Gendial_field_titleItem(
+                       ad->md.genlist,
+                       &(ad->itc_group),
+                       NULL,
+                       NULL);
+
        displayTimezone = get_timezone_displayname();
 
        if (displayTimezone != NULL) {
@@ -946,17 +980,24 @@ static int setting_time_main_create(void *cb)
        setting_get_int_slp_key(INT_SLP_SETTING_REGIONFORMAT_TIME1224, &value,
                        &err);
 
+       /* separator */
+       setting_create_Gendial_field_titleItem(
+                       ad->md.genlist,
+                       &(ad->itc_group),
+                       NULL,
+                       NULL);
+
        ad->data_time_fmt = setting_create_Gendial_field_def(
                        ad->md.genlist,
-                       &(ad->itc_1text_1icon),
+                       &(ad->itc_multiline),
                        setting_time_main_mouse_up_Gendial_list_cb,
                        ad,
-                       SWALLOW_Type_1CHECK,
+                       SWALLOW_Type_1TOGGLE,
                        NULL,
                        NULL,
                        (value == VCONFKEY_TIME_FORMAT_24),
                        "IDS_ST_MBODY_24_HOUR_CLOCK",
-                       NULL,
+                       "IDS_ST_SBODY_SHOW_THE_TIME_IN_24_HOUR_FORMAT_INSTEAD_OF_12_HOUR_HAM_PM_FORMAT",
                        setting_time_main_chk_btn_cb);
 
        if (ad->data_time_fmt) {
@@ -965,8 +1006,6 @@ static int setting_time_main_create(void *cb)
        } else {
                SETTING_TRACE_ERROR("ad->data_time_fmt is NULL");
        }
-       setting_add_gl_help(ad->md.genlist, "IDS_ST_SBODY_SHOW_THE_TIME_IN_24_HOUR_"
-                       "FORMAT_INSTEAD_OF_12_HOUR_HAM_PM_FORMAT");
 
 #if APPLIED_DATATIME_DATA_FORMAT
        char *pa_date_format = get_pa_date_format_str();
@@ -989,8 +1028,10 @@ static int setting_time_main_create(void *cb)
                if (ad->data_tz)
                        elm_object_item_disabled_set(ad->data_tz->item, EINA_TRUE);
 
-               if (ad->data_time)
+               if (ad->data_time) {
                        elm_object_item_disabled_set(ad->data_time->item, EINA_TRUE);
+                       elm_object_item_disabled_set(ad->data_set_date_header->item, EINA_TRUE);
+               }
        }
 
        evas_object_show(ad->md.genlist);
@@ -1369,6 +1410,7 @@ static void __time_auto_update(void *data)
                evas_object_pass_events_set(ad->data_time->btn_right,
                                                                        EINA_TRUE);
                elm_object_item_disabled_set(ad->data_time->item, EINA_TRUE);
+               elm_object_item_disabled_set(ad->data_set_date_header->item, EINA_TRUE);
        }
 
        __update_time_via_sim_card(ad);
@@ -1409,6 +1451,7 @@ static void setting_time_main_chk_btn_cb(void *data, Evas_Object *obj,
                                evas_object_pass_events_set(ad->data_time->btn_right,
                                                                                        EINA_FALSE);
                                elm_object_item_disabled_set(ad->data_time->item, EINA_FALSE);
+                               elm_object_item_disabled_set(ad->data_set_date_header->item, EINA_FALSE);
                        }
                } else {
                        __time_auto_update(ad);
@@ -1512,6 +1555,7 @@ static void setting_time_main_mouse_up_Gendial_list_cb(
                                evas_object_pass_events_set(ad->data_time->eo_check,
                                                                                        EINA_FALSE);
                                elm_object_item_disabled_set(ad->data_time->item, EINA_FALSE);
+                               elm_object_item_disabled_set(ad->data_set_date_header->item, EINA_FALSE);
                        }
 
                } else {

diff --git a/setting-time/src/setting-time.c b/setting-time/src/setting-time.c
index 1580fade3a33e5edd061367e0b7bdccf64250356..da9a39d70a301a27a48314740dab86a737f233e1 100644 (file)
--- a/setting-time/src/setting-time.c
+++ b/setting-time/src/setting-time.c
@@ -55,13 +55,18 @@ static bool _setting_time_app_create(void *priv)
                        &(ad->itc_1text_1icon));
 
        /*date and time buttons item calss: */
-       setting_create_Gendial_itc("entry.main", &(ad->itc_layout));
+       setting_create_Gendial_itc(SETTING_GENLIST_1ICON_STYLE  , &(ad->itc_layout));
        setting_create_Gendial_itc(SETTING_GENLIST_2LINE_STYLE,
                        &(ad->itc_2text_2));
        setting_create_Gendial_itc(SETTING_GENLIST_2LINE_STYLE,
                        &(ad->itc_2text_3_parent));
        setting_create_Gendial_itc(SETTING_GENLIST_2LINE_STYLE,
                        &(ad->itc_1icon_1text_sub));
+       setting_create_Gendial_itc(SETTING_GENLIST_GROUP_INDEX_STYLE,
+                       &(ad->itc_group));
+       setting_create_Gendial_itc(SETTING_GENLIST_MULTILINE_STYLE,
+                       &(ad->itc_multiline));
+       setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(ad->itc_1line));
 
        /* creating a view. */
        setting_view_node_set_cur_view(&setting_view_time_main);